X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=trustStoreMerger%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Foom%2Ftruststoremerger%2Fconfiguration%2FAppConfigurationProvider.java;h=3adea9ab59df71f151c1c812be66f00efa21de76;hb=8ad064f65528f89dacbf8a03c87d94214a9871f5;hp=33ea8e4bb70a76054b48e52bd49aa97ee65d324c;hpb=0439aac459a3f68b57569018cfffbb0fc81ecee9;p=oom%2Fplatform%2Fcert-service.git

diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/AppConfigurationProvider.java b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/AppConfigurationProvider.java
index 33ea8e4b..3adea9ab 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/AppConfigurationProvider.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/AppConfigurationProvider.java
@@ -20,10 +20,10 @@
 package org.onap.oom.truststoremerger.configuration;
 
 
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.KEYSTORE_DESTINATION_PATHS_ENV;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.KEYSTORE_SOURCE_PATHS_ENV;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS_ENV;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PATHS_ENV;
+import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.KEYSTORE_DESTINATION_PATHS;
+import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.KEYSTORE_SOURCE_PATHS;
+import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS;
+import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PATHS;
 
 import java.util.Collections;
 import java.util.List;
@@ -48,15 +48,15 @@ public class AppConfigurationProvider {
     public AppConfiguration createConfiguration()
         throws ConfigurationException, CertificatesPathsValidationException {
 
-        List<String> truststoresPaths = getPaths(TRUSTSTORES_PATHS_ENV);
-        List<String> truststoresPasswordsPaths = getPaths(TRUSTSTORES_PASSWORDS_PATHS_ENV);
-        List<String> sourceKeystorePaths = getPaths(KEYSTORE_SOURCE_PATHS_ENV);
-        List<String> destinationKeystorePaths = getPaths(KEYSTORE_DESTINATION_PATHS_ENV);
+        List<String> truststoresPaths = getPaths(TRUSTSTORES_PATHS);
+        List<String> truststoresPasswordsPaths = getPaths(TRUSTSTORES_PASSWORDS_PATHS);
+        List<String> sourceKeystorePaths = getPaths(KEYSTORE_SOURCE_PATHS);
+        List<String> destinationKeystorePaths = getPaths(KEYSTORE_DESTINATION_PATHS);
 
-        ensureSameSize(truststoresPaths, truststoresPasswordsPaths, TRUSTSTORES_PATHS_ENV.name(),
-            TRUSTSTORES_PASSWORDS_PATHS_ENV.name());
-        ensureSameSize(sourceKeystorePaths, destinationKeystorePaths, KEYSTORE_SOURCE_PATHS_ENV.name(),
-            KEYSTORE_DESTINATION_PATHS_ENV.name());
+        ensureSameSize(truststoresPaths, truststoresPasswordsPaths, TRUSTSTORES_PATHS.name(),
+            TRUSTSTORES_PASSWORDS_PATHS.name());
+        ensureSameSize(sourceKeystorePaths, destinationKeystorePaths, KEYSTORE_SOURCE_PATHS.name(),
+            KEYSTORE_DESTINATION_PATHS.name());
 
         return new AppConfiguration(truststoresPaths, truststoresPasswordsPaths, sourceKeystorePaths,
             destinationKeystorePaths);