You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/07/30 09:49:48 UTC
[camel] branch master updated (4fc8dfe -> cba5b01)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4fc8dfe Regen
new b94580b Camel-Kubernetes: Use BindToRegistry annotation wherever possible
new cda7648 Camel-Kubernetes: Fixed CS
new cba5b01 Removed unused imports
The 3 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:
.../producer/KubernetesConfigMapsProducerTest.java | 13 ++--
.../KubernetesDeploymentsProducerTest.java | 70 +++++++---------------
.../producer/KubernetesHPAProducerTest.java | 11 ++--
.../producer/KubernetesJobProducerTest.java | 14 ++---
.../producer/KubernetesNamespacesProducerTest.java | 11 ++--
.../producer/KubernetesNodesProducerTest.java | 31 ++++------
...ernetesPersistentVolumesClaimsProducerTest.java | 11 ++--
.../KubernetesPersistentVolumesProducerTest.java | 11 ++--
.../producer/KubernetesPodsProducerTest.java | 11 ++--
...bernetesReplicationControllersProducerTest.java | 11 ++--
.../KubernetesResourcesQuotaProducerTest.java | 30 ++++------
.../producer/KubernetesSecretsProducerTest.java | 11 ++--
.../KubernetesServiceAccountsProducerTest.java | 11 ++--
.../producer/KubernetesServicesProducerTest.java | 11 ++--
.../OpenshiftBuildConfigsProducerTest.java | 10 ++--
.../producer/OpenshiftBuildsProducerTest.java | 10 ++--
16 files changed, 111 insertions(+), 166 deletions(-)
[camel] 01/03: Camel-Kubernetes: Use BindToRegistry annotation
wherever possible
Posted by 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
commit b94580bc40859ef305c6c4bc28e3164cc836d01d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 30 11:41:11 2019 +0200
Camel-Kubernetes: Use BindToRegistry annotation wherever possible
---
.../kubernetes/producer/KubernetesConfigMapsProducerTest.java | 10 +++++-----
.../kubernetes/producer/KubernetesDeploymentsProducerTest.java | 10 +++++-----
.../kubernetes/producer/KubernetesHPAProducerTest.java | 10 +++++-----
.../kubernetes/producer/KubernetesJobProducerTest.java | 10 +++++-----
.../kubernetes/producer/KubernetesNamespacesProducerTest.java | 10 +++++-----
.../kubernetes/producer/KubernetesNodesProducerTest.java | 10 +++++-----
.../KubernetesPersistentVolumesClaimsProducerTest.java | 10 +++++-----
.../producer/KubernetesPersistentVolumesProducerTest.java | 10 +++++-----
.../kubernetes/producer/KubernetesPodsProducerTest.java | 10 +++++-----
.../producer/KubernetesReplicationControllersProducerTest.java | 10 +++++-----
.../producer/KubernetesResourcesQuotaProducerTest.java | 10 +++++-----
.../kubernetes/producer/KubernetesSecretsProducerTest.java | 10 +++++-----
.../producer/KubernetesServiceAccountsProducerTest.java | 10 +++++-----
.../kubernetes/producer/KubernetesServicesProducerTest.java | 10 +++++-----
.../openshift/producer/OpenshiftBuildConfigsProducerTest.java | 9 ++++-----
.../openshift/producer/OpenshiftBuildsProducerTest.java | 9 ++++-----
16 files changed, 78 insertions(+), 80 deletions(-)
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
index f4b5481..14b90c6 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
@@ -24,8 +24,10 @@ import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.api.model.ConfigMapListBuilder;
import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -40,11 +42,9 @@ public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
index d728f93..5d544e4 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
@@ -23,8 +23,10 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
import io.fabric8.kubernetes.api.model.apps.DeploymentListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -39,11 +41,9 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
index 2a00bf4..6efd0d5 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
@@ -24,8 +24,10 @@ import io.fabric8.kubernetes.api.model.HorizontalPodAutoscaler;
import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerBuilder;
import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerListBuilder;
import io.fabric8.kubernetes.api.model.PodListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -40,11 +42,9 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
index 3babcd3..4e4f81b 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
@@ -24,8 +24,10 @@ import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.batch.Job;
import io.fabric8.kubernetes.api.model.batch.JobBuilder;
import io.fabric8.kubernetes.api.model.batch.JobListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -40,11 +42,9 @@ public class KubernetesJobProducerTest extends KubernetesTestSupport {
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
index 6f7b1a0..bf8134e 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
@@ -22,8 +22,10 @@ import io.fabric8.kubernetes.api.model.Namespace;
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
import io.fabric8.kubernetes.api.model.NamespaceListBuilder;
import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -38,11 +40,9 @@ public class KubernetesNamespacesProducerTest extends KubernetesTestSupport {
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
index ae7327c..703d9e7 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
@@ -22,8 +22,10 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.Node;
import io.fabric8.kubernetes.api.model.NodeListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -38,11 +40,9 @@ public class KubernetesNodesProducerTest extends KubernetesTestSupport {
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
index 25ac30c..f036691 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
@@ -25,8 +25,10 @@ import io.fabric8.kubernetes.api.model.PersistentVolume;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaimListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -41,11 +43,9 @@ public class KubernetesPersistentVolumesClaimsProducerTest extends KubernetesTes
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java
index 7ba00c4..95fe316 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java
@@ -22,8 +22,10 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.PersistentVolume;
import io.fabric8.kubernetes.api.model.PersistentVolumeListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -38,11 +40,9 @@ public class KubernetesPersistentVolumesProducerTest extends KubernetesTestSuppo
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
index 108ccf4..0427f53 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
@@ -23,8 +23,10 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.api.model.PodListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -39,11 +41,9 @@ public class KubernetesPodsProducerTest extends KubernetesTestSupport {
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
index ff92393..71cc9c0 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
@@ -23,8 +23,10 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.ReplicationController;
import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder;
import io.fabric8.kubernetes.api.model.ReplicationControllerListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -39,11 +41,9 @@ public class KubernetesReplicationControllersProducerTest extends KubernetesTest
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
index e9aaa77..9010c6e 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
@@ -21,8 +21,10 @@ import java.util.List;
import io.fabric8.kubernetes.api.model.ResourceQuota;
import io.fabric8.kubernetes.api.model.ResourceQuotaBuilder;
import io.fabric8.kubernetes.api.model.ResourceQuotaListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -37,11 +39,9 @@ public class KubernetesResourcesQuotaProducerTest extends KubernetesTestSupport
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
index c658c80..b8ae4f2 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
@@ -23,8 +23,10 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.SecretBuilder;
import io.fabric8.kubernetes.api.model.SecretListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -39,11 +41,9 @@ public class KubernetesSecretsProducerTest extends KubernetesTestSupport {
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
index 5851d2c..9af902f 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
@@ -23,8 +23,10 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.ServiceAccount;
import io.fabric8.kubernetes.api.model.ServiceAccountBuilder;
import io.fabric8.kubernetes.api.model.ServiceAccountListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -39,11 +41,9 @@ public class KubernetesServiceAccountsProducerTest extends KubernetesTestSupport
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
index c6f2235..23dda04 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
@@ -24,8 +24,10 @@ import io.fabric8.kubernetes.api.model.PodListBuilder;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceListBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -40,11 +42,9 @@ public class KubernetesServicesProducerTest extends KubernetesTestSupport {
@Rule
public KubernetesServer server = new KubernetesServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("kubernetesClient", server.getClient());
- return registry;
+ @BindToRegistry("kubernetesClient")
+ public KubernetesClient getClient() throws Exception {
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java
index e8372a5..979be96 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java
@@ -25,6 +25,7 @@ import io.fabric8.openshift.api.model.BuildConfigListBuilder;
import io.fabric8.openshift.client.OpenShiftClient;
import io.fabric8.openshift.client.server.mock.OpenShiftServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -39,11 +40,9 @@ public class OpenshiftBuildConfigsProducerTest extends KubernetesTestSupport {
@Rule
public OpenShiftServer server = new OpenShiftServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("client", server.getKubernetesClient().adapt(OpenShiftClient.class));
- return registry;
+ @BindToRegistry("client")
+ public OpenShiftClient loadClient() throws Exception {
+ return server.getKubernetesClient().adapt(OpenShiftClient.class);
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java
index 86a3155..1dc536b 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java
@@ -25,6 +25,7 @@ import io.fabric8.openshift.api.model.BuildListBuilder;
import io.fabric8.openshift.client.OpenShiftClient;
import io.fabric8.openshift.client.server.mock.OpenShiftServer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -39,11 +40,9 @@ public class OpenshiftBuildsProducerTest extends KubernetesTestSupport {
@Rule
public OpenShiftServer server = new OpenShiftServer();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("client", server.getKubernetesClient().adapt(OpenShiftClient.class));
- return registry;
+ @BindToRegistry("client")
+ public OpenShiftClient loadClient() throws Exception {
+ return server.getKubernetesClient().adapt(OpenShiftClient.class);
}
@Test
[camel] 02/03: Camel-Kubernetes: Fixed CS
Posted by 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
commit cda7648dc206ea0f629f679fbd861d0b0957ad41
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 30 11:46:21 2019 +0200
Camel-Kubernetes: Fixed CS
---
.../producer/KubernetesConfigMapsProducerTest.java | 4 +-
.../KubernetesDeploymentsProducerTest.java | 61 +++++++---------------
.../producer/KubernetesHPAProducerTest.java | 2 +-
.../producer/KubernetesJobProducerTest.java | 5 +-
.../producer/KubernetesNamespacesProducerTest.java | 2 +-
.../producer/KubernetesNodesProducerTest.java | 22 +++-----
...ernetesPersistentVolumesClaimsProducerTest.java | 2 +-
.../KubernetesPersistentVolumesProducerTest.java | 2 +-
.../producer/KubernetesPodsProducerTest.java | 2 +-
...bernetesReplicationControllersProducerTest.java | 2 +-
.../KubernetesResourcesQuotaProducerTest.java | 21 +++-----
.../producer/KubernetesSecretsProducerTest.java | 2 +-
.../KubernetesServiceAccountsProducerTest.java | 2 +-
.../producer/KubernetesServicesProducerTest.java | 2 +-
14 files changed, 47 insertions(+), 84 deletions(-)
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
index 14b90c6..83dcfd4 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
@@ -44,7 +44,7 @@ public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
@@ -73,7 +73,7 @@ public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
assertEquals(3, result.size());
}
-
+
@Test
public void getConfigMapTestDefaultNamespace() throws Exception {
ObjectMeta meta = new ObjectMeta();
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
index 5d544e4..9c59510 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
@@ -43,14 +43,13 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
-
+
@Test
public void listTest() throws Exception {
server.expect().withPath("/apis/extensions/v1beta1/namespaces/test/deployments").andReturn(200, new DeploymentListBuilder().addNewItem().and().build()).once();
- List<Deployment> result = template.requestBody("direct:list", "",
- List.class);
+ List<Deployment> result = template.requestBody("direct:list", "", List.class);
assertEquals(1, result.size());
}
@@ -58,7 +57,7 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
@Test
public void listByLabelsTest() throws Exception {
server.expect().withPath("/apis/extensions/v1beta1/namespaces/test/deployments?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
- .andReturn(200, new DeploymentListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
+ .andReturn(200, new DeploymentListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
Exchange ex = template.request("direct:listByLabels", new Processor() {
@Override
@@ -66,42 +65,23 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
Map<String, String> labels = new HashMap<>();
labels.put("key1", "value1");
labels.put("key2", "value2");
- exchange.getIn()
- .setHeader(
- KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS,
- labels);
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS, labels);
}
});
List<Deployment> result = ex.getOut().getBody(List.class);
-
+
assertEquals(3, result.size());
}
@Test
public void createAndDeleteDeployment() throws Exception {
- Deployment de1 = new DeploymentBuilder().withNewMetadata()
- .withNamespace("test")
- .withName("de1")
- .withResourceVersion("1")
- .withGeneration(2L)
- .endMetadata()
- .withNewSpec()
- .withReplicas(0)
- .endSpec()
- .withNewStatus()
- .withReplicas(1)
- .withObservedGeneration(1L)
- .endStatus()
- .build();
-
+ Deployment de1 = new DeploymentBuilder().withNewMetadata().withNamespace("test").withName("de1").withResourceVersion("1").withGeneration(2L).endMetadata().withNewSpec()
+ .withReplicas(0).endSpec().withNewStatus().withReplicas(1).withObservedGeneration(1L).endStatus().build();
+
server.expect().withPath("/apis/extensions/v1beta1/namespaces/test/deployments/de1").andReturn(200, de1).once();
- server.expect().withPath("/apis/extensions/v1beta1/namespaces/test/deployments/de1").andReturn(200, new DeploymentBuilder(de1)
- .editStatus()
- .withReplicas(0)
- .withObservedGeneration(2L)
- .endStatus()
- .build()).times(5);
+ server.expect().withPath("/apis/extensions/v1beta1/namespaces/test/deployments/de1")
+ .andReturn(200, new DeploymentBuilder(de1).editStatus().withReplicas(0).withObservedGeneration(2L).endStatus().build()).times(5);
Exchange ex = template.request("direct:deleteDeployment", new Processor() {
@@ -116,7 +96,7 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
assertTrue(deDeleted);
}
-
+
@Test
public void createScaleAndDeleteDeployment() throws Exception {
server.expect().withPath("/apis/extensions/v1beta1/namespaces/test/deployments/de1").andReturn(200, new DeploymentBuilder().withNewMetadata().withName("de1")
@@ -134,7 +114,7 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
}
});
- //Thread.sleep(3000);
+ // Thread.sleep(3000);
int replicas = ex.getOut().getBody(Integer.class);
assertEquals(5, replicas);
@@ -145,16 +125,11 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:list")
- .toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=listDeployments");
- from("direct:listByLabels")
- .toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=listDeploymentsByLabels");
- from("direct:deleteDeployment")
- .toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=deleteDeployment");
- from("direct:createDeployment")
- .toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=createDeployment");
- from("direct:scaleDeployment")
- .toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=scaleDeployment");
+ from("direct:list").toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=listDeployments");
+ from("direct:listByLabels").toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=listDeploymentsByLabels");
+ from("direct:deleteDeployment").toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=deleteDeployment");
+ from("direct:createDeployment").toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=createDeployment");
+ from("direct:scaleDeployment").toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=scaleDeployment");
}
};
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
index 6efd0d5..a7a1288 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
@@ -44,7 +44,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
index 4e4f81b..ef36fe3 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
@@ -44,12 +44,13 @@ public class KubernetesJobProducerTest extends KubernetesTestSupport {
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
public void listTest() throws Exception {
- server.expect().withPath("/apis/batch/v1/namespaces/test/jobs").andReturn(200, new JobListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
+ server.expect().withPath("/apis/batch/v1/namespaces/test/jobs").andReturn(200, new JobListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
+ .once();
List<Secret> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
index bf8134e..f7dc196 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
@@ -42,7 +42,7 @@ public class KubernetesNamespacesProducerTest extends KubernetesTestSupport {
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
index 703d9e7..8479acf 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
@@ -42,14 +42,13 @@ public class KubernetesNodesProducerTest extends KubernetesTestSupport {
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
-
+
@Test
public void listTest() throws Exception {
server.expect().withPath("/api/v1/nodes").andReturn(200, new NodeListBuilder().addNewItem().and().build()).once();
- List<Node> result = template.requestBody("direct:list", "",
- List.class);
+ List<Node> result = template.requestBody("direct:list", "", List.class);
assertEquals(1, result.size());
}
@@ -57,7 +56,7 @@ public class KubernetesNodesProducerTest extends KubernetesTestSupport {
@Test
public void listByLabelsTest() throws Exception {
server.expect().withPath("/api/v1/nodes?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
- .andReturn(200, new NodeListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
+ .andReturn(200, new NodeListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
Exchange ex = template.request("direct:listByLabels", new Processor() {
@Override
@@ -65,15 +64,12 @@ public class KubernetesNodesProducerTest extends KubernetesTestSupport {
Map<String, String> labels = new HashMap<>();
labels.put("key1", "value1");
labels.put("key2", "value2");
- exchange.getIn()
- .setHeader(
- KubernetesConstants.KUBERNETES_NODES_LABELS,
- labels);
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NODES_LABELS, labels);
}
});
List<Node> result = ex.getOut().getBody(List.class);
-
+
assertEquals(3, result.size());
}
@@ -82,10 +78,8 @@ public class KubernetesNodesProducerTest extends KubernetesTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:list")
- .toF("kubernetes-nodes:///?kubernetesClient=#kubernetesClient&operation=listNodes");
- from("direct:listByLabels")
- .toF("kubernetes-nodes:///?kubernetesClient=#kubernetesClient&operation=listNodesByLabels");
+ from("direct:list").toF("kubernetes-nodes:///?kubernetesClient=#kubernetesClient&operation=listNodes");
+ from("direct:listByLabels").toF("kubernetes-nodes:///?kubernetesClient=#kubernetesClient&operation=listNodesByLabels");
}
};
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
index f036691..e48531b 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
@@ -45,7 +45,7 @@ public class KubernetesPersistentVolumesClaimsProducerTest extends KubernetesTes
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java
index 95fe316..f4cc6a0 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java
@@ -42,7 +42,7 @@ public class KubernetesPersistentVolumesProducerTest extends KubernetesTestSuppo
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
index 0427f53..e80d976 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
@@ -43,7 +43,7 @@ public class KubernetesPodsProducerTest extends KubernetesTestSupport {
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
index 71cc9c0..6265d6b 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
@@ -43,7 +43,7 @@ public class KubernetesReplicationControllersProducerTest extends KubernetesTest
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
index 9010c6e..eb9dc3f 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
@@ -41,14 +41,13 @@ public class KubernetesResourcesQuotaProducerTest extends KubernetesTestSupport
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
-
+
@Test
public void listTest() throws Exception {
server.expect().withPath("/api/v1/resourcequotas").andReturn(200, new ResourceQuotaListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
- List<ResourceQuota> result = template.requestBody("direct:list", "",
- List.class);
+ List<ResourceQuota> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@@ -62,12 +61,8 @@ public class KubernetesResourcesQuotaProducerTest extends KubernetesTestSupport
@Override
public void process(Exchange exchange) throws Exception {
- exchange.getIn().setHeader(
- KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
- "test");
- exchange.getIn().setHeader(
- KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_NAME,
- "rq1");
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test");
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_NAME, "rq1");
}
});
@@ -81,10 +76,8 @@ public class KubernetesResourcesQuotaProducerTest extends KubernetesTestSupport
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:list")
- .to("kubernetes-resources-quota:///?kubernetesClient=#kubernetesClient&operation=listResourcesQuota");
- from("direct:delete")
- .to("kubernetes-resources-quota:///?kubernetesClient=#kubernetesClient&operation=deleteResourceQuota");
+ from("direct:list").to("kubernetes-resources-quota:///?kubernetesClient=#kubernetesClient&operation=listResourcesQuota");
+ from("direct:delete").to("kubernetes-resources-quota:///?kubernetesClient=#kubernetesClient&operation=deleteResourceQuota");
}
};
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
index b8ae4f2..c6a9165 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
@@ -43,7 +43,7 @@ public class KubernetesSecretsProducerTest extends KubernetesTestSupport {
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
index 9af902f..f579138 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
@@ -43,7 +43,7 @@ public class KubernetesServiceAccountsProducerTest extends KubernetesTestSupport
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
index 23dda04..230a908 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
@@ -44,7 +44,7 @@ public class KubernetesServicesProducerTest extends KubernetesTestSupport {
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() throws Exception {
- return server.getClient();
+ return server.getClient();
}
@Test
[camel] 03/03: Removed unused imports
Posted by 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
commit cba5b0169ad8fb5895a15cc73f49f26fbf3a9beb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 30 11:49:26 2019 +0200
Removed unused imports
---
.../component/kubernetes/producer/KubernetesConfigMapsProducerTest.java | 1 -
.../component/kubernetes/producer/KubernetesDeploymentsProducerTest.java | 1 -
.../camel/component/kubernetes/producer/KubernetesHPAProducerTest.java | 1 -
.../camel/component/kubernetes/producer/KubernetesJobProducerTest.java | 1 -
.../component/kubernetes/producer/KubernetesNamespacesProducerTest.java | 1 -
.../camel/component/kubernetes/producer/KubernetesNodesProducerTest.java | 1 -
.../producer/KubernetesPersistentVolumesClaimsProducerTest.java | 1 -
.../kubernetes/producer/KubernetesPersistentVolumesProducerTest.java | 1 -
.../camel/component/kubernetes/producer/KubernetesPodsProducerTest.java | 1 -
.../producer/KubernetesReplicationControllersProducerTest.java | 1 -
.../kubernetes/producer/KubernetesResourcesQuotaProducerTest.java | 1 -
.../component/kubernetes/producer/KubernetesSecretsProducerTest.java | 1 -
.../kubernetes/producer/KubernetesServiceAccountsProducerTest.java | 1 -
.../component/kubernetes/producer/KubernetesServicesProducerTest.java | 1 -
.../component/openshift/producer/OpenshiftBuildConfigsProducerTest.java | 1 -
.../camel/component/openshift/producer/OpenshiftBuildsProducerTest.java | 1 -
16 files changed, 16 deletions(-)
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
index 83dcfd4..96ff1ab 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
@@ -33,7 +33,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
index 9c59510..4a8dd1d 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
index a7a1288..51a8abf 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
@@ -33,7 +33,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
index ef36fe3..9ae3eb6 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
@@ -33,7 +33,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
index f7dc196..3640cd2 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
index 8479acf..e2a8ccc 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
index e48531b..0123a33 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
@@ -34,7 +34,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java
index f4cc6a0..70c1c54 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
index e80d976..8eb8fc9 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
index 6265d6b..412a1fd 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
index eb9dc3f..204fc4c 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
index c6a9165..93b6cb8 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
index f579138..4abedba 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
index 230a908..244a9bf 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
@@ -33,7 +33,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java
index 979be96..42d0b8b 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java
index 1dc536b..a2ece15 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Rule;
import org.junit.Test;