Removal of EnvValidationUtils class and cleanup

Issue-ID: AAF-996
Change-Id: Iccbbf5d746ed5772a0327a30fa8bdbc57bc8fe46
Signed-off-by: kjaniak <kornel.janiak@nokia.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java
index 3bd15288..26a2b1b1 100644
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java
@@ -20,20 +20,15 @@
 
 package org.onap.aaf.certservice.client.configuration.factory;
 
-
-
-import java.util.Optional;
 import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs;
-import org.onap.aaf.certservice.client.configuration.EnvValidationUtils;
 import org.onap.aaf.certservice.client.configuration.EnvsForClient;
 import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException;
 import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration;
 
-public class ClientConfigurationFactory implements AbstractConfigurationFactory<ClientConfiguration> {
+public class ClientConfigurationFactory extends AbstractConfigurationFactory<ClientConfiguration> {
 
     private final EnvsForClient envsForClient;
 
-
     public ClientConfigurationFactory(EnvsForClient envsForClient) {
         this.envsForClient = envsForClient;
     }
@@ -50,12 +45,12 @@ public class ClientConfigurationFactory implements AbstractConfigurationFactory<
                 .map(timeout -> configuration.setRequestTimeout(Integer.valueOf(timeout)));
 
         envsForClient.getOutputPath()
-                .filter(EnvValidationUtils::isPathValid)
+                .filter(this::isPathValid)
                 .map(configuration::setCertsOutputPath)
                 .orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.OUTPUT_PATH + " is invalid."));
 
         envsForClient.getCaName()
-                .filter(EnvValidationUtils::isAlphaNumeric)
+                .filter(this::isAlphaNumeric)
                 .map(configuration::setCaName)
                 .orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.CA_NAME + " is invalid."));