You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/03 07:41:32 UTC

[camel] branch main updated: replaced addAll() calls with parametrized constructor calls (#9763)

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

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 248e9c047d0 replaced addAll() calls with parametrized constructor calls (#9763)
248e9c047d0 is described below

commit 248e9c047d0f66dcee56e0dff1ddad800e8c8b70
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Mon Apr 3 10:41:25 2023 +0300

    replaced addAll() calls with parametrized constructor calls (#9763)
    
    * replaced addAll() calls with paranetrized constructor calls
    
    * replaced addAll() calls with parametrized constructor calls
    
    ---------
    
    Co-authored-by: dk2k <dk...@ya.ru>
---
 .../org/apache/camel/component/aws2/ddbstream/ShardList.java |  3 +--
 .../camel/component/box/internal/BoxConnectionHelper.java    |  3 +--
 .../org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java |  3 +--
 .../apache/camel/component/facebook/FacebookConsumer.java    |  6 ++----
 .../apache/camel/component/facebook/data/ReadingBuilder.java |  3 +--
 .../org/apache/camel/component/jetty/HttpHeaderCaseTest.java |  3 +--
 .../java/org/apache/camel/component/jmx/JMXEndpoint.java     |  3 +--
 .../server/core/integ5/ServerAnnotationProcessor.java        |  6 ++----
 .../server/core/integ5/ServerAnnotationProcessor.java        |  6 ++----
 .../java/org/apache/camel/component/mock/MockEndpoint.java   | 12 ++++--------
 .../camel/component/netty/http/NettyHttpHeaderCaseTest.java  |  3 +--
 .../org/apache/camel/component/olingo2/Olingo2Consumer.java  |  3 +--
 .../org/apache/camel/component/olingo2/Olingo2Index.java     |  3 +--
 .../org/apache/camel/component/olingo2/Olingo2Producer.java  |  3 +--
 .../org/apache/camel/component/olingo4/Olingo4Consumer.java  |  3 +--
 .../org/apache/camel/component/olingo4/Olingo4Index.java     |  3 +--
 .../org/apache/camel/component/olingo4/Olingo4Producer.java  |  3 +--
 .../java/org/apache/camel/spring/scan/ScanTestSupport.java   |  6 ++----
 .../zookeepermaster/group/internal/ZooKeeperGroup.java       |  3 +--
 .../java/org/apache/camel/impl/debugger/BacklogTracer.java   |  3 +--
 .../java/org/apache/camel/converter/CollectionConverter.java |  3 +--
 .../main/java/org/apache/camel/builder/NotifyBuilder.java    | 12 ++++--------
 .../java/org/apache/camel/processor/SplitterPojoTest.java    |  3 +--
 .../apache/camel/support/component/AbstractApiConsumer.java  |  3 +--
 .../java/org/apache/camel/dsl/jbang/core/commands/Run.java   |  9 +++------
 .../apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java |  3 +--
 26 files changed, 38 insertions(+), 76 deletions(-)

diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/ShardList.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/ShardList.java
index a34485234bd..95c388c36bf 100644
--- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/ShardList.java
+++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/ShardList.java
@@ -89,8 +89,7 @@ class ShardList {
 
     Shard atAfterSeq(String sequenceNumber, BigIntComparisons condition) {
         BigInteger atAfter = new BigInteger(sequenceNumber);
-        List<Shard> sorted = new ArrayList<>();
-        sorted.addAll(shards.values());
+        List<Shard> sorted = new ArrayList<>(shards.values());
         Collections.sort(sorted, StartingSequenceNumberComparator.INSTANCE);
         for (Shard shard : sorted) {
             if (shard.sequenceNumberRange().endingSequenceNumber() != null) {
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java
index d39129e0e67..c0d76fc4ee5 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java
@@ -119,8 +119,7 @@ public final class BoxConnectionHelper {
             passwordField.val(configuration.getUserPassword());
 
             //submit loginPage
-            final Map<String, String> cookies = new HashMap<>();
-            cookies.putAll(loginPageResponse.cookies());
+            final Map<String, String> cookies = new HashMap<>(loginPageResponse.cookies());
 
             Connection.Response response = addProxy(loginForm.submit(), proxy)
                     .cookies(cookies)
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
index d46f431a66c..37dd13dea26 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
@@ -106,8 +106,7 @@ public class CxfRsComponent extends HeaderFilterStrategyComponent implements SSL
             // The super class (DefaultComponent) will invoke "setProperties" after this method
             // with to apply properties defined by URI query.
             if (bean.getProperties() != null) {
-                Map<String, Object> copy = new HashMap<>();
-                copy.putAll(bean.getProperties());
+                Map<String, Object> copy = new HashMap<>(bean.getProperties());
                 setProperties(answer, copy);
             }
             // setup the skipFaultLogging
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
index e675606ed1e..fafcc46f3f0 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
@@ -119,8 +119,7 @@ public class FacebookConsumer extends ScheduledPollConsumer {
 
         FacebookMethodsType result;
         // find one that takes the largest subset of endpoint parameters
-        final Set<String> argNames = new HashSet<>();
-        argNames.addAll(
+        final Set<String> argNames = new HashSet<>(
                 FacebookPropertiesHelper.getEndpointPropertyNames(endpoint.getCamelContext(), endpoint.getConfiguration()));
 
         // add reading property for polling, if it doesn't already exist!
@@ -215,8 +214,7 @@ public class FacebookConsumer extends ScheduledPollConsumer {
     private Map<String, Object> getMethodArguments() {
         // start by setting the Reading since and until fields,
         // these are used to avoid reading duplicate results across polls
-        Map<String, Object> arguments = new HashMap<>();
-        arguments.putAll(endpointProperties);
+        Map<String, Object> arguments = new HashMap<>(endpointProperties);
 
         Reading reading = (Reading) arguments.remove(READING_PROPERTY);
         if (reading == null) {
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java
index cd54ddaf269..61b7302acd7 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java
@@ -39,8 +39,7 @@ public final class ReadingBuilder {
         final Map<String, String> source = (Map<String, String>) field.get(reading);
         // create another reading, and add all fields from source
         Reading copy = new Reading();
-        final Map<String, String> copyMap = new LinkedHashMap<>();
-        copyMap.putAll(source);
+        final Map<String, String> copyMap = new LinkedHashMap<>(source);
         if (skipSinceUtil) {
             copyMap.remove("since");
             copyMap.remove("until");
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderCaseTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderCaseTest.java
index 5e9968da093..17787702e0b 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderCaseTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderCaseTest.java
@@ -59,8 +59,7 @@ public class HttpHeaderCaseTest extends BaseJettyTest {
                     public void process(Exchange exchange) {
 
                         // headers received should be in case as well
-                        Map<String, Object> map = new LinkedHashMap<>();
-                        map.putAll(exchange.getIn().getHeaders());
+                        Map<String, Object> map = new LinkedHashMap<>(exchange.getIn().getHeaders());
 
                         assertEquals("123", map.get("OTHER"));
                         assertEquals(null, map.get("other"));
diff --git a/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java b/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
index 2e71a75e109..5d0f9eefd34 100644
--- a/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
+++ b/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
@@ -558,8 +558,7 @@ public class JMXEndpoint extends DefaultEndpoint {
             StringBuilder sb = new StringBuilder(getObjectDomain()).append(':').append("name=").append(getObjectName());
             objectName = new ObjectName(sb.toString());
         } else {
-            Hashtable<String, String> ht = new Hashtable<>();
-            ht.putAll(getObjectProperties());
+            Hashtable<String, String> ht = new Hashtable<>(getObjectProperties());
             objectName = new ObjectName(getObjectDomain(), ht);
         }
         return objectName;
diff --git a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index 5324c9bbb4f..00aca1668b8 100644
--- a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++ b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -21,6 +21,7 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.net.ServerSocket;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -166,10 +167,7 @@ public final class ServerAnnotationProcessor {
                 }
             }
 
-            List<String> realms = new ArrayList<String>();
-            for (String s : createLdapServer.saslRealms()) {
-                realms.add(s);
-            }
+            List<String> realms = new ArrayList<>(Arrays.asList(createLdapServer.saslRealms()));
 
             ldapServer.setSaslRealms(realms);
 
diff --git a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index 5324c9bbb4f..00aca1668b8 100644
--- a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++ b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -21,6 +21,7 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.net.ServerSocket;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -166,10 +167,7 @@ public final class ServerAnnotationProcessor {
                 }
             }
 
-            List<String> realms = new ArrayList<String>();
-            for (String s : createLdapServer.saslRealms()) {
-                realms.add(s);
-            }
+            List<String> realms = new ArrayList<>(Arrays.asList(createLdapServer.saslRealms()));
 
             ldapServer.setSaslRealms(realms);
 
diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index be83befd3a4..0bb05d5ea2a 100644
--- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -687,8 +687,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
      * <b>Important:</b> This overrides any previous set value using {@link #expectedMessageCount(int)}
      */
     public void expectedHeaderValuesReceivedInAnyOrder(String name, Object... values) {
-        List<Object> valueList = new ArrayList<>();
-        valueList.addAll(Arrays.asList(values));
+        List<Object> valueList = new ArrayList<>(Arrays.asList(values));
         expectedHeaderValuesReceivedInAnyOrder(name, valueList);
     }
 
@@ -776,8 +775,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
      * <b>Important:</b> This overrides any previous set value using {@link #expectedMessageCount(int)}
      */
     public void expectedPropertyValuesReceivedInAnyOrder(String name, Object... values) {
-        List<Object> valueList = new ArrayList<>();
-        valueList.addAll(Arrays.asList(values));
+        List<Object> valueList = new ArrayList<>(Arrays.asList(values));
         expectedPropertyValuesReceivedInAnyOrder(name, valueList);
     }
 
@@ -866,8 +864,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
      * <b>Important:</b> This overrides any previous set value using {@link #expectedMessageCount(int)}
      */
     public void expectedBodiesReceived(Object... bodies) {
-        List<Object> bodyList = new ArrayList<>();
-        bodyList.addAll(Arrays.asList(bodies));
+        List<Object> bodyList = new ArrayList<>(Arrays.asList(bodies));
         expectedBodiesReceived(bodyList);
     }
 
@@ -932,8 +929,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
      * <b>Important:</b> This overrides any previous set value using {@link #expectedMessageCount(int)}
      */
     public void expectedBodiesReceivedInAnyOrder(Object... bodies) {
-        List<Object> bodyList = new ArrayList<>();
-        bodyList.addAll(Arrays.asList(bodies));
+        List<Object> bodyList = new ArrayList<>(Arrays.asList(bodies));
         expectedBodiesReceivedInAnyOrder(bodyList);
     }
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderCaseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderCaseTest.java
index 9f894284d9b..28d72ac7dcc 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderCaseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderCaseTest.java
@@ -55,8 +55,7 @@ public class NettyHttpHeaderCaseTest extends BaseNettyTest {
                 from("netty-http:http://localhost:{{port}}/myapp/mytest").process(exchange -> {
 
                     // headers received should be in case as well
-                    Map<String, Object> map = new LinkedHashMap<>();
-                    map.putAll(exchange.getIn().getHeaders());
+                    Map<String, Object> map = new LinkedHashMap<>(exchange.getIn().getHeaders());
 
                     assertEquals("123", map.get("OTHER"));
                     assertEquals(null, map.get("other"));
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
index 6420ed7dad2..10b583acbd1 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
@@ -46,8 +46,7 @@ public class Olingo2Consumer extends AbstractApiConsumer<Olingo2ApiName, Olingo2
     @Override
     protected int poll() throws Exception {
         // invoke the consumer method
-        final Map<String, Object> args = new HashMap<>();
-        args.putAll(endpoint.getEndpointProperties());
+        final Map<String, Object> args = new HashMap<>(endpoint.getEndpointProperties());
 
         // let the endpoint and the Consumer intercept properties
         endpoint.interceptProperties(args);
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Index.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Index.java
index 75a6b0e8579..a291c805425 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Index.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Index.java
@@ -160,8 +160,7 @@ public class Olingo2Index {
             return odataFeed;
         }
 
-        List<ODataEntry> copyEntries = new ArrayList<>();
-        copyEntries.addAll(entries);
+        List<ODataEntry> copyEntries = new ArrayList<>(entries);
 
         for (ODataEntry entry : copyEntries) {
             if (resultIndex.contains(hash(entry))) {
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Producer.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Producer.java
index f2d4fab3563..d0bd321647d 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Producer.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Producer.java
@@ -47,8 +47,7 @@ public class Olingo2Producer extends AbstractApiProducer<Olingo2ApiName, Olingo2
     @Override
     public boolean process(final Exchange exchange, final AsyncCallback callback) {
         // properties for method arguments
-        final Map<String, Object> properties = new HashMap<>();
-        properties.putAll(endpoint.getEndpointProperties());
+        final Map<String, Object> properties = new HashMap<>(endpoint.getEndpointProperties());
         propertiesHelper.getExchangeProperties(exchange, properties);
 
         // let the endpoint and the Producer intercept properties
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java
index 5051b181944..9abc417d75e 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java
@@ -50,8 +50,7 @@ public class Olingo4Consumer extends AbstractApiConsumer<Olingo4ApiName, Olingo4
     @Override
     protected int poll() throws Exception {
         // invoke the consumer method
-        final Map<String, Object> args = new HashMap<>();
-        args.putAll(endpoint.getEndpointProperties());
+        final Map<String, Object> args = new HashMap<>(endpoint.getEndpointProperties());
 
         // let the endpoint and the Consumer intercept properties
         endpoint.interceptProperties(args);
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Index.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Index.java
index 5c90c0864b3..a91b0b77c73 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Index.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Index.java
@@ -82,8 +82,7 @@ public class Olingo4Index {
             return entitySet;
         }
 
-        List<ClientEntity> copyEntities = new ArrayList<>();
-        copyEntities.addAll(entities);
+        List<ClientEntity> copyEntities = new ArrayList<>(entities);
 
         for (ClientEntity entity : copyEntities) {
             if (resultIndex.contains(entity.hashCode())) {
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Producer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Producer.java
index 7123d7d96a9..569889ec770 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Producer.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Producer.java
@@ -47,8 +47,7 @@ public class Olingo4Producer extends AbstractApiProducer<Olingo4ApiName, Olingo4
     @Override
     public boolean process(final Exchange exchange, final AsyncCallback callback) {
         // properties for method arguments
-        final Map<String, Object> properties = new HashMap<>();
-        properties.putAll(endpoint.getEndpointProperties());
+        final Map<String, Object> properties = new HashMap<>(endpoint.getEndpointProperties());
         propertiesHelper.getExchangeProperties(exchange, properties);
 
         // let the endpoint and the Producer intercept properties
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
index fd5f70f343c..5cbd8924d4b 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.spring.scan;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -35,10 +36,7 @@ public abstract class ScanTestSupport {
     }
 
     protected void validateMatchingSetContains(Set<Class<?>> scannedClasses, Class<?>... matchingClasses) {
-        HashSet<Class<?>> expectedSet = new HashSet<>();
-        for (Class<?> expected : matchingClasses) {
-            expectedSet.add(expected);
-        }
+        HashSet<Class<?>> expectedSet = new HashSet<>(Arrays.asList(matchingClasses));
         validateMatchingSetContains(scannedClasses, expectedSet);
     }
 
diff --git a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
index 124b88dd037..5940415334d 100644
--- a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
+++ b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
@@ -407,8 +407,7 @@ public class ZooKeeperGroup<T extends NodeState> implements Group<T> {
      * @return list of children and data
      */
     public List<ChildData> getCurrentData() {
-        List<ChildData> answer = new ArrayList<>();
-        answer.addAll(currentData.values());
+        List<ChildData> answer = new ArrayList<>(currentData.values());
         return answer;
     }
 
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogTracer.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogTracer.java
index f03e661c748..48ccfb667f0 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogTracer.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogTracer.java
@@ -340,8 +340,7 @@ public final class BacklogTracer extends ServiceSupport implements org.apache.ca
 
     @Override
     public List<BacklogTracerEventMessage> dumpAllTracedMessages() {
-        List<BacklogTracerEventMessage> answer = new ArrayList<>();
-        answer.addAll(queue);
+        List<BacklogTracerEventMessage> answer = new ArrayList<>(queue);
         if (isRemoveOnDump()) {
             queue.clear();
         }
diff --git a/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java
index 1cf25a9315b..b99de79a338 100644
--- a/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java
@@ -99,8 +99,7 @@ public final class CollectionConverter {
 
     @Converter(order = 6)
     public static Set<Object> toSet(Object[] array) {
-        Set<Object> answer = new HashSet<>();
-        answer.addAll(Arrays.asList(array));
+        Set<Object> answer = new HashSet<>(Arrays.asList(array));
         return answer;
     }
 
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java
index ff6497e2a74..7d9da9ad3f2 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/NotifyBuilder.java
@@ -858,8 +858,7 @@ public class NotifyBuilder {
      * @see           #whenExactBodiesReceived(Object...)
      */
     public NotifyBuilder whenBodiesReceived(Object... bodies) {
-        List<Object> bodyList = new ArrayList<>();
-        bodyList.addAll(Arrays.asList(bodies));
+        List<Object> bodyList = new ArrayList<>(Arrays.asList(bodies));
         return doWhenBodies(bodyList, true, false);
     }
 
@@ -874,8 +873,7 @@ public class NotifyBuilder {
      * @see           #whenExactBodiesDone(Object...)
      */
     public NotifyBuilder whenBodiesDone(Object... bodies) {
-        List<Object> bodyList = new ArrayList<>();
-        bodyList.addAll(Arrays.asList(bodies));
+        List<Object> bodyList = new ArrayList<>(Arrays.asList(bodies));
         return doWhenBodies(bodyList, false, false);
     }
 
@@ -889,8 +887,7 @@ public class NotifyBuilder {
      * @see           #whenBodiesReceived(Object...)
      */
     public NotifyBuilder whenExactBodiesReceived(Object... bodies) {
-        List<Object> bodyList = new ArrayList<>();
-        bodyList.addAll(Arrays.asList(bodies));
+        List<Object> bodyList = new ArrayList<>(Arrays.asList(bodies));
         return doWhenBodies(bodyList, true, true);
     }
 
@@ -904,8 +901,7 @@ public class NotifyBuilder {
      * @see           #whenExactBodiesDone(Object...)
      */
     public NotifyBuilder whenExactBodiesDone(Object... bodies) {
-        List<Object> bodyList = new ArrayList<>();
-        bodyList.addAll(Arrays.asList(bodies));
+        List<Object> bodyList = new ArrayList<>(Arrays.asList(bodies));
         return doWhenBodies(bodyList, false, true);
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
index 7e21ae25184..dda0ba3ed7a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
@@ -104,9 +104,8 @@ public class SplitterPojoTest extends ContextTestSupport {
             // of the box support for splitting a String based on comma
             // but this is for show and tell, since this is java code
             // you have the full power how you like to split your messages
-            List<String> answer = new ArrayList<>();
             String[] parts = body.split(",");
-            answer.addAll(Arrays.asList(parts));
+            List<String> answer = new ArrayList<>(Arrays.asList(parts));
             return answer;
         }
 
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiConsumer.java
index 20c9c5350f9..3dc2ebbb967 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiConsumer.java
@@ -57,8 +57,7 @@ public abstract class AbstractApiConsumer<E extends Enum<E> & ApiName, T>
     @Override
     protected int poll() throws Exception {
         // invoke the consumer method
-        final Map<String, Object> args = new HashMap<>();
-        args.putAll(endpoint.getEndpointProperties());
+        final Map<String, Object> args = new HashMap<>(endpoint.getEndpointProperties());
 
         // let the endpoint and the Consumer intercept properties
         endpoint.interceptProperties(args);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 991433ba07a..8809c60fc63 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -606,8 +606,7 @@ public class Run extends CamelCommand {
     }
 
     protected int runCamelVersion(KameletMain main) throws Exception {
-        List<String> cmds = new ArrayList<>();
-        cmds.addAll(spec.commandLine().getParseResult().originalArgs());
+        List<String> cmds = new ArrayList<>(spec.commandLine().getParseResult().originalArgs());
 
         if (background) {
             cmds.remove("--background=true");
@@ -642,8 +641,7 @@ public class Run extends CamelCommand {
     }
 
     protected int runBackground(KameletMain main) throws Exception {
-        List<String> cmds = new ArrayList<>();
-        cmds.addAll(spec.commandLine().getParseResult().originalArgs());
+        List<String> cmds = new ArrayList<>(spec.commandLine().getParseResult().originalArgs());
 
         cmds.remove("--background=true");
         cmds.remove("--background");
@@ -693,8 +691,7 @@ public class Run extends CamelCommand {
         String fn = WORK_DIR + "/CustomCamelJBang.java";
         Files.write(Paths.get(fn), content.getBytes(StandardCharsets.UTF_8));
 
-        List<String> cmds = new ArrayList<>();
-        cmds.addAll(spec.commandLine().getParseResult().originalArgs());
+        List<String> cmds = new ArrayList<>(spec.commandLine().getParseResult().originalArgs());
 
         if (background) {
             cmds.remove("--background=true");
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
index 8236562a979..736c29982df 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
@@ -444,10 +444,9 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
      * Load all the definitions.
      */
     protected Set<ClassInfo> definitions() {
-        final Set<ClassInfo> discovered = new LinkedHashSet<>();
         final Set<ClassInfo> answer = new LinkedHashSet<>();
 
-        discovered.addAll(models().values());
+        final Set<ClassInfo> discovered = new LinkedHashSet<>(models().values());
 
         for (ClassInfo type : discovered) {
             answer.addAll(definitions(type));