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

[da...@apache.org]

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

davsclaus 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 ea03a72  CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Digitalocean component
ea03a72 is described below

commit ea03a72af3c4d5e7314b5c63aa941b52b2974a71
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 10 17:23:23 2019 +0100

    CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Digitalocean component
---
 .../camel/component/digitalocean/DigitalOceanComponent.java   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanComponent.java b/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanComponent.java
index e644a8d..4641e12 100644
--- a/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanComponent.java
+++ b/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanComponent.java
@@ -26,30 +26,27 @@ import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Represents the component that manages {@link DigitalOceanEndpoint}.
- */
 @Component("digitalocean")
 public class DigitalOceanComponent extends DefaultComponent {
 
     private static final transient Logger LOG = LoggerFactory.getLogger(DigitalOceanComponent.class);
 
-
     public DigitalOceanComponent() {
     }
 
     @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-
         DigitalOceanConfiguration configuration = new DigitalOceanConfiguration();
-        setProperties(configuration, parameters);
         configuration.setResource(DigitalOceanResources.valueOf(remaining));
 
+        DigitalOceanEndpoint endpoint = new DigitalOceanEndpoint(uri, this, configuration);
+        setProperties(endpoint, parameters);
+
         if (ObjectHelper.isEmpty(configuration.getOAuthToken()) && ObjectHelper.isEmpty(configuration.getDigitalOceanClient())) {
             throw new DigitalOceanException("oAuthToken or digitalOceanClient must be specified");
         }
 
-        return new DigitalOceanEndpoint(uri, this, configuration);
+        return endpoint;
     }
 
 }