diff --git a/core/src/main/java/cc/carm/lib/configuration/annotation/Ex.java b/core/src/main/java/cc/carm/lib/configuration/annotation/Ex.java deleted file mode 100644 index c21ad53..0000000 --- a/core/src/main/java/cc/carm/lib/configuration/annotation/Ex.java +++ /dev/null @@ -1,21 +0,0 @@ -package cc.carm.lib.configuration.annotation; - -import cc.carm.lib.configuration.source.loader.ConfigurationInitializer; - -public class Ex { - - static void init(ConfigurationInitializer initializer) { - initializer.appendFieldInitializer((holder, path, field, value) -> { - ValueRange range = field.getAnnotation(ValueRange.class); - if (range == null) return; - value.validate((h, v) -> { - if (!(v instanceof Number)) return; - Number number = (Number) v; - if (number.doubleValue() >= range.min() && number.doubleValue() <= range.max()) { - throw new IllegalArgumentException(range.message()); - } - }); - }); - } - -} diff --git a/core/src/main/java/cc/carm/lib/configuration/builder/AbstractConfigBuilder.java b/core/src/main/java/cc/carm/lib/configuration/builder/AbstractConfigBuilder.java index e617190..f1ee8f1 100644 --- a/core/src/main/java/cc/carm/lib/configuration/builder/AbstractConfigBuilder.java +++ b/core/src/main/java/cc/carm/lib/configuration/builder/AbstractConfigBuilder.java @@ -29,7 +29,7 @@ public abstract class AbstractConfigBuilder< protected @Nullable HOLDER holder; protected @Nullable String path; - protected @NotNull ValueValidator valueValidator = ValueValidator.none(); + protected @NotNull ValueValidator valueValidator = ValueValidator.none(); protected @NotNull Supplier<@Nullable TYPE> defaultValueSupplier = () -> null; protected @NotNull BiConsumer, String> initializer = (h, p) -> { }; @@ -63,7 +63,7 @@ public abstract class AbstractConfigBuilder< * @param validator The validator to set. * @return this builder */ - public SELF validator(@NotNull ValueValidator validator) { + public SELF validator(@NotNull ValueValidator validator) { this.valueValidator = validator; return self(); } @@ -81,20 +81,17 @@ public abstract class AbstractConfigBuilder< /** * Validate the value with the specified condition. * - * @param validator The validator to set. + * @param validator The validator to append. * @return this builder */ public SELF validate(@NotNull ValueValidator validator) { - return validator((h, v) -> { - this.valueValidator.validate(h, v); - validator.validate(h, v); - }); + return validator(this.valueValidator.and(validator)); } /** * Validate the value with the specified condition. * - * @param validator The validator to set. + * @param validator The validator to append. * @return this builder */ public SELF validate(@NotNull DataValidator validator) { diff --git a/core/src/main/java/cc/carm/lib/configuration/function/ConfigExceptionHandler.java b/core/src/main/java/cc/carm/lib/configuration/function/ConfigExceptionHandler.java new file mode 100644 index 0000000..1cb39a7 --- /dev/null +++ b/core/src/main/java/cc/carm/lib/configuration/function/ConfigExceptionHandler.java @@ -0,0 +1,22 @@ +package cc.carm.lib.configuration.function; + +import org.jetbrains.annotations.NotNull; + +@FunctionalInterface +public interface ConfigExceptionHandler { + + void handle(@NotNull String path, @NotNull Throwable throwable); + + static @NotNull ConfigExceptionHandler silence() { + return (path, throwable) -> { + }; + } + + static @NotNull ConfigExceptionHandler print() { + return (path, throwable) -> { + System.err.println("Error occurred at path: " + path); + throwable.printStackTrace(); + }; + } + +} diff --git a/core/src/main/java/cc/carm/lib/configuration/function/ValueValidator.java b/core/src/main/java/cc/carm/lib/configuration/function/ValueValidator.java index e99beda..a585254 100644 --- a/core/src/main/java/cc/carm/lib/configuration/function/ValueValidator.java +++ b/core/src/main/java/cc/carm/lib/configuration/function/ValueValidator.java @@ -9,7 +9,7 @@ public interface ValueValidator { void validate(@NotNull ConfigurationHolder holder, @Nullable T value) throws Exception; - default ValueValidator compose(ValueValidator other) { + default ValueValidator and(ValueValidator other) { return (holder, value) -> { validate(holder, value); other.validate(holder, value); diff --git a/core/src/main/java/cc/carm/lib/configuration/source/ConfigurationFactory.java b/core/src/main/java/cc/carm/lib/configuration/source/ConfigurationFactory.java index ad2aa08..bf8c6a5 100644 --- a/core/src/main/java/cc/carm/lib/configuration/source/ConfigurationFactory.java +++ b/core/src/main/java/cc/carm/lib/configuration/source/ConfigurationFactory.java @@ -2,7 +2,9 @@ package cc.carm.lib.configuration.source; import cc.carm.lib.configuration.adapter.*; import cc.carm.lib.configuration.adapter.strandard.StandardAdapters; +import cc.carm.lib.configuration.function.ConfigExceptionHandler; import cc.carm.lib.configuration.function.DataFunction; +import cc.carm.lib.configuration.function.ValueValidator; import cc.carm.lib.configuration.source.loader.ConfigurationInitializer; import cc.carm.lib.configuration.source.loader.PathGenerator; import cc.carm.lib.configuration.source.meta.ConfigurationMetaHolder; @@ -33,10 +35,11 @@ public abstract class ConfigurationFactory< SELF > { - protected ValueAdapterRegistry adapters = new ValueAdapterRegistry(); - protected ConfigurationOptionHolder options = new ConfigurationOptionHolder(); + protected @NotNull ValueAdapterRegistry adapters = new ValueAdapterRegistry(); + protected @NotNull ConfigurationOptionHolder options = new ConfigurationOptionHolder(); protected @NotNull Map metadata = new HashMap<>(); - protected ConfigurationInitializer initializer = new ConfigurationInitializer(); + protected @NotNull ConfigurationInitializer initializer = new ConfigurationInitializer(); + protected @NotNull ConfigExceptionHandler exceptionHandler = ConfigExceptionHandler.print(); protected ConfigurationFactory() { this.adapters.register(StandardAdapters.PRIMITIVES); @@ -147,6 +150,11 @@ public abstract class ConfigurationFactory< return self(); } + public SELF exceptionally(@NotNull ConfigExceptionHandler handler) { + this.exceptionHandler = handler; + return self(); + } + /** * Supply the base path generator for this configuration holder * @@ -154,9 +162,7 @@ public abstract class ConfigurationFactory< * @return this */ public SELF pathGenerator(PathGenerator generator) { - return initializer(loader -> { - loader.pathGenerator(generator); - }); + return initializer(loader -> loader.pathGenerator(generator)); } /** @@ -175,6 +181,19 @@ public abstract class ConfigurationFactory< return initializer(loader -> loader.registerAnnotation(annotation, metadata, extractor)); } + /** + * Register a new annotation for {@link ValueValidator} to the configuration loader + * + * @param annotation The {@link Annotation} + * @param builder The {@link Function} to build the {@link ValueValidator} from the annotation + * @param The annotation type + * @return this + */ + public SELF validAnnotation(@NotNull Class annotation, + @NotNull Function> builder) { + return initializer(loader -> loader.registerValidAnnotation(annotation, builder)); + } + /** * Build the configuration holder. * diff --git a/core/src/main/java/cc/carm/lib/configuration/source/ConfigurationHolder.java b/core/src/main/java/cc/carm/lib/configuration/source/ConfigurationHolder.java index f06e2af..912c93c 100644 --- a/core/src/main/java/cc/carm/lib/configuration/source/ConfigurationHolder.java +++ b/core/src/main/java/cc/carm/lib/configuration/source/ConfigurationHolder.java @@ -3,6 +3,7 @@ package cc.carm.lib.configuration.source; import cc.carm.lib.configuration.Configuration; import cc.carm.lib.configuration.adapter.ValueAdapterRegistry; import cc.carm.lib.configuration.adapter.ValueType; +import cc.carm.lib.configuration.function.ConfigExceptionHandler; import cc.carm.lib.configuration.source.loader.ConfigurationInitializer; import cc.carm.lib.configuration.source.meta.ConfigurationMetaHolder; import cc.carm.lib.configuration.source.meta.ConfigurationMetadata; @@ -31,14 +32,25 @@ public abstract class ConfigurationHolder metadata, @NotNull ConfigurationInitializer initializer) { + this(adapters, options, metadata, initializer, ConfigExceptionHandler.print()); + } + + public ConfigurationHolder(@NotNull ValueAdapterRegistry adapters, + @NotNull ConfigurationOptionHolder options, + @NotNull Map metadata, + @NotNull ConfigurationInitializer initializer, + @NotNull ConfigExceptionHandler exceptionHandler) { this.initializer = initializer; this.adapters = adapters; this.options = options; this.metadata = metadata; + this.exceptionHandler = exceptionHandler; } public abstract @NotNull SOURCE config(); @@ -117,7 +129,7 @@ public abstract class ConfigurationHolder initializeField(holder, root, field, path)); } @@ -151,7 +151,7 @@ public class ConfigurationInitializer { try { this.classInitializer.whenInitialize(holder, path, (Class) clazz, configField); } catch (Exception e) { - e.printStackTrace(); + holder.throwing(path, e); } for (Field field : clazz.getDeclaredFields()) { @@ -185,7 +185,7 @@ public class ConfigurationInitializer { try { this.valueInitializer.whenInitialize(holder, path, field, value); } catch (Exception e) { - e.printStackTrace(); + holder.throwing(path, e); } if (holder.option(StandardOptions.PRELOAD)) { value.get(); // Preload the value by calling #get method. diff --git a/core/src/main/java/cc/carm/lib/configuration/value/ValueManifest.java b/core/src/main/java/cc/carm/lib/configuration/value/ValueManifest.java index e81bd76..ab5814d 100644 --- a/core/src/main/java/cc/carm/lib/configuration/value/ValueManifest.java +++ b/core/src/main/java/cc/carm/lib/configuration/value/ValueManifest.java @@ -20,7 +20,7 @@ public class ValueManifest { protected @Nullable ConfigurationHolder holder; protected @Nullable String path; // Section path - protected @NotNull ValueValidator validator; + protected @NotNull ValueValidator validator; protected @NotNull Supplier<@Nullable TYPE> defaultSupplier; public ValueManifest(@NotNull ValueType type) { @@ -37,19 +37,19 @@ public class ValueManifest { public ValueManifest(@NotNull ValueType type, @NotNull Supplier<@Nullable TYPE> defaultSupplier, - @NotNull ValueValidator validator) { + @NotNull ValueValidator validator) { this(type, defaultSupplier, validator, EMPTY_INITIALIZER, null, null); } public ValueManifest(@NotNull ValueType type, @NotNull Supplier<@Nullable TYPE> defaultSupplier, - @NotNull ValueValidator validator, + @NotNull ValueValidator validator, @NotNull BiConsumer<@NotNull ConfigurationHolder, @NotNull String> initializer) { this(type, defaultSupplier, validator, initializer, null, null); } public ValueManifest(@NotNull ValueType type, @NotNull Supplier<@Nullable TYPE> defaultSupplier, - @NotNull ValueValidator validator, + @NotNull ValueValidator validator, @NotNull BiConsumer<@NotNull ConfigurationHolder, @NotNull String> initializer, @Nullable ConfigurationHolder holder, @Nullable String path) { this.type = type; @@ -103,19 +103,16 @@ public class ValueManifest { return defaults() != null; } - public @NotNull ValueValidator validator() { + public @NotNull ValueValidator validator() { return this.validator; } - public void validator(@NotNull ValueValidator validator) { + public void validator(@NotNull ValueValidator validator) { this.validator = validator; } - public void validate(@NotNull ValueValidator validator) { - validator((h, v) -> { - this.validator.validate(h, v); - validator.validate(h, v); - }); + public void validate(@NotNull ValueValidator validator) { + validator(this.validator.and(validator)); } protected UNIT withValidated(@Nullable UNIT value) throws Exception { @@ -151,6 +148,15 @@ public class ValueManifest { config().set(path(), value); } + protected void throwing(@NotNull Throwable throwable) { + throwing(path, throwable); + } + + protected void throwing(@NotNull String path, @NotNull Throwable throwable) { + if (holder == null) throwable.printStackTrace(); + else holder.throwing(path, throwable); + } + private static final @NotNull BiConsumer<@NotNull ConfigurationHolder, @NotNull String> EMPTY_INITIALIZER = (provider, valuePath) -> { }; diff --git a/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredList.java b/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredList.java index 969cfc9..c28dcf0 100644 --- a/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredList.java +++ b/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredList.java @@ -87,19 +87,24 @@ public class ConfiguredList extends CachedConfigValue, V> implements if (!cacheExpired()) return getCachedOrDefault(createList()); // Data that is outdated and needs to be parsed again. List list = createList(); - List data = config().contains(path()) ? config().getList(path()) : null; - if (data == null) return getDefaultFirst(list); + try { + List data = config().contains(path()) ? config().getList(path()) : null; + if (data == null) return getDefaultFirst(list); - ValueParser parser = parser(); - if (parser == null) return getDefaultFirst(list); + ValueParser parser = parser(); + if (parser == null) return getDefaultFirst(list); - for (Object dataVal : data) { - if (dataVal == null) continue; - try { - list.add(withValidated(parser.parse(holder(), paramType(), dataVal))); - } catch (Exception e) { - e.printStackTrace(); + int i = 0; + for (Object dataVal : data) { + if (dataVal == null) continue; + try { + list.add(withValidated(parser.parse(holder(), paramType(), dataVal))); + } catch (Exception e) { + throwing(path + "[" + i + "]", e); + } } + } catch (Exception ex) { + throwing(ex); } return updateCache(list); } @@ -111,7 +116,7 @@ public class ConfiguredList extends CachedConfigValue, V> implements setData(null); return; } - + ValueSerializer serializer = serializer(); if (serializer == null) return; @@ -121,7 +126,7 @@ public class ConfiguredList extends CachedConfigValue, V> implements try { data.add(serializer.serialize(holder(), paramType(), withValidated(val))); } catch (Exception ex) { - ex.printStackTrace(); + throwing(ex); } } setData(data); diff --git a/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredMap.java b/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredMap.java index 601d635..e041e41 100644 --- a/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredMap.java +++ b/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredMap.java @@ -77,27 +77,31 @@ public class ConfiguredMap extends CachedConfigValue, V> impleme // If the value is expired, we need to update it Map map = createMap(); - ConfigureSection section = config().getSection(path()); - if (section == null) return getDefaultFirst(map); + try { + ConfigureSection section = config().getSection(path()); + if (section == null) return getDefaultFirst(map); - Set keys = section.getKeys(false); - if (keys.isEmpty()) return getDefaultFirst(map); + Set keys = section.getKeys(false); + if (keys.isEmpty()) return getDefaultFirst(map); - ValueParser keyParser = parserFor(keyAdapter); - if (keyParser == null) return getDefaultFirst(map); - ValueParser valueParser = parserFor(valueAdapter); - if (valueParser == null) return getDefaultFirst(map); + ValueParser keyParser = parserFor(keyAdapter); + if (keyParser == null) return getDefaultFirst(map); + ValueParser valueParser = parserFor(valueAdapter); + if (valueParser == null) return getDefaultFirst(map); - for (String dataKey : keys) { - Object dataVal = section.get(dataKey); - if (dataVal == null) continue; - try { - K key = keyParser.parse(holder(), keyType(), dataKey); - V value = valueParser.parse(holder(), valueType(), dataVal); - map.put(key, withValidated(value)); - } catch (Exception e) { - e.printStackTrace(); + for (String dataKey : keys) { + Object dataVal = section.get(dataKey); + if (dataVal == null) continue; + try { + K key = keyParser.parse(holder(), keyType(), dataKey); + V value = valueParser.parse(holder(), valueType(), dataVal); + map.put(key, withValidated(value)); + } catch (Exception e) { + throwing(path + "." + dataKey, e); + } } + } catch (Exception ex) { + throwing(ex); } return updateCache(map); @@ -120,24 +124,28 @@ public class ConfiguredMap extends CachedConfigValue, V> impleme return; } - ValueSerializer keySerializer = serializerFor(keyAdapter); - if (keySerializer == null) return; - ValueSerializer valueSerializer = serializerFor(valueAdapter); - if (valueSerializer == null) return; + try { + ValueSerializer keySerializer = serializerFor(keyAdapter); + if (keySerializer == null) return; + ValueSerializer valueSerializer = serializerFor(valueAdapter); + if (valueSerializer == null) return; - Map data = new LinkedHashMap<>(); + Map data = new LinkedHashMap<>(); - for (Map.Entry entry : value.entrySet()) { - try { - data.put( - keySerializer.serialize(holder(), keyType(), entry.getKey()), - valueSerializer.serialize(holder(), valueType(), withValidated(entry.getValue())) - ); - } catch (Exception e) { - e.printStackTrace(); + for (Map.Entry entry : value.entrySet()) { + try { + data.put( + keySerializer.serialize(holder(), keyType(), entry.getKey()), + valueSerializer.serialize(holder(), valueType(), withValidated(entry.getValue())) + ); + } catch (Exception e) { + throwing(path + "." + entry.getKey(), e); + } } + setData(data); + } catch (Exception ex) { + throwing(ex); } - setData(data); } public @NotNull T handle(Function, T> function) { diff --git a/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredValue.java b/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredValue.java index 4c41751..fc6cc20 100644 --- a/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredValue.java +++ b/core/src/main/java/cc/carm/lib/configuration/value/standard/ConfiguredValue.java @@ -137,20 +137,19 @@ public class ConfiguredValue extends CachedConfigValue { if (!cacheExpired()) return getCachedOrDefault(); // Data that is outdated and needs to be parsed again. - Object data = getData(); - if (data == null) return defaults(); - - ValueParser parser = parser(); - if (parser == null) return defaults(); // No parser, return default value. - - try { + Object data = getData(); + if (data == null) return defaults(); + + ValueParser parser = parser(); + if (parser == null) return defaults(); // No parser, return default value. + // If there are no errors, update the cache and return. V parsed = parser.parse(holder(), type(), data); return updateCache(withValidated(parsed)); } catch (Exception e) { // There was a validate or parsing error, prompted and returned the default value. - e.printStackTrace(); + throwing(e); return defaults(); } @@ -169,14 +168,14 @@ public class ConfiguredValue extends CachedConfigValue { setData(null); return; } - - ValueSerializer serializer = serializer(); - if (serializer == null) return; // No serializer, do nothing. try { + ValueSerializer serializer = serializer(); + if (serializer == null) return; // No serializer, do nothing. + setData(serializer.serialize(holder(), type(), withValidated(value))); } catch (Exception e) { - e.printStackTrace(); + throwing(e); } } diff --git a/demo/pom.xml b/demo/pom.xml index e2ce12c..d555e00 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -13,6 +13,7 @@ ${project.jdk.version} UTF-8 UTF-8 + configured-demo jar @@ -40,6 +41,13 @@ compile + + ${project.parent.groupId} + configured-feature-validators + ${project.parent.version} + compile + + diff --git a/demo/src/main/java/cc/carm/lib/configuration/demo/DatabaseConfiguration.java b/demo/src/main/java/cc/carm/lib/configuration/demo/DatabaseConfiguration.java index b2769e8..c0c48da 100644 --- a/demo/src/main/java/cc/carm/lib/configuration/demo/DatabaseConfiguration.java +++ b/demo/src/main/java/cc/carm/lib/configuration/demo/DatabaseConfiguration.java @@ -3,7 +3,6 @@ package cc.carm.lib.configuration.demo; import cc.carm.lib.configuration.Configuration; import cc.carm.lib.configuration.annotation.ConfigPath; import cc.carm.lib.configuration.annotation.HeaderComments; -import cc.carm.lib.configuration.value.ConfigValue; import cc.carm.lib.configuration.value.standard.ConfiguredValue; @HeaderComments({"", "数据库配置", " 用于提供数据库连接，进行数据库操作。"}) @@ -16,17 +15,17 @@ public interface DatabaseConfiguration extends Configuration { "- MySQL(新): com.mysql.cj.jdbc.Driver", "- MariaDB(推荐): org.mariadb.jdbc.Driver", }) - ConfigValue DRIVER_NAME = ConfiguredValue.of( + ConfiguredValue DRIVER_NAME = ConfiguredValue.of( String.class, "com.mysql.cj.jdbc.Driver" ); - ConfigValue HOST = ConfiguredValue.of(String.class, "127.0.0.1"); - ConfigValue PORT = ConfiguredValue.of(Integer.class, 3306); - ConfigValue DATABASE = ConfiguredValue.of(String.class, "minecraft"); - ConfigValue USERNAME = ConfiguredValue.of(String.class, "root"); - ConfigValue PASSWORD = ConfiguredValue.of(String.class, "password"); + ConfiguredValue HOST = ConfiguredValue.of(String.class, "127.0.0.1"); + ConfiguredValue PORT = ConfiguredValue.of(Integer.class, 3306); + ConfiguredValue DATABASE = ConfiguredValue.of(String.class, "minecraft"); + ConfiguredValue USERNAME = ConfiguredValue.of(String.class, "root"); + ConfiguredValue PASSWORD = ConfiguredValue.of(String.class, "password"); - ConfigValue EXTRA = ConfiguredValue.of(String.class, "?useSSL=false"); + ConfiguredValue EXTRA = ConfiguredValue.of(String.class, "?useSSL=false"); static String buildJDBC() { return String.format("jdbc:mysql://%s:%s/%s%s", HOST.get(), PORT.get(), DATABASE.get(), EXTRA.get()); diff --git a/demo/src/main/java/cc/carm/lib/configuration/demo/tests/conf/DemoConfiguration.java b/demo/src/main/java/cc/carm/lib/configuration/demo/tests/conf/DemoConfiguration.java index 50c27e9..76e40e9 100644 --- a/demo/src/main/java/cc/carm/lib/configuration/demo/tests/conf/DemoConfiguration.java +++ b/demo/src/main/java/cc/carm/lib/configuration/demo/tests/conf/DemoConfiguration.java @@ -29,10 +29,7 @@ public interface DemoConfiguration extends Configuration { @ConfigPath(root = true) @FooterComments({"此处内容将显示在配置条目的下方", "可用于补充说明，但一般不建议使用"}) - ConfiguredValue TEST_NUMBER = ConfiguredValue.with(Long.class) - .validate(l -> l > 100, "数值必须大于100") - .validate(l -> l < 100000000, "数值必须小于100000000") - .defaults(123456789L).build(); + ConfiguredValue TEST_NUMBER = ConfiguredValue.with(Long.class).defaults(123456789L).build(); @HeaderComments({"枚举类型测试"}) @FooterComments({"上述的枚举内容本质上是通过STRING解析的"}) diff --git a/demo/src/main/java/cc/carm/lib/configuration/demo/tests/conf/InstanceConfig.java b/demo/src/main/java/cc/carm/lib/configuration/demo/tests/conf/InstanceConfig.java index ea68417..ffc7c67 100644 --- a/demo/src/main/java/cc/carm/lib/configuration/demo/tests/conf/InstanceConfig.java +++ b/demo/src/main/java/cc/carm/lib/configuration/demo/tests/conf/InstanceConfig.java @@ -2,11 +2,13 @@ package cc.carm.lib.configuration.demo.tests.conf; import cc.carm.lib.configuration.Configuration; import cc.carm.lib.configuration.annotation.HeaderComments; +import cc.carm.lib.configuration.annotation.ValueRange; import cc.carm.lib.configuration.value.standard.ConfiguredValue; -@HeaderComments("Inner Test") +@HeaderComments("service") public class InstanceConfig implements Configuration { + @ValueRange(min = 0, max = 100, message = "The value must be between 0 and 100") public final ConfiguredValue STATUS = ConfiguredValue.of(1.0D); } diff --git a/features/validators/src/main/java/cc/carm/lib/configuration/validators/Validators.java b/features/validators/src/main/java/cc/carm/lib/configuration/validators/Validators.java index c354efd..27a13f6 100644 --- a/features/validators/src/main/java/cc/carm/lib/configuration/validators/Validators.java +++ b/features/validators/src/main/java/cc/carm/lib/configuration/validators/Validators.java @@ -11,7 +11,11 @@ import java.util.regex.Pattern; public class Validators { - public static void initialize(ConfigurationHolder holder) { + private Validators() { + throw new UnsupportedOperationException("API Register."); + } + + public static void activate(ConfigurationHolder holder) { holder.initializer().registerValidAnnotation(ValueRange.class, r -> (ho, value) -> { if (!(value instanceof Number)) { throw new IllegalArgumentException("Value is not a number: " + value); diff --git a/providers/gson/src/test/java/config/JSONConfigTest.java b/providers/gson/src/test/java/config/JSONConfigTest.java index 07f98aa..c5cca74 100644 --- a/providers/gson/src/test/java/config/JSONConfigTest.java +++ b/providers/gson/src/test/java/config/JSONConfigTest.java @@ -1,10 +1,8 @@ package config; import cc.carm.lib.configuration.demo.tests.ConfigurationTest; -import cc.carm.lib.configuration.source.json.JSONConfigFactory; import cc.carm.lib.configuration.source.ConfigurationHolder; -import cc.carm.lib.configuration.value.ConfigValue; -import cc.carm.lib.configuration.value.standard.ConfiguredValue; +import cc.carm.lib.configuration.source.json.JSONConfigFactory; import org.junit.Test; import java.io.File; @@ -18,12 +16,6 @@ public class JSONConfigTest { @Test public void onTest() { - - ConfigValue EXAMPLE = ConfiguredValue.of(false); - EXAMPLE.initialize(this.holder, "example"); - - System.out.println("Example: " + EXAMPLE.get()); - ConfigurationTest.testDemo(this.holder); ConfigurationTest.testInner(this.holder); diff --git a/providers/yaml/src/test/java/yaml/test/YamlTests.java b/providers/yaml/src/test/java/yaml/test/YamlTests.java index 5315807..7540ab8 100644 --- a/providers/yaml/src/test/java/yaml/test/YamlTests.java +++ b/providers/yaml/src/test/java/yaml/test/YamlTests.java @@ -1,11 +1,11 @@ package yaml.test; -import cc.carm.lib.configuration.commentable.Commentable; import cc.carm.lib.configuration.commentable.CommentableMeta; import cc.carm.lib.configuration.demo.tests.ConfigurationTest; import cc.carm.lib.configuration.source.ConfigurationHolder; import cc.carm.lib.configuration.source.yaml.YAMLConfigFactory; import cc.carm.lib.configuration.source.yaml.YAMLSource; +import cc.carm.lib.configuration.validators.Validators; import org.junit.Test; import java.util.List; @@ -19,6 +19,8 @@ public class YamlTests { ConfigurationHolder holder = YAMLConfigFactory.from("target/tests.yml") .resourcePath("configs/sample.yml").build(); + Validators.activate(holder); + ConfigurationTest.testDemo(holder); ConfigurationTest.testInner(holder);