diff --git a/core/pom.xml b/core/pom.xml index 05b04f4..0f1ab76 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ easyconfiguration-parent cc.carm.lib - 3.3.2 + 3.3.3 4.0.0 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 index 1cd8a68..06c6219 100644 --- 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 abstract class AbstractConfigBuilder 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 index 8fdd916..4823b82 100644 --- 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 cc.carm.lib.configuration.core.value.type.ConfiguredMap; import org.jetbrains.annotations.NotNull; import java.util.Map; +import java.util.function.Consumer; import java.util.function.Supplier; public class SourceMapBuilder, S, K, V> extends CommonConfigBuilder> { @@ -51,6 +52,12 @@ public class SourceMapBuilder, S, K, V> extends CommonConfig ); } + public @NotNull SourceMapBuilder defaults(@NotNull Consumer factory) { + M map = supplier.get(); + factory.accept(map); + return defaults(map); + } + public @NotNull SourceMapBuilder parseKey(@NotNull ConfigDataFunction parser) { this.keyParser = parser; return this; diff --git a/demo/pom.xml b/demo/pom.xml index fc14e23..93d6544 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -5,7 +5,7 @@ easyconfiguration-parent cc.carm.lib - 3.3.2 + 3.3.3 4.0.0 diff --git a/impl/json/pom.xml b/impl/json/pom.xml index 59b7e3a..1a52f90 100644 --- a/impl/json/pom.xml +++ b/impl/json/pom.xml @@ -5,7 +5,7 @@ easyconfiguration-parent cc.carm.lib - 3.3.2 + 3.3.3 ../../pom.xml 4.0.0 diff --git a/impl/sql/pom.xml b/impl/sql/pom.xml index bc52f4c..e8a8a63 100644 --- a/impl/sql/pom.xml +++ b/impl/sql/pom.xml @@ -5,7 +5,7 @@ easyconfiguration-parent cc.carm.lib - 3.3.2 + 3.3.3 ../../pom.xml 4.0.0 diff --git a/impl/yaml/pom.xml b/impl/yaml/pom.xml index 885f166..e96b87a 100644 --- a/impl/yaml/pom.xml +++ b/impl/yaml/pom.xml @@ -5,7 +5,7 @@ easyconfiguration-parent cc.carm.lib - 3.3.2 + 3.3.3 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 1a9d0b1..548ad28 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ cc.carm.lib easyconfiguration-parent pom - 3.3.2 + 3.3.3 core demo