Merge pull request #6 from haq/develop

fixed bug where loading would not work
haq · Dec 2, 2020 · 7d8dab7 · 7d8dab7
2 parents 48f159d + c8797c0
commit 7d8dab7
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 61 deletions.
diff --git a/bungee/src/main/java/me/affanhaq/keeper/Keeper.java b/bungee/src/main/java/me/affanhaq/keeper/Keeper.java
@@ -18,7 +18,7 @@ public class Keeper {
     /**
      * @param plugin instance of your plugin
      */
-    public Keeper(Plugin plugin) {
+    public Keeper(@NotNull Plugin plugin) {
         this.plugin = plugin;
     }
 
@@ -52,36 +52,31 @@ public Keeper register(@NotNull Object... objects) {
      * @return instance of this class so you can build
      */
     public Keeper load() {
-        OBJECTS.entrySet().forEach(this::load);
-        return this;
-    }
-
-    public Keeper load(@NotNull Object object) {
-        ConfigurationFile file = OBJECTS.get(object);
-        Arrays.stream(object.getClass().getDeclaredFields())
-                .filter(field -> field.isAnnotationPresent(ConfigValue.class))
-                .forEach(field -> {
-
-                    Object value = file.getConfiguration().get(
-                            field.getAnnotation(ConfigValue.class).value()
-                    );
-
-                    if (value == null) {
-                        return;
-                    }
-
-                    if (value instanceof String) {
-                        value = ChatColor.translateAlternateColorCodes('&', value.toString());
-                    }
-
-                    try {
-                        field.setAccessible(true);
-                        field.set(object, value);
-                    } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                    }
-
-                });
+        OBJECTS.forEach((object, configFile) ->
+                Arrays.stream(object.getClass().getDeclaredFields())
+                        .filter(field -> field.isAnnotationPresent(ConfigValue.class))
+                        .forEach(field -> {
+
+                            Object value = configFile.getConfiguration().get(
+                                    field.getAnnotation(ConfigValue.class).value()
+                            );
+
+                            if (value == null) {
+                                return;
+                            }
+
+                            if (value instanceof String) {
+                                value = ChatColor.translateAlternateColorCodes('&', value.toString());
+                            }
+
+                            try {
+                                field.setAccessible(true);
+                                field.set(object, value);
+                            } catch (IllegalAccessException e) {
+                                e.printStackTrace();
+                            }
+
+                        }));
         return this;
     }
 

diff --git a/spigot/src/main/java/me/affanhaq/keeper/Keeper.java b/spigot/src/main/java/me/affanhaq/keeper/Keeper.java
@@ -52,36 +52,31 @@ public Keeper register(@NotNull Object... objects) {
      * @return instance of this class so you can build
      */
     public Keeper load() {
-        OBJECTS.entrySet().forEach(this::load);
-        return this;
-    }
-
-    public Keeper load(@NotNull Object object) {
-        ConfigurationFile file = OBJECTS.get(object);
-        Arrays.stream(object.getClass().getDeclaredFields())
-                .filter(field -> field.isAnnotationPresent(ConfigValue.class))
-                .forEach(field -> {
-
-                    Object value = file.getConfiguration().get(
-                            field.getAnnotation(ConfigValue.class).value()
-                    );
-
-                    if (value == null) {
-                        return;
-                    }
-
-                    if (value instanceof String) {
-                        value = ChatColor.translateAlternateColorCodes('&', value.toString());
-                    }
-
-                    try {
-                        field.setAccessible(true);
-                        field.set(object, value);
-                    } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                    }
-
-                });
+        OBJECTS.forEach((object, configFile) ->
+                Arrays.stream(object.getClass().getDeclaredFields())
+                        .filter(field -> field.isAnnotationPresent(ConfigValue.class))
+                        .forEach(field -> {
+
+                            Object value = configFile.getConfiguration().get(
+                                    field.getAnnotation(ConfigValue.class).value()
+                            );
+
+                            if (value == null) {
+                                return;
+                            }
+
+                            if (value instanceof String) {
+                                value = ChatColor.translateAlternateColorCodes('&', value.toString());
+                            }
+
+                            try {
+                                field.setAccessible(true);
+                                field.set(object, value);
+                            } catch (IllegalAccessException e) {
+                                e.printStackTrace();
+                            }
+
+                        }));
         return this;
     }