Makes exception types generic in ThrowableUtil

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))

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;
 	}

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 {

pandalib-reflect/src/main/java/fr/pandacube/lib/reflect/ReflectField.java

@@ -10,7 +10,7 @@ import java.lang.reflect.Modifier;
 public final class ReflectField<T> extends ReflectMember<T, String, Field, NoSuchFieldException> {
 
     /* Those fields are used to modify the value of a static variable. Depending of the current Java version,
-     * one of them whill be used for this purpose.
+     * one of them will be used for this purpose.
      */
     private static sun.misc.Unsafe sunMiscUnsafeInstance;
     private static Field modifiersFieldInFieldClass;

pandalib-util/src/main/java/fr/pandacube/lib/util/LazyOrException.java

@@ -6,35 +6,36 @@ import fr.pandacube.lib.util.ThrowableUtil.SupplierException;
 
 /**
  * Represents a lazy loaded value.
- * 
+ * <p>
  * The value will be computed using the Supplier provided in the
  * constructor, only the first time the {@link #get()} method is
  * called.
  *
  * @param <T> the type of the enclosed value.
+ * @param <E> the exception type
  */
-public class LazyOrException<T> implements SupplierException<T> {
+public class LazyOrException<T, E extends Exception> implements SupplierException<T, E> {
 	
 	private T cachedValue;
-	private final SupplierException<T> supplier;
+	private final SupplierException<T, E> supplier;
 	private boolean cached = false;
 
 	/**
 	 * Create a lazy value loader that will call the provided supplier to get the value.
 	 * @param s the supplier from which the value is fetched.
 	 */
-	public LazyOrException(SupplierException<T> s) {
+	public LazyOrException(SupplierException<T, E> s) {
 		supplier = Objects.requireNonNull(s);
 	}
 	
 	/**
 	 * Get the wrapped value, from cache or from the provider if it is not yet cached.
-	 * 
+	 * <p>
 	 * If the provider throws an exception, it will be redirected to the caller as is, and no value will be cached
 	 * (the next call to this method will execute the supplier again).
 	 */
 	@Override
-	public synchronized T get() throws Exception {
+	public synchronized T get() throws E {
 		if (!cached)
 			set(supplier.get());
 		return cachedValue;

pandalib-util/src/main/java/fr/pandacube/lib/util/ThrowableUtil.java

@@ -5,7 +5,6 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
-import java.util.function.BiConsumer;
 
 /**
  * Utility class to easily manipulate {@link Throwable}s.
@@ -43,7 +42,7 @@ public class ThrowableUtil {
 	 * @throws RuntimeException if the provided {@link SupplierException} throws a checked exception.
 	 * @param <T> the type of the returned object
 	 */
-	public static <T> T wrapEx(SupplierException<T> supp) {
+	public static <T> T wrapEx(SupplierException<T, Exception> supp) {
 		try {
 			return supp.get();
 		} catch (Exception e) {
@@ -56,7 +55,7 @@ public class ThrowableUtil {
 	 * @param run the {@link RunnableException} to run.
 	 * @throws RuntimeException if the provided {@link RunnableException} throws a checked exception.
 	 */
-	public static void wrapEx(RunnableException run) {
+	public static void wrapEx(RunnableException<Exception> run) {
 		try {
 			run.run();
 		} catch (Exception e) {
@@ -74,7 +73,7 @@ public class ThrowableUtil {
 	 * @throws RuntimeException if the provided {@link SupplierException} throws a checked exception.
 	 * @param <T> the type of the returned object
 	 */
-	public static <T> T wrapReflectEx(SupplierException<T> supp) {
+	public static <T> T wrapReflectEx(SupplierException<T, Exception> supp) {
 		try {
 			return supp.get();
 		} catch (Exception e) {
@@ -88,7 +87,7 @@ public class ThrowableUtil {
 	 * @param run the {@link RunnableException} to run.
 	 * @throws RuntimeException if the provided {@link RunnableException} throws a checked exception.
 	 */
-	public static void wrapReflectEx(RunnableException run) {
+	public static void wrapReflectEx(RunnableException<Exception> run) {
 		try {
 			run.run();
 		} catch (Exception e) {
@@ -152,13 +151,13 @@ public class ThrowableUtil {
 	 * A supplier that can possibly throw a checked exception.
 	 */
 	@FunctionalInterface
-	public interface SupplierException<T> { // TODO make exception type generic
+	public interface SupplierException<T, E extends Exception> {
 		/**
 		 * Gets a result.
 		 * @return a result.
-		 * @throws Exception if implementation failed to run.
+		 * @throws E if implementation failed to run.
 		 */
-		T get() throws Exception;
+		T get() throws E;
 	}
 
 
@@ -167,12 +166,12 @@ public class ThrowableUtil {
 	 * A runnable that can possibly throw a checked exception.
 	 */
 	@FunctionalInterface
-	public interface RunnableException { // TODO make exception type generic
+	public interface RunnableException<E extends Exception> {
 		/**
 		 * Run any code implemented.
-		 * @throws Exception if implementation failed to run.
+		 * @throws E if implementation failed to run.
 		 */
-		void run() throws Exception;
+		void run() throws E;
 	}