Add output type env to certservice client configuration

[oom/platform/cert-service.git] / certServiceClient / src / main / java / org / onap / aaf / certservice / client / configuration / model / ClientConfiguration.java

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java
index d6496b7..78fa1b4 100644 (file)
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java
@@ -20,20 +20,25 @@
 
 package org.onap.aaf.certservice.client.configuration.model;
 
+import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs;
+
 public class ClientConfiguration implements ConfigurationModel {
 
-    Integer DEFAULT_TIMEOUT_MS = 30000;
-    String DEFAULT_REQUEST_URL = "http://cert-service:8080/v1/certificate/";
+    private static final Integer DEFAULT_TIMEOUT_MS = 30000;
+    private static final String DEFAULT_REQUEST_URL = "https://aaf-cert-service:8443/v1/certificate/";
+    private static final String DEFAULT_OUTPUT_TYPE = "P12";
 
     private String urlToCertService;
     private Integer requestTimeout;
     private String certsOutputPath;
     private String caName;
+    private String outputType;
 
 
     public ClientConfiguration() {
         urlToCertService = DEFAULT_REQUEST_URL;
         requestTimeout = DEFAULT_TIMEOUT_MS;
+        outputType = DEFAULT_OUTPUT_TYPE;
     }
 
 
@@ -72,4 +77,23 @@ public class ClientConfiguration implements ConfigurationModel {
         this.caName = caName;
         return this;
     }
+
+    public String getOutputType() {
+        return outputType;
+    }
+
+    public ClientConfiguration setOutputType(String outputType) {
+        this.outputType = outputType;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s: %s, %s: %s, %s: %s, %s: %s, %s: %s",
+                ClientConfigurationEnvs.REQUEST_URL, urlToCertService,
+                ClientConfigurationEnvs.REQUEST_TIMEOUT, requestTimeout,
+                ClientConfigurationEnvs.OUTPUT_PATH, certsOutputPath,
+                ClientConfigurationEnvs.CA_NAME, caName,
+                ClientConfigurationEnvs.OUTPUT_TYPE, outputType);
+    }
 }