Repository: camel Updated Branches: refs/heads/master 5e83a39e3 -> 60f126a25
Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/60f126a2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/60f126a2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/60f126a2 Branch: refs/heads/master Commit: 60f126a2570107c42c4595abd9695cc8f54d0690 Parents: 3f6b909 Author: Andrea Cosentino <anco...@gmail.com> Authored: Fri Feb 12 14:15:00 2016 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Feb 12 14:15:15 2016 +0100 ---------------------------------------------------------------------- .../kubernetes/KubernetesConfiguration.java | 12 ++++----- .../kubernetes/KubernetesEndpoint.java | 4 +-- .../consumer/KubernetesNamespacesConsumer.java | 28 ++++++++++---------- .../consumer/KubernetesPodsConsumer.java | 26 +++++++++--------- ...ubernetesReplicationControllersConsumer.java | 28 ++++++++++---------- .../consumer/KubernetesSecretsConsumer.java | 26 +++++++++--------- .../consumer/KubernetesServicesConsumer.java | 26 +++++++++--------- .../KubernetesNamespacesConsumerTest.java | 4 +-- 8 files changed, 77 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/60f126a2/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java index f1a0c33..e36f771 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java @@ -292,14 +292,14 @@ public class KubernetesConfiguration { * The Consumer pool size */ public int getPoolSize() { - return poolSize; - } + return poolSize; + } - public void setPoolSize(int poolSize) { - this.poolSize = poolSize; - } + public void setPoolSize(int poolSize) { + this.poolSize = poolSize; + } - @Override + @Override public String toString() { return "KubernetesConfiguration [masterUrl=" + masterUrl + ", category=" + category + ", kubernetesClient=" + kubernetesClient + ", username=" + username + ", password=" + password + ", operation=" + operation http://git-wip-us.apache.org/repos/asf/camel/blob/60f126a2/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java index 8e521a2..86dd081 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java @@ -16,12 +16,12 @@ */ package org.apache.camel.component.kubernetes; +import java.util.concurrent.ExecutorService; + import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; -import java.util.concurrent.ExecutorService; - import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; http://git-wip-us.apache.org/repos/asf/camel/blob/60f126a2/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java index 097b3a6..e3d6d08 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java @@ -18,6 +18,10 @@ package org.apache.camel.component.kubernetes.consumer; import java.util.concurrent.ExecutorService; +import io.fabric8.kubernetes.api.model.Namespace; +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.Watcher; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.kubernetes.KubernetesConstants; @@ -28,10 +32,6 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.fabric8.kubernetes.api.model.Namespace; -import io.fabric8.kubernetes.client.KubernetesClientException; -import io.fabric8.kubernetes.client.Watcher; - public class KubernetesNamespacesConsumer extends DefaultConsumer { private static final Logger LOG = LoggerFactory.getLogger(KubernetesNamespacesConsumer.class); @@ -73,10 +73,10 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer { } class NamespacesConsumerTask implements Runnable { - + @Override public void run() { - if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getOauthToken())) { + if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getOauthToken())) { if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespaceName())) { getEndpoint().getKubernetesClient().namespaces() .withName(getEndpoint().getKubernetesConfiguration().getNamespaceName()) @@ -91,10 +91,10 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, ne.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } @Override @@ -116,10 +116,10 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, ne.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } http://git-wip-us.apache.org/repos/asf/camel/blob/60f126a2/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumer.java index 186f824..b92d05d 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumer.java @@ -18,6 +18,10 @@ package org.apache.camel.component.kubernetes.consumer; import java.util.concurrent.ExecutorService; +import io.fabric8.kubernetes.api.model.Pod; +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.Watcher; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.kubernetes.KubernetesConstants; @@ -28,10 +32,6 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.fabric8.kubernetes.api.model.Pod; -import io.fabric8.kubernetes.client.KubernetesClientException; -import io.fabric8.kubernetes.client.Watcher; - public class KubernetesPodsConsumer extends DefaultConsumer { private static final Logger LOG = LoggerFactory.getLogger(KubernetesPodsConsumer.class); @@ -73,7 +73,7 @@ public class KubernetesPodsConsumer extends DefaultConsumer { } class PodsConsumerTask implements Runnable { - + @Override public void run() { if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getOauthToken())) { @@ -91,10 +91,10 @@ public class KubernetesPodsConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, pe.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } @Override @@ -116,10 +116,10 @@ public class KubernetesPodsConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, pe.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/60f126a2/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java index 2fd6847..da577b7 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumer.java @@ -18,6 +18,10 @@ package org.apache.camel.component.kubernetes.consumer; import java.util.concurrent.ExecutorService; +import io.fabric8.kubernetes.api.model.ReplicationController; +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.Watcher; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.kubernetes.KubernetesConstants; @@ -28,10 +32,6 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.fabric8.kubernetes.api.model.ReplicationController; -import io.fabric8.kubernetes.client.KubernetesClientException; -import io.fabric8.kubernetes.client.Watcher; - public class KubernetesReplicationControllersConsumer extends DefaultConsumer { private static final Logger LOG = LoggerFactory.getLogger(KubernetesReplicationControllersConsumer.class); @@ -74,10 +74,10 @@ public class KubernetesReplicationControllersConsumer extends DefaultConsumer { } class ReplicationControllersConsumerTask implements Runnable { - + @Override public void run() { - if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getOauthToken())) { + if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getOauthToken())) { if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespaceName())) { getEndpoint().getKubernetesClient().replicationControllers() .inNamespace(getEndpoint().getKubernetesConfiguration().getNamespaceName()) @@ -92,10 +92,10 @@ public class KubernetesReplicationControllersConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, rce.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } @@ -121,10 +121,10 @@ public class KubernetesReplicationControllersConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, rce.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/60f126a2/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesSecretsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesSecretsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesSecretsConsumer.java index c9172e7..daadb11 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesSecretsConsumer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesSecretsConsumer.java @@ -18,6 +18,10 @@ package org.apache.camel.component.kubernetes.consumer; import java.util.concurrent.ExecutorService; +import io.fabric8.kubernetes.api.model.Secret; +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.Watcher; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.kubernetes.KubernetesConstants; @@ -28,10 +32,6 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.fabric8.kubernetes.api.model.Secret; -import io.fabric8.kubernetes.client.KubernetesClientException; -import io.fabric8.kubernetes.client.Watcher; - public class KubernetesSecretsConsumer extends DefaultConsumer { private static final Logger LOG = LoggerFactory.getLogger(KubernetesSecretsConsumer.class); @@ -74,7 +74,7 @@ public class KubernetesSecretsConsumer extends DefaultConsumer { } class SecretsConsumerTask implements Runnable { - + @Override public void run() { if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getOauthToken())) { @@ -92,10 +92,10 @@ public class KubernetesSecretsConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, se.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } @Override @@ -117,10 +117,10 @@ public class KubernetesSecretsConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, se.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/60f126a2/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumer.java index 8df7014..d8b28ae 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumer.java @@ -18,6 +18,10 @@ package org.apache.camel.component.kubernetes.consumer; import java.util.concurrent.ExecutorService; +import io.fabric8.kubernetes.api.model.Service; +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.Watcher; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.kubernetes.KubernetesConstants; @@ -28,10 +32,6 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.fabric8.kubernetes.api.model.Service; -import io.fabric8.kubernetes.client.KubernetesClientException; -import io.fabric8.kubernetes.client.Watcher; - public class KubernetesServicesConsumer extends DefaultConsumer { private static final Logger LOG = LoggerFactory.getLogger(KubernetesServicesConsumer.class); @@ -73,7 +73,7 @@ public class KubernetesServicesConsumer extends DefaultConsumer { } class ServicesConsumerTask implements Runnable { - + @Override public void run() { if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getOauthToken())) { @@ -91,10 +91,10 @@ public class KubernetesServicesConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, se.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } @@ -117,10 +117,10 @@ public class KubernetesServicesConsumer extends DefaultConsumer { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_ACTION, se.getAction()); exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIMESTAMP, System.currentTimeMillis()); try { - processor.process(exchange); - } catch (Exception e) { - getExceptionHandler().handleException("Error during processing", exchange, e); - } + processor.process(exchange); + } catch (Exception e) { + getExceptionHandler().handleException("Error during processing", exchange, e); + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/60f126a2/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java index 9f18a9c..97265dc 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java @@ -21,6 +21,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import io.fabric8.kubernetes.api.model.Namespace; + import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -32,8 +34,6 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.ObjectHelper; import org.junit.Test; -import io.fabric8.kubernetes.api.model.Namespace; - public class KubernetesNamespacesConsumerTest extends KubernetesTestSupport { @EndpointInject(uri = "mock:result")
