Merge pull request quarkusio#24454 from rsvoboda/misc.updates.2022-03-21

Misc updates in codebase to be a bit more efficient
loicmathieu · Mar 22, 2022 · 5742fb0 · 5742fb0
2 parents a8b43d5 + 8c3c556
commit 5742fb0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 33 deletions.
diff --git a/...ons/arc/deployment/src/main/java/io/quarkus/arc/deployment/LookupConditionsProcessor.java b/...ons/arc/deployment/src/main/java/io/quarkus/arc/deployment/LookupConditionsProcessor.java
@@ -121,9 +121,7 @@ List<AnnotationInstance> findAnnotations(AnnotationTarget target, DotName annota
             ret.add(annotation);
         }
         if (container != null) {
-            for (AnnotationInstance nested : container.value().asNestedArray()) {
-                ret.add(nested);
-            }
+            Collections.addAll(ret, container.value().asNestedArray());
         }
         return ret;
     }

diff --git a/.../micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/ConfigAdapter.java b/.../micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/ConfigAdapter.java
@@ -66,9 +66,9 @@ public static Map<String, String> captureProperties(Map<String, String> config,
         final Map<String, String> properties = new HashMap<>();
 
         // Rename and store properties
-        for (String name : config.keySet()) {
-            String key = prefix + camelHumpify(name);
-            properties.put(key, config.get(name));
+        for (Map.Entry<String, String> entry : config.entrySet()) {
+            String key = prefix + camelHumpify(entry.getKey());
+            properties.put(key, entry.getValue());
         }
         return properties;
     }

diff --git a/...i/deployment/src/main/java/io/quarkus/picocli/deployment/PicocliNativeImageProcessor.java b/...i/deployment/src/main/java/io/quarkus/picocli/deployment/PicocliNativeImageProcessor.java
@@ -3,6 +3,7 @@
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -87,9 +88,7 @@ void reflectionConfiguration(CombinedIndexBuildItem combinedIndexBuildItem,
                     if (value.kind() == Kind.CLASS) {
                         typeAnnotationValues.add(value.asClass());
                     } else if (value.kind() == Kind.ARRAY && value.componentKind() == Kind.CLASS) {
-                        for (Type componentClass : value.asClassArray()) {
-                            typeAnnotationValues.add(componentClass);
-                        }
+                        Collections.addAll(typeAnnotationValues, value.asClassArray());
                     }
                 }
             }

diff --git a/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java
@@ -212,9 +212,7 @@ List<MessageBundleBuildItem> processBundles(BeanArchiveIndexBuildItem beanArchiv
                 if (Modifier.isInterface(localized.flags())) {
                     if (!localizedInterfaces.contains(localized.name())) {
                         throw new MessageBundleException(
-                                String.format(
-                                        "A localized message bundle interface must extend a message bundle interface: "
-                                                + localized));
+                                "A localized message bundle interface must extend a message bundle interface: " + localized);
                     }
                 } else {
                     throw new MessageBundleException("@Localized must be declared on an interface: " + localized);

diff --git a/...s/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java b/...s/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java
@@ -680,15 +680,11 @@ private void processAnnotations(IndexView index, WebMetaData metaData) {
                 List<String> urlPatterns = new ArrayList<String>();
                 AnnotationValue urlPatternsValue = annotation.value("urlPatterns");
                 if (urlPatternsValue != null) {
-                    for (String urlPattern : urlPatternsValue.asStringArray()) {
-                        urlPatterns.add(urlPattern);
-                    }
+                    Collections.addAll(urlPatterns, urlPatternsValue.asStringArray());
                 }
                 urlPatternsValue = annotation.value();
                 if (urlPatternsValue != null) {
-                    for (String urlPattern : urlPatternsValue.asStringArray()) {
-                        urlPatterns.add(urlPattern);
-                    }
+                    Collections.addAll(urlPatterns, urlPatternsValue.asStringArray());
                 }
                 if (urlPatterns.size() > 0) {
                     servletMapping.setUrlPatterns(urlPatterns);
@@ -747,24 +743,18 @@ private void processAnnotations(IndexView index, WebMetaData metaData) {
                 List<DispatcherType> dispatchers = new ArrayList<DispatcherType>();
                 AnnotationValue urlPatternsValue = annotation.value("urlPatterns");
                 if (urlPatternsValue != null) {
-                    for (String urlPattern : urlPatternsValue.asStringArray()) {
-                        urlPatterns.add(urlPattern);
-                    }
+                    Collections.addAll(urlPatterns, urlPatternsValue.asStringArray());
                 }
                 urlPatternsValue = annotation.value();
                 if (urlPatternsValue != null) {
-                    for (String urlPattern : urlPatternsValue.asStringArray()) {
-                        urlPatterns.add(urlPattern);
-                    }
+                    Collections.addAll(urlPatterns, urlPatternsValue.asStringArray());
                 }
                 if (urlPatterns.size() > 0) {
                     filterMapping.setUrlPatterns(urlPatterns);
                 }
                 AnnotationValue servletNamesValue = annotation.value("servletNames");
                 if (servletNamesValue != null) {
-                    for (String servletName : servletNamesValue.asStringArray()) {
-                        servletNames.add(servletName);
-                    }
+                    Collections.addAll(servletNames, servletNamesValue.asStringArray());
                 }
                 if (servletNames.size() > 0) {
                     filterMapping.setServletNames(servletNames);
@@ -916,9 +906,7 @@ private void processAnnotations(IndexView index, WebMetaData metaData) {
                     }
                     AnnotationValue rolesAllowedValue = httpConstraint.value("rolesAllowed");
                     if (rolesAllowedValue != null) {
-                        for (String role : rolesAllowedValue.asStringArray()) {
-                            rolesAllowed.add(role);
-                        }
+                        Collections.addAll(rolesAllowed, rolesAllowedValue.asStringArray());
                     }
                 }
                 servletSecurity.setRolesAllowed(rolesAllowed);
@@ -946,9 +934,7 @@ private void processAnnotations(IndexView index, WebMetaData metaData) {
                             AnnotationValue rolesAllowedValue = httpMethodConstraint.value("rolesAllowed");
                             rolesAllowed = new ArrayList<String>();
                             if (rolesAllowedValue != null) {
-                                for (String role : rolesAllowedValue.asStringArray()) {
-                                    rolesAllowed.add(role);
-                                }
+                                Collections.addAll(rolesAllowed, rolesAllowedValue.asStringArray());
                             }
                             methodConstraint.setRolesAllowed(rolesAllowed);
                             methodConstraints.add(methodConstraint);