Refactor truststore merger logic

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

diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/TruststoreFilesListProvider.java b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/TruststoreFilesProvider.java
similarity index 56%
rename from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/TruststoreFilesListProvider.java
rename to trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/TruststoreFilesProvider.java
index 92e3c2a..9108fb6 100644 (file)
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/TruststoreFilesListProvider.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/TruststoreFilesProvider.java
@@ -17,37 +17,35 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.certification.file;
-
-import org.onap.oom.truststoremerger.certification.file.model.Truststore;
+package org.onap.oom.truststoremerger.merger;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.onap.oom.truststoremerger.certification.file.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.certification.file.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreFileFactoryException;
+import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
+import org.onap.oom.truststoremerger.merger.model.TruststoreFactory;
+import org.onap.oom.truststoremerger.merger.model.Truststore;
 
-public class TruststoreFilesListProvider {
+public class TruststoreFilesProvider {
 
-    private final TruststoreFileFactory truststoreFileFactory;
 
-    public TruststoreFilesListProvider(TruststoreFileFactory truststoreFileFactory) {
-        this.truststoreFileFactory = truststoreFileFactory;
+    private TruststoreFilesProvider() {
     }
 
-    public List<Truststore> getTruststoreFilesList(List<String> truststoreFilePaths,
+    public static List<Truststore> getTruststoreFiles(List<String> truststoreFilePaths,
         List<String> truststoreFilePasswordPaths)
         throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException {
-        List<Truststore> truststoreFilesList = new ArrayList<>();
+        List<Truststore> truststoreFiles = new ArrayList<>();
         for (int i = 0; i < truststoreFilePaths.size(); i++) {
             String truststorePath = truststoreFilePaths.get(i);
             String passwordPath = truststoreFilePasswordPaths.get(i);
 
-            Truststore truststore = truststoreFileFactory.create(truststorePath, passwordPath);
-            truststoreFilesList.add(truststore);
+            Truststore truststore = TruststoreFactory.create(truststorePath, passwordPath);
+            truststoreFiles.add(truststore);
         }
 
-        return truststoreFilesList;
+        return truststoreFiles;
     }
 }