[sling-org-apache-sling-feature-cpconverter] 02/03: returning a generic collection to avoid creating a list on a set

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git

commit 5100843d36c93cd832f4d52c2d2e5f9f83d64d34
Author: stripodi <st...@simos-mbp>
AuthorDate: Thu May 9 14:32:45 2019 +0200

    returning a generic collection to avoid creating a list on a set
---
 .../cli/ContentPackage2FeatureModelConverterLauncher.java         | 8 ++++----
 .../cli/ContentPackage2FeatureModelConverterLauncherTest.java     | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java b/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
index ca6d468..71f7755 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
@@ -18,10 +18,10 @@ package org.apache.sling.feature.cpconverter.cli;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -141,7 +141,7 @@ public final class ContentPackage2FeatureModelConverterLauncher implements Runna
 
             logger.info("Ordering input content-package(s) {}...", contentPackages);
 
-            List<File> orderedContentPackages = order(contentPackages);
+            Collection<File> orderedContentPackages = order(contentPackages);
 
             logger.info("New content-package(s) order: {}", orderedContentPackages);
 
@@ -168,7 +168,7 @@ public final class ContentPackage2FeatureModelConverterLauncher implements Runna
         }
     }
 
-    protected List<File> order(List<File> contentPackages) throws Exception {
+    protected Collection<File> order(List<File> contentPackages) throws Exception {
         Map<PackageId, File> idFileMap = new LinkedHashMap<>();
         Map<ZipVaultPackage, File> packageFileMapping = new HashMap<>();
         Map<PackageId, ZipVaultPackage> idPackageMapping = new HashMap<>();
@@ -192,7 +192,7 @@ public final class ContentPackage2FeatureModelConverterLauncher implements Runna
             orderDependencies(idFileMap, packageFileMapping, idPackageMapping, pack, new HashSet<PackageId>());
         }
 
-        return new LinkedList<>(idFileMap.values());
+        return idFileMap.values();
     }
 
     private void orderDependencies(Map<PackageId, File> idFileMap,
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncherTest.java b/src/test/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncherTest.java
index 6bfd042..d65bcbf 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncherTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncherTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
@@ -53,7 +54,7 @@ public class ContentPackage2FeatureModelConverterLauncherTest {
             URL packageUrl = getClass().getResource(pkgName);
             contentPackages.add(FileUtils.toFile(packageUrl));
         }
-        List<File> ordered = launcher.order(contentPackages);
+        Collection<File> ordered = launcher.order(contentPackages);
         Iterator<File> fileIt = ordered.iterator();
         for (String expected : TEST_PACKAGES_OUTPUT) {
             File next = fileIt.next();