You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by va...@apache.org on 2020/10/05 10:08:07 UTC

[camel-kafka-connector] branch master updated (1f22bfd -> 7e39b20)

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

valdar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.


    from 1f22bfd  Updated CHANGELOG.md
     new 9b3275e  [camel-main-support] Reordering props should not be required anymore
     new 7e39b20  Fixed CS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/camel/kafkaconnector/utils/CamelMainSupport.java   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)


[camel-kafka-connector] 01/02: [camel-main-support] Reordering props should not be required anymore

Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 9b3275e2e3a8d23a358247d4496fd023cc38b50e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 5 08:29:58 2020 +0200

    [camel-main-support] Reordering props should not be required anymore
---
 .../apache/camel/kafkaconnector/utils/CamelMainSupport.java    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
index 51dad11..cd01cf9 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
@@ -76,17 +76,9 @@ public class CamelMainSupport {
         camelMain.addMainListener(new CamelMainFinishedListener());
         camelMain.configure().setAutoConfigurationLogSummary(false);
 
-        // reordering properties to place the one starting with "#class:" first
-        LinkedHashMap<String, String> orderedProps = new LinkedHashMap<>();
-        props.keySet().stream()
-                .filter(k -> props.get(k).startsWith("#class:"))
-                .forEach(k -> orderedProps.put(k, props.get(k)));
-        props.keySet().stream()
-                .filter(k -> !props.get(k).startsWith("#class:"))
-                .forEach(k -> orderedProps.put(k, props.get(k)));
 
         Properties camelProperties = new OrderedProperties();
-        camelProperties.putAll(orderedProps);
+        camelProperties.putAll(props);
 
         LOG.info("Setting initial properties in Camel context: [{}]", camelProperties);
         this.camel.getPropertiesComponent().setInitialProperties(camelProperties);


[camel-kafka-connector] 02/02: Fixed CS

Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 7e39b20b050a93b4b6e4c7c7772ebe6f519c68b1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 5 11:27:31 2020 +0200

    Fixed CS
---
 .../java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
index cd01cf9..5a5f1fe 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
@@ -17,7 +17,6 @@
 package org.apache.camel.kafkaconnector.utils;
 
 import java.util.Collection;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;