diff options
Diffstat (limited to 'common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java')
-rw-r--r-- | common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java index 101b60e941..66494ed668 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/ConfigurationManager.java @@ -21,6 +21,8 @@ package org.openecomp.sdc.be.config; import com.google.common.annotations.VisibleForTesting; +import org.openecomp.sdc.be.config.validation.ArtifactConfigValidator; +import org.openecomp.sdc.common.api.ArtifactTypeEnum; import org.openecomp.sdc.common.api.BasicConfiguration; import org.openecomp.sdc.common.api.ConfigurationListener; import org.openecomp.sdc.common.api.ConfigurationSource; @@ -48,11 +50,11 @@ public class ConfigurationManager implements FileChangeCallback, IEcompConfigura super(); this.configurationSource = configurationSource; loadConfigurationFiles(); + validateConfiguration(); instance = this; } private void loadConfigurationFiles() { - loadConfigurationClass(Configuration.class); loadConfigurationClass(ErrorConfiguration.class); loadConfigurationClass(Neo4jErrorsConfiguration.class); @@ -60,6 +62,15 @@ public class ConfigurationManager implements FileChangeCallback, IEcompConfigura loadConfigurationClass(DistributionEngineConfiguration.class); } + private void validateConfiguration() { + final Object configurationObj = configurations.get(getKey(Configuration.class)); + if (configurationObj instanceof Configuration) { + final ArtifactConfigValidator artifactConfigValidator = + new ArtifactConfigValidator((Configuration) configurationObj, ArtifactTypeEnum.getBaseArtifacts()); + artifactConfigValidator.validate(); + } + } + private <T extends BasicConfiguration> void loadConfigurationClass(Class<T> clazz) { ConfigurationListener configurationListener = new ConfigurationListener(clazz, this); |