From 5dd5926cb68062ff8de98c47c1d086f9d1f69c4d Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Sun, 25 Sep 2022 12:07:03 +0200
Subject: [PATCH] [gson] Fix tests

---
 .../commons/serialize/gson/api/GsonHolder.java | 18 ++++++++----------
 .../gitlab/jfronny/commons/test/GsonTest.java  | 13 ++-----------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/commons-gson/src/main/java/io/gitlab/jfronny/commons/serialize/gson/api/GsonHolder.java b/commons-gson/src/main/java/io/gitlab/jfronny/commons/serialize/gson/api/GsonHolder.java
index 7d68193..850aeb3 100644
--- a/commons-gson/src/main/java/io/gitlab/jfronny/commons/serialize/gson/api/GsonHolder.java
+++ b/commons-gson/src/main/java/io/gitlab/jfronny/commons/serialize/gson/api/GsonHolder.java
@@ -1,32 +1,30 @@
 package io.gitlab.jfronny.commons.serialize.gson.api;
 
-import io.gitlab.jfronny.commons.serialize.*;
-import io.gitlab.jfronny.commons.serialize.gson.impl.*;
 import com.google.gson.*;
+import io.gitlab.jfronny.commons.serialize.gson.api.v1.GsonHolders;
 
-import java.lang.reflect.*;
-import java.util.function.*;
+import java.lang.reflect.Type;
+import java.util.function.Consumer;
 
 @Deprecated
 public class GsonHolder {
-    private static final io.gitlab.jfronny.commons.serialize.gson.api.v1.GsonHolder BACKEND = new io.gitlab.jfronny.commons.serialize.gson.api.v1.GsonHolder();
     public static Gson getGson() {
-        return BACKEND.getGson();
+        return GsonHolders.API.getGson();
     }
 
     public static void registerTypeAdapter(Type type, Object typeAdapter) {
-        BACKEND.registerTypeAdapter(type, typeAdapter);
+        GsonHolders.registerTypeAdapter(type, typeAdapter);
     }
 
     public static void registerTypeAdapterFactory(TypeAdapterFactory factory) {
-        BACKEND.registerTypeAdapterFactory(factory);
+        GsonHolders.registerTypeAdapterFactory(factory);
     }
 
     public static void modifyBuilder(Consumer<GsonBuilder> func) {
-        BACKEND.modifyBuilder(func);
+        GsonHolders.API.modifyBuilder(func);
     }
 
     public static void register() {
-        Serializer.setInstance(new GsonHolderSerializer(BACKEND));
+        GsonHolders.registerSerializer();
     }
 }
diff --git a/commons-gson/src/test/java/io/gitlab/jfronny/commons/test/GsonTest.java b/commons-gson/src/test/java/io/gitlab/jfronny/commons/test/GsonTest.java
index 638c669..c47b865 100644
--- a/commons-gson/src/test/java/io/gitlab/jfronny/commons/test/GsonTest.java
+++ b/commons-gson/src/test/java/io/gitlab/jfronny/commons/test/GsonTest.java
@@ -20,17 +20,8 @@ public class GsonTest {
     @Test
     void gsonIgnore() throws IOException {
         assertEquals("null", Serializer.getInstance().serialize(new ExampleTypeHidden()));
-        assertEquals("""
-                {
-                  "shouldShow": "Yes"
-                }""", Serializer.getInstance().serialize(new TransitiveHiddenType()));
-        assertEquals("""
-                {
-                  "id": "Yes",
-                  "shown": {
-                    "shouldShow": "Yes"
-                  }
-                }""", Serializer.getInstance().serialize(new ExampleType()));
+        assertEquals("{\"shouldShow\":\"Yes\"}", Serializer.getInstance().serialize(new TransitiveHiddenType()));
+        assertEquals("{\"id\":\"Yes\",\"shown\":{\"shouldShow\":\"Yes\"}}", Serializer.getInstance().serialize(new ExampleType()));
     }
 
     @Test