[OOM-CMPv2] Create KeystoreCopier

[oom/platform/cert-service.git] / trustStoreMerger / src / main / java / org / onap / oom / truststoremerger / CertificatePostProcessor.java

diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/CertificatePostProcessor.java b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/CertificatePostProcessor.java
index 7eab640..0045b2f 100644 (file)
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/CertificatePostProcessor.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/CertificatePostProcessor.java
@@ -19,58 +19,30 @@
 
 package org.onap.oom.truststoremerger;
 
-import java.util.List;
 import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.configuration.MergerConfigurationProvider;
-import org.onap.oom.truststoremerger.configuration.model.MergerConfiguration;
-import org.onap.oom.truststoremerger.configuration.path.DelimitedPathsReader;
-import org.onap.oom.truststoremerger.configuration.path.DelimitedPathsReaderFactory;
-import org.onap.oom.truststoremerger.configuration.path.env.EnvProvider;
-import org.onap.oom.truststoremerger.merger.TruststoreFilesProvider;
-import org.onap.oom.truststoremerger.merger.model.Truststore;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.truststoremerger.common.FileTools;
+import org.onap.oom.truststoremerger.configuration.AppConfigurationLoader;
+import org.onap.oom.truststoremerger.configuration.model.AppConfiguration;
+import org.onap.oom.truststoremerger.copier.KeystoreCopier;
+import org.onap.oom.truststoremerger.merger.TruststoreMerger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class CertificatePostProcessor implements Runnable {
 
-    private static final int FIRST_TRUSTSTORE_INDEX = 0;
-    private static final int SECOND_TRUSTSTORE_INDEX = 1;
+    private static final Logger LOGGER = LoggerFactory.getLogger(CertificatePostProcessor.class);
 
-    public void run() throws ExitableException {
-        mergeTruststores();
-    }
-
-    private void mergeTruststores() throws ExitableException {
-        MergerConfiguration configuration = loadConfiguration();
-        List<Truststore> truststoreFilesList = getTruststoreFiles(configuration);
-
-        Truststore baseFile = truststoreFilesList.get(FIRST_TRUSTSTORE_INDEX);
-        baseFile.createBackup();
-
-        for (int i = SECOND_TRUSTSTORE_INDEX; i < truststoreFilesList.size(); i++) {
-            Truststore truststore = truststoreFilesList.get(i);
-            List<CertificateWithAlias> certificateWrappers = truststore.getCertificates();
-            baseFile.addCertificates(certificateWrappers);
-        }
+    private AppConfigurationLoader config = new AppConfigurationLoader();
+    private TruststoreMerger merger = new TruststoreMerger();
+    private KeystoreCopier copier = new KeystoreCopier(new FileTools());
 
-        baseFile.saveFile();
-    }
-
-    private MergerConfiguration loadConfiguration() throws ExitableException {
-        DelimitedPathsReaderFactory readerFactory = new DelimitedPathsReaderFactory(new EnvProvider());
-        DelimitedPathsReader certificatesPathsReader = readerFactory.createCertificatePathsReader();
-        DelimitedPathsReader passwordsPathsReader = readerFactory.createPasswordPathsReader();
-        DelimitedPathsReader copierPathsReader = readerFactory.createKeystoreCopierPathsReader();
-        MergerConfigurationProvider factory = new MergerConfigurationProvider(certificatesPathsReader,
-            passwordsPathsReader,
-            copierPathsReader);
-        return factory.createConfiguration();
-    }
-
-    private static List<Truststore> getTruststoreFiles(MergerConfiguration configuration) throws ExitableException {
-        return TruststoreFilesProvider
-            .getTruststoreFiles(
-                configuration.getTruststoreFilePaths(),
-                configuration.getTruststoreFilePasswordPaths()
-            );
+    public void run() throws ExitableException {
+        LOGGER.debug("Loading configuration...");
+        AppConfiguration configuration = config.loadConfiguration();
+        LOGGER.debug("Starting TruststoreMerger...");
+        merger.mergeTruststores(configuration);
+        LOGGER.debug("Starting KeystoreCopier...");
+        copier.copyKeystores(configuration);
+        LOGGER.debug("Certificate post processing finished successfully.");
     }
 }