Moved Floodgate dump info to one class

bundabrg · Jun 8, 2021 · 68cd2eb · 68cd2eb
1 parent 1eef152
commit 68cd2eb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 40 deletions.
diff --git a/common/src/main/java/org/geysermc/floodgate/util/FloodgateConfigHolder.java b/common/src/main/java/org/geysermc/floodgate/util/FloodgateConfigHolder.java
diff --git a/...te/util/FloodgateGitPropertiesHolder.java → ...c/floodgate/util/FloodgateInfoHolder.java b/...te/util/FloodgateGitPropertiesHolder.java → ...c/floodgate/util/FloodgateInfoHolder.java
@@ -27,9 +27,13 @@
 
 import lombok.Getter;
 import lombok.Setter;
+
 import java.util.Properties;
 
-public class FloodgateGitPropertiesHolder {
+public final class FloodgateInfoHolder {
+    @Getter
+    @Setter
+    private static Object config;
     @Getter
     @Setter
     private static Properties gitProperties;

diff --git a/connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java b/connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java
@@ -42,8 +42,7 @@
 import org.geysermc.connector.utils.DockerCheck;
 import org.geysermc.connector.utils.FileUtils;
 import org.geysermc.floodgate.util.DeviceOs;
-import org.geysermc.floodgate.util.FloodgateConfigHolder;
-import org.geysermc.floodgate.util.FloodgateGitPropertiesHolder;
+import org.geysermc.floodgate.util.FloodgateInfoHolder;
 
 import java.io.File;
 import java.io.IOException;
@@ -184,8 +183,8 @@ public static class Floodgate {
         private final Object config;
 
         Floodgate() {
-            this.gitInfo = FloodgateGitPropertiesHolder.getGitProperties();
-            this.config = FloodgateConfigHolder.getConfig();
+            this.gitInfo = FloodgateInfoHolder.getGitProperties();
+            this.config = FloodgateInfoHolder.getConfig();
         }
     }