ibessonov commented on a change in pull request #67: URL: https://github.com/apache/ignite-3/pull/67#discussion_r596639428
########## File path: modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/internal/validation/ValidationUtilTest.java ########## @@ -0,0 +1,174 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.configuration.internal.validation; + +import java.lang.annotation.Annotation; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.ignite.configuration.annotation.Config; +import org.apache.ignite.configuration.annotation.ConfigValue; +import org.apache.ignite.configuration.annotation.ConfigurationRoot; +import org.apache.ignite.configuration.annotation.NamedConfigValue; +import org.apache.ignite.configuration.annotation.Value; +import org.apache.ignite.configuration.internal.RootsNode; +import org.apache.ignite.configuration.internal.util.ConfigurationUtil; +import org.apache.ignite.configuration.sample.storage.TestConfigurationStorage; +import org.apache.ignite.configuration.tree.NamedListView; +import org.apache.ignite.configuration.validation.ValidationContext; +import org.apache.ignite.configuration.validation.ValidationIssue; +import org.apache.ignite.configuration.validation.Validator; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static java.util.Collections.emptyMap; +import static java.util.Collections.emptySet; +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** */ +public class ValidationUtilTest { + /** */ + @Target(FIELD) + @Retention(RUNTIME) + @interface LeafValidation { + } + + /** */ + @Target(FIELD) + @Retention(RUNTIME) + @interface InnerValidation { + } + + /** */ + @Target(FIELD) + @Retention(RUNTIME) + @interface NamedListValidation { + } + + /** */ + @ConfigurationRoot(rootName = "root", storage = TestConfigurationStorage.class) + public static class ValidatedRootConfigurationSchema { + /** */ + @InnerValidation + @ConfigValue + public ValidatedChildConfigurationSchema child; + + /** */ + @NamedListValidation + @NamedConfigValue + public ValidatedChildConfigurationSchema elements; + } + + /** */ + @Config + public static class ValidatedChildConfigurationSchema { + /** */ + @LeafValidation + @Value(hasDefault = true) Review comment: Word "with" implies that expression will be followed by that very default, not by an indicator flag. So I think that "has" fits better. ########## File path: modules/configuration/src/main/java/org/apache/ignite/configuration/internal/validation/MaxValidator.java ########## @@ -17,28 +17,21 @@ package org.apache.ignite.configuration.internal.validation; -import org.apache.ignite.configuration.internal.DynamicConfiguration; -import org.apache.ignite.configuration.validation.ConfigurationValidationException; -import org.apache.ignite.configuration.validation.FieldValidator; +import javax.validation.constraints.Max; +import org.apache.ignite.configuration.validation.ValidationContext; +import org.apache.ignite.configuration.validation.ValidationIssue; +import org.apache.ignite.configuration.validation.Validator; /** * Validate that field value is not greater than some maximum value. - * - * @param <C> Root configuration type. */ -public class MaxValidator<C extends DynamicConfiguration<?, ?, ?>> extends FieldValidator<Number, C> { - /** Maximum value. */ - private final long maxValue; - - /** Constructor. */ - public MaxValidator(long maxValue, String message) { - super(message); - this.maxValue = maxValue; - } - +public class MaxValidator implements Validator<Max, Number> { /** {@inheritDoc} */ - @Override public void validate(Number value, C newRoot, C oldRoot) throws ConfigurationValidationException { - if (value.longValue() > maxValue) - throw new ConfigurationValidationException(message); + @Override public void validate(Max annotation, ValidationContext<Number> ctx) { + if (ctx.getNewValue().longValue() > annotation.value()) { + ctx.addIssue(new ValidationIssue( + "Configuration value '" + ctx.currentKey() + "' must not be greater tha " + annotation.value() Review comment: Sorry ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
