Add Certification merge logic

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

diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/TruststoreFilesListProvider.java b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/TruststoreFilesListProvider.java
similarity index 61%
rename from trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/TruststoreFilesListProvider.java
rename to trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/TruststoreFilesListProvider.java
index 2f5356d..92e3c2a 100644 (file)
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/provider/TruststoreFilesListProvider.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/certification/file/TruststoreFilesListProvider.java
@@ -17,13 +17,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.certification.file;
 
-import org.onap.oom.truststoremerger.certification.file.TruststoreFile;
+import org.onap.oom.truststoremerger.certification.file.model.Truststore;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 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;
 
 public class TruststoreFilesListProvider {
 
@@ -33,16 +36,16 @@ public class TruststoreFilesListProvider {
         this.truststoreFileFactory = truststoreFileFactory;
     }
 
-    public List<TruststoreFile> getTruststoreFilesList(List<String> truststoreFilePaths,
-                                                       List<String> truststoreFilePasswordPaths)
-            throws PasswordReaderException, TruststoreFileFactoryException {
-        List<TruststoreFile> truststoreFilesList = new ArrayList<>();
+    public List<Truststore> getTruststoreFilesList(List<String> truststoreFilePaths,
+        List<String> truststoreFilePasswordPaths)
+        throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException {
+        List<Truststore> truststoreFilesList = new ArrayList<>();
         for (int i = 0; i < truststoreFilePaths.size(); i++) {
             String truststorePath = truststoreFilePaths.get(i);
             String passwordPath = truststoreFilePasswordPaths.get(i);
 
-            TruststoreFile truststoreFile = truststoreFileFactory.create(truststorePath, passwordPath);
-            truststoreFilesList.add(truststoreFile);
+            Truststore truststore = truststoreFileFactory.create(truststorePath, passwordPath);
+            truststoreFilesList.add(truststore);
         }
 
         return truststoreFilesList;