This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7cb8856444a1c7c050323d3789d18bf5b0ca32bf
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Sep 16 16:45:18 2019 +0200
CAMEL-13978 - Fixed CS
---
.../kubernetes/config_maps/KubernetesConfigMapsConsumer.java | 9 ++++-----
.../camel/component/kubernetes/KubernetesTestSupport.java | 2 +-
.../kubernetes/consumer/KubernetesConfigMapsConsumerTest.java | 10 ++++------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
index 1b7128d..956cfdc 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -20,13 +20,10 @@ import java.util.concurrent.ExecutorService;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
-import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
-import io.fabric8.kubernetes.client.dsl.Resource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -91,10 +88,12 @@ public class KubernetesConfigMapsConsumer extends
DefaultConsumer {
FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch,
Watcher<ConfigMap>> w = null;
if
(ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
&&
ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue()))
{
- w =
getEndpoint().getKubernetesClient().configMaps().withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(),
getEndpoint().getKubernetesConfiguration().getLabelValue());
+ w =
getEndpoint().getKubernetesClient().configMaps().withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(),
+
getEndpoint().getKubernetesConfiguration().getLabelValue());
}
if
(ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getResourceName()))
{
- w = (FilterWatchListDeletable<ConfigMap, ConfigMapList,
Boolean, Watch, Watcher<ConfigMap>>)
getEndpoint().getKubernetesClient().configMaps().withName(getEndpoint().getKubernetesConfiguration().getResourceName());
+ w = (FilterWatchListDeletable<ConfigMap, ConfigMapList,
Boolean, Watch,
Watcher<ConfigMap>>)getEndpoint().getKubernetesClient().configMaps()
+
.withName(getEndpoint().getKubernetesConfiguration().getResourceName());
}
watch = w.watch(new Watcher<ConfigMap>() {
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
index 8cf45f9..0f17738 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
@@ -31,7 +31,7 @@ public class KubernetesTestSupport extends CamelTestSupport {
@Override
public void setUp() throws Exception {
// INSERT credentials and host here
- authToken = "IVStwJAV_7p26ifo1NX1R3cjNDLkGFUaU0R6VW6dbwo";
+ authToken = "";
host = "https://192.168.99.100:8443";;
super.setUp();
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
index a9e01c5..9ed6575 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -61,12 +61,12 @@ public class KubernetesConfigMapsConsumerTest extends
KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_DATA,
configMapData);
}
});
-
+
ex = template.request("direct:createConfigmap", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
-
exchange.getIn().removeHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS);
+
exchange.getIn().removeHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"default");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME,
"test1");
HashMap<String, String> configMapData = new HashMap<>();
@@ -83,7 +83,7 @@ public class KubernetesConfigMapsConsumerTest extends
KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME,
"test");
}
});
-
+
ex = template.request("direct:deleteConfigmap", new Processor() {
@Override
@@ -93,7 +93,6 @@ public class KubernetesConfigMapsConsumerTest extends
KubernetesTestSupport {
}
});
-
boolean cmDeleted = ex.getOut().getBody(Boolean.class);
assertTrue(cmDeleted);
@@ -110,8 +109,7 @@ public class KubernetesConfigMapsConsumerTest extends
KubernetesTestSupport {
public void configure() throws Exception {
from("direct:createConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=createConfigMap",
host, authToken);
from("direct:deleteConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=deleteConfigMap",
host, authToken);
-
fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=default&resourceName=test",
host, authToken).process(new KubernertesProcessor())
- .to(mockResultEndpoint);
+
fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=default&resourceName=test",
host, authToken).process(new KubernertesProcessor()).to(mockResultEndpoint);
}
};
}
