diff options
| author |   kjaniak <kornel.janiak@nokia.com> | 2020-09-15 08:21:21 +0200 |
|---|---|---|
| committer | kjaniak <kornel.janiak@nokia.com> | 2020-09-15 09:53:10 +0200 |
| commit | 8ad064f65528f89dacbf8a03c87d94214a9871f5 (patch) | |
| tree | 5dc74cf6d123bd2c32a23f9746a54530c5a516cc /trustStoreMerger/src/main/java | |
| parent | 0439aac459a3f68b57569018cfffbb0fc81ecee9 (diff) | |
Fix for env names
Postfix _ENV removed from envs names since it was introduced by mistake.
Issue spotted in CSITs.
Issue-ID: DCAEGEN2-2253
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
Change-Id: Ibbd99e3c655337ca6ae1fd3d4a568b01e35373dc
Diffstat (limited to 'trustStoreMerger/src/main/java')
2 files changed, 16 insertions, 16 deletions
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); diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/model/EnvVariable.java b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/model/EnvVariable.java index 456c58f8..3f4c73da 100644 --- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/model/EnvVariable.java +++ b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/model/EnvVariable.java @@ -27,10 +27,10 @@ import java.util.List; import java.util.function.Predicate; public enum EnvVariable { - TRUSTSTORES_PATHS_ENV(true, doesItContainValidCertificatesPaths()), - TRUSTSTORES_PASSWORDS_PATHS_ENV(true, doesItContainValidPasswordPaths()), - KEYSTORE_SOURCE_PATHS_ENV(false, doesItContainValidPathsToCopy()), - KEYSTORE_DESTINATION_PATHS_ENV(false, doesItContainValidPathsToCopy()); + TRUSTSTORES_PATHS(true, doesItContainValidCertificatesPaths()), + TRUSTSTORES_PASSWORDS_PATHS(true, doesItContainValidPasswordPaths()), + KEYSTORE_SOURCE_PATHS(false, doesItContainValidPathsToCopy()), + KEYSTORE_DESTINATION_PATHS(false, doesItContainValidPathsToCopy()); boolean isMandatory; |