You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/09/05 05:38:48 UTC
[camel] 01/02: CAMEL-18453: Deprecate Service Call EIP
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8d8b8588ab858eb6f853f6137395e8f0678be701
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 5 07:36:44 2022 +0200
CAMEL-18453: Deprecate Service Call EIP
---
.../org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java | 1 +
.../src/main/docs/modules/eips/pages/serviceCall-eip.adoc | 6 +++---
.../org/apache/camel/model/cloud/blacklistServiceFilter.json | 2 +-
.../org/apache/camel/model/cloud/cachingServiceDiscovery.json | 2 +-
.../org/apache/camel/model/cloud/combinedServiceDiscovery.json | 2 +-
.../org/apache/camel/model/cloud/combinedServiceFilter.json | 2 +-
.../org/apache/camel/model/cloud/consulServiceDiscovery.json | 2 +-
.../resources/org/apache/camel/model/cloud/customServiceFilter.json | 2 +-
.../resources/org/apache/camel/model/cloud/defaultLoadBalancer.json | 2 +-
.../resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json | 2 +-
.../org/apache/camel/model/cloud/healthyServiceFilter.json | 2 +-
.../org/apache/camel/model/cloud/kubernetesServiceDiscovery.json | 2 +-
.../org/apache/camel/model/cloud/loadBalancerConfiguration.json | 2 +-
.../org/apache/camel/model/cloud/passThroughServiceFilter.json | 2 +-
.../resources/org/apache/camel/model/cloud/serviceCall.json | 2 +-
.../org/apache/camel/model/cloud/serviceCallConfiguration.json | 2 +-
.../org/apache/camel/model/cloud/serviceChooserConfiguration.json | 2 +-
.../org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json | 2 +-
.../resources/org/apache/camel/model/cloud/serviceExpression.json | 2 +-
.../org/apache/camel/model/cloud/serviceFilterConfiguration.json | 2 +-
.../org/apache/camel/model/cloud/staticServiceDiscovery.json | 2 +-
.../org/apache/camel/model/cloud/zookeeperServiceDiscovery.json | 2 +-
.../src/main/java/org/apache/camel/model/ProcessorDefinition.java | 3 +++
.../model/cloud/BlacklistServiceCallServiceFilterConfiguration.java | 1 +
.../cloud/CachingServiceCallServiceDiscoveryConfiguration.java | 1 +
.../cloud/CombinedServiceCallServiceDiscoveryConfiguration.java | 1 +
.../model/cloud/CombinedServiceCallServiceFilterConfiguration.java | 1 +
.../model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java | 1 +
.../model/cloud/CustomServiceCallServiceFilterConfiguration.java | 1 +
.../cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java | 1 +
.../model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java | 1 +
.../model/cloud/HealthyServiceCallServiceFilterConfiguration.java | 1 +
.../cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java | 1 +
.../cloud/PassThroughServiceCallServiceFilterConfiguration.java | 1 +
.../camel/model/cloud/ServiceCallConfigurationDefinition.java | 1 +
.../java/org/apache/camel/model/cloud/ServiceCallDefinition.java | 1 +
.../apache/camel/model/cloud/ServiceCallDefinitionConstants.java | 1 +
.../camel/model/cloud/ServiceCallExpressionConfiguration.java | 1 +
.../camel/model/cloud/ServiceCallServiceChooserConfiguration.java | 1 +
.../camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java | 1 +
.../camel/model/cloud/ServiceCallServiceFilterConfiguration.java | 1 +
.../model/cloud/ServiceCallServiceLoadBalancerConfiguration.java | 1 +
.../model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java | 1 +
.../cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java | 1 +
.../src/main/java/org/apache/camel/reifier/ServiceCallReifier.java | 1 +
45 files changed, 49 insertions(+), 23 deletions(-)
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
index 7ef9a81ac37..e8371c72cac 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
@@ -50,6 +50,7 @@ import org.apache.camel.util.function.ThrowingHelper;
import static org.apache.camel.support.CamelContextHelper.findSingleByType;
import static org.apache.camel.support.CamelContextHelper.lookup;
+@Deprecated
public class ServiceCallProcessorFactory extends TypedProcessorFactory<ServiceCallDefinition> {
private volatile ServiceCallDefinition definition;
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/serviceCall-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/serviceCall-eip.adoc
index b4c129d8101..a8271737aa4 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/serviceCall-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/serviceCall-eip.adoc
@@ -1,9 +1,10 @@
-= Service Call EIP
+= Service Call EIP (deprecated)
:doctitle: Service Call
:shortname: serviceCall
:description: To call remote services
:since:
-:supportlevel: Stable
+:supportlevel: Stable-deprecated
+:deprecated: *deprecated*
How can I call a remote service in a distributed system where the service is looked up from a service registry of some sorts?
@@ -496,4 +497,3 @@ from("direct:start")
.end()
.to("mock:result");
----
-
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json
index 969158ef1fa..e91cc959916 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "blacklistServiceFilter",
"title": "Blacklist Service Filter",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-filter",
"javaType": "org.apache.camel.model.cloud.BlacklistServiceCallServiceFilterConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json
index 96d45139772..eb453473b85 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "cachingServiceDiscovery",
"title": "Caching Service Discovery",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.CachingServiceCallServiceDiscoveryConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json
index 40bcb053097..3835673be7a 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "combinedServiceDiscovery",
"title": "Combined Service Discovery",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.CombinedServiceCallServiceDiscoveryConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json
index edd3b44ef78..e31f477fe9a 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "combinedServiceFilter",
"title": "Combined Service Filter",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-filter",
"javaType": "org.apache.camel.model.cloud.CombinedServiceCallServiceFilterConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json
index 939a64113ef..b545e6667a9 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "consulServiceDiscovery",
"title": "Consul Service Discovery",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.ConsulServiceCallServiceDiscoveryConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json
index 25efec3de7c..3fbd16947b5 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "customServiceFilter",
"title": "Custom Service Filter",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-filter",
"javaType": "org.apache.camel.model.cloud.CustomServiceCallServiceFilterConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json
index 89aab217552..0284b7bcc77 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "defaultLoadBalancer",
"title": "Default Load Balancer",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,load-balancing",
"javaType": "org.apache.camel.model.cloud.DefaultServiceCallServiceLoadBalancerConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json
index fbeca3a3692..80a5d0062fc 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "dnsServiceDiscovery",
"title": "Dns Service Discovery",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.DnsServiceCallServiceDiscoveryConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json
index b675cc1bd7b..0958d621f50 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "healthyServiceFilter",
"title": "Healthy Service Filter",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-filter",
"javaType": "org.apache.camel.model.cloud.HealthyServiceCallServiceFilterConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json
index 535ca088d16..e23925edb8e 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "kubernetesServiceDiscovery",
"title": "Kubernetes Service Discovery",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.KubernetesServiceCallServiceDiscoveryConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json
index d39c000fc31..cb557df56f6 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "loadBalancerConfiguration",
"title": "Load Balancer Configuration",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,load-balancing",
"javaType": "org.apache.camel.model.cloud.ServiceCallServiceLoadBalancerConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json
index bb63adb918a..b25e69c249b 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "passThroughServiceFilter",
"title": "Pass Through Service Filter",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-filter",
"javaType": "org.apache.camel.model.cloud.PassThroughServiceCallServiceFilterConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
index 0af11e7ea10..7ab1d8d9d29 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json
@@ -4,7 +4,7 @@
"name": "serviceCall",
"title": "Service Call",
"description": "To call remote services",
- "deprecated": false,
+ "deprecated": true,
"label": "eip,routing",
"javaType": "org.apache.camel.model.cloud.ServiceCallDefinition",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
index 03b22f4d946..a50ae6816c5 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json
@@ -4,7 +4,7 @@
"name": "serviceCallConfiguration",
"title": "Service Call Configuration",
"description": "Remote service call configuration",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud",
"javaType": "org.apache.camel.model.cloud.ServiceCallConfigurationDefinition",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json
index 4f01e7b8342..e2a9e0eb1e5 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "serviceChooserConfiguration",
"title": "Service Chooser Configuration",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.ServiceCallServiceChooserConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json
index 2c189604b2a..2f13516c269 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "serviceDiscoveryConfiguration",
"title": "Service Discovery Configuration",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.ServiceCallServiceDiscoveryConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json
index 26839b7e258..cd31d8609c0 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "serviceExpression",
"title": "Service Expression",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud",
"javaType": "org.apache.camel.model.cloud.ServiceCallExpressionConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json
index 9d50b3455d8..95b80709422 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "serviceFilterConfiguration",
"title": "Service Filter Configuration",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.ServiceCallServiceFilterConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json
index 7ac41477006..b8b185e99dd 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "staticServiceDiscovery",
"title": "Static Service Discovery",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.StaticServiceCallServiceDiscoveryConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json
index 891d30739e3..43dad4d17ea 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "zookeeperServiceDiscovery",
"title": "Zookeeper Service Discovery",
- "deprecated": false,
+ "deprecated": true,
"label": "routing,cloud,service-discovery",
"javaType": "org.apache.camel.model.cloud.ZooKeeperServiceCallServiceDiscoveryConfiguration",
"abstract": false,
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 7a1600f75c7..1a820d47651 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -365,6 +365,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*
* @return the builder
*/
+ @Deprecated
public ServiceCallDefinition serviceCall() {
ServiceCallDefinition answer = new ServiceCallDefinition();
addOutput(answer);
@@ -377,6 +378,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param name the service name
* @return the builder
*/
+ @Deprecated
public Type serviceCall(String name) {
ServiceCallDefinition answer = new ServiceCallDefinition();
answer.setName(name);
@@ -391,6 +393,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param uri the endpoint uri to use for calling the service
* @return the builder
*/
+ @Deprecated
public Type serviceCall(String name, @AsEndpointUri String uri) {
ServiceCallDefinition answer = new ServiceCallDefinition();
answer.setName(name);
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
index 0b490df6509..e5eb4d20ea9 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
@@ -36,6 +36,7 @@ import org.apache.camel.util.ObjectHelper;
@XmlRootElement(name = "blacklistServiceFilter")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class BlacklistServiceCallServiceFilterConfiguration extends ServiceCallServiceFilterConfiguration {
@XmlElement
private List<String> servers;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
index b1748e9b925..058cea95e17 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
@@ -34,6 +34,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "cachingServiceDiscovery")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class CachingServiceCallServiceDiscoveryConfiguration extends ServiceCallServiceDiscoveryConfiguration {
@XmlAttribute
@Metadata(defaultValue = "60", javaType = "java.lang.Integer")
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
index 10cef609849..530b73c962b 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
@@ -35,6 +35,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "combinedServiceDiscovery")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class CombinedServiceCallServiceDiscoveryConfiguration extends ServiceCallServiceDiscoveryConfiguration {
@XmlElements({
@XmlElement(name = "consulServiceDiscovery", type = ConsulServiceCallServiceDiscoveryConfiguration.class),
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
index fc65306e150..39b07794516 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
@@ -35,6 +35,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "combinedServiceFilter")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class CombinedServiceCallServiceFilterConfiguration extends ServiceCallServiceFilterConfiguration {
@XmlElements({
@XmlElement(name = "blacklistServiceFilter", type = BlacklistServiceCallServiceFilterConfiguration.class),
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
index 0d6126005bc..579d4f57a7d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
@@ -30,6 +30,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
@XmlRootElement(name = "consulServiceDiscovery")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class ConsulServiceCallServiceDiscoveryConfiguration extends ServiceCallServiceDiscoveryConfiguration {
@XmlAttribute
private String url;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
index 9c14784ae4d..e43329f707c 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "customServiceFilter")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class CustomServiceCallServiceFilterConfiguration extends ServiceCallServiceFilterConfiguration {
@XmlAttribute(name = "ref")
private String serviceFilterRef;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
index a92384130d4..81c70409117 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
@@ -27,6 +27,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "defaultLoadBalancer")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class DefaultServiceCallServiceLoadBalancerConfiguration extends ServiceCallServiceLoadBalancerConfiguration {
public DefaultServiceCallServiceLoadBalancerConfiguration() {
this(null);
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
index baa859e974f..51b0dd08cc0 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
@@ -28,6 +28,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "dnsServiceDiscovery")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class DnsServiceCallServiceDiscoveryConfiguration extends ServiceCallServiceDiscoveryConfiguration {
@XmlAttribute
@Metadata(defaultValue = "_tcp")
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
index 83468baeece..d54dad1ee89 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
@@ -27,6 +27,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "healthyServiceFilter")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class HealthyServiceCallServiceFilterConfiguration extends ServiceCallServiceFilterConfiguration {
public HealthyServiceCallServiceFilterConfiguration() {
this(null);
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
index 691e21511cf..f1a787464b1 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
@@ -28,6 +28,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "kubernetesServiceDiscovery")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class KubernetesServiceCallServiceDiscoveryConfiguration extends ServiceCallServiceDiscoveryConfiguration {
@XmlAttribute
@Metadata(defaultValue = "environment", enums = "environment,dns,client")
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
index b5b37165627..ac48941ea52 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
@@ -27,6 +27,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "passThroughServiceFilter")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class PassThroughServiceCallServiceFilterConfiguration extends ServiceCallServiceFilterConfiguration {
public PassThroughServiceCallServiceFilterConfiguration() {
this(null);
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
index 98fbfc3b810..76f777c063e 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
@@ -40,6 +40,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "routing,cloud")
@XmlRootElement(name = "serviceCallConfiguration")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class ServiceCallConfigurationDefinition extends IdentifiedType {
@XmlAttribute
private String uri;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
index af71db89071..3b7a4cbe9d5 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
@@ -41,6 +41,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "eip,routing")
@XmlRootElement(name = "serviceCall")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class ServiceCallDefinition extends NoOutputDefinition<ServiceCallDefinition> {
@XmlAttribute
@Metadata(required = true)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
index 719731c9b65..c9e7370a14d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.model.cloud;
+@Deprecated
public final class ServiceCallDefinitionConstants {
public static final String RESOURCE_PATH = "META-INF/services/org/apache/camel/cloud/";
public static final String DEFAULT_COMPONENT = "http";
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
index 47770588839..023e3b749f6 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
@@ -42,6 +42,7 @@ import org.apache.camel.support.PropertyBindingSupport;
@XmlRootElement(name = "serviceExpression")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class ServiceCallExpressionConfiguration extends ServiceCallConfiguration implements ServiceExpressionFactory {
@XmlTransient
private final ServiceCallDefinition parent;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
index b65e614b82e..8a2ea2082da 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
@@ -39,6 +39,7 @@ import org.apache.camel.util.ObjectHelper;
@XmlRootElement(name = "serviceChooserConfiguration")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class ServiceCallServiceChooserConfiguration extends ServiceCallConfiguration implements ServiceChooserFactory {
@XmlTransient
private final ServiceCallDefinition parent;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
index 8f6e5aad52b..3d119ff5dfb 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
@@ -40,6 +40,7 @@ import org.apache.camel.util.ObjectHelper;
@XmlRootElement(name = "serviceDiscoveryConfiguration")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class ServiceCallServiceDiscoveryConfiguration extends ServiceCallConfiguration implements ServiceDiscoveryFactory {
@XmlTransient
private final Optional<ServiceCallDefinition> parent;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
index c7708088e3b..4cd83322c94 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
@@ -39,6 +39,7 @@ import org.apache.camel.util.ObjectHelper;
@XmlRootElement(name = "serviceFilterConfiguration")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class ServiceCallServiceFilterConfiguration extends ServiceCallConfiguration implements ServiceFilterFactory {
@XmlTransient
private final ServiceCallDefinition parent;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
index 613734cebd0..ebb8f98aa84 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
@@ -39,6 +39,7 @@ import org.apache.camel.util.ObjectHelper;
@XmlRootElement(name = "loadBalancerConfiguration")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer
+@Deprecated
public class ServiceCallServiceLoadBalancerConfiguration extends ServiceCallConfiguration
implements ServiceLoadBalancerFactory {
@XmlTransient
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
index 71505db49fe..2325486dd62 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
@@ -36,6 +36,7 @@ import org.apache.camel.util.ObjectHelper;
@XmlRootElement(name = "staticServiceDiscovery")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class StaticServiceCallServiceDiscoveryConfiguration extends ServiceCallServiceDiscoveryConfiguration {
@XmlElement
private List<String> servers;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
index d7a654f61f3..7f48a430130 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
@@ -28,6 +28,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "zookeeperServiceDiscovery")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
+@Deprecated
public class ZooKeeperServiceCallServiceDiscoveryConfiguration extends ServiceCallServiceDiscoveryConfiguration {
@XmlAttribute(required = true)
private String nodes;
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java
index 1f256e517c4..ee8a3cc025a 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java
@@ -21,6 +21,7 @@ import org.apache.camel.Route;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.cloud.ServiceCallDefinition;
+@Deprecated
public class ServiceCallReifier extends ProcessorReifier<ServiceCallDefinition> {
public ServiceCallReifier(Route route, ProcessorDefinition<?> definition) {