build(deps): Update with EasyConfiguration

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

platform/bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitSection.java

@@ -6,6 +6,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnmodifiableView;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
@@ -13,12 +14,14 @@ public class BukkitSection implements ConfigureSection {
 
     protected final @NotNull BukkitSource source;
     protected final @Nullable BukkitSection parent;
+    protected final @NotNull String path;
     protected final @NotNull ConfigurationSection data;
 
     public BukkitSection(@NotNull BukkitSource source, @Nullable BukkitSection parent,
-                         @NotNull ConfigurationSection data) {
+                         @NotNull String path, @NotNull ConfigurationSection data) {
         this.source = source;
         this.parent = parent;
+        this.path = path;
         this.data = data;
     }
 
@@ -31,6 +34,11 @@ public class BukkitSection implements ConfigureSection {
         return this.parent;
     }
 
+    @Override
+    public @NotNull String path() {
+        return this.path;
+    }
+
     public @NotNull ConfigurationSection data() {
         return this.data;
     }
@@ -42,11 +50,23 @@ public class BukkitSection implements ConfigureSection {
 
     @Override
     public @NotNull @UnmodifiableView Map<String, Object> getValues(boolean deep) {
-        return data().getValues(deep);
+
+        Map<String, Object> original = data().getValues(deep);
+        // wrap all ConfigurationSection
+        for (Map.Entry<String, Object> entry : original.entrySet()) {
+            if (entry.getValue() instanceof ConfigurationSection) {
+                original.put(entry.getKey(), createSection(entry.getKey(), (ConfigurationSection) entry.getValue()));
+            }
+        }
+
+        return Collections.unmodifiableMap(original);
     }
 
     @Override
     public void set(@NotNull String path, @Nullable Object value) {
+        if (value instanceof BukkitSection) { // unwrap
+            value = ((BukkitSection) value).data();
+        }
         data().set(path, value);
     }
 
@@ -60,27 +80,24 @@ public class BukkitSection implements ConfigureSection {
         Object value = get(path);
         if (value instanceof ConfigureSection) {
             return (ConfigureSection) value;
-        } else if (value instanceof ConfigurationSection) {
-            return new BukkitSection(source(), this, (ConfigurationSection) value);
         }
         return null;
     }
 
-    @Override
+    public @NotNull BukkitSection createSection(@NotNull String path, @NotNull ConfigurationSection section) {
-    public @NotNull ConfigureSection createSection(@NotNull Map<?, ?> data) {
+        return new BukkitSection(source(), this, path, section);
-        throw new UnsupportedOperationException("BukkitSection does not support this operation");
     }
 
     @Override
-    public @NotNull ConfigureSection computeSection(@NotNull String path) {
+    public @NotNull BukkitSection createSection(@NotNull String path, @NotNull Map<?, ?> data) {
-        return new BukkitSection(source(), this, data.createSection(path));
+        return createSection(path, data().createSection(path, data));
     }
 
     @Override
     public @Nullable Object get(@NotNull String path) {
         Object value = data().get(path);
-        if (value instanceof ConfigurationSection) {
+        if (value instanceof ConfigurationSection) { // wrap
-            return new BukkitSection(source(), this, (ConfigurationSection) value);
+            return createSection(path, (ConfigurationSection) value);
         }
         return value;
     }

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitSource.java

@@ -38,7 +38,7 @@ public class BukkitSource extends FileConfigSource<BukkitSection, YamlConfigurat
     }
 
     @Override
-    protected BukkitSource self() {
+    protected @NotNull BukkitSource self() {
         return this;
     }
 
@@ -68,7 +68,7 @@ public class BukkitSource extends FileConfigSource<BukkitSection, YamlConfigurat
     @Override
     protected void onReload() throws Exception {
         YamlConfiguration configuration = fileReader(YamlConfiguration::loadConfiguration);
-        this.rootSection = new BukkitSection(this, null, configuration);
+        this.rootSection = new BukkitSection(this, null, "", configuration);
     }
 
     @Override

platform/bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

platform/velocity/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -10,14 +10,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
-        <deps.easyconfifuration.version>4.0.6</deps.easyconfifuration.version>
+        <deps.easyconfifuration.version>4.0.7</deps.easyconfifuration.version>
         <deps.yamlcommentwriter.version>1.2.0</deps.yamlcommentwriter.version>
         <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
     </properties>
 
     <groupId>cc.carm.lib</groupId>
     <artifactId>mineconfiguration-parent</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <packaging>pom</packaging>
     <modules>
         <module>common</module>