fix fix

Author: ayyhimself

src/main/java/net/discordjug/javabot/SpringConfig.java

@@ -4,11 +4,7 @@
 import java.util.Collection;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.regex.Pattern;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.discordjug.javabot.data.config.PatternTypeAdapter;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -94,13 +90,4 @@ BotConfig botConfig() {
 		}
 		return botConfig;
 	}
-
-	@Bean
-	Gson gson() {
-		return new GsonBuilder()
-				.serializeNulls()
-				.setPrettyPrinting()
-				.registerTypeAdapter(Pattern.class, new PatternTypeAdapter())
-				.create();
-	}
 }

src/main/java/net/discordjug/javabot/data/config/BotConfig.java

@@ -1,10 +1,9 @@
 package net.discordjug.javabot.data.config;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import lombok.extern.slf4j.Slf4j;
 import net.discordjug.javabot.util.ExceptionLogger;
+import net.discordjug.javabot.util.GsonUtils;
 import net.dv8tion.jda.api.entities.Guild;
 
 import org.jetbrains.annotations.NotNull;
@@ -64,11 +63,10 @@ public BotConfig(Path dir) {
 			}
 		}
 		this.guilds = new ConcurrentHashMap<>();
-		Gson gson = new GsonBuilder().enableComplexMapKeySerialization().create();
 		Path systemsFile = dir.resolve(SYSTEMS_FILE);
 		if (Files.exists(systemsFile)) {
 			try (BufferedReader reader = Files.newBufferedReader(systemsFile)) {
-				this.systemsConfig = gson.fromJson(reader, SystemsConfig.class);
+				this.systemsConfig = GsonUtils.fromJson(reader, SystemsConfig.class);
 				log.info("Loaded systems config from {}", systemsFile);
 			} catch (JsonSyntaxException e) {
 				ExceptionLogger.capture(e, getClass().getSimpleName());
@@ -133,10 +131,9 @@ public SystemsConfig getSystems() {
 	 * Flushes all configuration to the disk.
 	 */
 	public void flush() {
-		Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
 		Path systemsFile = this.dir.resolve(SYSTEMS_FILE);
 		try (BufferedWriter writer = Files.newBufferedWriter(systemsFile)) {
-			gson.toJson(this.systemsConfig, writer);
+			GsonUtils.toJson(this.systemsConfig, writer);
 			writer.flush();
 		} catch (IOException e) {
 			ExceptionLogger.capture(e, getClass().getSimpleName());

src/main/java/net/discordjug/javabot/data/config/GuildConfig.java

@@ -1,12 +1,11 @@
 package net.discordjug.javabot.data.config;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import net.discordjug.javabot.data.config.guild.*;
 import net.discordjug.javabot.util.ExceptionLogger;
+import net.discordjug.javabot.util.GsonUtils;
 import net.discordjug.javabot.util.Pair;
 import net.dv8tion.jda.api.entities.Guild;
 
@@ -20,7 +19,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
-import java.util.regex.Pattern;
 
 /**
  * A collection of guild-specific configuration items, each of which represents
@@ -71,13 +69,10 @@ public GuildConfig(Guild guild, Path file) {
 	 * @throws UncheckedIOException if an IO error occurs.
 	 */
 	public static GuildConfig loadOrCreate(Guild guild, Path file) {
-		Gson gson = new GsonBuilder()
-				.registerTypeAdapter(Pattern.class, new PatternTypeAdapter())
-				.create();
 		GuildConfig config;
 		if (Files.exists(file)) {
 			try (BufferedReader reader = Files.newBufferedReader(file)) {
-				config = gson.fromJson(reader, GuildConfig.class);
+				config = GsonUtils.fromJson(reader, GuildConfig.class);
 				config.setFile(file);
 				config.setGuild(guild);
 				log.info("Loaded config from {}", file);
@@ -118,13 +113,8 @@ private void setGuild(Guild guild) {
 	 * Saves this config to its file path.
 	 */
 	public synchronized void flush() {
-		Gson gson = new GsonBuilder()
-				.serializeNulls()
-				.setPrettyPrinting()
-				.registerTypeAdapter(Pattern.class, new PatternTypeAdapter())
-				.create();
 		try (BufferedWriter writer = Files.newBufferedWriter(this.file)) {
-			gson.toJson(this, writer);
+			GsonUtils.toJson(this, writer);
 			writer.flush();
 		} catch (IOException e) {
 			ExceptionLogger.capture(e, getClass().getSimpleName());
@@ -167,9 +157,9 @@ public void set(String propertyName, String value) throws UnknownPropertyExcepti
 		Optional<Pair<Field, Object>> result = ReflectionUtils.resolveField(propertyName, this);
 		result.ifPresent(pair -> {
 			try {
-				Field updatedField = ReflectionUtils.set(pair.first(), pair.second(), value);
-				if (updatedField.get(pair.second()) instanceof GuildConfigItem) {
-					((GuildConfigItem) updatedField.get(pair.second())).setGuildConfig(this);
+				Object updatedField = ReflectionUtils.set(pair.first(), pair.second(), value);
+				if (updatedField instanceof GuildConfigItem item) {
+					item.setGuildConfig(this);
 				}
 				this.flush();
 			} catch (IllegalAccessException e) {

src/main/java/net/discordjug/javabot/data/config/ReflectionUtils.java

@@ -1,9 +1,8 @@
 package net.discordjug.javabot.data.config;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import lombok.extern.slf4j.Slf4j;
 import net.discordjug.javabot.util.ExceptionLogger;
+import net.discordjug.javabot.util.GsonUtils;
 import net.discordjug.javabot.util.Pair;
 
 import org.jetbrains.annotations.NotNull;
@@ -16,32 +15,13 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
-import java.util.regex.Pattern;
 
 /**
  * Utility class for resolving JSON files.
  */
 @Slf4j
 public class ReflectionUtils {
 	private static final Map<Class<?>, Function<String, Object>> propertyTypeParsers = new HashMap<>();
-	private static final Gson gson = new GsonBuilder()
-			.serializeNulls()
-			.setPrettyPrinting()
-			.registerTypeAdapter(Pattern.class, new PatternTypeAdapter())
-			.create();
-
-	static {
-		propertyTypeParsers.put(Integer.class, Integer::parseInt);
-		propertyTypeParsers.put(int.class, Integer::parseInt);
-		propertyTypeParsers.put(Long.class, Long::parseLong);
-		propertyTypeParsers.put(long.class, Long::parseLong);
-		propertyTypeParsers.put(Float.class, Float::parseFloat);
-		propertyTypeParsers.put(float.class, Float::parseFloat);
-		propertyTypeParsers.put(Double.class, Double::parseDouble);
-		propertyTypeParsers.put(double.class, Double::parseDouble);
-		propertyTypeParsers.put(Boolean.class, Boolean::parseBoolean);
-		propertyTypeParsers.put(String.class, s -> s);
-	}
 
 	private ReflectionUtils() {
 	}
@@ -134,11 +114,12 @@ private static Field findDeclaredField(Class<?> cl, String name) throws NoSuchFi
 	 * @param field  The field to set.
 	 * @param parent The object whose property value to set.
 	 * @param s      The string representation of the value.
-	 * @return Returns the edited {@link Field}.
+	 * @return Returns the new value.
 	 * @throws IllegalAccessException If the field cannot be set.
 	 */
-	public static Field set(@NotNull Field field, @NotNull Object parent, @NotNull String s) throws IllegalAccessException {
-		field.set(parent, gson.fromJson(s, field.getType()));
-		return field;
+	public static Object set(@NotNull Field field, @NotNull Object parent, @NotNull String s) throws IllegalAccessException {
+		Object value = GsonUtils.fromJson(s, field.getType());
+		field.set(parent, value);
+		return value;
 	}
 }

src/main/java/net/discordjug/javabot/listener/filter/MessageRuleFilter.java

@@ -13,7 +13,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.google.gson.Gson;
 import lombok.RequiredArgsConstructor;
 import net.discordjug.javabot.data.config.BotConfig;
 import net.discordjug.javabot.data.config.guild.MessageRule;
@@ -23,6 +22,7 @@
 import net.discordjug.javabot.data.h2db.message_cache.model.CachedMessage;
 import net.discordjug.javabot.util.Checks;
 import net.discordjug.javabot.util.ExceptionLogger;
+import net.discordjug.javabot.util.GsonUtils;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message.Attachment;
 import net.dv8tion.jda.api.entities.Message;
@@ -38,7 +38,6 @@ public class MessageRuleFilter implements MessageFilter {
 
 	private final BotConfig botConfig;
 	private final MessageCache messageCache;
-	private final Gson gson;
 
 	@Override
 	public MessageModificationStatus processMessage(MessageContent content) {
@@ -76,7 +75,7 @@ private void log(MessageContent content, MessageRule ruleToExecute, ModerationCo
 				content.event().getMessage().getAuthor(),
 				CachedMessage.of(content.event().getMessage()), "Message content")
 			.setTitle("Message rule triggered")
-			.addField("Rule description", "```\n" + gson.toJson(ruleToExecute) + "\n```", false);
+			.addField("Rule description", "```\n" + GsonUtils.toJson(ruleToExecute) + "\n```", false);
 		if (!content.attachments().isEmpty()) {
 			embed.addField("Attachment hashes", computeAttachmentDescription(content.attachments()), false);
 		}

src/main/java/net/discordjug/javabot/systems/configuration/GetConfigSubcommand.java

@@ -1,9 +1,9 @@
 package net.discordjug.javabot.systems.configuration;
 
-import com.google.gson.Gson;
 import net.discordjug.javabot.data.config.BotConfig;
 import net.discordjug.javabot.data.config.GuildConfig;
 import net.discordjug.javabot.data.config.UnknownPropertyException;
+import net.discordjug.javabot.util.GsonUtils;
 import net.discordjug.javabot.util.Responses;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
@@ -20,20 +20,15 @@
  * Subcommand that allows staff-members to get a single property variable from the guild config.
  */
 public class GetConfigSubcommand extends ConfigSubcommand implements AutoCompletable {
-
-	private final Gson gson;
-
 	/**
 	 * The constructor of this class, which sets the corresponding {@link SubcommandData}.
 	 * @param botConfig The main configuration of the bot
-	 * @param gson Mapper used for displaying config as json
 	 */
-	public GetConfigSubcommand(BotConfig botConfig, Gson gson) {
+	public GetConfigSubcommand(BotConfig botConfig) {
 		super(botConfig);
 		setCommandData(new SubcommandData("get", "Get the current value of a configuration property.")
 				.addOption(OptionType.STRING, "property", "The name of a property.", true, true)
 		);
-		this.gson = gson;
 	}
 
 	@Override
@@ -44,7 +39,7 @@ public ReplyCallbackAction handleConfigSubcommand(@Nonnull SlashCommandInteracti
 		}
 		String property = propertyOption.getAsString().trim();
 		Object value = config.resolve(property);
-		String json = gson.toJson(value);
+		String json = GsonUtils.toJson(value);
 		return Responses.info(event, "Configuration Property", "The value of the property `%s` is:\n```\n%s\n```", property, json);
 	}
 

src/main/java/net/discordjug/javabot/systems/configuration/SetConfigSubcommand.java

@@ -1,10 +1,10 @@
 package net.discordjug.javabot.systems.configuration;
 
-import com.google.gson.Gson;
 import net.discordjug.javabot.annotations.AutoDetectableComponentHandler;
 import net.discordjug.javabot.data.config.BotConfig;
 import net.discordjug.javabot.data.config.GuildConfig;
 import net.discordjug.javabot.data.config.UnknownPropertyException;
+import net.discordjug.javabot.util.GsonUtils;
 import net.discordjug.javabot.util.Responses;
 import net.dv8tion.jda.api.components.label.Label;
 import net.dv8tion.jda.api.components.textinput.TextInput;
@@ -32,21 +32,16 @@
  */
 @AutoDetectableComponentHandler("config-set")
 public class SetConfigSubcommand extends ConfigSubcommand implements ModalHandler, AutoCompletable {
-
-	private final Gson gson;
-
 	/**
 	 * The constructor of this class, which sets the corresponding {@link SubcommandData}.
 	 * @param botConfig The main configuration of the bot
-	 * @param gson Mapper used for displaying config as json
 	 */
-	public SetConfigSubcommand(BotConfig botConfig, Gson gson) {
+	public SetConfigSubcommand(BotConfig botConfig) {
 		super(botConfig);
 		setCommandData(new SubcommandData("set", "Sets the value of a configuration property.")
 				.addOption(OptionType.STRING, "property", "The name of a property.", true, true)
 				.addOption(OptionType.STRING, "value", "The value to set for the property.", false)
 		);
-		this.gson = gson;
 	}
 
 	@Override
@@ -63,7 +58,7 @@ public InteractionCallbackAction<?> handleConfigSubcommand(@Nonnull SlashCommand
 			if (resolved == null) {
 				return Responses.error(event, "Config `%s` not found", property);
 			}
-			String json = gson.toJson(resolved);
+			String json = GsonUtils.toJson(resolved);
 			return event.replyModal(
 					Modal.create(ComponentIdBuilder.build("config-set", property), "Change configuration value")
 					.addComponents(Label.of("new value", TextInput.create("value", TextInputStyle.PARAGRAPH)

src/main/java/net/discordjug/javabot/util/GsonUtils.java

@@ -0,0 +1,39 @@
+package net.discordjug.javabot.util;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import net.discordjug.javabot.data.config.PatternTypeAdapter;
+
+import java.io.Reader;
+import java.io.Writer;
+import java.util.regex.Pattern;
+
+/**
+ * Utility class that contains several methods for using Gson.
+ */
+public class GsonUtils {
+
+	private static final Gson gson = new GsonBuilder()
+			.serializeNulls()
+			.setPrettyPrinting()
+			.registerTypeAdapter(Pattern.class, new PatternTypeAdapter())
+			.enableComplexMapKeySerialization()
+			.create();
+
+	public static <T> T fromJson(String json, Class<T> type) {
+		return gson.fromJson(json, type);
+	}
+
+	public static <T> T fromJson(Reader json, Class<T> type) {
+		return gson.fromJson(json, type);
+	}
+
+	public static String toJson(Object object) {
+		return gson.toJson(object);
+	}
+
+	public static void toJson(Object object, Writer writer) {
+		gson.toJson(object, writer);
+	}
+
+}