summaryrefslogtreecommitdiffstats
path: root/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java
diff options
context:
space:
mode:
authorpwielebs <piotr.wielebski@nokia.com>2020-06-17 16:04:51 +0200
committerpwielebs <piotr.wielebski@nokia.com>2020-06-18 09:34:11 +0200
commit81d42dfeec4b638c7b7d8f201c6f677477f8226f (patch)
treef0679962afc004badbcb388f96b8cff19edf7bc2 /certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java
parent8464ed158369bbb5b047a63ddea3b483f6a79454 (diff)
Add validation for OUTPUT_TYPE parameter (2)
Issue-ID: AAF-1152 Signed-off-by: pwielebs <piotr.wielebski@nokia.com> Change-Id: I026d7979dcb35ccd3c953217b2eccf376cfaf85b
Diffstat (limited to 'certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java')
-rw-r--r--certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactory.java3
1 files changed, 2 insertions, 1 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 d813233a..d8498d84 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
@@ -43,7 +43,6 @@ public class ClientConfigurationFactory extends AbstractConfigurationFactory<Cli
ClientConfiguration configuration = new ClientConfiguration();
- Optional<String> outputType = envsForClient.getOutputType();
envsForClient.getUrlToCertService()
.map(configuration::setUrlToCertService);
@@ -61,6 +60,8 @@ public class ClientConfigurationFactory extends AbstractConfigurationFactory<Cli
.map(configuration::setCaName)
.orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.CA_NAME + " is invalid."));
+ Optional<String> outputType = envsForClient.getOutputType();
+
if (outputType.isPresent()) {
outputType.filter(this::isOutputTypeValid)
.map(configuration::setOutputType)