From df460264579b3acab6d7314affa4b8c731cf3d58 Mon Sep 17 00:00:00 2001
From: Marc Baloup <marc.baloup@laposte.net>
Date: Thu, 9 Mar 2023 18:57:09 +0100
Subject: [PATCH] Improves Json util class: ability to add TypeAdapterFactory
 on the fly.

---
 .../bungee/backup/BungeeWorkdirProcess.java   |  6 +-
 .../commands/BungeeBrigadierDispatcher.java   |  5 +-
 .../java/fr/pandacube/lib/core/json/Json.java | 61 ++++++++++++++++---
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/backup/BungeeWorkdirProcess.java b/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/backup/BungeeWorkdirProcess.java
index 74b7007..3bdfd6e 100644
--- a/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/backup/BungeeWorkdirProcess.java
+++ b/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/backup/BungeeWorkdirProcess.java
@@ -1,12 +1,8 @@
 package fr.pandacube.lib.bungee.backup;
 
 import fr.pandacube.lib.core.backup.BackupProcess;
-import fr.pandacube.lib.util.Log;
-import net.md_5.bungee.api.ChatColor;
 
 import java.io.File;
-import java.text.DateFormat;
-import java.util.Date;
 import java.util.function.BiPredicate;
 
 public class BungeeWorkdirProcess extends BackupProcess {
@@ -22,7 +18,7 @@ public class BungeeWorkdirProcess extends BackupProcess {
 	
 	
 	public BiPredicate<File, String> getFilenameFilter() {
-		return new BiPredicate<File, String>() {
+		return new BiPredicate<>() {
 			@Override
 			public boolean test(File file, String path) {
 				if (new File(getSourceDir(), "logs").equals(file))
diff --git a/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java b/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java
index 0c08416..40845ab 100644
--- a/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java
+++ b/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java
@@ -1,6 +1,5 @@
 package fr.pandacube.lib.bungee.commands;
 
-import fr.pandacube.lib.bungee.PandaLibBungee;
 import fr.pandacube.lib.chat.Chat;
 import fr.pandacube.lib.commands.BrigadierDispatcher;
 import net.kyori.adventure.text.ComponentLike;
@@ -21,6 +20,10 @@ public class BungeeBrigadierDispatcher extends BrigadierDispatcher<CommandSender
 
 	private static BungeeBrigadierDispatcher instance = null;
 
+	/**
+	 * Gets the instance of {@link BungeeBrigadierDispatcher}.
+	 * @return the instance of {@link BungeeBrigadierDispatcher}.
+	 */
 	public static synchronized BungeeBrigadierDispatcher getInstance() {
 		return instance;
 	}
diff --git a/pandalib-core/src/main/java/fr/pandacube/lib/core/json/Json.java b/pandalib-core/src/main/java/fr/pandacube/lib/core/json/Json.java
index ae18175..cebcea4 100644
--- a/pandalib-core/src/main/java/fr/pandacube/lib/core/json/Json.java
+++ b/pandalib-core/src/main/java/fr/pandacube/lib/core/json/Json.java
@@ -4,7 +4,9 @@ import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.RecordComponent;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 
@@ -18,30 +20,35 @@ import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 /**
- * Provides pre-instanciated {@link Gson} instances, all with support for Java records.
+ * Provides pre-instanciated {@link Gson} instances, all with support for Java records and additionnal
+ * {@link TypeAdapterFactory} provided with {@link #registerTypeAdapterFactory(TypeAdapterFactory)}.
  */
 public class Json {
 
 	/**
-	 * {@link Gson} instance with {@link GsonBuilder#setLenient()} and support for Java records.
+	 * {@link Gson} instance with {@link GsonBuilder#setLenient()} and support for Java records and additionnal
+	 * {@link TypeAdapterFactory} provided with {@link #registerTypeAdapterFactory(TypeAdapterFactory)}.
 	 */
 	public static final Gson gson = build(Function.identity());
 
 	/**
-	 * {@link Gson} instance with {@link GsonBuilder#setLenient()}, {@link GsonBuilder#setPrettyPrinting()}
-	 * and support for Java records.
+	 * {@link Gson} instance with {@link GsonBuilder#setLenient()}, {@link GsonBuilder#setPrettyPrinting()} and support
+	 * for Java records and additionnal {@link TypeAdapterFactory} provided with
+	 * {@link #registerTypeAdapterFactory(TypeAdapterFactory)}.
 	 */
 	public static final Gson gsonPrettyPrinting = build(GsonBuilder::setPrettyPrinting);
 
 	/**
-	 * {@link Gson} instance with {@link GsonBuilder#setLenient()}, {@link GsonBuilder#serializeNulls()}
-	 * and support for Java records.
+	 * {@link Gson} instance with {@link GsonBuilder#setLenient()}, {@link GsonBuilder#serializeNulls()} and support for
+	 * Java records and additionnal {@link TypeAdapterFactory} provided with
+	 * {@link #registerTypeAdapterFactory(TypeAdapterFactory)}.
 	 */
 	public static final Gson gsonSerializeNulls = build(GsonBuilder::serializeNulls);
 
 	/**
 	 * {@link Gson} instance with {@link GsonBuilder#setLenient()}, {@link GsonBuilder#serializeNulls()},
-	 * {@link GsonBuilder#setPrettyPrinting()} and support for Java records.
+	 * {@link GsonBuilder#setPrettyPrinting()} and support for Java records and additionnal {@link TypeAdapterFactory}
+	 * provided with {@link #registerTypeAdapterFactory(TypeAdapterFactory)}.
 	 */
 	public static final Gson gsonSerializeNullsPrettyPrinting = build(b -> b.serializeNulls().setPrettyPrinting());
 
@@ -52,8 +59,41 @@ public class Json {
 
 
 	private static Gson build(Function<GsonBuilder, GsonBuilder> builderModifier) {
-		return builderModifier
-				.apply(new GsonBuilder().registerTypeAdapterFactory(new RecordAdapterFactory()).setLenient()).create();
+		GsonBuilder base = new GsonBuilder()
+				.registerTypeAdapterFactory(new CustomAdapterFactory())
+				.setLenient();
+		return builderModifier.apply(base).create();
+	}
+
+
+	/**
+	 * Adds the provided {@link TypeAdapterFactory} to all the static Gson instances of this class.
+	 * @param factory the factory to add to the
+	 */
+	public static void registerTypeAdapterFactory(TypeAdapterFactory factory) {
+		synchronized (customTypeAdapterFactories) {
+			customTypeAdapterFactories.add(factory);
+		}
+	}
+
+
+
+	private static final List<TypeAdapterFactory> customTypeAdapterFactories = new ArrayList<>();
+
+
+
+	private static class CustomAdapterFactory implements TypeAdapterFactory {
+		@Override
+		public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+			synchronized (customTypeAdapterFactories) {
+				for (TypeAdapterFactory actualFactory : customTypeAdapterFactories) {
+					TypeAdapter<T> adapter = actualFactory.create(gson, type);
+					if (adapter != null)
+						return adapter;
+				}
+			}
+			return null;
+		}
 	}
 
 
@@ -62,6 +102,9 @@ public class Json {
 
 
 
+	static {
+		registerTypeAdapterFactory(new RecordAdapterFactory());
+	}
 
 	// from https://github.com/google/gson/issues/1794#issuecomment-812964421
 	private static class RecordAdapterFactory implements TypeAdapterFactory {