You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/08/05 09:36:42 UTC
[camel] branch main updated: (chores) camel-kubernetes: cleanups
(#5930)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b2466d6 (chores) camel-kubernetes: cleanups (#5930)
b2466d6 is described below
commit b2466d6ca8eb34186c2a57ced14c93113436f805
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Thu Aug 5 11:34:35 2021 +0200
(chores) camel-kubernetes: cleanups (#5930)
- removed unused method parameters
- removed usage of deprecated methods
- removed unused exceptions
- avoid catching Throwable
---
.../kubernetes/AbstractKubernetesComponent.java | 4 +-
.../component/kubernetes/KubernetesHelper.java | 6 +++
.../cloud/KubernetesClientServiceDiscovery.java | 24 +++++++-----
.../cluster/KubernetesClusterService.java | 2 +-
.../lock/KubernetesLeadershipController.java | 5 ++-
.../cluster/lock/TimedLeaderNotifier.java | 8 ++--
.../lock/impl/NativeLeaseResourceManager.java | 4 +-
.../config_maps/KubernetesConfigMapsComponent.java | 6 +--
.../config_maps/KubernetesConfigMapsProducer.java | 18 ++++-----
.../KubernetesCustomResourcesComponent.java | 6 +--
.../KubernetesCustomResourcesConsumer.java | 3 +-
.../KubernetesCustomResourcesProducer.java | 19 ++++-----
.../KubernetesDeploymentsComponent.java | 6 +--
.../deployments/KubernetesDeploymentsProducer.java | 21 ++++------
.../kubernetes/hpa/KubernetesHPAComponent.java | 6 +--
.../kubernetes/hpa/KubernetesHPAProducer.java | 18 ++++-----
.../kubernetes/job/KubernetesJobComponent.java | 6 +--
.../kubernetes/job/KubernetesJobProducer.java | 26 ++++++-------
.../namespaces/KubernetesNamespacesComponent.java | 6 +--
.../namespaces/KubernetesNamespacesProducer.java | 18 ++++-----
.../kubernetes/nodes/KubernetesNodesComponent.java | 6 +--
.../kubernetes/nodes/KubernetesNodesProducer.java | 18 ++++-----
.../KubernetesPersistentVolumesComponent.java | 7 ++--
.../KubernetesPersistentVolumesProducer.java | 12 +++---
...KubernetesPersistentVolumesClaimsComponent.java | 6 +--
.../KubernetesPersistentVolumesClaimsProducer.java | 19 ++++-----
.../kubernetes/pods/KubernetesPodsComponent.java | 6 +--
.../kubernetes/pods/KubernetesPodsProducer.java | 18 ++++-----
.../KubernetesReplicationControllersComponent.java | 6 +--
.../KubernetesReplicationControllersProducer.java | 45 ++++++++++------------
.../KubernetesResourcesQuotaComponent.java | 6 +--
.../KubernetesResourcesQuotaProducer.java | 18 ++++-----
.../secrets/KubernetesSecretsComponent.java | 6 +--
.../secrets/KubernetesSecretsProducer.java | 18 ++++-----
.../KubernetesServiceAccountsComponent.java | 6 +--
.../KubernetesServiceAccountsProducer.java | 18 ++++-----
.../services/KubernetesServicesComponent.java | 6 +--
.../services/KubernetesServicesProducer.java | 21 +++++-----
.../OpenshiftBuildConfigsComponent.java | 6 +--
.../OpenshiftBuildConfigsProducer.java | 11 +++---
.../openshift/builds/OpenshiftBuildsComponent.java | 6 +--
.../openshift/builds/OpenshiftBuildsProducer.java | 12 +++---
.../apache/camel/component/KubernetesServer.java | 8 +---
.../apache/camel/component/OpenShiftServer.java | 8 +---
.../producer/OpenshiftBuildsProducerTest.java | 2 +-
45 files changed, 210 insertions(+), 297 deletions(-)
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/AbstractKubernetesComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/AbstractKubernetesComponent.java
index 80a5671..e593119 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/AbstractKubernetesComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/AbstractKubernetesComponent.java
@@ -36,6 +36,6 @@ public abstract class AbstractKubernetesComponent extends DefaultComponent {
return endpoint;
}
- protected abstract AbstractKubernetesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception;
+ protected abstract AbstractKubernetesEndpoint doCreateEndpoint(
+ String uri, String remaining, KubernetesConfiguration config);
}
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 bcde9da..01ed3aa 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
@@ -24,6 +24,7 @@ import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.Watch;
import org.apache.camel.Exchange;
+import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -127,4 +128,9 @@ public final class KubernetesHelper {
return operation;
}
+ public static void prepareOutboundMessage(Exchange exchange, Object body) {
+ MessageHelper.copyHeaders(exchange.getIn(), exchange.getMessage(), true);
+ exchange.getMessage().setBody(body);
+ }
+
}
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 e92a169..cea85ad 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
@@ -62,16 +62,7 @@ public class KubernetesClientServiceDiscovery extends KubernetesServiceDiscovery
if (subset.getPorts().size() == 1) {
addServers(name, result, subset.getPorts().get(0), subset);
} else {
- final List<EndpointPort> ports = subset.getPorts();
- final int portSize = ports.size();
-
- EndpointPort port;
- for (int p = 0; p < portSize; p++) {
- port = ports.get(p);
- if (ObjectHelper.isEmpty(this.portName) || this.portName.endsWith(port.getName())) {
- addServers(name, result, port, subset);
- }
- }
+ addPortSet(name, result, subset);
}
}
}
@@ -79,6 +70,19 @@ public class KubernetesClientServiceDiscovery extends KubernetesServiceDiscovery
return result;
}
+ private void addPortSet(String name, List<ServiceDefinition> result, EndpointSubset subset) {
+ final List<EndpointPort> ports = subset.getPorts();
+ final int portSize = ports.size();
+
+ EndpointPort port;
+ for (int p = 0; p < portSize; p++) {
+ port = ports.get(p);
+ if (ObjectHelper.isEmpty(this.portName) || this.portName.endsWith(port.getName())) {
+ addServers(name, result, port, subset);
+ }
+ }
+ }
+
protected void addServers(String name, List<ServiceDefinition> servers, EndpointPort port, EndpointSubset subset) {
final List<EndpointAddress> addresses = subset.getAddresses();
final int size = addresses.size();
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterService.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterService.java
index d9e1ace..f254391 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterService.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterService.java
@@ -96,7 +96,7 @@ public class KubernetesClusterService extends AbstractCamelClusterService<Kubern
}
}
- ObjectHelper.notNull(config.getConfigMapName(), "configMapName");
+ ObjectHelper.notNull(config.getKubernetesResourceName(), "configMapName");
ObjectHelper.notNull(config.getClusterLabels(), "clusterLabels");
if (config.getJitterFactor() < 1) {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java
index 5f4d58d..cc868e8 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.kubernetes.cluster.lock;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -206,7 +207,7 @@ public class KubernetesLeadershipController implements Service {
// old version of the pod to shut down
long delay = this.lockConfiguration.getLeaseDurationMillis();
LOG.info("{} Current pod owns the leadership, but it will be effective in {} seconds...", logPrefix(),
- new BigDecimal(delay).divide(BigDecimal.valueOf(1000), 2, BigDecimal.ROUND_HALF_UP));
+ new BigDecimal(delay).divide(BigDecimal.valueOf(1000), 2, RoundingMode.HALF_UP));
try {
Thread.sleep(delay);
@@ -227,7 +228,7 @@ public class KubernetesLeadershipController implements Service {
// Wait always the same amount of time before giving up the leadership
long delay = this.lockConfiguration.getLeaseDurationMillis();
LOG.info("{} Current pod owns the leadership, but it will be lost in {} seconds...", logPrefix(),
- new BigDecimal(delay).divide(BigDecimal.valueOf(1000), 2, BigDecimal.ROUND_HALF_UP));
+ new BigDecimal(delay).divide(BigDecimal.valueOf(1000), 2, RoundingMode.HALF_UP));
try {
Thread.sleep(delay);
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java
index 650d592..8643f5a 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java
@@ -167,8 +167,8 @@ public class TimedLeaderNotifier implements Service {
try {
handler.onKubernetesClusterEvent(
(KubernetesClusterEvent.KubernetesClusterLeaderChangedEvent) () -> newLeader);
- } catch (Throwable t) {
- LOG.warn("Error while communicating the new leader to the handler", t);
+ } catch (Exception e) {
+ LOG.warn("Error while communicating the new leader to the handler", e);
}
}
@@ -179,8 +179,8 @@ public class TimedLeaderNotifier implements Service {
try {
handler.onKubernetesClusterEvent(
(KubernetesClusterEvent.KubernetesClusterMemberListChangedEvent) () -> newMembers);
- } catch (Throwable t) {
- LOG.warn("Error while communicating the cluster members to the handler", t);
+ } catch (Exception e) {
+ LOG.warn("Error while communicating the cluster members to the handler", e);
}
}
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 1400208..9a9976e 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
@@ -83,7 +83,7 @@ public class NativeLeaseResourceManager implements KubernetesLeaseResourceManage
.addToLabels("provider", "camel")
.endMetadata()
.withNewSpec()
- .withNewHolderIdentity(leaderInfo.getLeader())
+ .withHolderIdentity(leaderInfo.getLeader())
.withAcquireTime(now)
.withLeaseDurationSeconds(leaderInfo.getLeaseDurationSeconds())
.withRenewTime(now)
@@ -103,7 +103,7 @@ public class NativeLeaseResourceManager implements KubernetesLeaseResourceManage
ZonedDateTime now = ZonedDateTime.now();
return new LeaseBuilder(lease)
.editOrNewSpec()
- .withNewHolderIdentity(leaderInfo.getLeader())
+ .withHolderIdentity(leaderInfo.getLeader())
.withAcquireTime(now)
.withLeaseDurationSeconds(leaderInfo.getLeaseDurationSeconds())
.withRenewTime(now)
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsComponent.java
index fb2cb07..f3f3fef 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesConfigMapsComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesConfigMapsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesConfigMapsEndpoint endpoint = new KubernetesConfigMapsEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesConfigMapsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesConfigMapsEndpoint(uri, this, config);
}
}
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 ceb734c..6893bac 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
@@ -29,11 +29,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesConfigMapsProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesConfigMapsProducer.class);
@@ -81,8 +82,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
ConfigMapList configMapsList = getEndpoint().getKubernetesClient().configMaps().inAnyNamespace().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(configMapsList.getItems());
+ prepareOutboundMessage(exchange, configMapsList.getItems());
}
protected void doListConfigMapsByLabels(Exchange exchange) {
@@ -95,8 +95,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
}
configMapsList = configMaps.list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(configMapsList.getItems());
+ prepareOutboundMessage(exchange, configMapsList.getItems());
}
protected void doGetConfigMap(Exchange exchange) {
@@ -113,8 +112,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
configMap = getEndpoint().getKubernetesClient().configMaps().withName(cfMapName).get();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(configMap);
+ prepareOutboundMessage(exchange, configMap);
}
protected void doCreateConfigMap(Exchange exchange) {
@@ -140,8 +138,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
.withData(configMapData).build();
configMap = getEndpoint().getKubernetesClient().configMaps().inNamespace(namespaceName).create(cfMapCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(configMap);
+ prepareOutboundMessage(exchange, configMap);
}
protected void doDeleteConfigMap(Exchange exchange) {
@@ -158,7 +155,6 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
boolean cfMapDeleted
= getEndpoint().getKubernetesClient().configMaps().inNamespace(namespaceName).withName(configMapName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(cfMapDeleted);
+ prepareOutboundMessage(exchange, cfMapDeleted);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesComponent.java
index 127b260..28038f1 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesCustomResourcesComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesCustomResourcesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesCustomResourcesEndpoint endpoint = new KubernetesCustomResourcesEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesCustomResourcesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesCustomResourcesEndpoint(uri, this, config);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesConsumer.java
index a134ec9..34aad09 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesConsumer.java
@@ -138,13 +138,12 @@ public class KubernetesCustomResourcesConsumer extends DefaultConsumer {
throw new IllegalArgumentException("one of more of the custom resource definition argument(s) are missing.");
}
- CustomResourceDefinitionContext cRDContext = new CustomResourceDefinitionContext.Builder()
+ return new CustomResourceDefinitionContext.Builder()
.withName(config.getCrdName()) // example: "githubsources.sources.knative.dev"
.withGroup(config.getCrdGroup()) // example: "sources.knative.dev"
.withScope(config.getCrdScope()) // example: "Namespaced"
.withVersion(config.getCrdVersion()) // example: "v1alpha1"
.withPlural(config.getCrdPlural()) // example: "githubsources"
.build();
- return cRDContext;
}
}
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 423be07..074199d 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
@@ -29,13 +29,14 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesCustomResourcesProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesCustomResourcesProducer.class);
@@ -104,8 +105,7 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer {
customResourcesListItems = new JsonArray();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(customResourcesListItems);
+ prepareOutboundMessage(exchange, customResourcesListItems);
}
protected void doListByLabels(Exchange exchange, String namespaceName) {
@@ -118,8 +118,7 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer {
}
JsonArray customResourcesListItems = new JsonArray(customResourcesListJSON.getCollection("items"));
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(customResourcesListItems);
+ prepareOutboundMessage(exchange, customResourcesListItems);
}
protected void doGet(Exchange exchange, String namespaceName) {
@@ -140,8 +139,7 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer {
}
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(customResourceJSON);
+ prepareOutboundMessage(exchange, customResourceJSON);
}
protected void doDelete(Exchange exchange, String namespaceName) throws IOException {
@@ -179,8 +177,8 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer {
throw e;
}
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(gitHubSourceJSON);
+
+ prepareOutboundMessage(exchange, gitHubSourceJSON);
}
private CustomResourceDefinitionContext getCRDContext(Message message) {
@@ -221,13 +219,12 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer {
throw new IllegalArgumentException("one of more of the custom resource definition argument(s) are missing.");
}
- CustomResourceDefinitionContext cRDContext = new CustomResourceDefinitionContext.Builder()
+ return new CustomResourceDefinitionContext.Builder()
.withName(message.getHeader(KubernetesConstants.KUBERNETES_CRD_NAME, String.class)) // example: "githubsources.sources.knative.dev"
.withGroup(message.getHeader(KubernetesConstants.KUBERNETES_CRD_GROUP, String.class)) // example: "sources.knative.dev"
.withScope(message.getHeader(KubernetesConstants.KUBERNETES_CRD_SCOPE, String.class)) // example: "Namespaced"
.withVersion(message.getHeader(KubernetesConstants.KUBERNETES_CRD_VERSION, String.class)) // example: "v1alpha1"
.withPlural(message.getHeader(KubernetesConstants.KUBERNETES_CRD_PLURAL, String.class)) // example: "githubsources"
.build();
- return cRDContext;
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsComponent.java
index 4b460a3..f15366e 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesDeploymentsComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesDeploymentsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesDeploymentsEndpoint endpoint = new KubernetesDeploymentsEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesDeploymentsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesDeploymentsEndpoint(uri, this, config);
}
}
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 db8fa46..1de95c1 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
@@ -30,11 +30,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesDeploymentsProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesDeploymentsProducer.class);
@@ -86,8 +87,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
DeploymentList deploymentsList = getEndpoint().getKubernetesClient().apps().deployments().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(deploymentsList.getItems());
+ prepareOutboundMessage(exchange, deploymentsList.getItems());
}
protected void doListDeploymentsByLabels(Exchange exchange) {
@@ -100,8 +100,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
}
deploymentList = deployments.list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(deploymentList.getItems());
+ prepareOutboundMessage(exchange, deploymentList.getItems());
}
protected void doGetDeployment(Exchange exchange) {
@@ -113,8 +112,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
}
deployment = getEndpoint().getKubernetesClient().apps().deployments().withName(deploymentName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(deployment);
+ prepareOutboundMessage(exchange, deployment);
}
protected void doDeleteDeployment(Exchange exchange) {
@@ -132,8 +130,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
Boolean deployment = getEndpoint().getKubernetesClient().apps().deployments().inNamespace(namespaceName)
.withName(deploymentName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(deployment);
+ prepareOutboundMessage(exchange, deployment);
}
protected void doCreateDeployment(Exchange exchange) {
@@ -160,8 +157,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
deployment = getEndpoint().getKubernetesClient().apps().deployments().inNamespace(namespaceName)
.create(deploymentCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(deployment);
+ prepareOutboundMessage(exchange, deployment);
}
protected void doScaleDeployment(Exchange exchange) {
@@ -183,7 +179,6 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
Deployment deploymentScaled = getEndpoint().getKubernetesClient().apps().deployments().inNamespace(namespaceName)
.withName(deploymentName).scale(replicasNumber, false);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(deploymentScaled.getStatus().getReplicas());
+ prepareOutboundMessage(exchange, deploymentScaled.getStatus().getReplicas());
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAComponent.java
index f8d3544..e947ea6 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesHPAComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesHPAEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesHPAEndpoint endpoint = new KubernetesHPAEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesHPAEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesHPAEndpoint(uri, this, config);
}
}
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 a670583..ea10a4e 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
@@ -30,11 +30,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesHPAProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesHPAProducer.class);
@@ -83,8 +84,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
HorizontalPodAutoscalerList hpaList
= getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(hpaList.getItems());
+ prepareOutboundMessage(exchange, hpaList.getItems());
}
protected void doListHPAByLabel(Exchange exchange) {
@@ -102,8 +102,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
}
HorizontalPodAutoscalerList hpaList = hpas.list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(hpaList.getItems());
+ prepareOutboundMessage(exchange, hpaList.getItems());
}
protected void doGetHPA(Exchange exchange) {
@@ -121,8 +120,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
hpa = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().inNamespace(namespaceName)
.withName(podName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(hpa);
+ prepareOutboundMessage(exchange, hpa);
}
protected void doCreateHPA(Exchange exchange) {
@@ -149,8 +147,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
hpa = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().inNamespace(namespaceName)
.create(hpaCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(hpa);
+ prepareOutboundMessage(exchange, hpa);
}
protected void doDeleteHPA(Exchange exchange) {
@@ -167,7 +164,6 @@ public class KubernetesHPAProducer extends DefaultProducer {
boolean hpaDeleted = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers()
.inNamespace(namespaceName).withName(hpaName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(hpaDeleted);
+ prepareOutboundMessage(exchange, hpaDeleted);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobComponent.java
index 2112673..25f1af3 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesJobComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesJobEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesJobEndpoint endpoint = new KubernetesJobEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesJobEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesJobEndpoint(uri, this, config);
}
}
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 6e52816..7184ae8 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
@@ -34,6 +34,8 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesJobProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesJobProducer.class);
@@ -85,10 +87,9 @@ public class KubernetesJobProducer extends DefaultProducer {
}
protected void doList(Exchange exchange) {
- JobList jobList = getEndpoint().getKubernetesClient().batch().jobs().list();
+ JobList jobList = getEndpoint().getKubernetesClient().batch().v1().jobs().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(jobList.getItems());
+ prepareOutboundMessage(exchange, jobList.getItems());
}
protected void doListJobByLabel(Exchange exchange) {
@@ -98,14 +99,13 @@ public class KubernetesJobProducer extends DefaultProducer {
throw new IllegalArgumentException("Get Job by labels require specify a labels set");
}
- MixedOperation<Job, JobList, ScalableResource<Job>> jobs = getEndpoint().getKubernetesClient().batch().jobs();
+ MixedOperation<Job, JobList, ScalableResource<Job>> jobs = getEndpoint().getKubernetesClient().batch().v1().jobs();
for (Map.Entry<String, String> entry : labels.entrySet()) {
jobs.withLabel(entry.getKey(), entry.getValue());
}
JobList jobList = jobs.list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(jobList.getItems());
+ prepareOutboundMessage(exchange, jobList.getItems());
}
protected void doGetJob(Exchange exchange) {
@@ -120,10 +120,9 @@ 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().jobs().inNamespace(namespaceName).withName(jobName).get();
+ job = getEndpoint().getKubernetesClient().batch().v1().jobs().inNamespace(namespaceName).withName(jobName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(job);
+ prepareOutboundMessage(exchange, job);
}
protected void doCreateJob(Exchange exchange) {
@@ -146,10 +145,9 @@ 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().jobs().inNamespace(namespaceName).create(jobCreating);
+ job = getEndpoint().getKubernetesClient().batch().v1().jobs().inNamespace(namespaceName).create(jobCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(job);
+ prepareOutboundMessage(exchange, job);
}
protected void doDeleteJob(Exchange exchange) {
@@ -164,8 +162,8 @@ public class KubernetesJobProducer extends DefaultProducer {
throw new IllegalArgumentException("Delete a specific job require specify a namespace name");
}
- getEndpoint().getKubernetesClient().batch().jobs().inNamespace(namespaceName).withName(jobName).delete();
+ getEndpoint().getKubernetesClient().batch().v1().jobs().inNamespace(namespaceName).withName(jobName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
+ MessageHelper.copyHeaders(exchange.getIn(), exchange.getMessage(), true);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesComponent.java
index 57a422e..1c816af 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesNamespacesComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesNamespacesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesNamespacesEndpoint endpoint = new KubernetesNamespacesEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesNamespacesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesNamespacesEndpoint(uri, this, config);
}
}
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 959562d..0fe209a 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
@@ -29,11 +29,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesNamespacesProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesNamespacesProducer.class);
@@ -81,8 +82,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
NamespaceList namespacesList = getEndpoint().getKubernetesClient().namespaces().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(namespacesList.getItems());
+ prepareOutboundMessage(exchange, namespacesList.getItems());
}
protected void doListNamespaceByLabel(Exchange exchange) {
@@ -98,8 +98,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer {
}
NamespaceList namespace = namespaces.list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(namespace.getItems());
+ prepareOutboundMessage(exchange, namespace.getItems());
}
protected void doGetNamespace(Exchange exchange) {
@@ -110,8 +109,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer {
}
Namespace namespace = getEndpoint().getKubernetesClient().namespaces().withName(namespaceName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(namespace);
+ prepareOutboundMessage(exchange, namespace);
}
protected void doCreateNamespace(Exchange exchange) {
@@ -125,8 +123,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer {
= new NamespaceBuilder().withNewMetadata().withName(namespaceName).withLabels(labels).endMetadata().build();
Namespace namespace = getEndpoint().getKubernetesClient().namespaces().create(ns);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(namespace);
+ prepareOutboundMessage(exchange, namespace);
}
protected void doDeleteNamespace(Exchange exchange) {
@@ -137,7 +134,6 @@ public class KubernetesNamespacesProducer extends DefaultProducer {
}
Boolean namespace = getEndpoint().getKubernetesClient().namespaces().withName(namespaceName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(namespace);
+ prepareOutboundMessage(exchange, namespace);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesComponent.java
index 3b1773c..468ede8 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesNodesComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesNodesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesNodesEndpoint endpoint = new KubernetesNodesEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesNodesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesNodesEndpoint(uri, this, config);
}
}
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 f37c3e1..7b0a178 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
@@ -30,11 +30,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesNodesProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesNodesProducer.class);
@@ -82,8 +83,7 @@ public class KubernetesNodesProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
NodeList nodeList = getEndpoint().getKubernetesClient().nodes().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(nodeList.getItems());
+ prepareOutboundMessage(exchange, nodeList.getItems());
}
protected void doListNodesByLabels(Exchange exchange) {
@@ -95,8 +95,7 @@ public class KubernetesNodesProducer extends DefaultProducer {
}
nodeList = nodes.list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(nodeList.getItems());
+ prepareOutboundMessage(exchange, nodeList.getItems());
}
protected void doGetNode(Exchange exchange) {
@@ -108,8 +107,7 @@ public class KubernetesNodesProducer extends DefaultProducer {
}
node = getEndpoint().getKubernetesClient().nodes().withName(pvName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(node);
+ prepareOutboundMessage(exchange, node);
}
protected void doCreateNode(Exchange exchange) {
@@ -129,8 +127,7 @@ public class KubernetesNodesProducer extends DefaultProducer {
.withSpec(nodeSpec).build();
node = getEndpoint().getKubernetesClient().nodes().create(nodeCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(node);
+ prepareOutboundMessage(exchange, node);
}
protected void doDeleteNode(Exchange exchange) {
@@ -141,7 +138,6 @@ public class KubernetesNodesProducer extends DefaultProducer {
}
boolean nodeDeleted = getEndpoint().getKubernetesClient().nodes().withName(nodeName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(nodeDeleted);
+ prepareOutboundMessage(exchange, nodeDeleted);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesComponent.java
index ceb9d02..a8937cd 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesComponent.java
@@ -24,9 +24,8 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesPersistentVolumesComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesPersistentVolumesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesPersistentVolumesEndpoint endpoint = new KubernetesPersistentVolumesEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesPersistentVolumesEndpoint doCreateEndpoint(
+ String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesPersistentVolumesEndpoint(uri, this, config);
}
}
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 cd518d9..cf64935 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
@@ -28,11 +28,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesPersistentVolumesProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesPersistentVolumesProducer.class);
@@ -72,8 +73,7 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
PersistentVolumeList persistentVolumeList = getEndpoint().getKubernetesClient().persistentVolumes().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(persistentVolumeList.getItems());
+ prepareOutboundMessage(exchange, persistentVolumeList.getItems());
}
protected void doListPersistentVolumesByLabels(Exchange exchange) {
@@ -87,8 +87,7 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer {
}
pvList = pvs.list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(pvList.getItems());
+ prepareOutboundMessage(exchange, pvList.getItems());
}
protected void doGetPersistentVolume(Exchange exchange, String operation) {
@@ -100,7 +99,6 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer {
}
pv = getEndpoint().getKubernetesClient().persistentVolumes().withName(pvName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(pv);
+ prepareOutboundMessage(exchange, pv);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsComponent.java
index 0dcb700..455372f 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsComponent.java
@@ -25,9 +25,7 @@ public class KubernetesPersistentVolumesClaimsComponent extends AbstractKubernet
@Override
protected KubernetesPersistentVolumesClaimsEndpoint doCreateEndpoint(
- String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesPersistentVolumesClaimsEndpoint endpoint = new KubernetesPersistentVolumesClaimsEndpoint(uri, this, config);
- return endpoint;
+ String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesPersistentVolumesClaimsEndpoint(uri, this, config);
}
}
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 373ef45..f6edd1f 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
@@ -31,11 +31,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesPersistentVolumesClaimsProducer.class);
@@ -83,9 +84,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
PersistentVolumeClaimList persistentVolumeClaimList
= getEndpoint().getKubernetesClient().persistentVolumeClaims().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
-
- exchange.getOut().setBody(persistentVolumeClaimList.getItems());
+ prepareOutboundMessage(exchange, persistentVolumeClaimList.getItems());
}
protected void doListPersistentVolumesClaimsByLabels(Exchange exchange) {
@@ -110,8 +109,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
pvcList = pvcs.list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(pvcList.getItems());
+ prepareOutboundMessage(exchange, pvcList.getItems());
}
protected void doGetPersistentVolumeClaim(Exchange exchange) {
@@ -129,8 +127,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
}
pvc = getEndpoint().getKubernetesClient().persistentVolumeClaims().inNamespace(namespaceName).withName(pvcName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(pvc);
+ prepareOutboundMessage(exchange, pvc);
}
protected void doCreatePersistentVolumeClaim(Exchange exchange) {
@@ -159,8 +156,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
.withLabels(labels).endMetadata().withSpec(pvcSpec).build();
pvc = getEndpoint().getKubernetesClient().persistentVolumeClaims().inNamespace(namespaceName).create(pvcCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(pvc);
+ prepareOutboundMessage(exchange, pvc);
}
protected void doDeletePersistentVolumeClaim(Exchange exchange) {
@@ -178,7 +174,6 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
boolean pvcDeleted = getEndpoint().getKubernetesClient().persistentVolumeClaims().inNamespace(namespaceName)
.withName(pvcName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(pvcDeleted);
+ prepareOutboundMessage(exchange, pvcDeleted);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsComponent.java
index f2d089f..3568e93 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesPodsComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesPodsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesPodsEndpoint endpoint = new KubernetesPodsEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesPodsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesPodsEndpoint(uri, this, config);
}
}
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 eeb5c9e..d83b9e2 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
@@ -29,11 +29,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesPodsProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesPodsProducer.class);
@@ -86,8 +87,7 @@ public class KubernetesPodsProducer extends DefaultProducer {
} else {
podList = getEndpoint().getKubernetesClient().pods().inAnyNamespace().list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(podList.getItems());
+ prepareOutboundMessage(exchange, podList.getItems());
}
protected void doListPodsByLabel(Exchange exchange) {
@@ -103,8 +103,7 @@ public class KubernetesPodsProducer extends DefaultProducer {
}
PodList podList = pods.list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(podList.getItems());
+ prepareOutboundMessage(exchange, podList.getItems());
}
protected void doGetPod(Exchange exchange) {
@@ -121,8 +120,7 @@ public class KubernetesPodsProducer extends DefaultProducer {
}
pod = getEndpoint().getKubernetesClient().pods().inNamespace(namespaceName).withName(podName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(pod);
+ prepareOutboundMessage(exchange, pod);
}
protected void doCreatePod(Exchange exchange) {
@@ -147,8 +145,7 @@ public class KubernetesPodsProducer extends DefaultProducer {
.withSpec(podSpec).build();
pod = getEndpoint().getKubernetesClient().pods().inNamespace(namespaceName).create(podCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(pod);
+ prepareOutboundMessage(exchange, pod);
}
protected void doDeletePod(Exchange exchange) {
@@ -164,7 +161,6 @@ public class KubernetesPodsProducer extends DefaultProducer {
}
boolean podDeleted = getEndpoint().getKubernetesClient().pods().inNamespace(namespaceName).withName(podName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(podDeleted);
+ prepareOutboundMessage(exchange, podDeleted);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersComponent.java
index bb696c1..7b47aa3 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersComponent.java
@@ -25,9 +25,7 @@ public class KubernetesReplicationControllersComponent extends AbstractKubernete
@Override
protected KubernetesReplicationControllersEndpoint doCreateEndpoint(
- String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesReplicationControllersEndpoint endpoint = new KubernetesReplicationControllersEndpoint(uri, this, config);
- return endpoint;
+ String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesReplicationControllersEndpoint(uri, this, config);
}
}
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 4e84092..cf1d896 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
@@ -31,11 +31,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesReplicationControllersProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesReplicationControllersProducer.class);
@@ -56,27 +57,27 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
switch (operation) {
case KubernetesOperations.LIST_REPLICATION_CONTROLLERS_OPERATION:
- doList(exchange, operation);
+ doList(exchange);
break;
case KubernetesOperations.LIST_REPLICATION_CONTROLLERS_BY_LABELS_OPERATION:
- doListReplicationControllersByLabels(exchange, operation);
+ doListReplicationControllersByLabels(exchange);
break;
case KubernetesOperations.GET_REPLICATION_CONTROLLER_OPERATION:
- doGetReplicationController(exchange, operation);
+ doGetReplicationController(exchange);
break;
case KubernetesOperations.CREATE_REPLICATION_CONTROLLER_OPERATION:
- doCreateReplicationController(exchange, operation);
+ doCreateReplicationController(exchange);
break;
case KubernetesOperations.DELETE_REPLICATION_CONTROLLER_OPERATION:
- doDeleteReplicationController(exchange, operation);
+ doDeleteReplicationController(exchange);
break;
case KubernetesOperations.SCALE_REPLICATION_CONTROLLER_OPERATION:
- doScaleReplicationController(exchange, operation);
+ doScaleReplicationController(exchange);
break;
default:
@@ -84,7 +85,7 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
}
}
- protected void doList(Exchange exchange, String operation) {
+ protected void doList(Exchange exchange) {
ReplicationControllerList rcList = null;
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (!ObjectHelper.isEmpty(namespaceName)) {
@@ -93,11 +94,10 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
rcList = getEndpoint().getKubernetesClient().replicationControllers().inAnyNamespace().list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(rcList.getItems());
+ prepareOutboundMessage(exchange, rcList.getItems());
}
- protected void doListReplicationControllersByLabels(Exchange exchange, String operation) {
+ protected void doListReplicationControllersByLabels(Exchange exchange) {
ReplicationControllerList rcList = null;
Map<String, String> labels
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLERS_LABELS, Map.class);
@@ -121,12 +121,11 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
rcList = replicationControllers.list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(rcList.getItems());
+ prepareOutboundMessage(exchange, rcList.getItems());
}
- protected void doGetReplicationController(Exchange exchange, String operation) {
+ 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);
@@ -141,11 +140,10 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
}
rc = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName).withName(rcName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(rc);
+ prepareOutboundMessage(exchange, rc);
}
- protected void doCreateReplicationController(Exchange exchange, String operation) {
+ 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);
@@ -171,11 +169,10 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
.withLabels(labels).endMetadata().withSpec(rcSpec).build();
rc = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName).create(rcCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(rc);
+ prepareOutboundMessage(exchange, rc);
}
- protected void doDeleteReplicationController(Exchange exchange, String operation) {
+ protected void doDeleteReplicationController(Exchange exchange) {
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)) {
@@ -190,11 +187,10 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
boolean rcDeleted = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName)
.withName(rcName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(rcDeleted);
+ prepareOutboundMessage(exchange, rcDeleted);
}
- protected void doScaleReplicationController(Exchange exchange, String operation) {
+ protected void doScaleReplicationController(Exchange exchange) {
String rcName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLER_NAME, String.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
Integer replicasNumber
@@ -215,7 +211,6 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
ReplicationController rcScaled = getEndpoint().getKubernetesClient().replicationControllers().inNamespace(namespaceName)
.withName(rcName).scale(replicasNumber, false);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(rcScaled.getStatus().getReplicas());
+ prepareOutboundMessage(exchange, rcScaled.getStatus().getReplicas());
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaComponent.java
index 182d614..02275cf 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesResourcesQuotaComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesResourcesQuotaEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesResourcesQuotaEndpoint endpoint = new KubernetesResourcesQuotaEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesResourcesQuotaEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesResourcesQuotaEndpoint(uri, this, config);
}
}
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 c32f308..e1fee93 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
@@ -31,11 +31,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesResourcesQuotaProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesResourcesQuotaProducer.class);
@@ -83,8 +84,7 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
ResourceQuotaList resList = getEndpoint().getKubernetesClient().resourceQuotas().inAnyNamespace().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(resList.getItems());
+ prepareOutboundMessage(exchange, resList.getItems());
}
protected void doListResourceQuotasByLabels(Exchange exchange) {
@@ -108,8 +108,7 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
resList = resQuota.list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(resList.getItems());
+ prepareOutboundMessage(exchange, resList.getItems());
}
protected void doGetResourceQuota(Exchange exchange) {
@@ -126,8 +125,7 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
}
rq = getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName).withName(rqName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(rq);
+ prepareOutboundMessage(exchange, rq);
}
protected void doCreateResourceQuota(Exchange exchange) {
@@ -154,8 +152,7 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
.endMetadata().withSpec(rqSpec).build();
rq = getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName).create(rqCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(rq);
+ prepareOutboundMessage(exchange, rq);
}
protected void doDeleteResourceQuota(Exchange exchange) {
@@ -172,7 +169,6 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
boolean rqDeleted
= getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName).withName(rqName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(rqDeleted);
+ prepareOutboundMessage(exchange, rqDeleted);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsComponent.java
index d5c0b78..f575332 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesSecretsComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesSecretsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesSecretsEndpoint endpoint = new KubernetesSecretsEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesSecretsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesSecretsEndpoint(uri, this, config);
}
}
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 d520430..79c0e53 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
@@ -29,11 +29,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesSecretsProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesSecretsProducer.class);
@@ -80,8 +81,7 @@ public class KubernetesSecretsProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
SecretList secretsList = getEndpoint().getKubernetesClient().secrets().inAnyNamespace().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(secretsList.getItems());
+ prepareOutboundMessage(exchange, secretsList.getItems());
}
protected void doListSecretsByLabels(Exchange exchange) {
@@ -104,8 +104,7 @@ public class KubernetesSecretsProducer extends DefaultProducer {
secretsList = secrets.list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(secretsList.getItems());
+ prepareOutboundMessage(exchange, secretsList.getItems());
}
protected void doGetSecret(Exchange exchange) {
@@ -122,8 +121,7 @@ public class KubernetesSecretsProducer extends DefaultProducer {
}
secret = getEndpoint().getKubernetesClient().secrets().inNamespace(namespaceName).withName(secretName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(secret);
+ prepareOutboundMessage(exchange, secret);
}
protected void doCreateSecret(Exchange exchange) {
@@ -140,8 +138,7 @@ public class KubernetesSecretsProducer extends DefaultProducer {
}
secret = getEndpoint().getKubernetesClient().secrets().inNamespace(namespaceName).create(secretToCreate);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(secret);
+ prepareOutboundMessage(exchange, secret);
}
protected void doDeleteSecret(Exchange exchange) {
@@ -158,7 +155,6 @@ public class KubernetesSecretsProducer extends DefaultProducer {
boolean secretDeleted
= getEndpoint().getKubernetesClient().secrets().inNamespace(namespaceName).withName(secretName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(secretDeleted);
+ prepareOutboundMessage(exchange, secretDeleted);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsComponent.java
index 9d3551e..79d2e5b 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesServiceAccountsComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesServiceAccountsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesServiceAccountsEndpoint endpoint = new KubernetesServiceAccountsEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesServiceAccountsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesServiceAccountsEndpoint(uri, this, config);
}
}
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 fd0677e..cd423b7 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
@@ -29,11 +29,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesServiceAccountsProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesServiceAccountsProducer.class);
@@ -80,8 +81,7 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
ServiceAccountList saList = getEndpoint().getKubernetesClient().serviceAccounts().inAnyNamespace().list();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(saList.getItems());
+ prepareOutboundMessage(exchange, saList.getItems());
}
protected void doListServiceAccountsByLabels(Exchange exchange) {
@@ -105,8 +105,7 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
saList = serviceAccounts.list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(saList.getItems());
+ prepareOutboundMessage(exchange, saList.getItems());
}
protected void doGetServiceAccount(Exchange exchange) {
@@ -123,8 +122,7 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
}
sa = getEndpoint().getKubernetesClient().serviceAccounts().inNamespace(namespaceName).withName(saName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(sa);
+ prepareOutboundMessage(exchange, sa);
}
protected void doCreateServiceAccount(Exchange exchange) {
@@ -142,8 +140,7 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
}
sa = getEndpoint().getKubernetesClient().serviceAccounts().inNamespace(namespaceName).create(saToCreate);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(sa);
+ prepareOutboundMessage(exchange, sa);
}
protected void doDeleteServiceAccount(Exchange exchange) {
@@ -160,7 +157,6 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
boolean saDeleted
= getEndpoint().getKubernetesClient().serviceAccounts().inNamespace(namespaceName).withName(saName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(saDeleted);
+ prepareOutboundMessage(exchange, saDeleted);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesComponent.java
index f3c1747..ba13f5a 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class KubernetesServicesComponent extends AbstractKubernetesComponent {
@Override
- protected KubernetesServicesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- KubernetesServicesEndpoint endpoint = new KubernetesServicesEndpoint(uri, this, config);
- return endpoint;
+ protected KubernetesServicesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new KubernetesServicesEndpoint(uri, this, config);
}
}
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 19b77fb..dd68eec 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
@@ -31,11 +31,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class KubernetesServicesProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(KubernetesServicesProducer.class);
@@ -88,8 +89,7 @@ public class KubernetesServicesProducer extends DefaultProducer {
} else {
servicesList = getEndpoint().getKubernetesClient().services().inAnyNamespace().list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(servicesList.getItems());
+ prepareOutboundMessage(exchange, servicesList.getItems());
}
protected void doListServiceByLabels(Exchange exchange) {
@@ -111,8 +111,7 @@ public class KubernetesServicesProducer extends DefaultProducer {
}
servicesList = services.list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(servicesList.getItems());
+ prepareOutboundMessage(exchange, servicesList.getItems());
}
protected void doGetService(Exchange exchange) {
@@ -128,8 +127,8 @@ public class KubernetesServicesProducer extends DefaultProducer {
throw new IllegalArgumentException("Get a specific service require specify a namespace name");
}
service = getEndpoint().getKubernetesClient().services().inNamespace(namespaceName).withName(serviceName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(service);
+
+ prepareOutboundMessage(exchange, service);
}
protected void doCreateService(Exchange exchange) {
@@ -153,8 +152,8 @@ public class KubernetesServicesProducer extends DefaultProducer {
Service serviceCreating = new ServiceBuilder().withNewMetadata().withName(serviceName).withLabels(labels).endMetadata()
.withSpec(serviceSpec).build();
service = getEndpoint().getKubernetesClient().services().inNamespace(namespaceName).create(serviceCreating);
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(service);
+
+ prepareOutboundMessage(exchange, service);
}
protected void doDeleteService(Exchange exchange) {
@@ -170,7 +169,7 @@ public class KubernetesServicesProducer extends DefaultProducer {
}
boolean serviceDeleted
= getEndpoint().getKubernetesClient().services().inNamespace(namespaceName).withName(serviceName).delete();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(serviceDeleted);
+
+ prepareOutboundMessage(exchange, serviceDeleted);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsComponent.java
index 56d50f2..52ea17f 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsComponent.java
@@ -24,9 +24,7 @@ import org.apache.camel.spi.annotations.Component;
public class OpenshiftBuildConfigsComponent extends AbstractKubernetesComponent {
@Override
- protected OpenshiftBuildConfigsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- OpenshiftBuildConfigsEndpoint endpoint = new OpenshiftBuildConfigsEndpoint(uri, this, config);
- return endpoint;
+ protected OpenshiftBuildConfigsEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new OpenshiftBuildConfigsEndpoint(uri, this, config);
}
}
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 f848bd9..db60282 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
@@ -31,11 +31,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class OpenshiftBuildConfigsProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(OpenshiftBuildConfigsProducer.class);
@@ -75,7 +76,7 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
BuildConfigList buildConfigsList
= getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs().inAnyNamespace().list();
- exchange.getOut().setBody(buildConfigsList.getItems());
+ exchange.getMessage().setBody(buildConfigsList.getItems());
}
protected void doListBuildConfigsByLabels(Exchange exchange) {
@@ -98,8 +99,7 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer {
}
buildConfigsList = buildConfigs.list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(buildConfigsList.getItems());
+ prepareOutboundMessage(exchange, buildConfigsList.getItems());
}
protected void doGetBuildConfig(Exchange exchange) {
@@ -117,7 +117,6 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer {
buildConfig = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs().inNamespace(namespaceName)
.withName(buildConfigName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(buildConfig);
+ prepareOutboundMessage(exchange, buildConfig);
}
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsComponent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsComponent.java
index 23be1e4..578a39b 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsComponent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsComponent.java
@@ -25,9 +25,7 @@ import org.apache.camel.spi.annotations.Component;
public class OpenshiftBuildsComponent extends AbstractKubernetesComponent {
@Override
- protected AbstractKubernetesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config)
- throws Exception {
- OpenshiftBuildsEndpoint endpoint = new OpenshiftBuildsEndpoint(uri, this, config);
- return endpoint;
+ protected AbstractKubernetesEndpoint doCreateEndpoint(String uri, String remaining, KubernetesConfiguration config) {
+ return new OpenshiftBuildsEndpoint(uri, this, config);
}
}
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 fed7632..f0f7f19 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
@@ -31,11 +31,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants;
import org.apache.camel.component.kubernetes.KubernetesHelper;
import org.apache.camel.component.kubernetes.KubernetesOperations;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.component.kubernetes.KubernetesHelper.prepareOutboundMessage;
+
public class OpenshiftBuildsProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(OpenshiftBuildsProducer.class);
@@ -74,7 +75,7 @@ public class OpenshiftBuildsProducer extends DefaultProducer {
protected void doList(Exchange exchange) {
BuildList buildList = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).builds().inAnyNamespace().list();
- exchange.getOut().setBody(buildList.getItems());
+ exchange.getMessage().setBody(buildList.getItems());
}
protected void doListBuildByLabels(Exchange exchange) {
@@ -97,8 +98,8 @@ public class OpenshiftBuildsProducer extends DefaultProducer {
}
buildList = builds.list();
}
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(buildList.getItems());
+
+ prepareOutboundMessage(exchange, buildList.getItems());
}
protected void doGetBuild(Exchange exchange) {
@@ -116,7 +117,6 @@ public class OpenshiftBuildsProducer extends DefaultProducer {
build = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).builds().inNamespace(namespaceName)
.withName(buildName).get();
- MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true);
- exchange.getOut().setBody(build);
+ prepareOutboundMessage(exchange, build);
}
}
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
index 31aaa62..1524e27 100644
--- 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
@@ -99,15 +99,11 @@ public class KubernetesServer implements BeforeEachCallback, AfterEachCallback {
((TimesOnceableOrHttpHeaderable) ((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always();
}
- public MockWebServer getMockServer() {
- return this.mock.getServer();
- }
-
public RecordedRequest getLastRequest() throws InterruptedException {
- int count = this.mock.getServer().getRequestCount();
+ int count = this.mock.getRequestCount();
RecordedRequest request;
- for (request = null; count-- > 0; request = this.mock.getServer().takeRequest()) {
+ 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
index aba4a6f..861d757 100644
--- 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
@@ -92,15 +92,11 @@ public class OpenShiftServer implements BeforeEachCallback, AfterEachCallback {
((TimesOnceableOrHttpHeaderable) ((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always();
}
- public MockWebServer getMockServer() {
- return this.mock.getServer();
- }
-
public RecordedRequest getLastRequest() throws InterruptedException {
- int count = this.mock.getServer().getRequestCount();
+ int count = this.mock.getRequestCount();
RecordedRequest request;
- for (request = null; count-- > 0; request = this.mock.getServer().takeRequest()) {
+ for (request = null; count-- > 0; request = this.mock.takeRequest()) {
}
return request;
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 df043d3..7892624 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
@@ -76,7 +76,7 @@ public class OpenshiftBuildsProducerTest extends KubernetesTestSupport {
}
});
- List<Build> result = ex.getOut().getBody(List.class);
+ List<Build> result = ex.getMessage().getBody(List.class);
assertEquals(2, result.size());
}