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 7edb494 (chores) camel-kubernetes: remove unused parameters (#5852) 7edb494 is described below commit 7edb4941cc4e3a42035bbe2ee4cc745edf3324be Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Wed Jul 21 09:20:11 2021 +0200 (chores) camel-kubernetes: remove unused parameters (#5852) --- .../config_maps/KubernetesConfigMapsProducer.java | 20 +++++++++--------- .../KubernetesCustomResourcesProducer.java | 23 ++++++++++++--------- .../deployments/KubernetesDeploymentsProducer.java | 24 +++++++++++----------- .../kubernetes/hpa/KubernetesHPAProducer.java | 20 +++++++++--------- .../kubernetes/job/KubernetesJobProducer.java | 20 +++++++++--------- .../namespaces/KubernetesNamespacesProducer.java | 20 +++++++++--------- .../kubernetes/nodes/KubernetesNodesProducer.java | 20 +++++++++--------- .../KubernetesPersistentVolumesProducer.java | 8 ++++---- .../KubernetesPersistentVolumesClaimsProducer.java | 20 +++++++++--------- .../kubernetes/pods/KubernetesPodsProducer.java | 20 +++++++++--------- .../KubernetesResourcesQuotaProducer.java | 20 +++++++++--------- .../secrets/KubernetesSecretsProducer.java | 20 +++++++++--------- .../KubernetesServiceAccountsProducer.java | 20 +++++++++--------- .../services/KubernetesServicesProducer.java | 20 +++++++++--------- .../OpenshiftBuildConfigsProducer.java | 12 +++++------ .../openshift/builds/OpenshiftBuildsProducer.java | 12 +++++------ 16 files changed, 151 insertions(+), 148 deletions(-) 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 a799e7b..4aad154 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 @@ -59,23 +59,23 @@ public class KubernetesConfigMapsProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_CONFIGMAPS: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_CONFIGMAPS_BY_LABELS_OPERATION: - doListConfigMapsByLabels(exchange, operation); + doListConfigMapsByLabels(exchange); break; case KubernetesOperations.GET_CONFIGMAP_OPERATION: - doGetConfigMap(exchange, operation); + doGetConfigMap(exchange); break; case KubernetesOperations.CREATE_CONFIGMAP_OPERATION: - doCreateConfigMap(exchange, operation); + doCreateConfigMap(exchange); break; case KubernetesOperations.DELETE_CONFIGMAP_OPERATION: - doDeleteConfigMap(exchange, operation); + doDeleteConfigMap(exchange); break; default: @@ -83,14 +83,14 @@ public class KubernetesConfigMapsProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { ConfigMapList configMapsList = getEndpoint().getKubernetesClient().configMaps().inAnyNamespace().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); exchange.getOut().setBody(configMapsList.getItems()); } - protected void doListConfigMapsByLabels(Exchange exchange, String operation) { + protected void doListConfigMapsByLabels(Exchange exchange) { ConfigMapList configMapsList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, Map.class); FilterWatchListMultiDeletable<ConfigMap, ConfigMapList> configMaps @@ -104,7 +104,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer { exchange.getOut().setBody(configMapsList.getItems()); } - protected void doGetConfigMap(Exchange exchange, String operation) throws Exception { + protected void doGetConfigMap(Exchange exchange) throws Exception { ConfigMap configMap = null; String cfMapName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -122,7 +122,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer { exchange.getOut().setBody(configMap); } - protected void doCreateConfigMap(Exchange exchange, String operation) throws Exception { + protected void doCreateConfigMap(Exchange exchange) throws Exception { ConfigMap configMap = null; String cfMapName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -149,7 +149,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer { exchange.getOut().setBody(configMap); } - protected void doDeleteConfigMap(Exchange exchange, String operation) throws Exception { + protected void doDeleteConfigMap(Exchange exchange) throws Exception { String configMapName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(configMapName)) { 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 024e21b..530a210 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 @@ -69,23 +69,23 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_CUSTOMRESOURCES: - doList(exchange, operation, namespace); + doList(exchange, namespace); break; case KubernetesOperations.LIST_CUSTOMRESOURCES_BY_LABELS_OPERATION: - doListByLabels(exchange, operation, namespace); + doListByLabels(exchange, namespace); break; case KubernetesOperations.GET_CUSTOMRESOURCE: - doGet(exchange, operation, namespace); + doGet(exchange, namespace); break; case KubernetesOperations.DELETE_CUSTOMRESOURCE: - doDelete(exchange, operation, namespace); + doDelete(exchange, namespace); break; case KubernetesOperations.CREATE_CUSTOMRESOURCE: - doCreate(exchange, operation, namespace); + doCreate(exchange, namespace); break; default: @@ -93,7 +93,7 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation, String namespaceName) { + protected void doList(Exchange exchange, String namespaceName) { JsonObject customResourcesListJSON = new JsonObject( getEndpoint().getKubernetesClient().customResource(getCRDContext(exchange.getIn())).list(namespaceName)); if (LOG.isDebugEnabled()) { @@ -111,7 +111,7 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer { exchange.getOut().setBody(customResourcesListItems); } - protected void doListByLabels(Exchange exchange, String operation, String namespaceName) { + protected void doListByLabels(Exchange exchange, String namespaceName) { Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CRD_LABELS, Map.class); JsonObject customResourcesListJSON = new JsonObject( getEndpoint().getKubernetesClient().customResource(getCRDContext(exchange.getIn())).list(namespaceName, @@ -125,7 +125,8 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer { exchange.getOut().setBody(customResourcesListItems); } - protected void doGet(Exchange exchange, String operation, String namespaceName) throws Exception { + protected void doGet(Exchange exchange, String namespaceName) + throws Exception { String customResourceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CRD_INSTANCE_NAME, String.class); if (ObjectHelper.isEmpty(customResourceName)) { throw new IllegalArgumentException("Get a specific Deployment require specify a Deployment name"); @@ -147,7 +148,8 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer { exchange.getOut().setBody(customResourceJSON); } - protected void doDelete(Exchange exchange, String operation, String namespaceName) throws Exception { + protected void doDelete(Exchange exchange, String namespaceName) + throws Exception { String customResourceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CRD_INSTANCE_NAME, String.class); if (ObjectHelper.isEmpty(customResourceName)) { LOG.error("Delete a specific deployment require specify a deployment name"); @@ -168,7 +170,8 @@ public class KubernetesCustomResourcesProducer extends DefaultProducer { } } - protected void doCreate(Exchange exchange, String operation, String namespaceName) throws Exception { + protected void doCreate(Exchange exchange, String namespaceName) + throws Exception { String customResourceInstance = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CRD_INSTANCE, String.class); JsonObject gitHubSourceJSON = new JsonObject(); try { 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 518b089..8e33d61 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 @@ -60,27 +60,27 @@ public class KubernetesDeploymentsProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_DEPLOYMENTS: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_DEPLOYMENTS_BY_LABELS_OPERATION: - doListDeploymentsByLabels(exchange, operation); + doListDeploymentsByLabels(exchange); break; case KubernetesOperations.GET_DEPLOYMENT: - doGetDeployment(exchange, operation); + doGetDeployment(exchange); break; case KubernetesOperations.DELETE_DEPLOYMENT: - doDeleteDeployment(exchange, operation); + doDeleteDeployment(exchange); break; case KubernetesOperations.CREATE_DEPLOYMENT: - doCreateDeployment(exchange, operation); + doCreateDeployment(exchange); break; case KubernetesOperations.SCALE_DEPLOYMENT: - doScaleDeployment(exchange, operation); + doScaleDeployment(exchange); break; default: @@ -88,14 +88,14 @@ public class KubernetesDeploymentsProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { DeploymentList deploymentsList = getEndpoint().getKubernetesClient().apps().deployments().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); exchange.getOut().setBody(deploymentsList.getItems()); } - protected void doListDeploymentsByLabels(Exchange exchange, String operation) { + protected void doListDeploymentsByLabels(Exchange exchange) { DeploymentList deploymentList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS, Map.class); MixedOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>> deployments = getEndpoint() @@ -109,7 +109,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer { exchange.getOut().setBody(deploymentList.getItems()); } - protected void doGetDeployment(Exchange exchange, String operation) throws Exception { + protected void doGetDeployment(Exchange exchange) throws Exception { Deployment deployment = null; String deploymentName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_NAME, String.class); if (ObjectHelper.isEmpty(deploymentName)) { @@ -122,7 +122,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer { exchange.getOut().setBody(deployment); } - protected void doDeleteDeployment(Exchange exchange, String operation) { + protected void doDeleteDeployment(Exchange exchange) { String deploymentName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(deploymentName)) { @@ -141,7 +141,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer { exchange.getOut().setBody(deployment); } - protected void doCreateDeployment(Exchange exchange, String operation) throws Exception { + protected void doCreateDeployment(Exchange exchange) throws Exception { Deployment deployment = null; String deploymentName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -169,7 +169,7 @@ public class KubernetesDeploymentsProducer extends DefaultProducer { exchange.getOut().setBody(deployment); } - protected void doScaleDeployment(Exchange exchange, String operation) throws Exception { + protected void doScaleDeployment(Exchange exchange) throws Exception { String deploymentName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); Integer replicasNumber = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_REPLICAS, Integer.class); 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 f25763d..552f42f 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 @@ -60,23 +60,23 @@ public class KubernetesHPAProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_HPA: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_HPA_BY_LABELS_OPERATION: - doListHPAByLabel(exchange, operation); + doListHPAByLabel(exchange); break; case KubernetesOperations.GET_HPA_OPERATION: - doGetHPA(exchange, operation); + doGetHPA(exchange); break; case KubernetesOperations.CREATE_HPA_OPERATION: - doCreateHPA(exchange, operation); + doCreateHPA(exchange); break; case KubernetesOperations.DELETE_HPA_OPERATION: - doDeleteHPA(exchange, operation); + doDeleteHPA(exchange); break; default: @@ -84,7 +84,7 @@ public class KubernetesHPAProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { HorizontalPodAutoscalerList hpaList = getEndpoint().getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers().list(); @@ -92,7 +92,7 @@ public class KubernetesHPAProducer extends DefaultProducer { exchange.getOut().setBody(hpaList.getItems()); } - protected void doListHPAByLabel(Exchange exchange, String operation) { + protected void doListHPAByLabel(Exchange exchange) { Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_HPA_LABELS, Map.class); if (ObjectHelper.isEmpty(labels)) { LOG.error("Get HPA by labels require specify a labels set"); @@ -111,7 +111,7 @@ public class KubernetesHPAProducer extends DefaultProducer { exchange.getOut().setBody(hpaList.getItems()); } - protected void doGetHPA(Exchange exchange, String operation) throws Exception { + protected void doGetHPA(Exchange exchange) throws Exception { HorizontalPodAutoscaler hpa = null; String podName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_HPA_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -130,7 +130,7 @@ public class KubernetesHPAProducer extends DefaultProducer { exchange.getOut().setBody(hpa); } - protected void doCreateHPA(Exchange exchange, String operation) throws Exception { + protected void doCreateHPA(Exchange exchange) throws Exception { HorizontalPodAutoscaler hpa = null; String hpaName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_HPA_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -158,7 +158,7 @@ public class KubernetesHPAProducer extends DefaultProducer { exchange.getOut().setBody(hpa); } - protected void doDeleteHPA(Exchange exchange, String operation) throws Exception { + protected void doDeleteHPA(Exchange exchange) throws Exception { String hpaName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_HPA_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(hpaName)) { 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 2087750..1eaa038 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 @@ -60,23 +60,23 @@ public class KubernetesJobProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_JOB: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_JOB_BY_LABELS_OPERATION: - doListJobByLabel(exchange, operation); + doListJobByLabel(exchange); break; case KubernetesOperations.GET_JOB_OPERATION: - doGetJob(exchange, operation); + doGetJob(exchange); break; case KubernetesOperations.CREATE_JOB_OPERATION: - doCreateJob(exchange, operation); + doCreateJob(exchange); break; case KubernetesOperations.DELETE_JOB_OPERATION: - doDeleteJob(exchange, operation); + doDeleteJob(exchange); break; default: @@ -84,14 +84,14 @@ public class KubernetesJobProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { JobList jobList = getEndpoint().getKubernetesClient().batch().jobs().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); exchange.getOut().setBody(jobList.getItems()); } - protected void doListJobByLabel(Exchange exchange, String operation) { + protected void doListJobByLabel(Exchange exchange) { Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_JOB_LABELS, Map.class); if (ObjectHelper.isEmpty(labels)) { LOG.error("Get Job by labels require specify a labels set"); @@ -108,7 +108,7 @@ public class KubernetesJobProducer extends DefaultProducer { exchange.getOut().setBody(jobList.getItems()); } - protected void doGetJob(Exchange exchange, String operation) throws Exception { + protected void doGetJob(Exchange exchange) throws Exception { Job job = null; String jobName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_JOB_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -126,7 +126,7 @@ public class KubernetesJobProducer extends DefaultProducer { exchange.getOut().setBody(job); } - protected void doCreateJob(Exchange exchange, String operation) throws Exception { + protected void doCreateJob(Exchange exchange) throws Exception { Job job = null; String jobName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_JOB_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -152,7 +152,7 @@ public class KubernetesJobProducer extends DefaultProducer { exchange.getOut().setBody(job); } - protected void doDeleteJob(Exchange exchange, String operation) throws Exception { + protected void doDeleteJob(Exchange exchange) throws Exception { String jobName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_JOB_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(jobName)) { 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 622dbf6..eab02d2 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 @@ -59,23 +59,23 @@ public class KubernetesNamespacesProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_NAMESPACE_OPERATION: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_NAMESPACE_BY_LABELS_OPERATION: - doListNamespaceByLabel(exchange, operation); + doListNamespaceByLabel(exchange); break; case KubernetesOperations.GET_NAMESPACE_OPERATION: - doGetNamespace(exchange, operation); + doGetNamespace(exchange); break; case KubernetesOperations.CREATE_NAMESPACE_OPERATION: - doCreateNamespace(exchange, operation); + doCreateNamespace(exchange); break; case KubernetesOperations.DELETE_NAMESPACE_OPERATION: - doDeleteNamespace(exchange, operation); + doDeleteNamespace(exchange); break; default: @@ -83,14 +83,14 @@ public class KubernetesNamespacesProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { NamespaceList namespacesList = getEndpoint().getKubernetesClient().namespaces().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); exchange.getOut().setBody(namespacesList.getItems()); } - protected void doListNamespaceByLabel(Exchange exchange, String operation) { + protected void doListNamespaceByLabel(Exchange exchange) { Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_LABELS, Map.class); if (ObjectHelper.isEmpty(labels)) { LOG.error("Get a specific namespace by labels require specify a labels set"); @@ -107,7 +107,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer { exchange.getOut().setBody(namespace.getItems()); } - protected void doGetNamespace(Exchange exchange, String operation) { + protected void doGetNamespace(Exchange exchange) { String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(namespaceName)) { LOG.error("Get a specific namespace require specify a namespace name"); @@ -119,7 +119,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer { exchange.getOut().setBody(namespace); } - protected void doCreateNamespace(Exchange exchange, String operation) { + protected void doCreateNamespace(Exchange exchange) { String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(namespaceName)) { LOG.error("Create a specific namespace require specify a namespace name"); @@ -134,7 +134,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer { exchange.getOut().setBody(namespace); } - protected void doDeleteNamespace(Exchange exchange, String operation) { + protected void doDeleteNamespace(Exchange exchange) { String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(namespaceName)) { LOG.error("Delete a specific namespace require specify a namespace name"); 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 1c4a019..739a80e 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 @@ -60,23 +60,23 @@ public class KubernetesNodesProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_NODES: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_NODES_BY_LABELS_OPERATION: - doListNodesByLabels(exchange, operation); + doListNodesByLabels(exchange); break; case KubernetesOperations.GET_NODE_OPERATION: - doGetNode(exchange, operation); + doGetNode(exchange); break; case KubernetesOperations.CREATE_NODE_OPERATION: - doCreateNode(exchange, operation); + doCreateNode(exchange); break; case KubernetesOperations.DELETE_NODE_OPERATION: - doDeleteNode(exchange, operation); + doDeleteNode(exchange); break; default: @@ -84,14 +84,14 @@ public class KubernetesNodesProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) throws Exception { + protected void doList(Exchange exchange) throws Exception { NodeList nodeList = getEndpoint().getKubernetesClient().nodes().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); exchange.getOut().setBody(nodeList.getItems()); } - protected void doListNodesByLabels(Exchange exchange, String operation) { + protected void doListNodesByLabels(Exchange exchange) { NodeList nodeList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NODES_LABELS, Map.class); NonNamespaceOperation<Node, NodeList, Resource<Node>> nodes = getEndpoint().getKubernetesClient().nodes(); @@ -104,7 +104,7 @@ public class KubernetesNodesProducer extends DefaultProducer { exchange.getOut().setBody(nodeList.getItems()); } - protected void doGetNode(Exchange exchange, String operation) throws Exception { + protected void doGetNode(Exchange exchange) throws Exception { Node node = null; String pvName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NODE_NAME, String.class); if (ObjectHelper.isEmpty(pvName)) { @@ -117,7 +117,7 @@ public class KubernetesNodesProducer extends DefaultProducer { exchange.getOut().setBody(node); } - protected void doCreateNode(Exchange exchange, String operation) throws Exception { + protected void doCreateNode(Exchange exchange) throws Exception { Node node = null; String nodeName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NODE_NAME, String.class); NodeSpec nodeSpec = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NODE_SPEC, NodeSpec.class); @@ -138,7 +138,7 @@ public class KubernetesNodesProducer extends DefaultProducer { exchange.getOut().setBody(node); } - protected void doDeleteNode(Exchange exchange, String operation) throws Exception { + protected void doDeleteNode(Exchange exchange) throws Exception { String nodeName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NODE_NAME, String.class); if (ObjectHelper.isEmpty(nodeName)) { LOG.error("Deleting a specific Node require specify a Node name"); 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 114aa26..d509d38 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 @@ -58,11 +58,11 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_PERSISTENT_VOLUMES: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_PERSISTENT_VOLUMES_BY_LABELS_OPERATION: - doListPersistentVolumesByLabels(exchange, operation); + doListPersistentVolumesByLabels(exchange); break; case KubernetesOperations.GET_PERSISTENT_VOLUME_OPERATION: @@ -74,14 +74,14 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { PersistentVolumeList persistentVolumeList = getEndpoint().getKubernetesClient().persistentVolumes().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); exchange.getOut().setBody(persistentVolumeList.getItems()); } - protected void doListPersistentVolumesByLabels(Exchange exchange, String operation) { + protected void doListPersistentVolumesByLabels(Exchange exchange) { PersistentVolumeList pvList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_LABELS, Map.class); 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 4d7e313..7a93162 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 @@ -61,23 +61,23 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_PERSISTENT_VOLUMES_CLAIMS: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_PERSISTENT_VOLUMES_CLAIMS_BY_LABELS_OPERATION: - doListPersistentVolumesClaimsByLabels(exchange, operation); + doListPersistentVolumesClaimsByLabels(exchange); break; case KubernetesOperations.GET_PERSISTENT_VOLUME_CLAIM_OPERATION: - doGetPersistentVolumeClaim(exchange, operation); + doGetPersistentVolumeClaim(exchange); break; case KubernetesOperations.CREATE_PERSISTENT_VOLUME_CLAIM_OPERATION: - doCreatePersistentVolumeClaim(exchange, operation); + doCreatePersistentVolumeClaim(exchange); break; case KubernetesOperations.DELETE_PERSISTENT_VOLUME_CLAIM_OPERATION: - doDeletePersistentVolumeClaim(exchange, operation); + doDeletePersistentVolumeClaim(exchange); break; default: @@ -85,7 +85,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { PersistentVolumeClaimList persistentVolumeClaimList = getEndpoint().getKubernetesClient().persistentVolumeClaims().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); @@ -93,7 +93,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer { exchange.getOut().setBody(persistentVolumeClaimList.getItems()); } - protected void doListPersistentVolumesClaimsByLabels(Exchange exchange, String operation) { + protected void doListPersistentVolumesClaimsByLabels(Exchange exchange) { PersistentVolumeClaimList pvcList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS, Map.class); @@ -119,7 +119,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer { exchange.getOut().setBody(pvcList.getItems()); } - protected void doGetPersistentVolumeClaim(Exchange exchange, String operation) throws Exception { + protected void doGetPersistentVolumeClaim(Exchange exchange) throws Exception { PersistentVolumeClaim pvc = null; String pvcName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -138,7 +138,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer { exchange.getOut().setBody(pvc); } - protected void doCreatePersistentVolumeClaim(Exchange exchange, String operation) throws Exception { + protected void doCreatePersistentVolumeClaim(Exchange exchange) throws Exception { PersistentVolumeClaim pvc = null; String pvcName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -168,7 +168,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer { exchange.getOut().setBody(pvc); } - protected void doDeletePersistentVolumeClaim(Exchange exchange, String operation) throws Exception { + protected void doDeletePersistentVolumeClaim(Exchange exchange) throws Exception { String pvcName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(pvcName)) { 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 4e80208..18e77bb 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 @@ -59,23 +59,23 @@ public class KubernetesPodsProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_PODS_OPERATION: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_PODS_BY_LABELS_OPERATION: - doListPodsByLabel(exchange, operation); + doListPodsByLabel(exchange); break; case KubernetesOperations.GET_POD_OPERATION: - doGetPod(exchange, operation); + doGetPod(exchange); break; case KubernetesOperations.CREATE_POD_OPERATION: - doCreatePod(exchange, operation); + doCreatePod(exchange); break; case KubernetesOperations.DELETE_POD_OPERATION: - doDeletePod(exchange, operation); + doDeletePod(exchange); break; default: @@ -83,7 +83,7 @@ public class KubernetesPodsProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { PodList podList; String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isNotEmpty(namespaceName)) { @@ -95,7 +95,7 @@ public class KubernetesPodsProducer extends DefaultProducer { exchange.getOut().setBody(podList.getItems()); } - protected void doListPodsByLabel(Exchange exchange, String operation) { + protected void doListPodsByLabel(Exchange exchange) { Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PODS_LABELS, Map.class); if (ObjectHelper.isEmpty(labels)) { LOG.error("Get pods by labels require specify a labels set"); @@ -112,7 +112,7 @@ public class KubernetesPodsProducer extends DefaultProducer { exchange.getOut().setBody(podList.getItems()); } - protected void doGetPod(Exchange exchange, String operation) throws Exception { + protected void doGetPod(Exchange exchange) throws Exception { Pod pod = null; String podName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_POD_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -130,7 +130,7 @@ public class KubernetesPodsProducer extends DefaultProducer { exchange.getOut().setBody(pod); } - protected void doCreatePod(Exchange exchange, String operation) throws Exception { + protected void doCreatePod(Exchange exchange) throws Exception { Pod pod = null; String podName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_POD_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -156,7 +156,7 @@ public class KubernetesPodsProducer extends DefaultProducer { exchange.getOut().setBody(pod); } - protected void doDeletePod(Exchange exchange, String operation) throws Exception { + protected void doDeletePod(Exchange exchange) throws Exception { String podName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_POD_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(podName)) { 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 4dca82f..816b77b 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 @@ -61,23 +61,23 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_RESOURCES_QUOTA: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_SECRETS_BY_LABELS_OPERATION: - doListResourceQuotasByLabels(exchange, operation); + doListResourceQuotasByLabels(exchange); break; case KubernetesOperations.GET_RESOURCE_QUOTA_OPERATION: - doGetResourceQuota(exchange, operation); + doGetResourceQuota(exchange); break; case KubernetesOperations.CREATE_RESOURCE_QUOTA_OPERATION: - doCreateResourceQuota(exchange, operation); + doCreateResourceQuota(exchange); break; case KubernetesOperations.DELETE_RESOURCE_QUOTA_OPERATION: - doDeleteResourceQuota(exchange, operation); + doDeleteResourceQuota(exchange); break; default: @@ -85,14 +85,14 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { ResourceQuotaList resList = getEndpoint().getKubernetesClient().resourceQuotas().inAnyNamespace().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); exchange.getOut().setBody(resList.getItems()); } - protected void doListResourceQuotasByLabels(Exchange exchange, String operation) { + protected void doListResourceQuotasByLabels(Exchange exchange) { ResourceQuotaList resList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_LABELS, Map.class); @@ -117,7 +117,7 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer { exchange.getOut().setBody(resList.getItems()); } - protected void doGetResourceQuota(Exchange exchange, String operation) throws Exception { + protected void doGetResourceQuota(Exchange exchange) throws Exception { ResourceQuota rq = null; String rqName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -135,7 +135,7 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer { exchange.getOut().setBody(rq); } - protected void doCreateResourceQuota(Exchange exchange, String operation) throws Exception { + protected void doCreateResourceQuota(Exchange exchange) throws Exception { ResourceQuota rq = null; String rqName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -163,7 +163,7 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer { exchange.getOut().setBody(rq); } - protected void doDeleteResourceQuota(Exchange exchange, String operation) throws Exception { + protected void doDeleteResourceQuota(Exchange exchange) throws Exception { String rqName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(rqName)) { 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 b8c6302..8b58d1d 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 @@ -59,23 +59,23 @@ public class KubernetesSecretsProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_SECRETS: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_SECRETS_BY_LABELS_OPERATION: - doListSecretsByLabels(exchange, operation); + doListSecretsByLabels(exchange); break; case KubernetesOperations.GET_SECRET_OPERATION: - doGetSecret(exchange, operation); + doGetSecret(exchange); break; case KubernetesOperations.CREATE_SECRET_OPERATION: - doCreateSecret(exchange, operation); + doCreateSecret(exchange); break; case KubernetesOperations.DELETE_SECRET_OPERATION: - doDeleteSecret(exchange, operation); + doDeleteSecret(exchange); break; default: @@ -83,13 +83,13 @@ public class KubernetesSecretsProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { SecretList secretsList = getEndpoint().getKubernetesClient().secrets().inAnyNamespace().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); exchange.getOut().setBody(secretsList.getItems()); } - protected void doListSecretsByLabels(Exchange exchange, String operation) { + protected void doListSecretsByLabels(Exchange exchange) { SecretList secretsList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SECRETS_LABELS, Map.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -113,7 +113,7 @@ public class KubernetesSecretsProducer extends DefaultProducer { exchange.getOut().setBody(secretsList.getItems()); } - protected void doGetSecret(Exchange exchange, String operation) throws Exception { + protected void doGetSecret(Exchange exchange) throws Exception { Secret secret = null; String secretName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SECRET_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -131,7 +131,7 @@ public class KubernetesSecretsProducer extends DefaultProducer { exchange.getOut().setBody(secret); } - protected void doCreateSecret(Exchange exchange, String operation) throws Exception { + protected void doCreateSecret(Exchange exchange) throws Exception { Secret secret = null; String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); Secret secretToCreate = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SECRET, Secret.class); @@ -149,7 +149,7 @@ public class KubernetesSecretsProducer extends DefaultProducer { exchange.getOut().setBody(secret); } - protected void doDeleteSecret(Exchange exchange, String operation) throws Exception { + protected void doDeleteSecret(Exchange exchange) throws Exception { String secretName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SECRET_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(secretName)) { 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 dc11a91..90e8a8b 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 @@ -59,23 +59,23 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_SERVICE_ACCOUNTS: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_SERVICE_ACCOUNTS_BY_LABELS_OPERATION: - doListServiceAccountsByLabels(exchange, operation); + doListServiceAccountsByLabels(exchange); break; case KubernetesOperations.GET_SECRET_OPERATION: - doGetServiceAccount(exchange, operation); + doGetServiceAccount(exchange); break; case KubernetesOperations.CREATE_SERVICE_ACCOUNT_OPERATION: - doCreateServiceAccount(exchange, operation); + doCreateServiceAccount(exchange); break; case KubernetesOperations.DELETE_SERVICE_ACCOUNT_OPERATION: - doDeleteServiceAccount(exchange, operation); + doDeleteServiceAccount(exchange); break; default: @@ -83,13 +83,13 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { ServiceAccountList saList = getEndpoint().getKubernetesClient().serviceAccounts().inAnyNamespace().list(); MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), true); exchange.getOut().setBody(saList.getItems()); } - protected void doListServiceAccountsByLabels(Exchange exchange, String operation) { + protected void doListServiceAccountsByLabels(Exchange exchange) { ServiceAccountList saList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_ACCOUNTS_LABELS, Map.class); @@ -114,7 +114,7 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer { exchange.getOut().setBody(saList.getItems()); } - protected void doGetServiceAccount(Exchange exchange, String operation) throws Exception { + protected void doGetServiceAccount(Exchange exchange) throws Exception { ServiceAccount sa = null; String saName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_ACCOUNT_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -132,7 +132,7 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer { exchange.getOut().setBody(sa); } - protected void doCreateServiceAccount(Exchange exchange, String operation) throws Exception { + protected void doCreateServiceAccount(Exchange exchange) throws Exception { ServiceAccount sa = null; String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); ServiceAccount saToCreate @@ -151,7 +151,7 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer { exchange.getOut().setBody(sa); } - protected void doDeleteServiceAccount(Exchange exchange, String operation) throws Exception { + protected void doDeleteServiceAccount(Exchange exchange) throws Exception { String saName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_ACCOUNT_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(saName)) { 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 07fdcbb..cb42e24 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 @@ -61,23 +61,23 @@ public class KubernetesServicesProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_SERVICES_OPERATION: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_SERVICES_BY_LABELS_OPERATION: - doListServiceByLabels(exchange, operation); + doListServiceByLabels(exchange); break; case KubernetesOperations.GET_SERVICE_OPERATION: - doGetService(exchange, operation); + doGetService(exchange); break; case KubernetesOperations.CREATE_SERVICE_OPERATION: - doCreateService(exchange, operation); + doCreateService(exchange); break; case KubernetesOperations.DELETE_SERVICE_OPERATION: - doDeleteService(exchange, operation); + doDeleteService(exchange); break; default: @@ -85,7 +85,7 @@ public class KubernetesServicesProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { ServiceList servicesList = null; String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (!ObjectHelper.isEmpty(namespaceName)) { @@ -97,7 +97,7 @@ public class KubernetesServicesProducer extends DefaultProducer { exchange.getOut().setBody(servicesList.getItems()); } - protected void doListServiceByLabels(Exchange exchange, String operation) { + protected void doListServiceByLabels(Exchange exchange) { ServiceList servicesList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_LABELS, Map.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -120,7 +120,7 @@ public class KubernetesServicesProducer extends DefaultProducer { exchange.getOut().setBody(servicesList.getItems()); } - protected void doGetService(Exchange exchange, String operation) throws Exception { + protected void doGetService(Exchange exchange) throws Exception { Service service = null; String serviceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -137,7 +137,7 @@ public class KubernetesServicesProducer extends DefaultProducer { exchange.getOut().setBody(service); } - protected void doCreateService(Exchange exchange, String operation) throws Exception { + protected void doCreateService(Exchange exchange) throws Exception { Service service = null; String serviceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -162,7 +162,7 @@ public class KubernetesServicesProducer extends DefaultProducer { exchange.getOut().setBody(service); } - protected void doDeleteService(Exchange exchange, String operation) throws Exception { + protected void doDeleteService(Exchange exchange) throws Exception { String serviceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (ObjectHelper.isEmpty(serviceName)) { 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 04e7f6a..8183756 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 @@ -61,15 +61,15 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_BUILD_CONFIGS: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_BUILD_CONFIGS_BY_LABELS_OPERATION: - doListBuildConfigsByLabels(exchange, operation); + doListBuildConfigsByLabels(exchange); break; case KubernetesOperations.GET_BUILD_CONFIG_OPERATION: - doGetBuildConfig(exchange, operation); + doGetBuildConfig(exchange); break; default: @@ -77,13 +77,13 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { BuildConfigList buildConfigsList = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs().inAnyNamespace().list(); exchange.getOut().setBody(buildConfigsList.getItems()); } - protected void doListBuildConfigsByLabels(Exchange exchange, String operation) { + protected void doListBuildConfigsByLabels(Exchange exchange) { BuildConfigList buildConfigsList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_BUILD_CONFIGS_LABELS, Map.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -107,7 +107,7 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer { exchange.getOut().setBody(buildConfigsList.getItems()); } - protected void doGetBuildConfig(Exchange exchange, String operation) throws Exception { + protected void doGetBuildConfig(Exchange exchange) throws Exception { BuildConfig buildConfig = null; String buildConfigName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_BUILD_CONFIG_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); 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 d0539de..ef5d169 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 @@ -61,15 +61,15 @@ public class OpenshiftBuildsProducer extends DefaultProducer { switch (operation) { case KubernetesOperations.LIST_BUILD: - doList(exchange, operation); + doList(exchange); break; case KubernetesOperations.LIST_BUILD_BY_LABELS_OPERATION: - doListBuildByLabels(exchange, operation); + doListBuildByLabels(exchange); break; case KubernetesOperations.GET_BUILD_OPERATION: - doGetBuild(exchange, operation); + doGetBuild(exchange); break; default: @@ -77,12 +77,12 @@ public class OpenshiftBuildsProducer extends DefaultProducer { } } - protected void doList(Exchange exchange, String operation) { + protected void doList(Exchange exchange) { BuildList buildList = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).builds().inAnyNamespace().list(); exchange.getOut().setBody(buildList.getItems()); } - protected void doListBuildByLabels(Exchange exchange, String operation) { + protected void doListBuildByLabels(Exchange exchange) { BuildList buildList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_BUILDS_LABELS, Map.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); @@ -106,7 +106,7 @@ public class OpenshiftBuildsProducer extends DefaultProducer { exchange.getOut().setBody(buildList.getItems()); } - protected void doGetBuild(Exchange exchange, String operation) throws Exception { + protected void doGetBuild(Exchange exchange) throws Exception { Build build = null; String buildName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_BUILD_NAME, String.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);