You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/01/12 16:31:37 UTC
[camel] branch master updated (4b10a49 -> 5eda18c)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4b10a49 CAMEL-16003: camel-spring-rabbitmq - New component using spring client
new 38a4928 CAMEL-16013 - Camel-Kubernetes: Upgrade to Kubernetes client 5.x
new b802889 Regen
new 6c241cb Added Camel-spring-rabbitmq to components pom
new 62c9b00 Regen
new 5eda18c Regen
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 4 ++--
.../org/apache/camel/catalog/components/spring-rabbitmq.json | 9 +++++----
.../kubernetes/config_maps/KubernetesConfigMapsConsumer.java | 9 ++++-----
.../kubernetes/config_maps/KubernetesConfigMapsProducer.java | 3 +--
.../customresources/KubernetesCustomResourcesConsumer.java | 4 ++--
.../kubernetes/deployments/KubernetesDeploymentsConsumer.java | 9 ++++-----
.../kubernetes/deployments/KubernetesDeploymentsProducer.java | 8 +++-----
.../camel/component/kubernetes/hpa/KubernetesHPAConsumer.java | 7 +++----
.../camel/component/kubernetes/hpa/KubernetesHPAProducer.java | 3 +--
.../camel/component/kubernetes/job/KubernetesJobProducer.java | 4 +---
.../kubernetes/namespaces/KubernetesNamespacesConsumer.java | 7 +++----
.../kubernetes/namespaces/KubernetesNamespacesProducer.java | 3 +--
.../component/kubernetes/nodes/KubernetesNodesConsumer.java | 8 +++-----
.../component/kubernetes/nodes/KubernetesNodesProducer.java | 4 +---
.../KubernetesPersistentVolumesProducer.java | 5 ++---
.../KubernetesPersistentVolumesClaimsProducer.java | 6 ++----
.../component/kubernetes/pods/KubernetesPodsConsumer.java | 8 +++-----
.../component/kubernetes/pods/KubernetesPodsProducer.java | 4 +---
.../KubernetesReplicationControllersConsumer.java | 7 +++----
.../KubernetesReplicationControllersProducer.java | 6 ++----
.../resources_quota/KubernetesResourcesQuotaProducer.java | 9 ++++-----
.../kubernetes/secrets/KubernetesSecretsProducer.java | 8 +++-----
.../service_accounts/KubernetesServiceAccountsProducer.java | 8 +++-----
.../kubernetes/services/KubernetesServicesConsumer.java | 8 +++-----
.../kubernetes/services/KubernetesServicesProducer.java | 8 +++-----
.../openshift/build_configs/OpenshiftBuildConfigsProducer.java | 10 ++++------
.../component/openshift/builds/OpenshiftBuildsProducer.java | 9 +++------
components/pom.xml | 1 +
docs/components/modules/ROOT/pages/minio-component.adoc | 2 +-
parent/pom.xml | 4 ++--
30 files changed, 74 insertions(+), 111 deletions(-)
[camel] 02/05: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b8028892a20aee772a173c051085013e238f0154
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 12 16:26:13 2021 +0100
Regen
---
.../resources/org/apache/camel/catalog/docs/minio-component.adoc | 2 +-
docs/components/modules/ROOT/pages/minio-component.adoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
index 69f089f..22c4f5b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
@@ -506,4 +506,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
diff --git a/docs/components/modules/ROOT/pages/minio-component.adoc b/docs/components/modules/ROOT/pages/minio-component.adoc
index 2109582..365473c 100644
--- a/docs/components/modules/ROOT/pages/minio-component.adoc
+++ b/docs/components/modules/ROOT/pages/minio-component.adoc
@@ -508,4 +508,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
[camel] 05/05: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5eda18cab9f42f903a6288edb1a7257fc119d5f2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 12 17:25:46 2021 +0100
Regen
---
.../resources/org/apache/camel/catalog/docs/minio-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
index 22c4f5b..69f089f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
@@ -506,4 +506,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
+include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
[camel] 04/05: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 62c9b0002a45c713ae3f41fe5bf1a5036fa3dbe3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 12 17:24:06 2021 +0100
Regen
---
camel-dependencies/pom.xml | 4 ++--
.../org/apache/camel/catalog/components/spring-rabbitmq.json | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index e101b6a..2161c60 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -371,8 +371,8 @@
<jzlib-version>1.1.3</jzlib-version>
<kafka-version>2.7.0</kafka-version>
<kie-version>7.47.0.Final</kie-version>
- <kubernetes-client-version>4.13.0</kubernetes-client-version>
- <kubernetes-model-version>4.13.0</kubernetes-model-version>
+ <kubernetes-client-version>5.0.0</kubernetes-client-version>
+ <kubernetes-model-version>5.0.0</kubernetes-model-version>
<kudu-version>1.12.0</kudu-version>
<lettuce-version>5.1.0.RELEASE</lettuce-version>
<leveldb-api-version>0.10</leveldb-api-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
index d5c19b7..33531aa 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
@@ -38,15 +38,16 @@
"shutdownTimeout": { "kind": "property", "displayName": "Shutdown Timeout", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they c [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
+ "ignoreDeclarationExceptions": { "kind": "property", "displayName": "Ignore Declaration Exceptions", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Switch on ignore exceptions such as mismatched properties when declaring" },
"messageConverter": { "kind": "property", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.amqp.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessageConverter so you can be in control how to map to\/from a org.springframework.amqp.core.Message." },
"messagePropertiesConverter": { "kind": "property", "displayName": "Message Properties Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.springrabbit.MessagePropertiesConverter", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessagePropertiesConverter so you can be in control how to map to\/from a org.springframework.amqp.core.MessageProperties." },
"headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." }
},
"properties": {
"exchangeName": { "kind": "path", "displayName": "Exchange Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The exchange name determines the exchange to which the produced messages will be sent to. In the case of consumers, the exchange name determines the exchange the queue will be bound to. Note: to use default exchange then do n [...]
- "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.springframework.amqp.rabbit.connection.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
- "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the ReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the ReplyTo header. You can use this option if you want Camel to consume from a rout [...]
- "routingKey": { "kind": "parameter", "displayName": "Routing Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Routing key." },
+ "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.springframework.amqp.rabbit.connection.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+ "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the ReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the ReplyTo header. You can use this option if you want Camel to consume from [...]
+ "routingKey": { "kind": "parameter", "displayName": "Routing Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The value of a routing key to use. Default is empty which is not helpful when using the default (or any direct) exchange, but fine if the exchange is a headers exchange for instance." },
"testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel [...]
"acknowledgeMode": { "kind": "parameter", "displayName": "Acknowledge Mode", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.springframework.amqp.core.AcknowledgeMode", "enum": [ "NONE", "MANUAL", "AUTO" ], "deprecated": false, "autowired": false, "secret": false, "description": "Flag controlling the behaviour of the container with respect to message acknowledgement. The most common usage is to let the container handle the acknowledgeme [...]
"asyncConsumer": { "kind": "parameter", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the consumer processes the Exchange asynchronously. If enabled then the consumer may pickup the next message from the queue, while the previous message is being processed asynchronously (by the Asynchronous [...]
@@ -60,7 +61,7 @@
"exchangeType": { "kind": "parameter", "displayName": "Exchange Type", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "direct", "fanout", "headers", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "direct", "description": "The type of the exchange" },
"exclusive": { "kind": "parameter", "displayName": "Exclusive", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true for an exclusive consumer" },
"noLocal": { "kind": "parameter", "displayName": "No Local", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Set to true for an no-local consumer" },
- "queues": { "kind": "parameter", "displayName": "Queues", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The queue(s) to use for consuming messages. Multiple queue names can be separated by comma." },
+ "queues": { "kind": "parameter", "displayName": "Queues", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The queue(s) to use for consuming messages. Multiple queue names can be separated by comma. If none has been configured then Camel will generate an unique id as the queue name for the consumer." },
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
[camel] 01/05: CAMEL-16013 - Camel-Kubernetes: Upgrade to
Kubernetes client 5.x
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 38a4928507eafa28024afc9b9fafb906fb0fe8ea
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 12 14:44:02 2021 +0100
CAMEL-16013 - Camel-Kubernetes: Upgrade to Kubernetes client 5.x
---
.../kubernetes/config_maps/KubernetesConfigMapsConsumer.java | 9 ++++-----
.../kubernetes/config_maps/KubernetesConfigMapsProducer.java | 3 +--
.../customresources/KubernetesCustomResourcesConsumer.java | 4 ++--
.../kubernetes/deployments/KubernetesDeploymentsConsumer.java | 9 ++++-----
.../kubernetes/deployments/KubernetesDeploymentsProducer.java | 8 +++-----
.../camel/component/kubernetes/hpa/KubernetesHPAConsumer.java | 7 +++----
.../camel/component/kubernetes/hpa/KubernetesHPAProducer.java | 3 +--
.../camel/component/kubernetes/job/KubernetesJobProducer.java | 4 +---
.../kubernetes/namespaces/KubernetesNamespacesConsumer.java | 7 +++----
.../kubernetes/namespaces/KubernetesNamespacesProducer.java | 3 +--
.../component/kubernetes/nodes/KubernetesNodesConsumer.java | 8 +++-----
.../component/kubernetes/nodes/KubernetesNodesProducer.java | 4 +---
.../KubernetesPersistentVolumesProducer.java | 5 ++---
.../KubernetesPersistentVolumesClaimsProducer.java | 6 ++----
.../component/kubernetes/pods/KubernetesPodsConsumer.java | 8 +++-----
.../component/kubernetes/pods/KubernetesPodsProducer.java | 4 +---
.../KubernetesReplicationControllersConsumer.java | 7 +++----
.../KubernetesReplicationControllersProducer.java | 6 ++----
.../resources_quota/KubernetesResourcesQuotaProducer.java | 9 ++++-----
.../kubernetes/secrets/KubernetesSecretsProducer.java | 8 +++-----
.../service_accounts/KubernetesServiceAccountsProducer.java | 8 +++-----
.../kubernetes/services/KubernetesServicesConsumer.java | 8 +++-----
.../kubernetes/services/KubernetesServicesProducer.java | 8 +++-----
.../openshift/build_configs/OpenshiftBuildConfigsProducer.java | 10 ++++------
.../component/openshift/builds/OpenshiftBuildsProducer.java | 9 +++------
parent/pom.xml | 4 ++--
26 files changed, 65 insertions(+), 104 deletions(-)
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
index 9088f7b..b33b737 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -20,9 +20,9 @@ import java.util.concurrent.ExecutorService;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -90,7 +90,7 @@ public class KubernetesConfigMapsConsumer extends DefaultConsumer {
@Override
public void run() {
- FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch> w = null;
+ FilterWatchListDeletable<ConfigMap, ConfigMapList> w = null;
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
&& ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue())) {
w = getEndpoint().getKubernetesClient().configMaps().withLabel(
@@ -98,7 +98,7 @@ public class KubernetesConfigMapsConsumer extends DefaultConsumer {
getEndpoint().getKubernetesConfiguration().getLabelValue());
}
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getResourceName())) {
- w = (FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch>) getEndpoint()
+ w = (FilterWatchListDeletable<ConfigMap, ConfigMapList>) getEndpoint()
.getKubernetesClient().configMaps()
.withName(getEndpoint().getKubernetesConfiguration().getResourceName());
}
@@ -122,11 +122,10 @@ public class KubernetesConfigMapsConsumer extends DefaultConsumer {
}
@Override
- public void onClose(KubernetesClientException cause) {
+ public void onClose(WatcherException cause) {
if (cause != null) {
LOG.error(cause.getMessage(), cause);
}
-
}
});
}
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 192292e..10abe58 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
@@ -22,7 +22,6 @@ import java.util.Map;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import org.apache.camel.Exchange;
import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
@@ -94,7 +93,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer {
protected void doListConfigMapsByLabels(Exchange exchange, String operation) throws Exception {
ConfigMapList configMapsList = null;
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, Map.class);
- FilterWatchListMultiDeletable<ConfigMap, ConfigMapList, Boolean, Watch> configMaps
+ FilterWatchListMultiDeletable<ConfigMap, ConfigMapList> configMaps
= getEndpoint().getKubernetesClient().configMaps().inAnyNamespace();
for (Map.Entry<String, String> entry : labels.entrySet()) {
configMaps.withLabel(entry.getKey(), entry.getValue());
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 0190a36..8ce8010 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
@@ -18,9 +18,9 @@ package org.apache.camel.component.kubernetes.customresources;
import java.util.concurrent.ExecutorService;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
import io.fabric8.kubernetes.client.dsl.internal.RawCustomResourceOperationsImpl;
import org.apache.camel.Exchange;
@@ -110,7 +110,7 @@ public class KubernetesCustomResourcesConsumer extends DefaultConsumer {
}
@Override
- public void onClose(KubernetesClientException cause) {
+ public void onClose(WatcherException cause) {
if (cause != null) {
LOG.error(cause.getMessage(), cause);
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java
index 68d99da..58bbc45 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java
@@ -20,11 +20,10 @@ import java.util.concurrent.ExecutorService;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.DeploymentList;
-import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
-import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
+import io.fabric8.kubernetes.client.WatcherException;
+import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -90,7 +89,7 @@ public class KubernetesDeploymentsConsumer extends DefaultConsumer {
@Override
public void run() {
- NonNamespaceOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> w
+ MixedOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>> w
= getEndpoint().getKubernetesClient()
.apps().deployments();
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
@@ -118,7 +117,7 @@ public class KubernetesDeploymentsConsumer extends DefaultConsumer {
}
@Override
- public void onClose(KubernetesClientException cause) {
+ public void onClose(WatcherException cause) {
if (cause != null) {
LOG.error(cause.getMessage(), cause);
}
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 7efd22c..2cc053c 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
@@ -22,8 +22,7 @@ import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
import io.fabric8.kubernetes.api.model.apps.DeploymentList;
import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
-import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
-import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
+import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
import org.apache.camel.Exchange;
import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
@@ -99,9 +98,8 @@ public class KubernetesDeploymentsProducer extends DefaultProducer {
protected void doListDeploymentsByLabels(Exchange exchange, String operation) throws Exception {
DeploymentList deploymentList = null;
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS, Map.class);
- NonNamespaceOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> deployments
- = getEndpoint()
- .getKubernetesClient().apps().deployments();
+ MixedOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>> deployments = getEndpoint()
+ .getKubernetesClient().apps().deployments();
for (Map.Entry<String, String> entry : labels.entrySet()) {
deployments.withLabel(entry.getKey(), entry.getValue());
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAConsumer.java
index fb24a2e..99d13e5 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAConsumer.java
@@ -18,12 +18,11 @@ package org.apache.camel.component.kubernetes.hpa;
import java.util.concurrent.ExecutorService;
-import io.fabric8.kubernetes.api.model.autoscaling.v1.DoneableHorizontalPodAutoscaler;
import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler;
import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import org.apache.camel.Exchange;
@@ -90,7 +89,7 @@ public class KubernetesHPAConsumer extends DefaultConsumer {
@Override
public void run() {
- MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> w
+ MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> w
= getEndpoint()
.getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers();
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespace())) {
@@ -122,7 +121,7 @@ public class KubernetesHPAConsumer extends DefaultConsumer {
}
@Override
- public void onClose(KubernetesClientException cause) {
+ public void onClose(WatcherException cause) {
if (cause != null) {
LOG.error(cause.getMessage(), cause);
}
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 8dcb595..2524974 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
@@ -18,7 +18,6 @@ package org.apache.camel.component.kubernetes.hpa;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.autoscaling.v1.DoneableHorizontalPodAutoscaler;
import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler;
import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerBuilder;
import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList;
@@ -100,7 +99,7 @@ public class KubernetesHPAProducer extends DefaultProducer {
throw new IllegalArgumentException("Get HPA by labels require specify a labels set");
}
- MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> hpas
+ MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> hpas
= getEndpoint()
.getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers();
for (Map.Entry<String, String> entry : labels.entrySet()) {
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 73b87dc..d2256b6 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
@@ -18,7 +18,6 @@ package org.apache.camel.component.kubernetes.job;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.batch.DoneableJob;
import io.fabric8.kubernetes.api.model.batch.Job;
import io.fabric8.kubernetes.api.model.batch.JobBuilder;
import io.fabric8.kubernetes.api.model.batch.JobList;
@@ -99,8 +98,7 @@ public class KubernetesJobProducer extends DefaultProducer {
throw new IllegalArgumentException("Get Job by labels require specify a labels set");
}
- MixedOperation<Job, JobList, DoneableJob, ScalableResource<Job, DoneableJob>> jobs
- = getEndpoint().getKubernetesClient().batch().jobs();
+ MixedOperation<Job, JobList, ScalableResource<Job>> jobs = getEndpoint().getKubernetesClient().batch().jobs();
for (Map.Entry<String, String> entry : labels.entrySet()) {
jobs.withLabel(entry.getKey(), entry.getValue());
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesConsumer.java
index f7d761c..862fe83 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesConsumer.java
@@ -18,12 +18,11 @@ package org.apache.camel.component.kubernetes.namespaces;
import java.util.concurrent.ExecutorService;
-import io.fabric8.kubernetes.api.model.DoneableNamespace;
import io.fabric8.kubernetes.api.model.Namespace;
import io.fabric8.kubernetes.api.model.NamespaceList;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import org.apache.camel.Exchange;
@@ -90,7 +89,7 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer {
@Override
public void run() {
- NonNamespaceOperation<Namespace, NamespaceList, DoneableNamespace, Resource<Namespace, DoneableNamespace>> w
+ NonNamespaceOperation<Namespace, NamespaceList, Resource<Namespace>> w
= getEndpoint().getKubernetesClient().namespaces();
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespace())) {
w.withName(getEndpoint().getKubernetesConfiguration().getNamespace());
@@ -112,7 +111,7 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer {
}
@Override
- public void onClose(KubernetesClientException cause) {
+ public void onClose(WatcherException cause) {
if (cause != null) {
LOG.error(cause.getMessage(), cause);
}
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 8fc6903..9fefd22 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
@@ -18,7 +18,6 @@ package org.apache.camel.component.kubernetes.namespaces;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.DoneableNamespace;
import io.fabric8.kubernetes.api.model.Namespace;
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
import io.fabric8.kubernetes.api.model.NamespaceList;
@@ -97,7 +96,7 @@ public class KubernetesNamespacesProducer extends DefaultProducer {
LOG.error("Get a specific namespace by labels require specify a labels set");
throw new IllegalArgumentException("Get a specific namespace by labels require specify a labels set");
}
- NonNamespaceOperation<Namespace, NamespaceList, DoneableNamespace, Resource<Namespace, DoneableNamespace>> namespaces
+ NonNamespaceOperation<Namespace, NamespaceList, Resource<Namespace>> namespaces
= getEndpoint().getKubernetesClient().namespaces();
for (Map.Entry<String, String> entry : labels.entrySet()) {
namespaces.withLabel(entry.getKey(), entry.getValue());
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesConsumer.java
index c5384f8..0a4f745 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesConsumer.java
@@ -18,12 +18,11 @@ package org.apache.camel.component.kubernetes.nodes;
import java.util.concurrent.ExecutorService;
-import io.fabric8.kubernetes.api.model.DoneableNode;
import io.fabric8.kubernetes.api.model.Node;
import io.fabric8.kubernetes.api.model.NodeList;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import org.apache.camel.Exchange;
@@ -90,8 +89,7 @@ public class KubernetesNodesConsumer extends DefaultConsumer {
@Override
public void run() {
- NonNamespaceOperation<Node, NodeList, DoneableNode, Resource<Node, DoneableNode>> w
- = getEndpoint().getKubernetesClient().nodes();
+ NonNamespaceOperation<Node, NodeList, Resource<Node>> w = getEndpoint().getKubernetesClient().nodes();
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
&& ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue())) {
w.withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(),
@@ -117,7 +115,7 @@ public class KubernetesNodesConsumer extends DefaultConsumer {
}
@Override
- public void onClose(KubernetesClientException cause) {
+ public void onClose(WatcherException cause) {
if (cause != null) {
LOG.error(cause.getMessage(), cause);
}
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 6c9440d..23b6cf2 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
@@ -18,7 +18,6 @@ package org.apache.camel.component.kubernetes.nodes;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.DoneableNode;
import io.fabric8.kubernetes.api.model.Node;
import io.fabric8.kubernetes.api.model.NodeBuilder;
import io.fabric8.kubernetes.api.model.NodeList;
@@ -95,8 +94,7 @@ public class KubernetesNodesProducer extends DefaultProducer {
protected void doListNodesByLabels(Exchange exchange, String operation) throws Exception {
NodeList nodeList = null;
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NODES_LABELS, Map.class);
- NonNamespaceOperation<Node, NodeList, DoneableNode, Resource<Node, DoneableNode>> nodes
- = getEndpoint().getKubernetesClient().nodes();
+ NonNamespaceOperation<Node, NodeList, Resource<Node>> nodes = getEndpoint().getKubernetesClient().nodes();
for (Map.Entry<String, String> entry : labels.entrySet()) {
nodes.withLabel(entry.getKey(), entry.getValue());
}
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 0098837..b5aa7cc 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
@@ -18,7 +18,6 @@ package org.apache.camel.component.kubernetes.persistent_volumes;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolume;
import io.fabric8.kubernetes.api.model.PersistentVolume;
import io.fabric8.kubernetes.api.model.PersistentVolumeList;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
@@ -86,8 +85,8 @@ public class KubernetesPersistentVolumesProducer extends DefaultProducer {
PersistentVolumeList pvList = null;
Map<String, String> labels
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_LABELS, Map.class);
- NonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, Resource<PersistentVolume, DoneablePersistentVolume>> pvs;
- pvs = getEndpoint().getKubernetesClient().persistentVolumes();
+ NonNamespaceOperation<PersistentVolume, PersistentVolumeList, Resource<PersistentVolume>> pvs
+ = getEndpoint().getKubernetesClient().persistentVolumes();
for (Map.Entry<String, String> entry : labels.entrySet()) {
pvs.withLabel(entry.getKey(), entry.getValue());
}
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 70d0ac2..6d1279b 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
@@ -18,12 +18,10 @@ package org.apache.camel.component.kubernetes.persistent_volumes_claims;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaimList;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec;
-import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
@@ -101,7 +99,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (!ObjectHelper.isEmpty(namespaceName)) {
- NonNamespaceOperation<PersistentVolumeClaim, PersistentVolumeClaimList, DoneablePersistentVolumeClaim, Resource<PersistentVolumeClaim, DoneablePersistentVolumeClaim>> pvcs
+ NonNamespaceOperation<PersistentVolumeClaim, PersistentVolumeClaimList, Resource<PersistentVolumeClaim>> pvcs
= getEndpoint()
.getKubernetesClient().persistentVolumeClaims().inNamespace(namespaceName);
for (Map.Entry<String, String> entry : labels.entrySet()) {
@@ -109,7 +107,7 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer {
}
pvcList = pvcs.list();
} else {
- FilterWatchListMultiDeletable<PersistentVolumeClaim, PersistentVolumeClaimList, Boolean, Watch> pvcs = getEndpoint()
+ FilterWatchListMultiDeletable<PersistentVolumeClaim, PersistentVolumeClaimList> pvcs = getEndpoint()
.getKubernetesClient().persistentVolumeClaims().inAnyNamespace();
for (Map.Entry<String, String> entry : labels.entrySet()) {
pvcs.withLabel(entry.getKey(), entry.getValue());
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsConsumer.java
index 30b3330..d336aef 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsConsumer.java
@@ -18,12 +18,11 @@ package org.apache.camel.component.kubernetes.pods;
import java.util.concurrent.ExecutorService;
-import io.fabric8.kubernetes.api.model.DoneablePod;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodList;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.PodResource;
import org.apache.camel.Exchange;
@@ -90,8 +89,7 @@ public class KubernetesPodsConsumer extends DefaultConsumer {
@Override
public void run() {
- MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> w
- = getEndpoint().getKubernetesClient().pods();
+ MixedOperation<Pod, PodList, PodResource<Pod>> w = getEndpoint().getKubernetesClient().pods();
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespace())) {
w.inNamespace(getEndpoint().getKubernetesConfiguration().getNamespace());
}
@@ -120,7 +118,7 @@ public class KubernetesPodsConsumer extends DefaultConsumer {
}
@Override
- public void onClose(KubernetesClientException cause) {
+ public void onClose(WatcherException cause) {
if (cause != null) {
LOG.error(cause.getMessage(), cause);
}
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 9bc7709..1da96d8 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
@@ -22,7 +22,6 @@ import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.api.model.PodList;
import io.fabric8.kubernetes.api.model.PodSpec;
-import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import org.apache.camel.Exchange;
import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
@@ -103,8 +102,7 @@ public class KubernetesPodsProducer extends DefaultProducer {
throw new IllegalArgumentException("Get pods by labels require specify a labels set");
}
- FilterWatchListMultiDeletable<Pod, PodList, Boolean, Watch> pods
- = getEndpoint().getKubernetesClient().pods().inAnyNamespace();
+ FilterWatchListMultiDeletable<Pod, PodList> pods = getEndpoint().getKubernetesClient().pods().inAnyNamespace();
for (Map.Entry<String, String> entry : labels.entrySet()) {
pods.withLabel(entry.getKey(), entry.getValue());
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersConsumer.java
index b1a874e..a2a0d8d 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersConsumer.java
@@ -18,12 +18,11 @@ package org.apache.camel.component.kubernetes.replication_controllers;
import java.util.concurrent.ExecutorService;
-import io.fabric8.kubernetes.api.model.DoneableReplicationController;
import io.fabric8.kubernetes.api.model.ReplicationController;
import io.fabric8.kubernetes.api.model.ReplicationControllerList;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
import org.apache.camel.Exchange;
@@ -90,7 +89,7 @@ public class KubernetesReplicationControllersConsumer extends DefaultConsumer {
@Override
public void run() {
- MixedOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>> w
+ MixedOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> w
= getEndpoint()
.getKubernetesClient().replicationControllers();
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespace())) {
@@ -122,7 +121,7 @@ public class KubernetesReplicationControllersConsumer extends DefaultConsumer {
}
@Override
- public void onClose(KubernetesClientException cause) {
+ public void onClose(WatcherException cause) {
if (cause != null) {
LOG.error(cause.getMessage(), cause);
}
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 f480284..bc1b91b 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
@@ -18,12 +18,10 @@ package org.apache.camel.component.kubernetes.replication_controllers;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.DoneableReplicationController;
import io.fabric8.kubernetes.api.model.ReplicationController;
import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder;
import io.fabric8.kubernetes.api.model.ReplicationControllerList;
import io.fabric8.kubernetes.api.model.ReplicationControllerSpec;
-import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
@@ -111,7 +109,7 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (!ObjectHelper.isEmpty(namespaceName)) {
- NonNamespaceOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>> replicationControllers
+ NonNamespaceOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> replicationControllers
= getEndpoint()
.getKubernetesClient().replicationControllers().inNamespace(namespaceName);
for (Map.Entry<String, String> entry : labels.entrySet()) {
@@ -119,7 +117,7 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer {
}
rcList = replicationControllers.list();
} else {
- FilterWatchListMultiDeletable<ReplicationController, ReplicationControllerList, Boolean, Watch> replicationControllers
+ FilterWatchListMultiDeletable<ReplicationController, ReplicationControllerList> replicationControllers
= getEndpoint()
.getKubernetesClient().replicationControllers().inAnyNamespace();
for (Map.Entry<String, String> entry : labels.entrySet()) {
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 9e699a1..7c85a2a 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
@@ -18,7 +18,6 @@ package org.apache.camel.component.kubernetes.resources_quota;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.DoneableResourceQuota;
import io.fabric8.kubernetes.api.model.ResourceQuota;
import io.fabric8.kubernetes.api.model.ResourceQuotaBuilder;
import io.fabric8.kubernetes.api.model.ResourceQuotaList;
@@ -99,15 +98,15 @@ public class KubernetesResourcesQuotaProducer extends DefaultProducer {
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (!ObjectHelper.isEmpty(namespaceName)) {
- NonNamespaceOperation<ResourceQuota, ResourceQuotaList, DoneableResourceQuota, Resource<ResourceQuota, DoneableResourceQuota>> resQuota;
- resQuota = getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName);
+ NonNamespaceOperation<ResourceQuota, ResourceQuotaList, Resource<ResourceQuota>> resQuota
+ = getEndpoint().getKubernetesClient().resourceQuotas().inNamespace(namespaceName);
for (Map.Entry<String, String> entry : labels.entrySet()) {
resQuota.withLabel(entry.getKey(), entry.getValue());
}
resList = resQuota.list();
} else {
- MixedOperation<ResourceQuota, ResourceQuotaList, DoneableResourceQuota, Resource<ResourceQuota, DoneableResourceQuota>> resQuota;
- resQuota = getEndpoint().getKubernetesClient().resourceQuotas();
+ MixedOperation<ResourceQuota, ResourceQuotaList, Resource<ResourceQuota>> resQuota
+ = getEndpoint().getKubernetesClient().resourceQuotas();
for (Map.Entry<String, String> entry : labels.entrySet()) {
resQuota.withLabel(entry.getKey(), entry.getValue());
}
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 e5e0586..fd546f5 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
@@ -18,10 +18,8 @@ package org.apache.camel.component.kubernetes.secrets;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.DoneableSecret;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.SecretList;
-import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
@@ -96,14 +94,14 @@ public class KubernetesSecretsProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SECRETS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (!ObjectHelper.isEmpty(namespaceName)) {
- NonNamespaceOperation<Secret, SecretList, DoneableSecret, Resource<Secret, DoneableSecret>> secrets;
- secrets = getEndpoint().getKubernetesClient().secrets().inNamespace(namespaceName);
+ NonNamespaceOperation<Secret, SecretList, Resource<Secret>> secrets
+ = getEndpoint().getKubernetesClient().secrets().inNamespace(namespaceName);
for (Map.Entry<String, String> entry : labels.entrySet()) {
secrets.withLabel(entry.getKey(), entry.getValue());
}
secretsList = secrets.list();
} else {
- FilterWatchListMultiDeletable<Secret, SecretList, Boolean, Watch> secrets
+ FilterWatchListMultiDeletable<Secret, SecretList> secrets
= getEndpoint().getKubernetesClient().secrets().inAnyNamespace();
for (Map.Entry<String, String> entry : labels.entrySet()) {
secrets.withLabel(entry.getKey(), entry.getValue());
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 03c92bd..4cac0fe 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
@@ -18,10 +18,8 @@ package org.apache.camel.component.kubernetes.service_accounts;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.DoneableServiceAccount;
import io.fabric8.kubernetes.api.model.ServiceAccount;
import io.fabric8.kubernetes.api.model.ServiceAccountList;
-import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
@@ -97,14 +95,14 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer {
= exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_ACCOUNTS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (!ObjectHelper.isEmpty(namespaceName)) {
- NonNamespaceOperation<ServiceAccount, ServiceAccountList, DoneableServiceAccount, Resource<ServiceAccount, DoneableServiceAccount>> serviceAccounts;
- serviceAccounts = getEndpoint().getKubernetesClient().serviceAccounts().inNamespace(namespaceName);
+ NonNamespaceOperation<ServiceAccount, ServiceAccountList, Resource<ServiceAccount>> serviceAccounts
+ = getEndpoint().getKubernetesClient().serviceAccounts().inNamespace(namespaceName);
for (Map.Entry<String, String> entry : labels.entrySet()) {
serviceAccounts.withLabel(entry.getKey(), entry.getValue());
}
saList = serviceAccounts.list();
} else {
- FilterWatchListMultiDeletable<ServiceAccount, ServiceAccountList, Boolean, Watch> serviceAccounts
+ FilterWatchListMultiDeletable<ServiceAccount, ServiceAccountList> serviceAccounts
= getEndpoint().getKubernetesClient().serviceAccounts().inAnyNamespace();
for (Map.Entry<String, String> entry : labels.entrySet()) {
serviceAccounts.withLabel(entry.getKey(), entry.getValue());
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesConsumer.java
index f9b1fb9..98b3cb0 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesConsumer.java
@@ -18,12 +18,11 @@ package org.apache.camel.component.kubernetes.services;
import java.util.concurrent.ExecutorService;
-import io.fabric8.kubernetes.api.model.DoneableService;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceList;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.ServiceResource;
import org.apache.camel.Exchange;
@@ -90,8 +89,7 @@ public class KubernetesServicesConsumer extends DefaultConsumer {
@Override
public void run() {
- MixedOperation<Service, ServiceList, DoneableService, ServiceResource<Service, DoneableService>> w
- = getEndpoint().getKubernetesClient().services();
+ MixedOperation<Service, ServiceList, ServiceResource<Service>> w = getEndpoint().getKubernetesClient().services();
if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespace())) {
w.inNamespace(getEndpoint().getKubernetesConfiguration().getNamespace());
}
@@ -121,7 +119,7 @@ public class KubernetesServicesConsumer extends DefaultConsumer {
}
@Override
- public void onClose(KubernetesClientException cause) {
+ public void onClose(WatcherException cause) {
if (cause != null) {
LOG.error(cause.getMessage(), cause);
}
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 cbd93b3..705659c 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
@@ -18,12 +18,10 @@ package org.apache.camel.component.kubernetes.services;
import java.util.Map;
-import io.fabric8.kubernetes.api.model.DoneableService;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceList;
import io.fabric8.kubernetes.api.model.ServiceSpec;
-import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.ServiceResource;
@@ -104,14 +102,14 @@ public class KubernetesServicesProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_SERVICE_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (!ObjectHelper.isEmpty(namespaceName)) {
- NonNamespaceOperation<Service, ServiceList, DoneableService, ServiceResource<Service, DoneableService>> services;
- services = getEndpoint().getKubernetesClient().services().inNamespace(namespaceName);
+ NonNamespaceOperation<Service, ServiceList, ServiceResource<Service>> services
+ = getEndpoint().getKubernetesClient().services().inNamespace(namespaceName);
for (Map.Entry<String, String> entry : labels.entrySet()) {
services.withLabel(entry.getKey(), entry.getValue());
}
servicesList = services.list();
} else {
- FilterWatchListMultiDeletable<Service, ServiceList, Boolean, Watch> services
+ FilterWatchListMultiDeletable<Service, ServiceList> services
= getEndpoint().getKubernetesClient().services().inAnyNamespace();
for (Map.Entry<String, String> entry : labels.entrySet()) {
services.withLabel(entry.getKey(), entry.getValue());
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 d719b7e..f6ca6d0 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
@@ -18,13 +18,11 @@ package org.apache.camel.component.openshift.build_configs;
import java.util.Map;
-import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.openshift.api.model.Build;
import io.fabric8.openshift.api.model.BuildConfig;
import io.fabric8.openshift.api.model.BuildConfigList;
-import io.fabric8.openshift.api.model.DoneableBuildConfig;
import io.fabric8.openshift.client.OpenShiftClient;
import io.fabric8.openshift.client.dsl.BuildConfigResource;
import org.apache.camel.Exchange;
@@ -90,15 +88,15 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer {
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);
if (!ObjectHelper.isEmpty(namespaceName)) {
- NonNamespaceOperation<BuildConfig, BuildConfigList, DoneableBuildConfig, BuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build>> buildConfigs;
- buildConfigs = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs()
- .inNamespace(namespaceName);
+ NonNamespaceOperation<BuildConfig, BuildConfigList, BuildConfigResource<BuildConfig, Void, Build>> buildConfigs
+ = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs()
+ .inNamespace(namespaceName);
for (Map.Entry<String, String> entry : labels.entrySet()) {
buildConfigs.withLabel(entry.getKey(), entry.getValue());
}
buildConfigsList = buildConfigs.list();
} else {
- FilterWatchListMultiDeletable<BuildConfig, BuildConfigList, Boolean, Watch> buildConfigs
+ FilterWatchListMultiDeletable<BuildConfig, BuildConfigList> buildConfigs
= getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs().inAnyNamespace();
for (Map.Entry<String, String> entry : labels.entrySet()) {
buildConfigs.withLabel(entry.getKey(), entry.getValue());
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 36248f9..31f977b 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
@@ -18,13 +18,11 @@ package org.apache.camel.component.openshift.builds;
import java.util.Map;
-import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
import io.fabric8.kubernetes.client.dsl.LogWatch;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.openshift.api.model.Build;
import io.fabric8.openshift.api.model.BuildList;
-import io.fabric8.openshift.api.model.DoneableBuild;
import io.fabric8.openshift.client.OpenShiftClient;
import io.fabric8.openshift.client.dsl.BuildResource;
import org.apache.camel.Exchange;
@@ -89,15 +87,14 @@ public class OpenshiftBuildsProducer extends DefaultProducer {
Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_BUILDS_LABELS, Map.class);
String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
if (!ObjectHelper.isEmpty(namespaceName)) {
- NonNamespaceOperation<Build, BuildList, DoneableBuild, BuildResource<Build, DoneableBuild, String, LogWatch>> builds
- = getEndpoint().getKubernetesClient()
- .adapt(OpenShiftClient.class).builds().inNamespace(namespaceName);
+ NonNamespaceOperation<Build, BuildList, BuildResource<Build, LogWatch>> builds = getEndpoint().getKubernetesClient()
+ .adapt(OpenShiftClient.class).builds().inNamespace(namespaceName);
for (Map.Entry<String, String> entry : labels.entrySet()) {
builds.withLabel(entry.getKey(), entry.getValue());
}
buildList = builds.list();
} else {
- FilterWatchListMultiDeletable<Build, BuildList, Boolean, Watch> builds
+ FilterWatchListMultiDeletable<Build, BuildList> builds
= getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).builds()
.inAnyNamespace();
for (Map.Entry<String, String> entry : labels.entrySet()) {
diff --git a/parent/pom.xml b/parent/pom.xml
index 9920022..21c3a30 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -354,8 +354,8 @@
<jzlib-version>1.1.3</jzlib-version>
<kafka-version>2.7.0</kafka-version>
<kie-version>7.47.0.Final</kie-version>
- <kubernetes-client-version>4.13.0</kubernetes-client-version>
- <kubernetes-model-version>4.13.0</kubernetes-model-version>
+ <kubernetes-client-version>5.0.0</kubernetes-client-version>
+ <kubernetes-model-version>5.0.0</kubernetes-model-version>
<kudu-version>1.12.0</kudu-version>
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.10</leveldb-api-version>
[camel] 03/05: Added Camel-spring-rabbitmq to components pom
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6c241cbc236fff53907fe9fc10f5f3b9a56c8d1c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 12 16:27:21 2021 +0100
Added Camel-spring-rabbitmq to components pom
---
components/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/pom.xml b/components/pom.xml
index 220dae2..39b8eb2 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -356,6 +356,7 @@
<module>camel-spring-integration</module>
<module>camel-spring-javaconfig</module>
<module>camel-spring-ldap</module>
+ <module>camel-spring-rabbitmq</module>
<module>camel-spring-redis</module>
<module>camel-spring-security</module>
<module>camel-spring-ws</module>