Refactor flow of cert files generation, based on OUTPUT_TYPE parameter

[oom/platform/cert-service.git] / certServiceClient / src / main / java / org / onap / aaf / certservice / client / certification / conversion / PKCS12ArtifactsCreator.java

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/KeystoreTruststoreCreator.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PKCS12ArtifactsCreator.java
similarity index 78%
rename from certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/KeystoreTruststoreCreator.java
rename to certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PKCS12ArtifactsCreator.java
index 4378460..c07dfd1 100644 (file)
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/KeystoreTruststoreCreator.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/PKCS12ArtifactsCreator.java
@@ -23,7 +23,7 @@ import java.security.PrivateKey;
 import java.util.List;
 import org.onap.aaf.certservice.client.certification.exception.PemToPKCS12ConverterException;
 
-public class KeystoreTruststoreCreator {
+public class PKCS12ArtifactsCreator implements ArtifactsCreator {
 
     private static final String CERTIFICATE_ALIAS = "certificate";
     private static final String TRUSTED_CERTIFICATE_ALIAS = "trusted-certificate-";
@@ -32,21 +32,27 @@ public class KeystoreTruststoreCreator {
     private final PemToPKCS12Converter converter;
     private final PKCS12FilesCreator creator;
 
-    public KeystoreTruststoreCreator(PKCS12FilesCreator creator, RandomPasswordGenerator generator,
-        PemToPKCS12Converter converter) {
+    public PKCS12ArtifactsCreator(PKCS12FilesCreator creator, RandomPasswordGenerator generator,
+                                  PemToPKCS12Converter converter) {
         this.generator = generator;
         this.converter = converter;
         this.creator = creator;
     }
 
-    public void createKeystore(List<String> data, PrivateKey privateKey)
+    @Override
+    public void create(List<String> keystoreData, List<String> truststoreData, PrivateKey privateKey) throws PemToPKCS12ConverterException {
+        createKeystore(keystoreData,privateKey);
+        createTruststore(truststoreData);
+    }
+
+    private void createKeystore(List<String> data, PrivateKey privateKey)
         throws PemToPKCS12ConverterException {
         Password password = generator.generate(PASSWORD_LENGTH);
         creator.saveKeystoreData(converter.convertKeystore(data, password, CERTIFICATE_ALIAS, privateKey),
             password.getCurrentPassword());
     }
 
-    public void createTruststore(List<String> data)
+    private void createTruststore(List<String> data)
         throws PemToPKCS12ConverterException {
         Password password = generator.generate(PASSWORD_LENGTH);
         creator.saveTruststoreData(converter.convertTruststore(data, password, TRUSTED_CERTIFICATE_ALIAS),