feat: Implement more sections functions

CarmJos · Feb 21, 2025 · d818556 · d818556
1 parent 5c16e98
commit d818556
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 23 deletions.
diff --git a/core/src/main/java/cc/carm/lib/configuration/source/section/ConfigureSection.java b/core/src/main/java/cc/carm/lib/configuration/source/section/ConfigureSection.java
@@ -18,7 +18,7 @@
  * @author Carm
  * @since 4.0.0
  */
-public interface ConfigureSection extends Cloneable {
+public interface ConfigureSection {
 
     /**
      * Gets the parent section of this section.
@@ -30,6 +30,24 @@ public interface ConfigureSection extends Cloneable {
     @Contract(pure = true)
     @Nullable ConfigureSection parent();
 
+    /**
+     * Gets if this section is a root section.
+     *
+     * @return True if this section is a root section, false otherwise.
+     */
+    default boolean isRoot() {
+        return parent() == null;
+    }
+
+    /**
+     * Gets if this section is empty.
+     *
+     * @return True if this section is empty, false otherwise.
+     */
+    default boolean isEmpty() {
+        return getValues(false).isEmpty();
+    }
+
     /**
      * Gets a set containing all keys in this section.
      * <p>
@@ -190,7 +208,10 @@ default boolean isSection(@NotNull String path) {
      * @return The section if the path exists and is a section, otherwise null.
      */
     @Nullable
-    ConfigureSection getSection(@NotNull String path);
+    default ConfigureSection getSection(@NotNull String path) {
+        Object val = get(path);
+        return (val instanceof ConfigureSection) ? (ConfigureSection) val : null;
+    }
 
     /**
      * Get the origin value of the path.
@@ -686,7 +707,8 @@ default boolean isString(@NotNull String path) {
     }
 
     static <T, C extends Collection<T>> @NotNull C parseCollection(
-            @Nullable List<?> data, @NotNull Supplier<C> constructor,
+            @Nullable List<?> data,
+            @NotNull Supplier<C> constructor,
             @NotNull DataFunction<Object, T> parser
     ) {
         C values = constructor.get();

diff --git a/core/src/main/java/cc/carm/lib/configuration/source/section/ConfigureSource.java b/core/src/main/java/cc/carm/lib/configuration/source/section/ConfigureSource.java
@@ -108,11 +108,6 @@ public void remove(@NotNull String path) {
         section().remove(path);
     }
 
-    @Override
-    public @Nullable ConfigureSection getSection(@NotNull String path) {
-        return section().getSection(path);
-    }
-
     @Override
     public @Nullable Object get(@NotNull String path) {
         return section().get(path);

diff --git a/features/section/src/main/java/cc/carm/lib/configuration/source/section/MapSection.java b/features/section/src/main/java/cc/carm/lib/configuration/source/section/MapSection.java
@@ -8,14 +8,6 @@
 
 public abstract class MapSection<R extends MapSection<R>> implements ConfigureSection {
 
-    public static RawMapSection of() {
-        return new RawMapSection(new LinkedHashMap<>(), null);
-    }
-
-    public static RawMapSection of(@NotNull Map<?, ?> data) {
-        return new RawMapSection(data, null);
-    }
-
     protected final @NotNull Map<String, Object> data;
     protected final @Nullable R parent;
 
@@ -57,6 +49,11 @@ public void migrate(Map<?, ?> data) {
         return this.data;
     }
 
+    @Override
+    public boolean isEmpty() {
+        return data.isEmpty();
+    }
+
     @UnmodifiableView
     public @NotNull Map<String, Object> rawMap() {
         Map<String, Object> output = new LinkedHashMap<>();
@@ -118,12 +115,6 @@ public void remove(@NotNull String path) {
         return section == this ? data.get(path) : section.get(childPath(path));
     }
 
-    @Override
-    public @Nullable ConfigureSection getSection(@NotNull String path) {
-        Object val = get(path);
-        return (val instanceof ConfigureSection) ? (ConfigureSection) val : null;
-    }
-
     @SuppressWarnings("unchecked")
     private R getSectionFor(String path) {
         int index = path.indexOf(pathSeparator());

diff --git a/features/section/src/main/java/cc/carm/lib/configuration/source/section/RawMapSection.java b/features/section/src/main/java/cc/carm/lib/configuration/source/section/RawMapSection.java
@@ -3,10 +3,27 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class RawMapSection extends MapSection<RawMapSection> {
-
+
+    public static RawMapSection of() {
+        return of((RawMapSection) null);
+    }
+
+    public static RawMapSection of(@NotNull Map<?, ?> data) {
+        return of(data, null);
+    }
+
+    public static RawMapSection of(@Nullable RawMapSection parent) {
+        return of(new LinkedHashMap<>(), parent);
+    }
+
+    public static RawMapSection of(@NotNull Map<?, ?> data, @Nullable RawMapSection parent) {
+        return new RawMapSection(data, parent);
+    }
+
     protected RawMapSection(@NotNull Map<?, ?> raw, @Nullable RawMapSection parent) {
         super(parent);
         migrate(raw);