feat(builder): 为 ConfiguredMap 提供更便利的defaults方法。

CarmJos · Feb 11, 2023 · fd01d9b · fd01d9b
1 parent 0f8383b
commit fd01d9b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.3.2</version>
+        <version>3.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/core/src/main/java/cc/carm/lib/configuration/core/builder/AbstractConfigBuilder.java b/core/src/main/java/cc/carm/lib/configuration/core/builder/AbstractConfigBuilder.java
@@ -62,7 +62,7 @@ public AbstractConfigBuilder(Class<? super P> providerClass) {
         return getThis();
     }
 
-    public @NotNull B defaults(@NotNull Supplier<T> defaultValueSupplier) {
+    public @NotNull B defaults(@NotNull Supplier<@Nullable T> defaultValueSupplier) {
         return defaults(defaultValueSupplier.get());
     }
 

diff --git a/core/src/main/java/cc/carm/lib/configuration/core/builder/map/SourceMapBuilder.java b/core/src/main/java/cc/carm/lib/configuration/core/builder/map/SourceMapBuilder.java
@@ -6,6 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 public class SourceMapBuilder<M extends Map<K, V>, S, K, V> extends CommonConfigBuilder<M, SourceMapBuilder<M, S, K, V>> {
@@ -51,6 +52,12 @@ public <MAP extends Map<K, V>> SourceMapBuilder<MAP, S, K, V> supplier(@NotNull
         );
     }
 
+    public @NotNull SourceMapBuilder<M, S, K, V> defaults(@NotNull Consumer<M> factory) {
+        M map = supplier.get();
+        factory.accept(map);
+        return defaults(map);
+    }
+
     public @NotNull SourceMapBuilder<M, S, K, V> parseKey(@NotNull ConfigDataFunction<String, K> parser) {
         this.keyParser = parser;
         return this;

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.3.2</version>
+        <version>3.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/impl/json/pom.xml b/impl/json/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.3.2</version>
+        <version>3.3.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/impl/sql/pom.xml b/impl/sql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.3.2</version>
+        <version>3.3.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/impl/yaml/pom.xml b/impl/yaml/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.3.2</version>
+        <version>3.3.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.3.2</version>
+    <version>3.3.3</version>
     <modules>
         <module>core</module>
         <module>demo</module>