[camel] branch master updated: CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - robotframework

[ac...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new dddea30  CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - robotframework
dddea30 is described below

commit dddea30c74d08d41fccac96847ed40f9ea50fdd7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Dec 12 11:15:04 2019 +0100

    CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - robotframework
---
 .../apache/camel/component/robotframework/RobotFrameworkComponent.java  | 2 +-
 .../component/robotframework/RobotFrameworkCamelConfigurationTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkComponent.java b/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkComponent.java
index 3f11fd0..2cc47ba 100644
--- a/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkComponent.java
+++ b/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkComponent.java
@@ -55,9 +55,9 @@ public class RobotFrameworkComponent extends DefaultComponent {
 
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         final RobotFrameworkCamelConfiguration configuration = this.configuration.copy();
-        setProperties(configuration, parameters);
 
         Endpoint endpoint = new RobotFrameworkEndpoint(uri, this, remaining, configuration);
+        setProperties(endpoint, parameters);
         return endpoint;
     }
 }
diff --git a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConfigurationTest.java b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConfigurationTest.java
index d7995fd..1baadf9 100644
--- a/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConfigurationTest.java
+++ b/components/camel-robotframework/src/test/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConfigurationTest.java
@@ -42,7 +42,7 @@ public class RobotFrameworkCamelConfigurationTest extends CamelTestSupport {
     }
 
     private RobotFrameworkEndpoint createEndpointWithOption(String option) throws Exception {
-        RobotFrameworkComponent robotFrameworkComponent = new RobotFrameworkComponent(context);
+        RobotFrameworkComponent robotFrameworkComponent = context.getComponent("robotframework", RobotFrameworkComponent.class);
         RobotFrameworkEndpoint robotFrameworkEndpoint = (RobotFrameworkEndpoint)robotFrameworkComponent
             .createEndpoint("robotframework:src/test/resources/org/apache/camel/component/robotframework/send_no_camel_exchnage_only_camel_configs.robot?" + option);
         return robotFrameworkEndpoint;