You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2022/10/07 14:00:12 UTC
[camel] 01/04: CAMEL-17438: camel-kubernetes - Fix warnings and deprecations
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-17438/add-update-to-producers
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0ab2cb0e8701cf9faf80e9662f68f971380c8f21
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Fri Oct 7 08:39:45 2022 +0200
CAMEL-17438: camel-kubernetes - Fix warnings and deprecations
---
.../component/kubernetes/KubernetesHelper.java | 6 +-
.../cloud/KubernetesClientServiceDiscovery.java | 4 +-
.../lock/impl/ConfigMapLeaseResourceManager.java | 11 +-
.../lock/impl/NativeLeaseResourceManager.java | 15 +--
.../config_maps/KubernetesConfigMapsProducer.java | 6 +-
.../KubernetesCustomResourcesProducer.java | 6 +-
.../deployments/KubernetesDeploymentsProducer.java | 9 +-
.../kubernetes/hpa/KubernetesHPAProducer.java | 13 +--
.../kubernetes/job/KubernetesJobProducer.java | 7 +-
.../namespaces/KubernetesNamespacesProducer.java | 2 +-
.../kubernetes/nodes/KubernetesNodesProducer.java | 6 +-
.../KubernetesPersistentVolumesProducer.java | 3 +-
.../KubernetesPersistentVolumesClaimsProducer.java | 11 +-
.../kubernetes/pods/KubernetesPodsProducer.java | 6 +-
.../properties/BasePropertiesFunction.java | 11 +-
.../KubernetesReplicationControllersProducer.java | 12 +--
.../KubernetesResourcesQuotaProducer.java | 10 +-
.../secrets/KubernetesSecretsProducer.java | 9 +-
.../KubernetesServiceAccountsProducer.java | 10 +-
.../services/KubernetesServicesProducer.java | 11 +-
.../OpenshiftBuildConfigsProducer.java | 8 +-
.../openshift/builds/OpenshiftBuildsProducer.java | 5 +-
.../OpenshiftDeploymentConfigsProducer.java | 3 +-
.../apache/camel/component/KubernetesServer.java | 111 ---------------------
.../apache/camel/component/OpenShiftServer.java | 105 -------------------
.../kubernetes/KubernetesTestSupport.java | 3 +-
.../KubernetesConfigMapsConsumerIT.java | 6 +-
.../KubernetesCustomResourcesConsumerIT.java | 31 +++---
.../KubernetesNamespacesConsumerIT.java | 14 +--
.../integration/KubernetesNodesConsumerIT.java | 2 +-
.../integration/KubernetesPodsConsumerIT.java | 4 +-
...KubernetesReplicationControllersConsumerIT.java | 4 +-
.../integration/KubernetesServicesConsumerIT.java | 5 +-
.../producer/KubernetesConfigMapsProducerTest.java | 26 ++---
.../KubernetesCustomResourcesProducerTest.java | 39 +++-----
.../KubernetesDeploymentsProducerTest.java | 25 ++---
.../producer/KubernetesHPAProducerTest.java | 59 +++++------
.../producer/KubernetesJobProducerTest.java | 23 +++--
.../producer/KubernetesNamespacesProducerTest.java | 20 ++--
.../producer/KubernetesNodesProducerTest.java | 24 +++--
...ernetesPersistentVolumesClaimsProducerTest.java | 24 ++---
.../KubernetesPersistentVolumesProducerTest.java | 21 ++--
.../producer/KubernetesPodsProducerTest.java | 28 +++---
...bernetesReplicationControllersProducerTest.java | 26 ++---
.../KubernetesResourcesQuotaProducerTest.java | 18 ++--
.../producer/KubernetesSecretsProducerTest.java | 24 +++--
.../KubernetesServiceAccountsProducerTest.java | 22 ++--
.../producer/KubernetesServicesProducerTest.java | 24 +++--
.../ConfigMapMountPropertiesFunctionTest.java | 29 +++---
.../ConfigMapPropertiesFunctionRouteTest.java | 4 +-
.../ConfigMapPropertiesFunctionTest.java | 9 +-
.../SecretMountPropertiesFunctionTest.java | 29 +++---
.../SecretPropertiesFunctionRouteTest.java | 6 +-
.../properties/SecretPropertiesFunctionTest.java | 9 +-
.../OpenshiftBuildConfigsProducerTest.java | 21 ++--
.../producer/OpenshiftBuildsProducerTest.java | 39 ++++----
.../OpenshiftDeploymentConfigsProducerTest.java | 28 +++---
57 files changed, 403 insertions(+), 643 deletions(-)
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java
index 6fc390b0143..10fc54863d0 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java
@@ -20,8 +20,8 @@ import java.util.function.Supplier;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.fabric8.kubernetes.client.Watch;
import org.apache.camel.Exchange;
import org.apache.camel.support.MessageHelper;
@@ -46,7 +46,7 @@ public final class KubernetesHelper {
return createKubernetesClient(configuration);
} else {
LOG.info("Creating default kubernetes client without applying configuration");
- return new DefaultKubernetesClient();
+ return new KubernetesClientBuilder().build();
}
}
@@ -76,7 +76,7 @@ public final class KubernetesHelper {
ObjectHelper.ifNotEmpty(configuration.getNamespace(), builder::withNamespace);
Config conf = builder.build();
- return new DefaultKubernetesClient(conf);
+ return new KubernetesClientBuilder().withConfig(conf).build();
}
public static void close(Runnable runnable, Supplier<Watch> watchGetter) {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
index 3406bf3f468..3d51d4ba826 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
@@ -24,8 +24,8 @@ import io.fabric8.kubernetes.api.model.EndpointPort;
import io.fabric8.kubernetes.api.model.EndpointSubset;
import io.fabric8.kubernetes.api.model.Endpoints;
import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.kubernetes.KubernetesConfiguration;
import org.apache.camel.impl.cloud.DefaultServiceDefinition;
@@ -122,7 +122,7 @@ public class KubernetesClientServiceDiscovery extends KubernetesServiceDiscovery
ObjectHelper.ifNotEmpty(configuration.getClientKeyPassphrase(), builder::withClientKeyPassphrase);
ObjectHelper.ifNotEmpty(configuration.getTrustCerts(), builder::withTrustCerts);
- client = new DefaultKubernetesClient(builder.build());
+ client = new KubernetesClientBuilder().withConfig(builder.build()).build();
}
private boolean hasUsernameAndPassword(KubernetesConfiguration configuration) {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
index cf8062727ba..0c8b8f5da1e 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
@@ -55,8 +55,8 @@ public class ConfigMapLeaseResourceManager implements KubernetesLeaseResourceMan
ConfigMap updatedConfigMap = getConfigMapWithoutLeader(leaseResource, group);
return client.configMaps()
.inNamespace(leaseResource.getMetadata().getNamespace())
- .withName(leaseResource.getMetadata().getName())
- .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace(updatedConfigMap);
+ .resource(updatedConfigMap)
+ .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
}
@Override
@@ -64,8 +64,8 @@ public class ConfigMapLeaseResourceManager implements KubernetesLeaseResourceMan
ConfigMap updatedConfigMap = getConfigMapWithNewLeader(leaseResource, newLeaderInfo);
return client.configMaps()
.inNamespace(leaseResource.getMetadata().getNamespace())
- .withName(leaseResource.getMetadata().getName())
- .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace(updatedConfigMap);
+ .resource(updatedConfigMap)
+ .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
}
@Override
@@ -81,7 +81,8 @@ public class ConfigMapLeaseResourceManager implements KubernetesLeaseResourceMan
return client.configMaps()
.inNamespace(namespace)
- .create(newConfigMap);
+ .resource(newConfigMap)
+ .create();
}
@Override
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/NativeLeaseResourceManager.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/NativeLeaseResourceManager.java
index 9a9976ea7b9..8d46d742a2d 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/NativeLeaseResourceManager.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/NativeLeaseResourceManager.java
@@ -45,8 +45,8 @@ public class NativeLeaseResourceManager implements KubernetesLeaseResourceManage
Lease updatedLease = getLeaseWithoutLeader(leaseResource);
return client.leases()
.inNamespace(leaseResource.getMetadata().getNamespace())
- .withName(leaseResource.getMetadata().getName())
- .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace(updatedLease);
+ .resource(updatedLease)
+ .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
}
@Override
@@ -54,8 +54,8 @@ public class NativeLeaseResourceManager implements KubernetesLeaseResourceManage
Lease updatedLease = getLeaseWithNewLeader(leaseResource, newLeaderInfo);
return client.leases()
.inNamespace(leaseResource.getMetadata().getNamespace())
- .withName(leaseResource.getMetadata().getName())
- .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace(updatedLease);
+ .resource(updatedLease)
+ .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
}
@Override
@@ -69,8 +69,8 @@ public class NativeLeaseResourceManager implements KubernetesLeaseResourceManage
.build();
return client.leases()
.inNamespace(leaseResource.getMetadata().getNamespace())
- .withName(leaseResource.getMetadata().getName())
- .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace(updatedLease);
+ .resource(updatedLease)
+ .lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
}
return leaseResource;
}
@@ -92,7 +92,8 @@ public class NativeLeaseResourceManager implements KubernetesLeaseResourceManage
return client.leases()
.inNamespace(namespace)
- .create(newLease);
+ .resource(newLease)
+ .create();
}
private static Lease getLeaseWithNewLeader(Lease lease, LeaderInfo leaderInfo) {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
index fef5dcf0b69..24638924748 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
@@ -98,13 +98,13 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
}
protected void doGetConfigMap(Exchange exchange) {
- ConfigMap configMap = null;
String cfMapName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(cfMapName)) {
LOG.error("Get a specific ConfigMap require specify a ConfigMap name");
throw new IllegalArgumentException("Get a specific ConfigMap require specify a ConfigMap name");
}
+ ConfigMap configMap;
if (namespaceName != null) {
configMap = getEndpoint().getKubernetesClient().configMaps().inNamespace(namespaceName).withName(cfMapName).get();
} else {
@@ -115,7 +115,6 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
}
protected void doCreateConfigMap(Exchange exchange) {
- ConfigMap configMap = null;
String cfMapName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
HashMap<String, String> configMapData
@@ -135,7 +134,8 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, Map.class);
ConfigMap cfMapCreating = new ConfigMapBuilder().withNewMetadata().withName(cfMapName).withLabels(labels).endMetadata()
.withData(configMapData).build();
- configMap = getEndpoint().getKubernetesClient().configMaps().inNamespace(namespaceName).create(cfMapCreating);
+ ConfigMap configMap
+ = getEndpoint().getKubernetesClient().configMaps().inNamespace(namespaceName).resource(cfMapCreating).create();
prepareOutboundMessage(exchange, configMap);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesProducer.java
index d8ffad1da96..86e331188f8 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesProducer.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.kubernetes.customresources;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -182,14 +181,15 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer {
}
- protected void doCreate(Exchange exchange, String namespaceName) throws IOException {
+ protected void doCreate(Exchange exchange, String namespaceName) {
String customResourceInstance = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CRD_INSTANCE, String.class);
GenericKubernetesResource customResource = new GenericKubernetesResource();
try {
customResource = getEndpoint().getKubernetesClient()
.genericKubernetesResources(getCRDContext(exchange.getIn()))
.inNamespace(namespaceName)
- .create(Serialization.unmarshal(customResourceInstance, GenericKubernetesResource.class));
+ .resource(Serialization.unmarshal(customResourceInstance, GenericKubernetesResource.class))
+ .create();
} catch (KubernetesClientException e) {
if (e.getCode() == 409) {
LOG.info("Custom resource instance already exists", e);
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
index 43be88eb6ab..2f37559da4a 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
@@ -104,13 +104,12 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
}
protected void doGetDeployment(Exchange exchange) {
- Deployment deployment = null;
String deploymentName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_NAME, String.class);
if (ObjectHelper.isEmpty(deploymentName)) {
LOG.error("Get a specific Deployment require specify a Deployment name");
throw new IllegalArgumentException("Get a specific Deployment require specify a Deployment name");
}
- deployment = getEndpoint().getKubernetesClient().apps().deployments().withName(deploymentName).get();
+ Deployment deployment = getEndpoint().getKubernetesClient().apps().deployments().withName(deploymentName).get();
prepareOutboundMessage(exchange, deployment);
}
@@ -135,7 +134,6 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
}
protected void doCreateDeployment(Exchange exchange) {
- Deployment deployment = null;
String deploymentName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
DeploymentSpec deSpec
@@ -155,8 +153,9 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS, Map.class);
Deployment deploymentCreating = new DeploymentBuilder().withNewMetadata().withName(deploymentName).withLabels(labels)
.endMetadata().withSpec(deSpec).build();
- deployment = getEndpoint().getKubernetesClient().apps().deployments().inNamespace(namespaceName)
- .create(deploymentCreating);
+ Deployment deployment = getEndpoint().getKubernetesClient().apps().deployments().inNamespace(namespaceName)
+ .resource(deploymentCreating)
+ .create();
prepareOutboundMessage(exchange, deployment);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
index 03a91a16004..cc1a13a31e2 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
@@ -106,7 +106,6 @@ public class KubernetesHPAProducer extends DefaultProducer {
}
protected void doGetHPA(Exchange exchange) {
- HorizontalPodAutoscaler hpa = null;
String podName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_HPA_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(podName)) {
@@ -117,14 +116,14 @@ public class KubernetesHPAProducer extends DefaultProducer {
LOG.error("Get a specific hpa require specify a namespace name");
throw new IllegalArgumentException("Get a specific hpa require specify a namespace name");
}
- hpa = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().inNamespace(namespaceName)
- .withName(podName).get();
+ HorizontalPodAutoscaler hpa
+ = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().inNamespace(namespaceName)
+ .withName(podName).get();
prepareOutboundMessage(exchange, hpa);
}
protected void doCreateHPA(Exchange exchange) {
- HorizontalPodAutoscaler hpa = null;
String hpaName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_HPA_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
HorizontalPodAutoscalerSpec hpaSpec
@@ -144,8 +143,10 @@ public class KubernetesHPAProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_HPA_LABELS, Map.class);
HorizontalPodAutoscaler hpaCreating = new HorizontalPodAutoscalerBuilder().withNewMetadata().withName(hpaName)
.withLabels(labels).endMetadata().withSpec(hpaSpec).build();
- hpa = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().inNamespace(namespaceName)
- .create(hpaCreating);
+ HorizontalPodAutoscaler hpa
+ = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().inNamespace(namespaceName)
+ .resource(hpaCreating)
+ .create();
prepareOutboundMessage(exchange, hpa);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java
index ba3cc282365..51ed0c99cdc 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java
@@ -107,7 +107,6 @@ public class KubernetesJobProducer extends DefaultProducer {
}
protected void doGetJob(Exchange exchange) {
- Job job = null;
String jobName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_JOB_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(jobName)) {
@@ -118,13 +117,12 @@ public class KubernetesJobProducer extends DefaultProducer {
LOG.error("Get a specific job require specify a namespace name");
throw new IllegalArgumentException("Get a specific job require specify a namespace name");
}
- job = getEndpoint().getKubernetesClient().batch().v1().jobs().inNamespace(namespaceName).withName(jobName).get();
+ Job job = getEndpoint().getKubernetesClient().batch().v1().jobs().inNamespace(namespaceName).withName(jobName).get();
prepareOutboundMessage(exchange, job);
}
protected void doCreateJob(Exchange exchange) {
- Job job = null;
String jobName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_JOB_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
JobSpec jobSpec = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_JOB_SPEC, JobSpec.class);
@@ -143,7 +141,8 @@ public class KubernetesJobProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_JOB_LABELS, Map.class);
Job jobCreating = new JobBuilder().withNewMetadata().withName(jobName).withLabels(labels).endMetadata()
.withSpec(jobSpec).build();
- job = getEndpoint().getKubernetesClient().batch().v1().jobs().inNamespace(namespaceName).create(jobCreating);
+ Job job = getEndpoint().getKubernetesClient().batch().v1().jobs().inNamespace(namespaceName).resource(jobCreating)
+ .create();
prepareOutboundMessage(exchange, job);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesProducer.java
index 9f20bf928ce..0f8428506a9 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesProducer.java
@@ -117,7 +117,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_LABELS, Map.class);
Namespace ns
= new NamespaceBuilder().withNewMetadata().withName(namespaceName).withLabels(labels).endMetadata().build();
- Namespace namespace = getEndpoint().getKubernetesClient().namespaces().create(ns);
+ Namespace namespace = getEndpoint().getKubernetesClient().namespaces().resource(ns).create();
prepareOutboundMessage(exchange, namespace);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
index 7bc1a8cdf4b..e767af9c89e 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
@@ -97,19 +97,17 @@ public class KubernetesNodesProducer extends DefaultProducer {
}
protected void doGetNode(Exchange exchange) {
- Node node = null;
String pvName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NODE_NAME, String.class);
if (ObjectHelper.isEmpty(pvName)) {
LOG.error("Get a specific Node require specify a Node name");
throw new IllegalArgumentException("Get a specific Node require specify a Node name");
}
- node = getEndpoint().getKubernetesClient().nodes().withName(pvName).get();
+ Node node = getEndpoint().getKubernetesClient().nodes().withName(pvName).get();
prepareOutboundMessage(exchange, node);
}
protected void doCreateNode(Exchange exchange) {
- Node node = null;
String nodeName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NODE_NAME, String.class);
NodeSpec nodeSpec = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NODE_SPEC, NodeSpec.class);
if (ObjectHelper.isEmpty(nodeName)) {
@@ -123,7 +121,7 @@ public class KubernetesNodesProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PODS_LABELS, Map.class);
Node nodeCreating = new NodeBuilder().withNewMetadata().withName(nodeName).withLabels(labels).endMetadata()
.withSpec(nodeSpec).build();
- node = getEndpoint().getKubernetesClient().nodes().create(nodeCreating);
+ Node node = getEndpoint().getKubernetesClient().nodes().resource(nodeCreating).create();
prepareOutboundMessage(exchange, node);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesProducer.java
index b5b0ccd657e..bea1242e268 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesProducer.java
@@ -83,13 +83,12 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer {
}
protected void doGetPersistentVolume(Exchange exchange) {
- PersistentVolume pv = null;
String pvName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_NAME, String.class);
if (ObjectHelper.isEmpty(pvName)) {
LOG.error("Get a specific Persistent Volume require specify a Persistent Volume name");
throw new IllegalArgumentException("Get a specific Persistent Volume require specify a Persistent Volume name");
}
- pv = getEndpoint().getKubernetesClient().persistentVolumes().withName(pvName).get();
+ PersistentVolume pv = getEndpoint().getKubernetesClient().persistentVolumes().withName(pvName).get();
prepareOutboundMessage(exchange, pv);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
index 76b11115d82..0f7d286ebe7 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
@@ -87,10 +87,10 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
}
protected void doListPersistentVolumesClaimsByLabels(Exchange exchange) {
- PersistentVolumeClaimList pvcList = null;
Map<String, String> labels
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ PersistentVolumeClaimList pvcList;
if (!ObjectHelper.isEmpty(namespaceName)) {
pvcList = getEndpoint()
.getKubernetesClient()
@@ -111,7 +111,6 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
}
protected void doGetPersistentVolumeClaim(Exchange exchange) {
- PersistentVolumeClaim pvc = null;
String pvcName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(pvcName)) {
@@ -123,13 +122,13 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
LOG.error("Get a specific Persistent Volume Claim require specify a namespace name");
throw new IllegalArgumentException("Get a specific Persistent Volume Claim require specify a namespace name");
}
- pvc = getEndpoint().getKubernetesClient().persistentVolumeClaims().inNamespace(namespaceName).withName(pvcName).get();
+ PersistentVolumeClaim pvc = getEndpoint().getKubernetesClient().persistentVolumeClaims().inNamespace(namespaceName)
+ .withName(pvcName).get();
prepareOutboundMessage(exchange, pvc);
}
protected void doCreatePersistentVolumeClaim(Exchange exchange) {
- PersistentVolumeClaim pvc = null;
String pvcName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
PersistentVolumeClaimSpec pvcSpec = exchange.getIn()
@@ -152,7 +151,9 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS, Map.class);
PersistentVolumeClaim pvcCreating = new PersistentVolumeClaimBuilder().withNewMetadata().withName(pvcName)
.withLabels(labels).endMetadata().withSpec(pvcSpec).build();
- pvc = getEndpoint().getKubernetesClient().persistentVolumeClaims().inNamespace(namespaceName).create(pvcCreating);
+ PersistentVolumeClaim pvc
+ = getEndpoint().getKubernetesClient().persistentVolumeClaims().inNamespace(namespaceName).resource(pvcCreating)
+ .create();
prepareOutboundMessage(exchange, pvc);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
index f71eef26546..9de34cc7617 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
@@ -108,7 +108,6 @@ public class KubernetesPodsProducer extends DefaultProducer {
}
protected void doGetPod(Exchange exchange) {
- Pod pod = null;
String podName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_POD_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(podName)) {
@@ -119,13 +118,12 @@ public class KubernetesPodsProducer extends DefaultProducer {
LOG.error("Get a specific pod require specify a namespace name");
throw new IllegalArgumentException("Get a specific pod require specify a namespace name");
}
- pod = getEndpoint().getKubernetesClient().pods().inNamespace(namespaceName).withName(podName).get();
+ Pod pod = getEndpoint().getKubernetesClient().pods().inNamespace(namespaceName).withName(podName).get();
prepareOutboundMessage(exchange, pod);
}
protected void doCreatePod(Exchange exchange) {
- Pod pod = null;
String podName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_POD_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
PodSpec podSpec = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_POD_SPEC, PodSpec.class);
@@ -144,7 +142,7 @@ public class KubernetesPodsProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PODS_LABELS, Map.class);
Pod podCreating = new PodBuilder().withNewMetadata().withName(podName).withLabels(labels).endMetadata()
.withSpec(podSpec).build();
- pod = getEndpoint().getKubernetesClient().pods().inNamespace(namespaceName).create(podCreating);
+ Pod pod = getEndpoint().getKubernetesClient().pods().inNamespace(namespaceName).resource(podCreating).create();
prepareOutboundMessage(exchange, pod);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/BasePropertiesFunction.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/BasePropertiesFunction.java
index c084fc785d2..d2a313354e1 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/BasePropertiesFunction.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/BasePropertiesFunction.java
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.ExtendedCamelContext;
@@ -70,8 +70,7 @@ abstract class BasePropertiesFunction extends ServiceSupport implements Properti
private String mountPathSecrets;
@Override
- @SuppressWarnings("unchecked")
- protected void doInit() throws Exception {
+ protected void doInit() {
ObjectHelper.notNull(camelContext, "CamelContext");
if (localMode == null) {
localMode = "true"
@@ -82,7 +81,7 @@ abstract class BasePropertiesFunction extends ServiceSupport implements Properti
}
}
- protected void doInitKubernetesClient() throws Exception {
+ protected void doInitKubernetesClient() {
if (clientEnabled == null) {
clientEnabled = "true"
.equalsIgnoreCase(camelContext.getPropertiesComponent().resolveProperty(CLIENT_ENABLED).orElse("true"));
@@ -130,7 +129,7 @@ abstract class BasePropertiesFunction extends ServiceSupport implements Properti
properties.remove(e.getKey());
}
}
- client = new DefaultKubernetesClient(config.build());
+ client = new KubernetesClientBuilder().withConfig(config.build()).build();
LOG.info("Auto-configuration KubernetesClient summary");
for (var entry : properties.entrySet()) {
String k = entry.getKey().toString();
@@ -150,7 +149,7 @@ abstract class BasePropertiesFunction extends ServiceSupport implements Properti
}
} else {
// create a default client to use
- client = new DefaultKubernetesClient();
+ client = new KubernetesClientBuilder().build();
LOG.debug("Created default KubernetesClient (auto-configured by itself)");
}
// add to registry so the client can be reused
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java
index 11050a7fa38..45a9981961b 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java
@@ -87,8 +87,8 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
}
protected void doList(Exchange exchange) {
- ReplicationControllerList rcList = null;
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ ReplicationControllerList rcList;
if (!ObjectHelper.isEmpty(namespaceName)) {
rcList = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName).list();
} else {
@@ -99,10 +99,10 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
}
protected void doListReplicationControllersByLabels(Exchange exchange) {
- ReplicationControllerList rcList = null;
Map<String, String> labels
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLERS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ ReplicationControllerList rcList;
if (!ObjectHelper.isEmpty(namespaceName)) {
NonNamespaceOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> replicationControllers
@@ -123,7 +123,6 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
}
protected void doGetReplicationController(Exchange exchange) {
- ReplicationController rc = null;
String rcName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLER_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(rcName)) {
@@ -135,13 +134,13 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
LOG.error("Get a specific replication controller require specify a namespace name");
throw new IllegalArgumentException("Get a specific replication controller require specify a namespace name");
}
- rc = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName).withName(rcName).get();
+ ReplicationController rc = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName)
+ .withName(rcName).get();
prepareOutboundMessage(exchange, rc);
}
protected void doCreateReplicationController(Exchange exchange) {
- ReplicationController rc = null;
String rcName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLER_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
ReplicationControllerSpec rcSpec = exchange.getIn()
@@ -164,7 +163,8 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLERS_LABELS, Map.class);
ReplicationController rcCreating = new ReplicationControllerBuilder().withNewMetadata().withName(rcName)
.withLabels(labels).endMetadata().withSpec(rcSpec).build();
- rc = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName).create(rcCreating);
+ ReplicationController rc = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName)
+ .resource(rcCreating).create();
prepareOutboundMessage(exchange, rc);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaProducer.java
index 34549c0b9c4..be90b4cd3e5 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaProducer.java
@@ -90,10 +90,10 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
}
protected void doListResourceQuotasByLabels(Exchange exchange) {
- ResourceQuotaList resList = null;
Map<String, String> labels
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ ResourceQuotaList resList;
if (!ObjectHelper.isEmpty(namespaceName)) {
NonNamespaceOperation<ResourceQuota, ResourceQuotaList, Resource<ResourceQuota>> resQuota
= getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName);
@@ -114,7 +114,6 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
}
protected void doGetResourceQuota(Exchange exchange) {
- ResourceQuota rq = null;
String rqName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(rqName)) {
@@ -125,13 +124,13 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
LOG.error("Get a specific Resource Quota require specify a namespace name");
throw new IllegalArgumentException("Get a specific Resource Quota require specify a namespace name");
}
- rq = getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName).withName(rqName).get();
+ ResourceQuota rq
+ = getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName).withName(rqName).get();
prepareOutboundMessage(exchange, rq);
}
protected void doCreateResourceQuota(Exchange exchange) {
- ResourceQuota rq = null;
String rqName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
ResourceQuotaSpec rqSpec
@@ -152,7 +151,8 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_LABELS, Map.class);
ResourceQuota rqCreating = new ResourceQuotaBuilder().withNewMetadata().withName(rqName).withLabels(labels)
.endMetadata().withSpec(rqSpec).build();
- rq = getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName).create(rqCreating);
+ ResourceQuota rq
+ = getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName).resource(rqCreating).create();
prepareOutboundMessage(exchange, rq);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java
index bbc27d0874c..30c05103d27 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java
@@ -84,9 +84,9 @@ public class KubernetesSecretsProducer extends DefaultProducer {
}
protected void doListSecretsByLabels(Exchange exchange) {
- SecretList secretsList = null;
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SECRETS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ SecretList secretsList;
if (!ObjectHelper.isEmpty(namespaceName)) {
secretsList = getEndpoint()
.getKubernetesClient()
@@ -106,7 +106,6 @@ public class KubernetesSecretsProducer extends DefaultProducer {
}
protected void doGetSecret(Exchange exchange) {
- Secret secret = null;
String secretName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SECRET_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(secretName)) {
@@ -117,13 +116,12 @@ public class KubernetesSecretsProducer extends DefaultProducer {
LOG.error("Get a specific Secret require specify a namespace name");
throw new IllegalArgumentException("Get a specific Secret require specify a namespace name");
}
- secret = getEndpoint().getKubernetesClient().secrets().inNamespace(namespaceName).withName(secretName).get();
+ Secret secret = getEndpoint().getKubernetesClient().secrets().inNamespace(namespaceName).withName(secretName).get();
prepareOutboundMessage(exchange, secret);
}
protected void doCreateSecret(Exchange exchange) {
- Secret secret = null;
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
Secret secretToCreate = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SECRET, Secret.class);
if (ObjectHelper.isEmpty(namespaceName)) {
@@ -134,7 +132,8 @@ public class KubernetesSecretsProducer extends DefaultProducer {
LOG.error("Create a specific secret require specify a secret bean");
throw new IllegalArgumentException("Create a specific secret require specify a secret bean");
}
- secret = getEndpoint().getKubernetesClient().secrets().inNamespace(namespaceName).create(secretToCreate);
+ Secret secret
+ = getEndpoint().getKubernetesClient().secrets().inNamespace(namespaceName).resource(secretToCreate).create();
prepareOutboundMessage(exchange, secret);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java
index d1677c9cec8..95125bca63f 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java
@@ -84,10 +84,10 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
}
protected void doListServiceAccountsByLabels(Exchange exchange) {
- ServiceAccountList saList = null;
Map<String, String> labels
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_ACCOUNTS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ ServiceAccountList saList;
if (!ObjectHelper.isEmpty(namespaceName)) {
saList = getEndpoint()
.getKubernetesClient()
@@ -108,7 +108,6 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
}
protected void doGetServiceAccount(Exchange exchange) {
- ServiceAccount sa = null;
String saName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_ACCOUNT_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(saName)) {
@@ -119,13 +118,13 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
LOG.error("Get a specific Service Account require specify a namespace name");
throw new IllegalArgumentException("Get a specific Service Account require specify a namespace name");
}
- sa = getEndpoint().getKubernetesClient().serviceAccounts().inNamespace(namespaceName).withName(saName).get();
+ ServiceAccount sa
+ = getEndpoint().getKubernetesClient().serviceAccounts().inNamespace(namespaceName).withName(saName).get();
prepareOutboundMessage(exchange, sa);
}
protected void doCreateServiceAccount(Exchange exchange) {
- ServiceAccount sa = null;
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
ServiceAccount saToCreate
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_ACCOUNT, ServiceAccount.class);
@@ -137,7 +136,8 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
LOG.error("Create a specific Service Account require specify a Service Account bean");
throw new IllegalArgumentException("Create a specific Service Account require specify a Service Account bean");
}
- sa = getEndpoint().getKubernetesClient().serviceAccounts().inNamespace(namespaceName).create(saToCreate);
+ ServiceAccount sa = getEndpoint().getKubernetesClient().serviceAccounts().inNamespace(namespaceName)
+ .resource(saToCreate).create();
prepareOutboundMessage(exchange, sa);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java
index 2df1c1d29fb..a97e6946fd1 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java
@@ -81,8 +81,8 @@ public class KubernetesServicesProducer extends DefaultProducer {
}
protected void doList(Exchange exchange) {
- ServiceList servicesList = null;
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ ServiceList servicesList;
if (!ObjectHelper.isEmpty(namespaceName)) {
servicesList = getEndpoint().getKubernetesClient().services().inNamespace(namespaceName).list();
} else {
@@ -92,9 +92,9 @@ public class KubernetesServicesProducer extends DefaultProducer {
}
protected void doListServiceByLabels(Exchange exchange) {
- ServiceList servicesList = null;
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ ServiceList servicesList;
if (!ObjectHelper.isEmpty(namespaceName)) {
servicesList = getEndpoint()
.getKubernetesClient()
@@ -115,7 +115,6 @@ public class KubernetesServicesProducer extends DefaultProducer {
}
protected void doGetService(Exchange exchange) {
- Service service = null;
String serviceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(serviceName)) {
@@ -126,13 +125,12 @@ public class KubernetesServicesProducer extends DefaultProducer {
LOG.error("Get a specific service require specify a namespace name");
throw new IllegalArgumentException("Get a specific service require specify a namespace name");
}
- service = getEndpoint().getKubernetesClient().services().inNamespace(namespaceName).withName(serviceName).get();
+ Service service = getEndpoint().getKubernetesClient().services().inNamespace(namespaceName).withName(serviceName).get();
prepareOutboundMessage(exchange, service);
}
protected void doCreateService(Exchange exchange) {
- Service service = null;
String serviceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
ServiceSpec serviceSpec = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_SPEC, ServiceSpec.class);
@@ -151,7 +149,8 @@ public class KubernetesServicesProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_LABELS, Map.class);
Service serviceCreating = new ServiceBuilder().withNewMetadata().withName(serviceName).withLabels(labels).endMetadata()
.withSpec(serviceSpec).build();
- service = getEndpoint().getKubernetesClient().services().inNamespace(namespaceName).create(serviceCreating);
+ Service service
+ = getEndpoint().getKubernetesClient().services().inNamespace(namespaceName).resource(serviceCreating).create();
prepareOutboundMessage(exchange, service);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java
index e485d3defcd..6057993c645 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java
@@ -76,9 +76,9 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer {
}
protected void doListBuildConfigsByLabels(Exchange exchange) {
- BuildConfigList buildConfigsList = null;
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_BUILD_CONFIGS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ BuildConfigList buildConfigsList;
if (!ObjectHelper.isEmpty(namespaceName)) {
buildConfigsList = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs()
.inNamespace(namespaceName).withLabels(labels).list();
@@ -90,7 +90,6 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer {
}
protected void doGetBuildConfig(Exchange exchange) {
- BuildConfig buildConfig = null;
String buildConfigName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_BUILD_CONFIG_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(buildConfigName)) {
@@ -101,8 +100,9 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer {
LOG.error("Get a specific Build Config require specify a namespace name");
throw new IllegalArgumentException("Get a specific Build Config require specify a namespace name");
}
- buildConfig = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs().inNamespace(namespaceName)
- .withName(buildConfigName).get();
+ BuildConfig buildConfig
+ = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs().inNamespace(namespaceName)
+ .withName(buildConfigName).get();
prepareOutboundMessage(exchange, buildConfig);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java
index da5474ce895..5a8d3952479 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java
@@ -75,9 +75,9 @@ public class OpenshiftBuildsProducer extends DefaultProducer {
}
protected void doListBuildByLabels(Exchange exchange) {
- BuildList buildList = null;
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_BUILDS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
+ BuildList buildList;
if (!ObjectHelper.isEmpty(namespaceName)) {
buildList = getEndpoint().getKubernetesClient()
.adapt(OpenShiftClient.class).builds().inNamespace(namespaceName).withLabels(labels).list();
@@ -90,7 +90,6 @@ public class OpenshiftBuildsProducer extends DefaultProducer {
}
protected void doGetBuild(Exchange exchange) {
- Build build = null;
String buildName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_BUILD_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (ObjectHelper.isEmpty(buildName)) {
@@ -101,7 +100,7 @@ public class OpenshiftBuildsProducer extends DefaultProducer {
LOG.error("Get a specific Build require specify a namespace name");
throw new IllegalArgumentException("Get a specific Build require specify a namespace name");
}
- build = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).builds().inNamespace(namespaceName)
+ Build build = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).builds().inNamespace(namespaceName)
.withName(buildName).get();
prepareOutboundMessage(exchange, build);
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsProducer.java
index a2f7732dbaf..9fdad01b7f7 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsProducer.java
@@ -156,7 +156,8 @@ public class OpenshiftDeploymentConfigsProducer extends DefaultProducer {
.withLabels(labels).endMetadata().withSpec(dcSpec).build();
DeploymentConfig deploymentConfig = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).deploymentConfigs()
.inNamespace(namespaceName)
- .create(deploymentCreating);
+ .resource(deploymentCreating)
+ .create();
prepareOutboundMessage(exchange, deploymentConfig);
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/KubernetesServer.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/KubernetesServer.java
deleted file mode 100644
index 1f50c32614e..00000000000
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/KubernetesServer.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component;
-
-import java.util.HashMap;
-
-import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
-import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher;
-import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import io.fabric8.mockwebserver.Context;
-import io.fabric8.mockwebserver.dsl.MockServerExpectation;
-import io.fabric8.mockwebserver.dsl.ReturnOrWebsocketable;
-import io.fabric8.mockwebserver.dsl.TimesOnceableOrHttpHeaderable;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
-import org.junit.jupiter.api.extension.AfterEachCallback;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-
-public class KubernetesServer implements BeforeEachCallback, AfterEachCallback {
-
- private KubernetesMockServer mock;
- private NamespacedKubernetesClient client;
- private boolean https;
- private boolean crudMode;
-
- public KubernetesServer() {
- this(true, false);
- }
-
- public KubernetesServer(boolean https) {
- this(https, false);
- }
-
- public KubernetesServer(boolean https, boolean crudMode) {
- this.https = https;
- this.crudMode = crudMode;
- }
-
- @Override
- public void beforeEach(ExtensionContext context) {
- this.mock = this.crudMode
- ? new KubernetesMockServer(
- new Context(), new MockWebServer(), new HashMap(), new KubernetesCrudDispatcher(), true)
- : new KubernetesMockServer(this.https);
- this.mock.init();
- this.client = this.mock.createClient();
- }
-
- @Override
- public void afterEach(ExtensionContext context) {
- this.mock.destroy();
- this.client.close();
- }
-
- public NamespacedKubernetesClient getClient() {
- return this.client;
- }
-
- public MockServerExpectation expect() {
- return this.mock.expect();
- }
-
- /** @deprecated */
- @Deprecated
- public <T> void expectAndReturnAsJson(String path, int code, T body) {
- ((TimesOnceableOrHttpHeaderable) ((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always();
- }
-
- /** @deprecated */
- @Deprecated
- public void expectAndReturnAsString(String path, int code, String body) {
- ((TimesOnceableOrHttpHeaderable) ((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always();
- }
-
- /** @deprecated */
- @Deprecated
- public <T> void expectAndReturnAsJson(String method, String path, int code, T body) {
- ((TimesOnceableOrHttpHeaderable) ((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always();
- }
-
- /** @deprecated */
- @Deprecated
- public void expectAndReturnAsString(String method, String path, int code, String body) {
- ((TimesOnceableOrHttpHeaderable) ((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always();
- }
-
- public RecordedRequest getLastRequest() throws InterruptedException {
- int count = this.mock.getRequestCount();
-
- RecordedRequest request;
- for (request = null; count-- > 0; request = this.mock.takeRequest()) {
- }
-
- return request;
- }
-}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/OpenShiftServer.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/OpenShiftServer.java
deleted file mode 100644
index 1223c0e8dac..00000000000
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/OpenShiftServer.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component;
-
-import java.util.HashMap;
-
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher;
-import io.fabric8.mockwebserver.Context;
-import io.fabric8.mockwebserver.dsl.MockServerExpectation;
-import io.fabric8.mockwebserver.dsl.ReturnOrWebsocketable;
-import io.fabric8.mockwebserver.dsl.TimesOnceableOrHttpHeaderable;
-import io.fabric8.openshift.client.NamespacedOpenShiftClient;
-import io.fabric8.openshift.client.server.mock.OpenShiftMockServer;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
-import org.junit.jupiter.api.extension.AfterEachCallback;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-
-public class OpenShiftServer implements BeforeEachCallback, AfterEachCallback {
-
- protected OpenShiftMockServer mock;
- private NamespacedOpenShiftClient client;
- private boolean https;
- private boolean curdMode;
-
- public OpenShiftServer() {
- this(true, false);
- }
-
- public OpenShiftServer(boolean https) {
- this(https, false);
- }
-
- public OpenShiftServer(boolean https, boolean curdMode) {
- this.https = https;
- this.curdMode = curdMode;
- }
-
- @Override
- public void beforeEach(ExtensionContext context) {
- this.mock = this.curdMode
- ? new OpenShiftMockServer(
- new Context(), new MockWebServer(), new HashMap(), new KubernetesCrudDispatcher(), true)
- : new OpenShiftMockServer(this.https);
- this.mock.init();
- this.client = this.mock.createOpenShiftClient();
- }
-
- @Override
- public void afterEach(ExtensionContext context) {
- this.mock.destroy();
- this.client.close();
- }
-
- public KubernetesClient getKubernetesClient() {
- return this.client;
- }
-
- public NamespacedOpenShiftClient getOpenshiftClient() {
- return this.client;
- }
-
- public MockServerExpectation expect() {
- return this.mock.expect();
- }
-
- /** @deprecated */
- @Deprecated
- public <T> void expectAndReturnAsJson(String path, int code, T body) {
- ((TimesOnceableOrHttpHeaderable) ((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always();
- }
-
- /** @deprecated */
- @Deprecated
- public void expectAndReturnAsString(String path, int code, String body) {
- ((TimesOnceableOrHttpHeaderable) ((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always();
- }
-
- public RecordedRequest getLastRequest() throws InterruptedException {
- int count = this.mock.getRequestCount();
-
- RecordedRequest request;
- for (request = null; count-- > 0; request = this.mock.takeRequest()) {
- }
-
- return request;
- }
-
-}
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 ba8253cbc4d..37135c894dc 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
@@ -18,6 +18,7 @@ package org.apache.camel.component.kubernetes;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
@@ -49,6 +50,6 @@ public class KubernetesTestSupport extends CamelTestSupport {
}
public static String toUrlEncoded(String str) throws UnsupportedEncodingException {
- return URLEncoder.encode(str, "UTF-8");
+ return URLEncoder.encode(str, StandardCharsets.UTF_8);
}
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesConfigMapsConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesConfigMapsConsumerIT.java
index d8508157efa..c5f4e7803e5 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesConfigMapsConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesConfigMapsConsumerIT.java
@@ -65,7 +65,7 @@ public class KubernetesConfigMapsConsumerIT extends KubernetesTestSupport {
@Test
@Order(1)
- public void createConfigMapWithProperties() {
+ void createConfigMapWithProperties() {
configureMock();
Exchange ex = template.request("direct:createConfigmap", exchange -> {
@@ -87,7 +87,7 @@ public class KubernetesConfigMapsConsumerIT extends KubernetesTestSupport {
@Test
@Order(2)
- public void createConfigMap() {
+ void createConfigMap() {
configureMock();
Exchange ex = template.request("direct:createConfigmap", exchange -> {
@@ -108,7 +108,7 @@ public class KubernetesConfigMapsConsumerIT extends KubernetesTestSupport {
@ParameterizedTest
@Order(3)
@ValueSource(strings = { "test", "test1" })
- public void deleteConfigMaps(String configMapName) {
+ void deleteConfigMaps(String configMapName) {
Exchange ex = template.request("direct:deleteConfigmap", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, configMapName);
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesCustomResourcesConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesCustomResourcesConsumerIT.java
index 3a90ab6de32..e51dc808329 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesCustomResourcesConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesCustomResourcesConsumerIT.java
@@ -22,8 +22,8 @@ import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition
import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionBuilder;
import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionVersionBuilder;
import io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.fabric8.kubernetes.client.Watcher;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
@@ -54,23 +54,22 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class KubernetesCustomResourcesConsumerIT extends KubernetesTestSupport {
- private static final KubernetesClient CLIENT = new DefaultKubernetesClient();
+ private static final KubernetesClient CLIENT = new KubernetesClientBuilder().build();
+ private static final String CRD_SOURCE_STRING = "{\n" +
+ " \"apiVersion\": \"camel.apache.org/v1\",\n" +
+ " \"kind\": \"CamelTest\",\n" +
+ " \"metadata\": {\n" +
+ " \"name\": \"camel-crd-itest\"\n" +
+ " },\n" +
+ " \"spec\": {\n" +
+ " \"message\": \"Apache Camel Rocks!\"\n" +
+ " }\n" +
+ "}";
private static CustomResourceDefinition crd;
@EndpointInject("mock:result")
protected MockEndpoint mockResultEndpoint;
- private String crdSourceString = "{\n" +
- " \"apiVersion\": \"camel.apache.org/v1\",\n" +
- " \"kind\": \"CamelTest\",\n" +
- " \"metadata\": {\n" +
- " \"name\": \"camel-crd-itest\"\n" +
- " },\n" +
- " \"spec\": {\n" +
- " \"message\": \"Apache Camel Rocks!\"\n" +
- " }\n" +
- "}";
-
@BeforeAll
public static void beforeAll() {
crd = new CustomResourceDefinitionBuilder()
@@ -115,11 +114,11 @@ public class KubernetesCustomResourcesConsumerIT extends KubernetesTestSupport {
@Test
@Order(1)
- public void createCustomResource() throws Exception {
+ void createCustomResource() throws Exception {
mockResultEndpoint.expectedHeaderValuesReceivedInAnyOrder(KubernetesConstants.KUBERNETES_CRD_EVENT_ACTION,
Watcher.Action.ADDED);
Exchange ex = template.request("direct:createCustomResource", exchange -> {
- exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CRD_INSTANCE, crdSourceString);
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CRD_INSTANCE, CRD_SOURCE_STRING);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CRD_INSTANCE_NAME, "camel-crd-itest");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CRD_NAME, "cameltests.camel.apache.org");
@@ -137,7 +136,7 @@ public class KubernetesCustomResourcesConsumerIT extends KubernetesTestSupport {
@Test
@Order(2)
- public void deleteCustomResource() throws Exception {
+ void deleteCustomResource() throws Exception {
mockResultEndpoint.reset();
mockResultEndpoint.expectedHeaderValuesReceivedInAnyOrder(KubernetesConstants.KUBERNETES_CRD_EVENT_ACTION,
Watcher.Action.ADDED, Watcher.Action.DELETED);
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNamespacesConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNamespacesConsumerIT.java
index e34c62cd465..d4f5b840369 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNamespacesConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNamespacesConsumerIT.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.kubernetes.consumer.integration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
@@ -56,7 +55,7 @@ public class KubernetesNamespacesConsumerIT extends KubernetesTestSupport {
@Test
@Order(1)
- public void createPod() {
+ void createPod() {
mockResultEndpoint.expectedMessageCount(5);
mockResultEndpoint.expectedHeaderValuesReceivedInAnyOrder(KubernetesConstants.KUBERNETES_EVENT_ACTION, "ADDED",
"MODIFIED", "MODIFIED", "MODIFIED", "DELETED");
@@ -76,20 +75,17 @@ public class KubernetesNamespacesConsumerIT extends KubernetesTestSupport {
@Test
@Order(2)
- public void listByLabels() {
+ void listByLabels() {
Exchange ex = template.request("direct:listByLabels", exchange -> {
Map<String, String> labels = new HashMap<>();
labels.put("this", "rocks");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_LABELS, labels);
});
- List<Namespace> result = ex.getMessage().getBody(List.class);
-
boolean testNamespaceExists = false;
- Iterator<Namespace> it = result.iterator();
- while (it.hasNext()) {
- Namespace namespace = it.next();
+ for (Object o : ex.getMessage().getBody(List.class)) {
+ Namespace namespace = (Namespace) o;
if (TEST_NAME_SPACE.equalsIgnoreCase(namespace.getMetadata().getName())) {
testNamespaceExists = true;
}
@@ -100,7 +96,7 @@ public class KubernetesNamespacesConsumerIT extends KubernetesTestSupport {
@Test
@Order(3)
- public void deletePod() throws Exception {
+ void deletePod() throws Exception {
Exchange ex = template.request("direct:deleteNamespace",
exchange -> exchange.getIn()
.setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, TEST_NAME_SPACE));
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNodesConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNodesConsumerIT.java
index b43c04ebeaf..250047c9ab4 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNodesConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNodesConsumerIT.java
@@ -47,7 +47,7 @@ public class KubernetesNodesConsumerIT extends KubernetesTestSupport {
@Test
@Order(1)
- public void listNode() throws Exception {
+ void listNode() throws Exception {
configureMock();
Exchange ex = template.request("direct:listNode", exchange -> {
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesPodsConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesPodsConsumerIT.java
index cd552995678..f43758de4d1 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesPodsConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesPodsConsumerIT.java
@@ -88,7 +88,7 @@ public class KubernetesPodsConsumerIT extends KubernetesTestSupport {
@Test
@Order(1)
- public void createPod() throws Exception {
+ void createPod() throws Exception {
mockResultEndpoint.expectedMessageCount(2);
mockResultEndpoint.expectedHeaderValuesReceivedInAnyOrder(KubernetesConstants.KUBERNETES_EVENT_ACTION, "ADDED",
"ADDED", "ADDED");
@@ -103,7 +103,7 @@ public class KubernetesPodsConsumerIT extends KubernetesTestSupport {
@Test
@Order(2)
- public void deletePod() throws Exception {
+ void deletePod() throws Exception {
mockResultEndpoint.expectedMessageCount(1);
mockResultEndpoint.expectedHeaderValuesReceivedInAnyOrder(KubernetesConstants.KUBERNETES_EVENT_ACTION,
"ADDED", "ADDED", "ADDED");
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesReplicationControllersConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesReplicationControllersConsumerIT.java
index 71b99b80cb4..f0607e6e61a 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesReplicationControllersConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesReplicationControllersConsumerIT.java
@@ -60,7 +60,7 @@ public class KubernetesReplicationControllersConsumerIT extends KubernetesTestSu
@Test
@Order(1)
- public void createReplicationController() throws Exception {
+ void createReplicationController() throws Exception {
mockResultEndpoint.expectedHeaderValuesReceivedInAnyOrder(KubernetesConstants.KUBERNETES_EVENT_ACTION, "ADDED",
"MODIFIED", "MODIFIED");
@@ -93,7 +93,7 @@ public class KubernetesReplicationControllersConsumerIT extends KubernetesTestSu
@Test
@Order(2)
- public void deleteReplicationController() throws Exception {
+ void deleteReplicationController() throws Exception {
Exchange ex = template.request("direct:deleteReplicationController", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLER_NAME, "test");
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesServicesConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesServicesConsumerIT.java
index f4cbfc88c2e..7040cbbf55b 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesServicesConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesServicesConsumerIT.java
@@ -60,8 +60,7 @@ public class KubernetesServicesConsumerIT extends KubernetesTestSupport {
@Test
@Order(1)
- public void createService() {
- // mockResultEndpoint.expectedMessageCount(1);
+ void createService() {
mockResultEndpoint.expectedHeaderValuesReceivedInAnyOrder(KubernetesConstants.KUBERNETES_EVENT_ACTION, "ADDED");
Exchange ex = template.request("direct:createService", exchange -> {
@@ -94,7 +93,7 @@ public class KubernetesServicesConsumerIT extends KubernetesTestSupport {
@Test
@Order(2)
- public void deleteService() {
+ void deleteService() {
Exchange ex = template.request("direct:deleteService", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SERVICE_NAME, TEST_SERVICE_NAME);
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 817e538d8fc..fc18509ca1d 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
@@ -25,39 +25,41 @@ 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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/configmaps")
.andReturn(200, new ConfigMapListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
- List<ConfigMap> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect().withPath("/api/v1/configmaps?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200, new ConfigMapListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
@@ -68,13 +70,13 @@ public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, labels);
});
- List<ConfigMap> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void getConfigMapTestDefaultNamespace() {
+ void getConfigMapTestDefaultNamespace() {
ObjectMeta meta = new ObjectMeta();
meta.setName("cm1");
server.expect().withPath("/api/v1/namespaces/test/configmaps/cm1")
@@ -90,7 +92,7 @@ public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
}
@Test
- public void getConfigMapTestCustomNamespace() {
+ void getConfigMapTestCustomNamespace() {
ObjectMeta meta = new ObjectMeta();
meta.setName("cm1");
server.expect().withPath("/api/v1/namespaces/custom/configmaps/cm1")
@@ -108,7 +110,7 @@ public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
}
@Test
- public void createGetAndDeleteConfigMap() {
+ void createGetAndDeleteConfigMap() {
ConfigMap cm1 = new ConfigMapBuilder().withNewMetadata().withName("cm1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/configmaps/cm1").andReturn(200, cm1).once();
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
index 039a0a26490..d203627c727 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
@@ -25,12 +25,13 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import io.fabric8.kubernetes.api.model.GenericKubernetesResourceList;
import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.kubernetes.client.utils.Serialization;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.apache.camel.util.IOHelper;
@@ -39,7 +40,6 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -47,22 +47,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class KubernetesCustomResourcesProducerTest extends KubernetesTestSupport {
private static String githubSourceString;
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
-
- private CustomResourceDefinitionContext getCustomResourceContext() {
- return new CustomResourceDefinitionContext.Builder()
- .withName("githubsources.sources.knative.dev")
- .withGroup("sources.knative.dev")
- .withScope("Namespaced")
- .withVersion("v1alpha1")
- .withPlural("githubsources")
- .build();
- }
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BeforeAll
public static void readResource() throws IOException {
@@ -73,10 +64,10 @@ public class KubernetesCustomResourcesProducerTest extends KubernetesTestSupport
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
- private String setupGithubSourceList() throws Exception {
+ private String setupGithubSourceList() {
GenericKubernetesResourceList list = new GenericKubernetesResourceList();
list.getItems().add(Serialization.unmarshal(githubSourceString, GenericKubernetesResource.class));
return Serialization.asJson(list);
@@ -84,7 +75,7 @@ public class KubernetesCustomResourcesProducerTest extends KubernetesTestSupport
@Test
@Order(1)
- public void createTest() throws Exception {
+ void createTest() {
server.expect().post().withPath("/apis/sources.knative.dev/v1alpha1/namespaces/testnamespace/githubsources")
.andReturn(200, githubSourceString).once();
server.expect().delete().withPath("/apis/sources.knative.dev/v1alpha1/namespaces/testnamespace/githubsources/samplecr")
@@ -110,7 +101,7 @@ public class KubernetesCustomResourcesProducerTest extends KubernetesTestSupport
@Test
@Order(2)
- public void listTest() throws Exception {
+ void listTest() throws Exception {
server.expect().get().withPath("/apis/sources.knative.dev/v1alpha1/namespaces/testnamespace/githubsources")
.andReturn(200, setupGithubSourceList()).once();
@@ -126,14 +117,14 @@ public class KubernetesCustomResourcesProducerTest extends KubernetesTestSupport
assertFalse(ex.isFailed());
assertNull(ex.getException());
- List<Map<String, Object>> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(1, result.size());
}
@Test
@Order(3)
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect().get()
.withPath("/apis/sources.knative.dev/v1alpha1/namespaces/testnamespace/githubsources?labelSelector="
+ toUrlEncoded("key1=value1,key2=value2"))
@@ -155,14 +146,14 @@ public class KubernetesCustomResourcesProducerTest extends KubernetesTestSupport
assertFalse(ex.isFailed());
assertNull(ex.getException());
- List<Map<String, Object>> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(1, result.size());
}
@Test
@Order(4)
- public void deleteTest() throws Exception {
+ void deleteTest() {
server.expect().post().withPath("/apis/sources.knative.dev/v1alpha1/namespaces/testnamespace/githubsources")
.andReturn(200, githubSourceString).once();
server.expect().delete().withPath("/apis/sources.knative.dev/v1alpha1/namespaces/testnamespace/githubsources/samplecr")
@@ -184,7 +175,7 @@ public class KubernetesCustomResourcesProducerTest extends KubernetesTestSupport
@Test
@Order(5)
- public void testListNotFound() {
+ void testListNotFound() {
server.expect().get().withPath("/apis/sources.knative.dev/v1alpha1/namespaces/testnamespace/githubsources")
.andReturn(404, "").once();
Exchange ex4 = template.request("direct:listCustomResources", exchange -> {
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 230e6a8929e..3f6d1c78d19 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
@@ -24,39 +24,41 @@ 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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/apis/apps/v1/namespaces/test/deployments")
.andReturn(200, new DeploymentListBuilder().addNewItem().and().build()).once();
- List<Deployment> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(1, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect()
.withPath("/apis/apps/v1/namespaces/test/deployments?labelSelector="
+ toUrlEncoded("key1=value1,key2=value2"))
@@ -69,13 +71,13 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS, labels);
});
- List<Deployment> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void createAndDeleteDeployment() {
+ void createAndDeleteDeployment() {
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();
@@ -98,7 +100,7 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
}
@Test
- public void createScaleAndDeleteDeployment() {
+ void createScaleAndDeleteDeployment() {
server.expect().withPath("/apis/apps/v1/namespaces/test/deployments/de1")
.andReturn(200, new DeploymentBuilder().withNewMetadata().withName("de1")
.withResourceVersion("1").endMetadata().withNewSpec().withReplicas(5).endSpec().withNewStatus()
@@ -116,7 +118,6 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_REPLICAS, 5);
});
- // Thread.sleep(3000);
int replicas = ex.getMessage().getBody(Integer.class);
assertEquals(5, replicas);
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 17791425bf3..95e08e2aa84 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
@@ -25,64 +25,61 @@ import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler;
import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerBuilder;
import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerListBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesHPAProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers")
.andReturn(200, new HorizontalPodAutoscalerListBuilder().addNewItem().and().addNewItem().and().addNewItem()
.and().build())
.once();
- List<HorizontalPodAutoscaler> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect()
.withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers?labelSelector="
+ toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
- Exchange ex = template.request("direct:listByLabels", new Processor() {
-
- @Override
- public void process(Exchange exchange) {
- Map<String, String> labels = new HashMap<>();
- labels.put("key1", "value1");
- labels.put("key2", "value2");
- exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_HPA_LABELS, labels);
- }
+ Exchange ex = template.request("direct:listByLabels", exchange -> {
+ Map<String, String> labels = new HashMap<>();
+ labels.put("key1", "value1");
+ labels.put("key2", "value2");
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_HPA_LABELS, labels);
});
- List<HorizontalPodAutoscaler> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void getHPATest() {
+ void getHPATest() {
HorizontalPodAutoscaler hpa1
= new HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa1").withNamespace("test").and().build();
HorizontalPodAutoscaler hpa2
@@ -92,13 +89,9 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
.once();
server.expect().withPath("/apis/autoscaling/v1/namespaces/ns1/horizontalpodautoscalers/hpa2").andReturn(200, hpa2)
.once();
- Exchange ex = template.request("direct:getHPA", new Processor() {
-
- @Override
- public void process(Exchange exchange) {
- exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test");
- exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_HPA_NAME, "hpa1");
- }
+ Exchange ex = template.request("direct:getHPA", exchange -> {
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test");
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_HPA_NAME, "hpa1");
});
HorizontalPodAutoscaler result = ex.getMessage().getBody(HorizontalPodAutoscaler.class);
@@ -107,19 +100,15 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
}
@Test
- public void deleteHPATest() {
+ void deleteHPATest() {
HorizontalPodAutoscaler hpa1
= new HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa1").withNamespace("test").and().build();
server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1)
.once();
- Exchange ex = template.request("direct:deleteHPA", new Processor() {
-
- @Override
- public void process(Exchange exchange) {
- exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test");
- exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_HPA_NAME, "hpa1");
- }
+ Exchange ex = template.request("direct:deleteHPA", exchange -> {
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test");
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_HPA_NAME, "hpa1");
});
boolean podDeleted = ex.getMessage().getBody(Boolean.class);
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 334ea500e48..05df966fca0 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
@@ -20,45 +20,46 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.batch.v1.Job;
import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder;
import io.fabric8.kubernetes.api.model.batch.v1.JobListBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+@EnableKubernetesMockClient
public class KubernetesJobProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
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);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect().withPath("/apis/batch/v1/namespaces/test/jobs?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200, new JobListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
Exchange ex = template.request("direct:listByLabels", exchange -> {
@@ -68,13 +69,13 @@ public class KubernetesJobProducerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_JOB_LABELS, labels);
});
- List<Job> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void getJobTest() {
+ void getJobTest() {
Job sc1 = new JobBuilder().withNewMetadata().withName("sc1").withNamespace("test").and().build();
server.expect().withPath("/apis/batch/v1/namespaces/test/jobs/sc1").andReturn(200, sc1).once();
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 ac149508f8b..abddf8a5b6c 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
@@ -23,39 +23,41 @@ 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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesNamespacesProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/namespaces")
.andReturn(200, new NamespaceListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
- List<Namespace> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void getNamespace() {
+ void getNamespace() {
ObjectMeta meta = new ObjectMeta();
meta.setName("test");
server.expect().withPath("/api/v1/namespaces/test").andReturn(200, new NamespaceBuilder().withMetadata(meta).build())
@@ -70,7 +72,7 @@ public class KubernetesNamespacesProducerTest extends KubernetesTestSupport {
}
@Test
- public void createAndDeleteNamespace() {
+ void createAndDeleteNamespace() {
Namespace ns1 = new NamespaceBuilder().withNewMetadata().withName("ns1").endMetadata().build();
server.expect().withPath("/api/v1/namespaces/ns1").andReturn(200, ns1).once();
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 3449a712dff..32de775f6b2 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
@@ -27,38 +27,40 @@ import io.fabric8.kubernetes.api.model.NodeSpec;
import io.fabric8.kubernetes.api.model.NodeSpecBuilder;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesNodesProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/nodes").andReturn(200, new NodeListBuilder().addNewItem().and().build()).once();
- List<Node> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(1, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ 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();
Exchange ex = template.request("direct:listByLabels", exchange -> {
@@ -68,13 +70,13 @@ public class KubernetesNodesProducerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NODES_LABELS, labels);
});
- List<Node> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void createNodeTest() {
+ void createNodeTest() {
ObjectMeta meta = new ObjectMeta();
meta.setName("test");
server.expect().withPath("/api/v1/nodes").andReturn(200, new NodeBuilder().withMetadata(meta).build()).once();
@@ -94,7 +96,7 @@ public class KubernetesNodesProducerTest extends KubernetesTestSupport {
}
@Test
- public void deleteNode() {
+ void deleteNode() {
Node node1 = new NodeBuilder().withNewMetadata().withName("node1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/nodes/node1").andReturn(200, node1).once();
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 261692c5e05..e088baa35f2 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
@@ -21,46 +21,46 @@ import java.util.List;
import java.util.Map;
import io.fabric8.kubernetes.api.model.ObjectMeta;
-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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesPersistentVolumesClaimsProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/namespaces/test/persistentvolumeclaims")
.andReturn(200,
new PersistentVolumeClaimListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
- List<PersistentVolumeClaim> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect()
.withPath("/api/v1/namespaces/test/persistentvolumeclaims?labelSelector="
+ toUrlEncoded("key1=value1,key2=value2"))
@@ -75,12 +75,12 @@ public class KubernetesPersistentVolumesClaimsProducerTest extends KubernetesTes
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS, labels);
});
- List<PersistentVolume> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void createListAndDeletePersistentVolumeClaim() {
+ void createListAndDeletePersistentVolumeClaim() {
ObjectMeta meta = new ObjectMeta();
meta.setName("pvc1");
server.expect().withPath("/api/v1/namespaces/test/persistentvolumeclaims/pvc1")
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 7013aed2783..b875449d8f9 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
@@ -20,43 +20,44 @@ import java.util.HashMap;
import java.util.List;
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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
+@EnableKubernetesMockClient
public class KubernetesPersistentVolumesProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/persistentvolumes")
.andReturn(200,
new PersistentVolumeListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
- List<PersistentVolume> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect().withPath("/api/v1/persistentvolumes?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200,
new PersistentVolumeListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
@@ -68,7 +69,7 @@ public class KubernetesPersistentVolumesProducerTest extends KubernetesTestSuppo
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_LABELS, labels);
});
- List<PersistentVolume> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
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 80e6db521f5..5f437db56c6 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
@@ -24,46 +24,48 @@ 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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesPodsProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/pods")
.andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
server.expect().withPath("/api/v1/namespaces/test/pods")
.andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().build()).once();
- List<Pod> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
Exchange ex = template.request("direct:list",
exchange -> exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test"));
- List<Pod> resultNamespaced = ex.getMessage().getBody(List.class);
+ List<?> resultNamespace = ex.getMessage().getBody(List.class);
- assertEquals(2, resultNamespaced.size());
+ assertEquals(2, resultNamespace.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect().withPath("/api/v1/pods?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
Exchange ex = template.request("direct:listByLabels", exchange -> {
@@ -73,13 +75,13 @@ public class KubernetesPodsProducerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PODS_LABELS, labels);
});
- List<Pod> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void getPodTest() {
+ void getPodTest() {
Pod pod1 = new PodBuilder().withNewMetadata().withName("pod1").withNamespace("test").and().build();
Pod pod2 = new PodBuilder().withNewMetadata().withName("pod2").withNamespace("ns1").and().build();
@@ -96,7 +98,7 @@ public class KubernetesPodsProducerTest extends KubernetesTestSupport {
}
@Test
- public void deletePod() {
+ void deletePod() {
Pod pod1 = new PodBuilder().withNewMetadata().withName("pod1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/pods/pod1").andReturn(200, pod1).once();
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 ffd87f95bc3..0f9d16dbff4 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
@@ -25,43 +25,45 @@ 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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesReplicationControllersProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/replicationcontrollers")
.andReturn(200,
new ReplicationControllerListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
- List<ReplicationController> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect().withPath("/api/v1/replicationcontrollers?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200,
new ReplicationControllerListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
@@ -73,13 +75,13 @@ public class KubernetesReplicationControllersProducerTest extends KubernetesTest
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLERS_LABELS, labels);
});
- List<ReplicationController> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void getReplicationControllerTest() {
+ void getReplicationControllerTest() {
ReplicationController rc1
= new ReplicationControllerBuilder().withNewMetadata().withName("rc1").withNamespace("test").and().build();
@@ -95,7 +97,7 @@ public class KubernetesReplicationControllersProducerTest extends KubernetesTest
}
@Test
- public void createAndDeleteReplicationController() {
+ void createAndDeleteReplicationController() {
server.expect().withPath("/api/v1/namespaces/test/replicationcontrollers/repl1")
.andReturn(200, new ReplicationControllerBuilder().withNewMetadata().withName("repl1")
.withResourceVersion("1").endMetadata().withNewSpec().withReplicas(0).endSpec().withNewStatus()
@@ -119,7 +121,7 @@ public class KubernetesReplicationControllersProducerTest extends KubernetesTest
}
@Test
- public void createScaleAndDeleteReplicationController() {
+ void createScaleAndDeleteReplicationController() {
server.expect().withPath("/api/v1/namespaces/test/replicationcontrollers/repl1")
.andReturn(200, new ReplicationControllerBuilder().withNewMetadata().withName("repl1")
.withResourceVersion("1").endMetadata().withNewSpec().withReplicas(5).endSpec().withNewStatus()
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 9cf7fa36522..4b799d1a03f 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
@@ -22,40 +22,42 @@ 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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesResourcesQuotaProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
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<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void deleteResourceQuota() {
+ void deleteResourceQuota() {
ResourceQuota rq1 = new ResourceQuotaBuilder().withNewMetadata().withName("rq1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/resourcequotas/rq1").andReturn(200, rq1).once();
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 363a9ffd3d3..b9fb1c75caa 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
@@ -24,41 +24,43 @@ 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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesSecretsProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/secrets")
.andReturn(200, new SecretListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
- List<Secret> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect().withPath("/api/v1/secrets?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200, new SecretListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
@@ -69,13 +71,13 @@ public class KubernetesSecretsProducerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SECRETS_LABELS, labels);
});
- List<Secret> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void getSecretTest() {
+ void getSecretTest() {
Secret sc1 = new SecretBuilder().withNewMetadata().withName("sc1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/secrets/sc1").andReturn(200, sc1).once();
@@ -90,7 +92,7 @@ public class KubernetesSecretsProducerTest extends KubernetesTestSupport {
}
@Test
- public void createAndDeleteSecret() {
+ void createAndDeleteSecret() {
Secret sc1 = new SecretBuilder().withNewMetadata().withName("sc1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/secrets/sc1").andReturn(200, sc1).once();
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 bd54fff8a57..ee9fb27c586 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
@@ -24,41 +24,43 @@ 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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesServiceAccountsProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/serviceaccounts")
.andReturn(200,
new ServiceAccountListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
- List<ServiceAccount> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect().withPath("/api/v1/serviceaccounts?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200,
new ServiceAccountListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
@@ -70,13 +72,13 @@ public class KubernetesServiceAccountsProducerTest extends KubernetesTestSupport
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SERVICE_ACCOUNTS_LABELS, labels);
});
- List<ServiceAccount> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void createAndDeleteServiceAccount() {
+ void createAndDeleteServiceAccount() {
ServiceAccount pod1 = new ServiceAccountBuilder().withNewMetadata().withName("sa1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/serviceaccounts/sa1").andReturn(200, pod1).once();
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 64163fae41b..85bb4e48f95 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
@@ -25,41 +25,43 @@ 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.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.KubernetesServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class KubernetesServicesProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public KubernetesServer server = new KubernetesServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
public KubernetesClient getClient() {
- return server.getClient();
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/api/v1/services")
.andReturn(200, new ServiceListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
- List<Service> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect().withPath("/api/v1/services?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
Exchange ex = template.request("direct:listByLabels", exchange -> {
@@ -69,12 +71,12 @@ public class KubernetesServicesProducerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SERVICE_LABELS, labels);
});
- List<Service> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void getServiceTest() {
+ void getServiceTest() {
Service se1 = new ServiceBuilder().withNewMetadata().withName("se1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/services/se1").andReturn(200, se1).once();
@@ -89,7 +91,7 @@ public class KubernetesServicesProducerTest extends KubernetesTestSupport {
}
@Test
- public void createAndDeleteService() {
+ void createAndDeleteService() {
Service se1 = new ServiceBuilder().withNewMetadata().withName("se1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/services/se1").andReturn(200, se1).once();
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapMountPropertiesFunctionTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapMountPropertiesFunctionTest.java
index 63606f17641..5f74a2f6340 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapMountPropertiesFunctionTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapMountPropertiesFunctionTest.java
@@ -29,25 +29,24 @@ public class ConfigMapMountPropertiesFunctionTest extends KubernetesTestSupport
@Test
@Order(1)
public void configMapMountPropertiesFunction() throws Exception {
- ConfigMapPropertiesFunction cmf = new ConfigMapPropertiesFunction();
- cmf.setClientEnabled(false);
- cmf.setMountPathConfigMaps("src/test/resources/");
- cmf.setCamelContext(context);
- cmf.start();
+ try (ConfigMapPropertiesFunction cmf = new ConfigMapPropertiesFunction()) {
+ cmf.setClientEnabled(false);
+ cmf.setMountPathConfigMaps("src/test/resources/");
+ cmf.setCamelContext(context);
+ cmf.start();
- String out = cmf.apply("myconfig/foo");
- Assertions.assertEquals("456", out);
+ String out = cmf.apply("myconfig/foo");
+ Assertions.assertEquals("456", out);
- out = cmf.apply("myconfig/unknown");
- Assertions.assertNull(out);
+ out = cmf.apply("myconfig/unknown");
+ Assertions.assertNull(out);
- out = cmf.apply("myconfig/unknown:444");
- Assertions.assertEquals("444", out);
+ out = cmf.apply("myconfig/unknown:444");
+ Assertions.assertEquals("444", out);
- out = cmf.apply("myconfig/bar");
- Assertions.assertEquals("Jacks Bar", out);
-
- cmf.stop();
+ out = cmf.apply("myconfig/bar");
+ Assertions.assertEquals("Jacks Bar", out);
+ }
}
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
index 9dd34684da5..764fb073cab 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
@@ -21,8 +21,8 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
@@ -64,7 +64,7 @@ public class ConfigMapPropertiesFunctionRouteTest extends KubernetesTestSupport
ConfigBuilder builder = new ConfigBuilder();
builder.withOauthToken(authToken);
builder.withMasterUrl(host);
- client = new DefaultKubernetesClient(builder.build());
+ client = new KubernetesClientBuilder().withConfig(builder.build()).build();
context.getRegistry().bind("KubernetesClient", client);
Map<String, String> data = Map.of("foo", "123", "bar", "Moes Bar");
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
index bf687d3716a..dab7c355f08 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
@@ -21,8 +21,8 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
@@ -47,14 +47,13 @@ public class ConfigMapPropertiesFunctionTest extends KubernetesTestSupport {
builder.withOauthToken(authToken);
builder.withMasterUrl(host);
- KubernetesClient client = new DefaultKubernetesClient(builder.build());
+ KubernetesClient client = new KubernetesClientBuilder().withConfig(builder.build()).build();
Map<String, String> data = Map.of("foo", "123", "bar", "Moes Bar");
ConfigMap cm = new ConfigMapBuilder().editOrNewMetadata().withName("myconfig").endMetadata().withData(data).build();
client.resource(cm).createOrReplace();
- try {
- ConfigMapPropertiesFunction cmf = new ConfigMapPropertiesFunction();
+ try (ConfigMapPropertiesFunction cmf = new ConfigMapPropertiesFunction()) {
cmf.setClient(client);
cmf.setCamelContext(context);
cmf.start();
@@ -70,8 +69,6 @@ public class ConfigMapPropertiesFunctionTest extends KubernetesTestSupport {
out = cmf.apply("myconfig/bar");
Assertions.assertEquals("Moes Bar", out);
-
- cmf.stop();
} finally {
client.resource(cm).delete();
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretMountPropertiesFunctionTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretMountPropertiesFunctionTest.java
index fa6e88f1c75..a60fbe77874 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretMountPropertiesFunctionTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretMountPropertiesFunctionTest.java
@@ -29,25 +29,24 @@ public class SecretMountPropertiesFunctionTest extends KubernetesTestSupport {
@Test
@Order(1)
public void secretMountPropertiesFunction() throws Exception {
- SecretPropertiesFunction cmf = new SecretPropertiesFunction();
- cmf.setMountPathSecrets("src/test/resources/");
- cmf.setClientEnabled(false);
- cmf.setCamelContext(context);
- cmf.start();
+ try (SecretPropertiesFunction cmf = new SecretPropertiesFunction()) {
+ cmf.setMountPathSecrets("src/test/resources/");
+ cmf.setClientEnabled(false);
+ cmf.setCamelContext(context);
+ cmf.start();
- String out = cmf.apply("mysecret/myuser");
- Assertions.assertEquals("donald", out);
+ String out = cmf.apply("mysecret/myuser");
+ Assertions.assertEquals("donald", out);
- out = cmf.apply("mysecret/unknown");
- Assertions.assertNull(out);
+ out = cmf.apply("mysecret/unknown");
+ Assertions.assertNull(out);
- out = cmf.apply("mysecret/unknown:444");
- Assertions.assertEquals("444", out);
+ out = cmf.apply("mysecret/unknown:444");
+ Assertions.assertEquals("444", out);
- out = cmf.apply("mysecret/mypass");
- Assertions.assertEquals("seCre!t", out);
-
- cmf.stop();
+ out = cmf.apply("mysecret/mypass");
+ Assertions.assertEquals("seCre!t", out);
+ }
}
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionRouteTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionRouteTest.java
index d9f734f581b..d5c4c6872f6 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionRouteTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionRouteTest.java
@@ -23,8 +23,8 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.SecretBuilder;
import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
@@ -66,7 +66,7 @@ public class SecretPropertiesFunctionRouteTest extends KubernetesTestSupport {
ConfigBuilder builder = new ConfigBuilder();
builder.withOauthToken(authToken);
builder.withMasterUrl(host);
- client = new DefaultKubernetesClient(builder.build());
+ client = new KubernetesClientBuilder().withConfig(builder.build()).build();
context.getRegistry().bind("KubernetesClient", client);
Map<String, String> data
@@ -93,7 +93,7 @@ public class SecretPropertiesFunctionRouteTest extends KubernetesTestSupport {
@Test
@Order(1)
- public void secretPropertiesFunction() throws Exception {
+ public void secretPropertiesFunction() {
String out = template.requestBody("direct:start", null, String.class);
Assertions.assertEquals("Connect with scott:tiger", out);
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
index 49db700b436..669690b0e70 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
@@ -23,8 +23,8 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.SecretBuilder;
import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
@@ -49,7 +49,7 @@ public class SecretPropertiesFunctionTest extends KubernetesTestSupport {
builder.withOauthToken(authToken);
builder.withMasterUrl(host);
- KubernetesClient client = new DefaultKubernetesClient(builder.build());
+ KubernetesClient client = new KubernetesClientBuilder().withConfig(builder.build()).build();
Map<String, String> data
= Map.of("myuser", Base64.getEncoder().encodeToString("scott".getBytes(StandardCharsets.UTF_8)),
@@ -57,8 +57,7 @@ public class SecretPropertiesFunctionTest extends KubernetesTestSupport {
Secret sec = new SecretBuilder().editOrNewMetadata().withName("mysecret").endMetadata().withData(data).build();
client.resource(sec).createOrReplace();
- try {
- SecretPropertiesFunction cmf = new SecretPropertiesFunction();
+ try (SecretPropertiesFunction cmf = new SecretPropertiesFunction()) {
cmf.setClient(client);
cmf.setCamelContext(context);
cmf.start();
@@ -74,8 +73,6 @@ public class SecretPropertiesFunctionTest extends KubernetesTestSupport {
out = cmf.apply("mysecret/mypass");
Assertions.assertEquals("tiger", out);
-
- cmf.stop();
} finally {
client.resource(sec).delete();
}
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 5861b4b38cc..2abd1841687 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
@@ -19,25 +19,25 @@ package org.apache.camel.component.openshift.producer;
import java.util.List;
import io.fabric8.kubernetes.api.model.APIGroupListBuilder;
-import io.fabric8.openshift.api.model.BuildConfig;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.openshift.api.model.BuildConfigListBuilder;
-import io.fabric8.openshift.client.NamespacedOpenShiftClient;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.OpenShiftServer;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
+@EnableKubernetesMockClient
public class OpenshiftBuildConfigsProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public OpenShiftServer server = new OpenShiftServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("client")
- public NamespacedOpenShiftClient loadClient() {
+ public NamespacedKubernetesClient loadClient() {
server.expect().withPath("/apis/build.openshift.io/v1/namespaces/test/buildconfigs")
.andReturn(200, new BuildConfigListBuilder().build()).once();
@@ -55,13 +55,12 @@ public class OpenshiftBuildConfigsProducerTest extends KubernetesTestSupport {
.andReturn(200, new BuildConfigListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build())
.once();
- return server.getOpenshiftClient();
+ return client;
}
@Test
- public void listTest() {
- List<BuildConfig> result = template.requestBody("direct:list", "", List.class);
-
+ void listTest() {
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(3, result.size());
}
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 8c15d2e3b8f..3340714d140 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
@@ -21,28 +21,27 @@ import java.util.List;
import java.util.Map;
import io.fabric8.kubernetes.api.model.APIGroupListBuilder;
-import io.fabric8.openshift.api.model.Build;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.openshift.api.model.BuildListBuilder;
-import io.fabric8.openshift.client.OpenShiftClient;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.OpenShiftServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
+@EnableKubernetesMockClient
public class OpenshiftBuildsProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public OpenShiftServer server = new OpenShiftServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("client")
- public OpenShiftClient loadClient() throws Exception {
+ public NamespacedKubernetesClient loadClient() throws Exception {
server.expect().withPath("/apis/build.openshift.io/v1/builds")
.andReturn(200, new BuildListBuilder().addNewItem().and().addNewItem().and().build()).once();
server.expect().withPath("/apis/build.openshift.io/v1/builds?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
@@ -53,30 +52,26 @@ public class OpenshiftBuildsProducerTest extends KubernetesTestSupport {
.addNewGroup()
.withApiVersion("v1").withName("security.openshift.io").endGroup().build())
.always();
- return server.getOpenshiftClient();
+ return client;
}
@Test
- public void listTest() {
- List<Build> result = template.requestBody("direct:list", "", List.class);
+ void listTest() {
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(2, result.size());
}
@Test
- public void listByLabelsTest() {
- Exchange ex = template.request("direct:listByLabels", new Processor() {
-
- @Override
- public void process(Exchange exchange) {
- Map<String, String> labels = new HashMap<>();
- labels.put("key1", "value1");
- labels.put("key2", "value2");
- exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_BUILDS_LABELS, labels);
- }
+ void listByLabelsTest() {
+ Exchange ex = template.request("direct:listByLabels", exchange -> {
+ Map<String, String> labels = new HashMap<>();
+ labels.put("key1", "value1");
+ labels.put("key2", "value2");
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_BUILDS_LABELS, labels);
});
- List<Build> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(2, result.size());
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
index 1f874a6856c..b8b6106ea43 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
@@ -20,43 +20,44 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.openshift.api.model.DeploymentConfig;
import io.fabric8.openshift.api.model.DeploymentConfigBuilder;
import io.fabric8.openshift.api.model.DeploymentConfigListBuilder;
-import io.fabric8.openshift.client.OpenShiftClient;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.OpenShiftServer;
import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesTestSupport;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@EnableKubernetesMockClient
public class OpenshiftDeploymentConfigsProducerTest extends KubernetesTestSupport {
- @RegisterExtension
- public OpenShiftServer server = new OpenShiftServer();
+ KubernetesMockServer server;
+ NamespacedKubernetesClient client;
@BindToRegistry("kubernetesClient")
- public OpenShiftClient getClient() {
- return server.getOpenshiftClient();
+ public NamespacedKubernetesClient getClient() {
+ return client;
}
@Test
- public void listTest() {
+ void listTest() {
server.expect().withPath("/apis/apps.openshift.io/v1/namespaces/test/deploymentconfigs")
.andReturn(200, new DeploymentConfigListBuilder().addNewItem().and().build()).once();
- List<DeploymentConfig> result = template.requestBody("direct:list", "", List.class);
+ List<?> result = template.requestBody("direct:list", "", List.class);
assertEquals(1, result.size());
}
@Test
- public void listByLabelsTest() throws Exception {
+ void listByLabelsTest() throws Exception {
server.expect()
.withPath("/apis/apps.openshift.io/v1/namespaces/test/deploymentconfigs?labelSelector="
+ toUrlEncoded("key1=value1,key2=value2"))
@@ -70,13 +71,13 @@ public class OpenshiftDeploymentConfigsProducerTest extends KubernetesTestSuppor
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS, labels);
});
- List<DeploymentConfig> result = ex.getMessage().getBody(List.class);
+ List<?> result = ex.getMessage().getBody(List.class);
assertEquals(3, result.size());
}
@Test
- public void createAndDeleteDeploymentConfig() {
+ void createAndDeleteDeploymentConfig() {
DeploymentConfig de1 = new DeploymentConfigBuilder().withNewMetadata().withNamespace("test").withName("dc1")
.withResourceVersion("1").withGeneration(2L).endMetadata().withNewSpec()
.withReplicas(0).endSpec().withNewStatus().withReplicas(1).withObservedGeneration(1L).endStatus().build();
@@ -100,7 +101,7 @@ public class OpenshiftDeploymentConfigsProducerTest extends KubernetesTestSuppor
}
@Test
- public void createScaleAndDeleteDeploymentConfig() {
+ void createScaleAndDeleteDeploymentConfig() {
server.expect().withPath("/apis/apps.openshift.io/v1/namespaces/test/deploymentconfigs/dc1")
.andReturn(200, new DeploymentConfigBuilder().withNewMetadata().withName("dc1")
.withResourceVersion("1").endMetadata().withNewSpec().withReplicas(5).endSpec().withNewStatus()
@@ -119,7 +120,6 @@ public class OpenshiftDeploymentConfigsProducerTest extends KubernetesTestSuppor
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_REPLICAS, 1);
});
- // Thread.sleep(3000);
int replicas = ex.getMessage().getBody(Integer.class);
assertEquals(5, replicas);