Add reloadsWith().

Author: RezzedUp

config-values-bukkit/src/main/java/community/leaf/configvalues/bukkit/data/YamlDataFile.java

@@ -26,6 +26,7 @@
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 public class YamlDataFile implements UpdatableYamlDataSource
@@ -38,6 +39,7 @@ public class YamlDataFile implements UpdatableYamlDataSource
     private boolean isLoaded = false;
     private boolean isUpdated = false;
     private @NullOr Exception invalid = null;
+    private @NullOr Runnable reloadHandler = null;
 
     public YamlDataFile(Path directoryPath, String name)
     {
@@ -72,6 +74,12 @@ public YamlDataFile(Path directoryPath, String name, Consumer<Exception> excepti
 
     public final int totalReloads() { return reloads; }
 
+    protected void reloadsWith(Runnable reloadHandler)
+    {
+        this.reloadHandler = Objects.requireNonNull(reloadHandler, "reloadHandler");
+        reloadHandler.run();
+    }
+    
     public final void reload()
     {
         reloads++;
@@ -92,12 +100,9 @@ public final void reload()
             }
         }
 
-        if (isAlreadyLoaded) { handleReload(); }
+        if (isAlreadyLoaded && reloadHandler != null) { reloadHandler.run(); }
     }
 
-    // Override me.
-    protected void handleReload() {}
-    
     public String toYamlString() { return data.saveToString(); }
 
     public void save()
@@ -135,8 +140,10 @@ public void header(String header)
         // is changed, that should not constitute rewriting the entire file.
     }
 
-    public void setupHeader(String resource)
+    public void headerFromResource(String resource)
     {
+        Objects.requireNonNull(resource, "resource");
+        
         try
         {
             @NullOr URL resourceUrl = getClass().getClassLoader().getResource(resource);
@@ -158,26 +165,28 @@ public void setupHeader(String resource)
         }
     }
 
+    private void migrate(YamlValue<?> value, ConfigurationSection existing)
+    {
+        if (value.migrations().isEmpty()) { return; }
+        for (Migration migration : value.migrations()) { migration.migrate(existing, this, value.key()); }
+    }
+    
     public void migrateValues(List<YamlValue<?>> values, ConfigurationSection existing)
     {
-        for (YamlValue<?> value : values)
-        {
-            for (Migration migration : value.migrations())
-            {
-                migration.migrate(existing, this, value.key());
-            }
-        }
+        Objects.requireNonNull(values, "values");
+        Objects.requireNonNull(existing, "existing");
+        
+        for (YamlValue<?> value : values) { migrate(value, existing); }
     }
 
-    public void setupDefaults(List<YamlValue<?>> defaults)
+    public void defaultValues(List<YamlValue<?>> defaults)
     {
         for (YamlValue<?> value : defaults)
         {
+            migrate(value, data);
             if (!(value instanceof DefaultYamlValue<?>)) { continue; }
             setAsDefaultIfUnset((DefaultYamlValue<?>) value);
         }
-        
-        migrateValues(defaults, data);
     }
 
     protected static void write(Path filePath, String contents, Consumer<? super IOException> exceptions)

examples/config-values-example-bukkit/src/main/java/community/leaf/examples/configvalues/bukkit/Config.java

@@ -29,31 +29,26 @@ public class Config extends YamlDataFile
     private static final List<YamlValue<?>> VALUES =
         Aggregates.list(Config.class, YamlValue.type(), Aggregates.matching().all());
 
-    private final ExampleConfigPlugin plugin;
-    
     public Config(ExampleConfigPlugin plugin)
     {
         super(plugin.directory(), "config.yml");
-        this.plugin = plugin;
-        handleReload();
-    }
-    
-    @Override
-    protected void handleReload()
-    {
-        if (isInvalid()) { return; }
-        
-        String configVersion = get(VERSION).orElse("");
-        String pluginVersion = plugin.getDescription().getVersion();
 
-        boolean isOutdated = !configVersion.equals(pluginVersion);
+        reloadsWith(() ->
+        {
+            if (isInvalid()) { return; }
 
-        if (isOutdated) { set(VERSION, pluginVersion); }
-    
-        setupHeader("config.header.txt");
-        setupDefaults(VALUES);
+            String configVersion = get(VERSION).orElse("");
+            String pluginVersion = plugin.getDescription().getVersion();
+            
+            boolean isOutdated = !configVersion.equals(pluginVersion);
+            
+            if (isOutdated) { set(VERSION, pluginVersion); }
 
-        if (isOutdated) { migrateValues(VALUES, data()); }
-        if (isUpdated()) { backupThenSave(plugin.backups(), "v" + configVersion); }
+            headerFromResource("config.header.txt");
+            defaultValues(VALUES);
+            
+            if (isOutdated) { migrateValues(VALUES, data()); }
+            if (isUpdated()) { backupThenSave(plugin.backups(), "v" + configVersion); }
+        });
     }
 }