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
commit 41093d855dc55b3d5539ff0b896d58108821da41 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue May 15 14:15:22 2018 +0200 CAMEL-12512 - Fixed CS --- .../component/consul/ConsulConfiguration.java | 20 +++++++++---------- .../camel/component/consul/ConsulEndpoint.java | 23 +++++++--------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java index ed6f7aa..603f6fd 100644 --- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java +++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java @@ -16,12 +16,12 @@ */ package org.apache.camel.component.consul; +import com.orbitz.consul.Consul; + import org.apache.camel.RuntimeCamelException; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; -import com.orbitz.consul.Consul; - @UriParams public class ConsulConfiguration extends ConsulClientConfiguration { @UriParam @@ -69,25 +69,23 @@ public class ConsulConfiguration extends ConsulClientConfiguration { public void setKey(String key) { this.key = key; } - public Consul getConsulClient() { - return consulClient; - } + return consulClient; + } /** - * Reference to a `com.orbitz.consul.Consul` in the - * registry. + * Reference to a `com.orbitz.consul.Consul` in the registry. */ - public void setConsulClient(Consul consulClient) { - this.consulClient = consulClient; - } + public void setConsulClient(Consul consulClient) { + this.consulClient = consulClient; + } // **************************************** // Copy // **************************************** - @Override + @Override public ConsulConfiguration copy() { try { return (ConsulConfiguration)super.clone(); diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java index 447f1a9..c8afe35 100644 --- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java +++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java @@ -34,8 +34,8 @@ import org.apache.camel.util.ObjectHelper; @UriEndpoint(firstVersion = "2.18.0", scheme = "consul", title = "Consul", syntax = "consul:apiEndpoint", label = "api,cloud") public class ConsulEndpoint extends DefaultEndpoint { - //@UriParam(description = "The consul configuration") - //@Metadata + // @UriParam(description = "The consul configuration") + // @Metadata private final ConsulConfiguration configuration; @UriPath(description = "The API endpoint") @@ -47,13 +47,8 @@ public class ConsulEndpoint extends DefaultEndpoint { private Consul consul; - public ConsulEndpoint( - String apiEndpoint, - String uri, - ConsulComponent component, - ConsulConfiguration configuration, - Optional<ConsulFactories.ProducerFactory> producerFactory, - Optional<ConsulFactories.ConsumerFactory> consumerFactory) { + public ConsulEndpoint(String apiEndpoint, String uri, ConsulComponent component, ConsulConfiguration configuration, Optional<ConsulFactories.ProducerFactory> producerFactory, + Optional<ConsulFactories.ConsumerFactory> consumerFactory) { super(uri, component); @@ -70,18 +65,14 @@ public class ConsulEndpoint extends DefaultEndpoint { @Override public Producer createProducer() throws Exception { - ConsulFactories.ProducerFactory factory = producerFactory.orElseThrow( - () -> new IllegalArgumentException("No producer for " + apiEndpoint) - ); + ConsulFactories.ProducerFactory factory = producerFactory.orElseThrow(() -> new IllegalArgumentException("No producer for " + apiEndpoint)); return factory.create(this, configuration); } @Override public Consumer createConsumer(Processor processor) throws Exception { - ConsulFactories.ConsumerFactory factory = consumerFactory.orElseThrow( - () -> new IllegalArgumentException("No consumer for " + apiEndpoint) - ); + ConsulFactories.ConsumerFactory factory = consumerFactory.orElseThrow(() -> new IllegalArgumentException("No consumer for " + apiEndpoint)); return factory.create(this, configuration, processor); } @@ -102,7 +93,7 @@ public class ConsulEndpoint extends DefaultEndpoint { if (consul == null && ObjectHelper.isEmpty(getConfiguration().getConsulClient())) { consul = configuration.createConsulClient(getCamelContext()); } else { - consul = getConfiguration().getConsulClient(); + consul = getConfiguration().getConsulClient(); } return consul; -- To stop receiving notification emails like this one, please contact acosent...@apache.org.