diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core')
3 files changed, 71 insertions, 86 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/impl/ValidationManagerFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/impl/ValidationManagerFactoryImpl.java index 87d4dd8118..4605f0251a 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/impl/ValidationManagerFactoryImpl.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/impl/ValidationManagerFactoryImpl.java @@ -7,9 +7,9 @@ * Licensed 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. @@ -17,18 +17,15 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.validation.impl; - import org.openecomp.core.validation.api.ValidationManager; import org.openecomp.core.validation.factory.ValidationManagerFactory; - public class ValidationManagerFactoryImpl extends ValidationManagerFactory { - @Override - public ValidationManager createInterface() { - return new ValidationManagerImpl(); - } + @Override + public ValidationManager createInterface() { + return new ValidationManagerImpl(); + } } diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/impl/ValidationManagerImpl.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/impl/ValidationManagerImpl.java index a25b8ae88f..9937bfb413 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/impl/ValidationManagerImpl.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/impl/ValidationManagerImpl.java @@ -7,9 +7,9 @@ * Licensed 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. @@ -17,9 +17,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.validation.impl; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import org.apache.commons.collections4.CollectionUtils; import org.openecomp.core.validation.api.ValidationManager; import org.openecomp.core.validation.types.GlobalValidationContext; @@ -28,48 +31,40 @@ import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.validation.Validator; import org.openecomp.sdc.validation.services.ValidationFactory; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - public class ValidationManagerImpl implements ValidationManager { - private GlobalValidationContext globalContext; - private List<Validator> validators; + private GlobalValidationContext globalContext; + private List<Validator> validators; - public ValidationManagerImpl() { - globalContext = new GlobalValidationContext(); - validators = ValidationFactory.getValidators(); - } - - @Override - public Map<String, List<ErrorMessage>> validate() { - for (Validator validator : validators) { - if(Objects.nonNull(validator)) { - validator.validate(globalContext); - } + public ValidationManagerImpl() { + globalContext = new GlobalValidationContext(); + validators = ValidationFactory.getValidators(); } - return convertMessageContainsToErrorMessage(globalContext.getContextMessageContainers()); - } - @Override - public void addFile(String fileName, byte[] fileContent) { - globalContext.addFileContext(fileName, fileContent); - } + @Override + public Map<String, List<ErrorMessage>> validate() { + for (Validator validator : validators) { + if (Objects.nonNull(validator)) { + validator.validate(globalContext); + } + } + return convertMessageContainsToErrorMessage(globalContext.getContextMessageContainers()); + } - @Override - public void updateGlobalContext(GlobalValidationContext globalContext) { - this.globalContext = globalContext; - } + @Override + public void addFile(String fileName, byte[] fileContent) { + globalContext.addFileContext(fileName, fileContent); + } - private Map<String, List<ErrorMessage>> convertMessageContainsToErrorMessage( - Map<String, MessageContainer> contextMessageContainers) { - Map<String, List<ErrorMessage>> errors = new HashMap<>(); - contextMessageContainers.entrySet().stream() - .filter(entry -> CollectionUtils.isNotEmpty(entry.getValue().getErrorMessageList())) - .forEach(entry -> errors.put(entry.getKey(), entry.getValue().getErrorMessageList())); - return errors; - } + @Override + public void updateGlobalContext(GlobalValidationContext globalContext) { + this.globalContext = globalContext; + } + private Map<String, List<ErrorMessage>> convertMessageContainsToErrorMessage(Map<String, MessageContainer> contextMessageContainers) { + Map<String, List<ErrorMessage>> errors = new HashMap<>(); + contextMessageContainers.entrySet().stream().filter(entry -> CollectionUtils.isNotEmpty(entry.getValue().getErrorMessageList())) + .forEach(entry -> errors.put(entry.getKey(), entry.getValue().getErrorMessageList())); + return errors; + } } diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/services/ValidationFactory.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/services/ValidationFactory.java index a6c25fbec6..112f6d2f87 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/services/ValidationFactory.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/main/java/org/openecomp/sdc/validation/services/ValidationFactory.java @@ -19,6 +19,10 @@ */ package org.openecomp.sdc.validation.services; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import org.apache.commons.collections4.CollectionUtils; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationManager; @@ -29,48 +33,37 @@ import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.validation.Validator; import org.openecomp.sdc.validation.type.ConfigConstants; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - public class ValidationFactory { - private static final List<Validator> validators = new ArrayList<>(); - private static Map<String, ImplementationConfiguration> validationImplMap; - private static Logger logger = - (Logger) LoggerFactory.getLogger(ValidationFactory.class); - private static File file; + private static final List<Validator> validators = new ArrayList<>(); + private static Map<String, ImplementationConfiguration> validationImplMap; + private static Logger logger = (Logger) LoggerFactory.getLogger(ValidationFactory.class); + private static File file; - static { - Configuration config = ConfigurationManager.lookup(); - validationImplMap = config.populateMap(ConfigConstants.Namespace, - ConfigConstants.Validator_Impl_Key, ImplementationConfiguration.class); - validationImplMap.putAll(config.populateMap(ConfigConstants.Mandatory_Namespace, - ConfigConstants.Validator_Impl_Key, ImplementationConfiguration.class)); - } - - /** - * Initialize a validator. - */ - public static List<Validator> getValidators() { - synchronized (validators) { - if (CollectionUtils.isEmpty(validators)) { - validationImplMap.values().stream() - .filter(implementationConfiguration -> implementationConfiguration - .isEnable()).forEachOrdered(implementationConfiguration -> validators.add - (cerateValidatorImpl(implementationConfiguration))); - } + static { + Configuration config = ConfigurationManager.lookup(); + validationImplMap = config.populateMap(ConfigConstants.Namespace, ConfigConstants.Validator_Impl_Key, ImplementationConfiguration.class); + validationImplMap + .putAll(config.populateMap(ConfigConstants.Mandatory_Namespace, ConfigConstants.Validator_Impl_Key, ImplementationConfiguration.class)); } - return validators; - } - private static Validator cerateValidatorImpl(ImplementationConfiguration validatorConf) { - Validator validator = - CommonMethods.newInstance(validatorConf.getImplementationClass(), Validator.class); - validator.init(validatorConf.getProperties()); + /** + * Initialize a validator. + */ + public static List<Validator> getValidators() { + synchronized (validators) { + if (CollectionUtils.isEmpty(validators)) { + validationImplMap.values().stream().filter(implementationConfiguration -> implementationConfiguration.isEnable()) + .forEachOrdered(implementationConfiguration -> validators.add(cerateValidatorImpl(implementationConfiguration))); + } + } + return validators; + } - logger.debug("created validator" + validatorConf.getImplementationClass()); - return validator; - } + private static Validator cerateValidatorImpl(ImplementationConfiguration validatorConf) { + Validator validator = CommonMethods.newInstance(validatorConf.getImplementationClass(), Validator.class); + validator.init(validatorConf.getProperties()); + logger.debug("created validator" + validatorConf.getImplementationClass()); + return validator; + } } |