[camel-kafka-connector] branch issue-498 updated (7c211a8 -> 8c5959d)

[ac...@apache.org]

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

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


 discard 7c211a8  A
 discard aea04bf  [camel-main-support] Reordering props should not be required anymore
     new 8c5959d  [camel-main-support] Reordering props should not be required anymore

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7c211a8)
            \
             N -- N -- N   refs/heads/issue-498 (8c5959d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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:

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

[ac...@apache.org]

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

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

commit 8c5959d52405aa1e6213e0c7ec3c2aeddcf921dd
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);