Collection construction clean-ups

* Provide copied collections to the constructor when possible, instead of using .addAll(), .putAll() etc. * Add collections in one call when possible, instead of looping. Signed-off-by: Stephen Kitt <[email protected]>
canhnh · May 21, 2019 · 1112adc · 1112adc
1 parent 8833b6e
commit 1112adc
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 45 deletions.
diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java
@@ -228,8 +228,7 @@ private String getAttribute(BundleCapability capability, String name) {
     */
     private void createNode(Node<Bundle> node) {
         Bundle bundle = node.getValue();
-        Collection<Bundle> exporters = new HashSet<>();
-        exporters.addAll(bundleService.getWiredBundles(bundle).values());
+        Collection<Bundle> exporters = new HashSet<>(bundleService.getWiredBundles(bundle).values());
 
         for (Bundle exporter : exporters) {
             if (node.hasAncestor(exporter)) {                

diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -944,8 +944,7 @@ && isUpdateable(resource) && !deployment.bundleChecksums.containsKey(bundle.getB
                 return;
             }
 
-            toStop = new HashSet<>();
-            toStop.addAll(toRefresh.keySet());
+            toStop = new HashSet<>(toRefresh.keySet());
             removeFragmentsAndBundlesInState(toStop, UNINSTALLED | RESOLVED | STOPPING);
             if (!toStop.isEmpty()) {
                 print("Stopping bundles:", verbose);

diff --git a/...es/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/...es/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
@@ -263,11 +263,11 @@ void bootDone() {
     public void registerListener(FeaturesListener listener) {
         listeners.add(listener);
         try {
-            Set<String> repositoriesList = new TreeSet<>();
-            Map<String, Set<String>> installedFeatures = new TreeMap<>();
+            Set<String> repositoriesList;
+            Map<String, Set<String>> installedFeatures;
             synchronized (lock) {
-                repositoriesList.addAll(state.repositories);
-                installedFeatures.putAll(copy(state.installedFeatures));
+                repositoriesList = new TreeSet<>(state.repositories);
+                installedFeatures = new TreeMap<>(copy(state.installedFeatures));
             }
             for (String uri : repositoriesList) {
                 Repository repository = repositories.create(URI.create(uri), false);

diff --git a/...he/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java b/...he/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java
@@ -227,9 +227,7 @@ private static String explode(Dictionary dictionary) {
     private static final Collection<ServiceReference> asCollection(ServiceReference[] references) {
         List<ServiceReference> result = new LinkedList<>();
         if (references != null) {
-            for (ServiceReference reference : references) {
-                result.add(reference);
-            }
+            result.addAll(Arrays.asList(references));
         }
         return result;
     }

diff --git a/...va/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java b/...va/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java
@@ -17,6 +17,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Dictionary;
 import java.util.Enumeration;
@@ -201,9 +202,7 @@ private static String explode(Dictionary dictionary) {
     private static final Collection<ServiceReference> asCollection(ServiceReference[] references) {
         List<ServiceReference> result = new LinkedList<>();
         if (references != null) {
-            for (ServiceReference reference : references) {
-                result.add(reference);
-            }
+            result.addAll(Arrays.asList(references));
         }
         return result;
     }

diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java
@@ -93,8 +93,7 @@ public AppConfigurationEntry[] getEntries() {
         logOptions.put("logger", properties.get("audit.log.logger"));
         logOptions.put("level", properties.get("audit.log.level"));
 
-        Map<String, Object> eventadminOptions = new HashMap<>();
-        eventadminOptions.putAll(properties);
+        Map<String, Object> eventadminOptions = new HashMap<>(properties);
         eventadminOptions.put(BundleContext.class.getName(), bundleContext);
         eventadminOptions.put(ProxyLoginModule.PROPERTY_MODULE, EVENTADMIN_AUDIT_MODULE);
         eventadminOptions.put(ProxyLoginModule.PROPERTY_BUNDLE, Long.toString(bundleContext.getBundle().getBundleId()));

diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
@@ -281,9 +281,7 @@ private String[] doGetUserRoles(String user, String userDn, String userDnNamespa
                                 if (roleMappings.isEmpty()) {
                                     rolesList.add(role);
                                 } else {
-                                    for (String roleMapped : roleMappings) {
-                                        rolesList.add(roleMapped);
-                                    }
+                                    rolesList.addAll(roleMappings);
                                 }
                             }
                         }

diff --git a/...ement/server/src/main/java/org/apache/karaf/management/internal/JMXSecurityMBeanImpl.java b/...ement/server/src/main/java/org/apache/karaf/management/internal/JMXSecurityMBeanImpl.java
@@ -16,6 +16,7 @@
  */
 package org.apache.karaf.management.internal;
 
+import java.util.Arrays;
 import org.apache.karaf.management.JMXSecurityMBean;
 import org.apache.karaf.management.KarafMBeanServerGuard;
 import org.slf4j.Logger;
@@ -124,9 +125,7 @@ private String parseMethodName(String method, List<String> argTypes) {
             return method;
 
         String args = method.substring(index + 1, method.length() - 1);
-        for (String arg : args.split(",")) {
-            argTypes.add(arg);
-        }
+        argTypes.addAll(Arrays.asList(args.split(",")));
 
         return method.substring(0, index);
     }

diff --git a/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java b/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
@@ -467,8 +467,7 @@ protected MavenRepositoryURL[] repositories(Dictionary<String, Object> config, b
                     repositories[0] = repositories[0].substring(1);
                 }
 
-                List<String> newRepositories = new LinkedList<>();
-                newRepositories.addAll(Arrays.asList(repositories));
+                List<String> newRepositories = new LinkedList<>(Arrays.asList(repositories));
 
                 // append all repositories from all active profiles from available settings.xml
                 if (mavenSettings != null) {

diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ManagerImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ManagerImpl.java
@@ -76,8 +76,8 @@ public <T> T instantiate(Class<? extends T> clazz, Registry registry) throws Exc
                     GenericType type = new GenericType(field.getGenericType());
                     Object value;
                     if (type.getRawClass() == List.class) {
-                        Set<Object> set = new HashSet<>();
-                        set.addAll(registry.getServices(type.getActualTypeArgument(0).getRawClass()));
+                        Set<Object> set =
+                            new HashSet<>(registry.getServices(type.getActualTypeArgument(0).getRawClass()));
                         if (registry != this.dependencies) {
                             set.addAll(this.dependencies.getServices(type.getActualTypeArgument(0).getRawClass()));
                         }

diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/MultiServiceTracker.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/MultiServiceTracker.java
@@ -98,9 +98,9 @@ public void close() {
     }
 
     private void updateState() {
-        List<T> svcs = new ArrayList<>();
+        List<T> svcs;
         synchronized (refs) {
-            svcs.addAll(refs.values());
+            svcs = new ArrayList<>(refs.values());
         }
         updateState(svcs);
     }

diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/table/Col.java b/shell/core/src/main/java/org/apache/karaf/shell/support/table/Col.java
@@ -158,8 +158,7 @@ String getHeader() {
     }
 
     String getContent(String content) {
-        List<String> lines = new ArrayList<>();
-        lines.addAll(Arrays.asList(content.split("\n")));
+        List<String> lines = new ArrayList<>(Arrays.asList(content.split("\n")));
         if (wrap) {
             List<String> wrapped = new ArrayList<>();
             for (String line : lines) {

diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ManifestUtils.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ManifestUtils.java
@@ -17,6 +17,7 @@
  */
 package org.apache.karaf.tooling.utils;
 
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.jar.Manifest;
@@ -45,12 +46,8 @@ private ManifestUtils() {
      * @return the list of imports
      */
     public static List<Clause> getImports(Manifest manifest) {
-    	List<Clause> result = new LinkedList<>();
-    	Clause[] clauses = Parser.parseHeader(getHeader(Constants.IMPORT_PACKAGE, manifest));
-    	for (Clause clause : clauses) {
-    		result.add(clause);
-    	}
-    	return result;
+        Clause[] clauses = Parser.parseHeader(getHeader(Constants.IMPORT_PACKAGE, manifest));
+        return new LinkedList<>(Arrays.asList(clauses));
     }
 
     /**
@@ -76,12 +73,8 @@ public static List<Clause> getMandatoryImports(Manifest manifest) {
      * @return the list of exports
      */
     public static List<Clause> getExports(Manifest manifest) {
-    	List<Clause> result = new LinkedList<>();
-    	Clause[] clauses = Parser.parseHeader(getHeader(Constants.EXPORT_PACKAGE, manifest));
-    	for (Clause clause : clauses) {
-    		result.add(clause);
-    	}
-    	return result;
+        Clause[] clauses = Parser.parseHeader(getHeader(Constants.EXPORT_PACKAGE, manifest));
+        return new LinkedList<>(Arrays.asList(clauses));
     }
 
     /**

diff --git a/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java b/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java
@@ -23,6 +23,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -310,9 +311,7 @@ private List<Repository> getRepositories() {
         }
 
         try {
-            for (Repository r : featuresService.listRepositories()) {
-                repositories.add(r);
-            }
+            repositories.addAll(Arrays.asList(featuresService.listRepositories()));
         } catch (Exception e) {
             this.log.error(e.getMessage());
         }