AMashenkov commented on code in PR #6225: URL: https://github.com/apache/ignite-3/pull/6225#discussion_r2200022557
########## modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigAnnotationsValidator.java: ########## @@ -0,0 +1,161 @@ +/* + * 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.internal.configuration.compatibility.framework; + +import static org.apache.ignite.internal.lang.IgniteStringFormatter.format; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; +import org.apache.ignite.configuration.validation.ExceptKeys; +import org.apache.ignite.configuration.validation.OneOf; +import org.apache.ignite.configuration.validation.Range; +import org.apache.ignite.internal.configuration.compatibility.framework.annotations.DefaultAnnotationCompatibilityValidator; +import org.apache.ignite.internal.configuration.compatibility.framework.annotations.ExceptKeysAnnotationCompatibilityValidator; +import org.apache.ignite.internal.configuration.compatibility.framework.annotations.OneOfAnnotationCompatibilityValidator; +import org.apache.ignite.internal.configuration.compatibility.framework.annotations.RangeAnnotationCompatibilityValidator; + +/** + * Configuration annotation validator. + */ +final class ConfigAnnotationsValidator { + + private static final DefaultAnnotationCompatibilityValidator DEFAULT_VALIDATOR = new DefaultAnnotationCompatibilityValidator(); + + private final Map<String, AnnotationCompatibilityValidator> validators; + + /** Constructor. */ + ConfigAnnotationsValidator() { + this(Map.of( + Range.class.getName(), new RangeAnnotationCompatibilityValidator(), + ExceptKeys.class.getName(), new ExceptKeysAnnotationCompatibilityValidator(), + OneOf.class.getName(), new OneOfAnnotationCompatibilityValidator() + )); + } + + /** Constructor. */ + ConfigAnnotationsValidator(Map<String, AnnotationCompatibilityValidator> validators) { + this.validators = Map.copyOf(validators); + } + + /** + * Validates annotations. + */ + void validate(ConfigNode candidate, ConfigNode node, List<String> errors) { + List<ConfigAnnotation> currentAnnotations = node.annotations(); + List<ConfigAnnotation> candidateAnnotations = candidate.annotations(); + + Map<String, ConfigAnnotation> currentMap = new HashMap<>(); + for (ConfigAnnotation annotation : currentAnnotations) { + currentMap.put(annotation.name(), annotation); + } + + Map<String, ConfigAnnotation> candidateMap = new HashMap<>(); + for (ConfigAnnotation annotation : candidateAnnotations) { + candidateMap.put(annotation.name(), annotation); + } + + Set<String> newAnnotations = new TreeSet<>(); + + for (String currentKey : currentMap.keySet()) { + if (!candidateMap.containsKey(currentKey)) { + newAnnotations.add(currentKey); + } + } + + if (!newAnnotations.isEmpty()) { + errors.add("Adding annotations is not allowed. New annotations: " + newAnnotations); + } Review Comment: Can we change @Deprecated annotation validation to use this code? -- 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. To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
