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 7f5d2197c5b204100d12647831c8f351153cef26 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Sep 24 09:52:23 2021 +0200 Polished EIPs and make their categorization simpler for tooling. --- .../src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc | 2 +- .../src/main/docs/modules/eips/pages/failover-eip.adoc | 2 +- .../src/main/docs/modules/eips/pages/loadBalance-eip.adoc | 4 ++-- .../src/main/docs/modules/eips/pages/random-eip.adoc | 2 +- .../src/main/docs/modules/eips/pages/roundRobin-eip.adoc | 2 +- .../src/main/docs/modules/eips/pages/saga-eip.adoc | 2 +- .../src/main/docs/modules/eips/pages/sticky-eip.adoc | 2 +- .../src/main/docs/modules/eips/pages/toD-eip.adoc | 2 +- .../src/main/docs/modules/eips/pages/topic-eip.adoc | 2 +- .../src/main/docs/modules/eips/pages/weighted-eip.adoc | 2 +- .../resources/org/apache/camel/model/circuitBreaker.json | 2 +- .../resources/org/apache/camel/model/config/batch-config.json | 2 +- .../resources/org/apache/camel/model/config/stream-config.json | 2 +- .../generated/resources/org/apache/camel/model/dynamicRouter.json | 2 +- .../org/apache/camel/model/faultToleranceConfiguration.json | 2 +- .../src/generated/resources/org/apache/camel/model/from.json | 2 +- .../resources/org/apache/camel/model/hystrixConfiguration.json | 2 +- .../src/generated/resources/org/apache/camel/model/inOnly.json | 2 +- .../src/generated/resources/org/apache/camel/model/inOut.json | 2 +- .../src/generated/resources/org/apache/camel/model/kamelet.json | 2 +- .../org/apache/camel/model/loadbalancer/customLoadBalancer.json | 4 ++-- .../resources/org/apache/camel/model/loadbalancer/failover.json | 4 ++-- .../resources/org/apache/camel/model/loadbalancer/random.json | 4 ++-- .../resources/org/apache/camel/model/loadbalancer/roundRobin.json | 4 ++-- .../resources/org/apache/camel/model/loadbalancer/sticky.json | 4 ++-- .../resources/org/apache/camel/model/loadbalancer/topic.json | 4 ++-- .../resources/org/apache/camel/model/loadbalancer/weighted.json | 4 ++-- .../src/generated/resources/org/apache/camel/model/log.json | 2 +- .../generated/resources/org/apache/camel/model/onFallback.json | 2 +- .../generated/resources/org/apache/camel/model/pollEnrich.json | 2 +- .../generated/resources/org/apache/camel/model/recipientList.json | 2 +- .../generated/resources/org/apache/camel/model/resequence.json | 2 +- .../org/apache/camel/model/resilience4jConfiguration.json | 2 +- .../generated/resources/org/apache/camel/model/routingSlip.json | 2 +- .../src/generated/resources/org/apache/camel/model/saga.json | 2 +- .../src/generated/resources/org/apache/camel/model/to.json | 2 +- .../src/generated/resources/org/apache/camel/model/toD.json | 4 ++-- .../src/generated/resources/org/apache/camel/model/wireTap.json | 2 +- .../java/org/apache/camel/model/CircuitBreakerDefinition.java | 2 +- .../main/java/org/apache/camel/model/DynamicRouterDefinition.java | 2 +- .../apache/camel/model/FaultToleranceConfigurationDefinition.java | 2 +- .../src/main/java/org/apache/camel/model/FromDefinition.java | 2 +- .../org/apache/camel/model/HystrixConfigurationDefinition.java | 2 +- .../src/main/java/org/apache/camel/model/InOnlyDefinition.java | 2 +- .../src/main/java/org/apache/camel/model/InOutDefinition.java | 2 +- .../src/main/java/org/apache/camel/model/KameletDefinition.java | 2 +- .../src/main/java/org/apache/camel/model/LogDefinition.java | 2 +- .../main/java/org/apache/camel/model/OnFallbackDefinition.java | 2 +- .../main/java/org/apache/camel/model/PollEnrichDefinition.java | 2 +- .../main/java/org/apache/camel/model/RecipientListDefinition.java | 2 +- .../main/java/org/apache/camel/model/ResequenceDefinition.java | 1 - .../apache/camel/model/Resilience4jConfigurationDefinition.java | 2 +- .../main/java/org/apache/camel/model/RoutingSlipDefinition.java | 2 +- .../main/java/org/apache/camel/model/SagaActionUriDefinition.java | 3 ++- .../src/main/java/org/apache/camel/model/SagaDefinition.java | 2 +- .../main/java/org/apache/camel/model/SagaOptionDefinition.java | 4 ++-- .../src/main/java/org/apache/camel/model/SamplingDefinition.java | 3 --- .../src/main/java/org/apache/camel/model/ToDefinition.java | 2 +- .../src/main/java/org/apache/camel/model/ToDynamicDefinition.java | 8 +------- .../src/main/java/org/apache/camel/model/WireTapDefinition.java | 2 +- .../org/apache/camel/model/config/BatchResequencerConfig.java | 2 +- .../org/apache/camel/model/config/StreamResequencerConfig.java | 2 +- .../camel/model/loadbalancer/CustomLoadBalancerDefinition.java | 4 ++-- .../camel/model/loadbalancer/FailoverLoadBalancerDefinition.java | 7 ++----- .../camel/model/loadbalancer/RandomLoadBalancerDefinition.java | 4 ++-- .../model/loadbalancer/RoundRobinLoadBalancerDefinition.java | 6 +++--- .../camel/model/loadbalancer/StickyLoadBalancerDefinition.java | 5 ++--- .../camel/model/loadbalancer/TopicLoadBalancerDefinition.java | 4 ++-- .../camel/model/loadbalancer/WeightedLoadBalancerDefinition.java | 6 ++---- 69 files changed, 86 insertions(+), 101 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc index a81e09e..89d5dd5 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc @@ -1,7 +1,7 @@ = Custom Load Balancer EIP :doctitle: Custom Load Balancer :shortname: customLoadBalancer -:description: Custom load balancer +:description: To use a custom load balancer implementation. :since: :supportlevel: Stable diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/failover-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/failover-eip.adoc index 1d3a07a..dc176cb 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/failover-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/failover-eip.adoc @@ -1,7 +1,7 @@ = Failover EIP :doctitle: Failover :shortname: failover -:description: Failover load balancer The failover load balancer is capable of trying the next processor in case an Exchange failed with an exception during processing. You can constrain the failover to activate only when one exception of a list you specify occurs. If you do not specify a list any exception will cause fail over to occur. This balancer uses the same strategy for matching exceptions as the Exception Clause does for the onException. +:description: In case of failures the exchange will be tried on the next endpoint. :since: :supportlevel: Stable diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc index 517abe3..3133c48 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc @@ -14,12 +14,12 @@ Camel provides the following policies out-of-the-box: [width="100%",cols="3,6",options="header"] |======================================================================= | Policy | Description -| xref:customLoadBalancer-eip.adoc[Custom Load Balancer] |To use a custom load balancer implementation. +| xref:customLoadBalancer-eip.adoc[Custom Load Balancer] | To use a custom load balancer implementation. | xref:failover-eip.adoc[Failover Load Balancer] | In case of failures the exchange will be tried on the next endpoint. | xref:roundRobin-eip.adoc[Round Robin Load Balancer] | The exchanges are selected in a round robin fashion. This is a well known and classic policy, which spreads the load evenly. | xref:random-eip.adoc[Random Load Balancer] | A random endpoint is selected for each exchange. | xref:sticky-eip.adoc[Sticky Load Balancer] | Sticky load balancing using an xref:latest@manual:ROOT:expression.adoc[Expression] to calculate a correlation key to perform the sticky load balancing. | xref:topic-eip.adoc[Topic Load Balancer] | Topic which sends to all destinations. -| xref:weighted-eip.adoc[Weighted Loader Balancer] |Uses a weighted load distribution ratio for each server with respect to others. +| xref:weighted-eip.adoc[Weighted Loader Balancer] | Uses a weighted load distribution ratio for each server with respect to others. |======================================================================= diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc index 1d97949..1bfcd1e 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc @@ -1,7 +1,7 @@ = Random EIP :doctitle: Random :shortname: random -:description: Random load balancer The random load balancer selects a random endpoint for each exchange. +:description: A random endpoint is selected for each exchange. :since: :supportlevel: Stable diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc index e96b5b3..ab441a3 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc @@ -1,7 +1,7 @@ = Round Robin EIP :doctitle: Round Robin :shortname: roundRobin -:description: Round robin load balancer The round robin load balancer will use the next endpoint for each message. This load balancer is not meant to work with failover, for that you should use the dedicated failover load balancer. +:description: The exchanges are selected in a round robin fashion. This is a well known and classic policy, which spreads the load evenly. :since: :supportlevel: Stable diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/saga-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/saga-eip.adoc index 85e300a..2a965fa 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/saga-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/saga-eip.adoc @@ -1,7 +1,7 @@ = Saga EIP :doctitle: Saga :shortname: saga -:description: Enables sagas on the route +:description: Enables Sagas on the route :since: :supportlevel: Stable diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc index 163cc4c..d64bfda 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc @@ -1,7 +1,7 @@ = Sticky EIP :doctitle: Sticky :shortname: sticky -:description: Sticky load balancer Sticky load balancing using an Expression to calculate a correlation key to perform the sticky load balancing; rather like jsessionid in the web or JMSXGroupID in JMS. +:description: Sticky load balancing using an expression to calculate a correlation key to perform the sticky load balancing. :since: :supportlevel: Stable diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/toD-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/toD-eip.adoc index db54691..dae0c8d 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/toD-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/toD-eip.adoc @@ -1,7 +1,7 @@ = To D EIP :doctitle: To D :shortname: toD -:description: Sends the message to a dynamic endpoint You can specify multiple languages in the uri separated by the plus sign, such as mock:language:xpath:/order/uri where mock: would be a prefix to a xpath expression. For more dynamic behavior use Recipient List or Dynamic Router EIP instead. +:description: Sends the message to a dynamic endpoint :since: :supportlevel: Stable diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc index 6765b06..a4898f8 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc @@ -1,7 +1,7 @@ = Topic EIP :doctitle: Topic :shortname: topic -:description: Topic load balancer The topic load balancer sends to all destinations (rather like JMS Topics) +:description: Topic which sends to all destinations. :since: :supportlevel: Stable diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc index 8e18c3c..d4c2d17 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc @@ -1,7 +1,7 @@ = Weighted EIP :doctitle: Weighted :shortname: weighted -:description: Weighted load balancer The weighted load balancing policy allows you to specify a processing load distribution ratio for each server with respect to others. In addition to the weight, endpoint selection is then further refined using random distribution based on weight. +:description: Uses a weighted load distribution ratio for each server with respect to others. :since: :supportlevel: Stable diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/circuitBreaker.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/circuitBreaker.json index 70b2673..6ed0b97 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/circuitBreaker.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/circuitBreaker.json @@ -5,7 +5,7 @@ "title": "Circuit Breaker", "description": "Route messages in a fault tolerance way using Circuit Breaker", "deprecated": false, - "label": "eip,routing,circuitbreaker", + "label": "eip,routing", "javaType": "org.apache.camel.model.CircuitBreakerDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json index c3d8929..0b58308 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json @@ -5,7 +5,7 @@ "title": "Batch-config", "description": "Configures batch-processing resequence eip.", "deprecated": false, - "label": "eip,routing,resequence", + "label": "configuration", "javaType": "org.apache.camel.model.config.BatchResequencerConfig", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json index 83586fc..e6a7653 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json @@ -5,7 +5,7 @@ "title": "Stream-config", "description": "Configures stream-processing resequence eip.", "deprecated": false, - "label": "eip,routing,resequence", + "label": "configuration", "javaType": "org.apache.camel.model.config.StreamResequencerConfig", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dynamicRouter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dynamicRouter.json index 3025197..7335aac 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dynamicRouter.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dynamicRouter.json @@ -5,7 +5,7 @@ "title": "Dynamic Router", "description": "Route messages based on dynamic rules", "deprecated": false, - "label": "eip,endpoint,routing", + "label": "eip,routing", "javaType": "org.apache.camel.model.DynamicRouterDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json index 5099ebb..83dd77c 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json @@ -5,7 +5,7 @@ "title": "Fault Tolerance Configuration", "description": "MicroProfile Fault Tolerance Circuit Breaker EIP configuration", "deprecated": false, - "label": "eip,routing,circuitbreaker", + "label": "configuration", "javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/from.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/from.json index 7ecbc80..26d84d7 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/from.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/from.json @@ -5,7 +5,7 @@ "title": "From", "description": "Act as a message source as input to a route", "deprecated": false, - "label": "eip,endpoint,routing", + "label": "eip,routing", "javaType": "org.apache.camel.model.FromDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json index 6c33f6b..58ef3032 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json @@ -5,7 +5,7 @@ "title": "Hystrix Configuration", "description": "Hystrix Circuit Breaker EIP configuration", "deprecated": true, - "label": "eip,routing,circuitbreaker", + "label": "configuration", "javaType": "org.apache.camel.model.HystrixConfigurationDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOnly.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOnly.json index a8a6eee..21ea917 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOnly.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOnly.json @@ -5,7 +5,7 @@ "title": "In Only", "description": "Marks the exchange pattern for the route to one way", "deprecated": true, - "label": "eip,endpoint,routing", + "label": "eip,routing", "javaType": "org.apache.camel.model.InOnlyDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOut.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOut.json index a005b50..601c318 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOut.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/inOut.json @@ -5,7 +5,7 @@ "title": "In Out", "description": "Marks the exchange pattern for the route to request\/reply", "deprecated": true, - "label": "eip,endpoint,routing", + "label": "eip,routing", "javaType": "org.apache.camel.model.InOutDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/kamelet.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/kamelet.json index 6b5e06e..4805e77 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/kamelet.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/kamelet.json @@ -5,7 +5,7 @@ "title": "Kamelet", "description": "To call Kamelets", "deprecated": false, - "label": "eip,routing,kamelet", + "label": "eip,routing", "javaType": "org.apache.camel.model.KameletDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json index 1cb2aeb..da5dc76 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json @@ -3,9 +3,9 @@ "kind": "model", "name": "customLoadBalancer", "title": "Custom Load Balancer", - "description": "Custom load balancer", + "description": "To use a custom load balancer implementation.", "deprecated": false, - "label": "eip,routing,loadbalance", + "label": "eip,routing", "javaType": "org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json index 31c811d..808cb219 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json @@ -3,9 +3,9 @@ "kind": "model", "name": "failover", "title": "Failover", - "description": "Failover load balancer The failover load balancer is capable of trying the next processor in case an Exchange failed with an exception during processing. You can constrain the failover to activate only when one exception of a list you specify occurs. If you do not specify a list any exception will cause fail over to occur. This balancer uses the same strategy for matching exceptions as the Exception Clause does for the onException.", + "description": "In case of failures the exchange will be tried on the next endpoint.", "deprecated": false, - "label": "eip,routing,loadbalance", + "label": "eip,routing", "javaType": "org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/random.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/random.json index 00be038..9dda75d 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/random.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/random.json @@ -3,9 +3,9 @@ "kind": "model", "name": "random", "title": "Random", - "description": "Random load balancer The random load balancer selects a random endpoint for each exchange.", + "description": "A random endpoint is selected for each exchange.", "deprecated": false, - "label": "eip,routing,loadbalance", + "label": "eip,routing", "javaType": "org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json index 4d67833..52b5cd9 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json @@ -3,9 +3,9 @@ "kind": "model", "name": "roundRobin", "title": "Round Robin", - "description": "Round robin load balancer The round robin load balancer will use the next endpoint for each message. This load balancer is not meant to work with failover, for that you should use the dedicated failover load balancer.", + "description": "The exchanges are selected in a round robin fashion. This is a well known and classic policy, which spreads the load evenly.", "deprecated": false, - "label": "eip,routing,loadbalance", + "label": "eip,routing", "javaType": "org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json index baf2751..1557642 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json @@ -3,9 +3,9 @@ "kind": "model", "name": "sticky", "title": "Sticky", - "description": "Sticky load balancer Sticky load balancing using an Expression to calculate a correlation key to perform the sticky load balancing; rather like jsessionid in the web or JMSXGroupID in JMS.", + "description": "Sticky load balancing using an expression to calculate a correlation key to perform the sticky load balancing.", "deprecated": false, - "label": "eip,routing,loadbalance", + "label": "eip,routing", "javaType": "org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json index 14713e8..e33710e 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json @@ -3,9 +3,9 @@ "kind": "model", "name": "topic", "title": "Topic", - "description": "Topic load balancer The topic load balancer sends to all destinations (rather like JMS Topics)", + "description": "Topic which sends to all destinations.", "deprecated": false, - "label": "eip,routing,loadbalance", + "label": "eip,routing", "javaType": "org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json index aa3ec08..ab8c76b 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json @@ -3,9 +3,9 @@ "kind": "model", "name": "weighted", "title": "Weighted", - "description": "Weighted load balancer The weighted load balancing policy allows you to specify a processing load distribution ratio for each server with respect to others. In addition to the weight, endpoint selection is then further refined using random distribution based on weight.", + "description": "Uses a weighted load distribution ratio for each server with respect to others.", "deprecated": false, - "label": "eip,routing,loadbalance", + "label": "eip,routing", "javaType": "org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/log.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/log.json index fcae253..45e0b5f 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/log.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/log.json @@ -5,7 +5,7 @@ "title": "Log", "description": "Logs the defined message to the logger", "deprecated": false, - "label": "eip,configuration", + "label": "eip,routing", "javaType": "org.apache.camel.model.LogDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/onFallback.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/onFallback.json index 9bb08a9..2e5ae9d 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/onFallback.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/onFallback.json @@ -5,7 +5,7 @@ "title": "On Fallback", "description": "Route to be executed when Hystrix EIP executes fallback", "deprecated": false, - "label": "eip,routing,circuitbreaker", + "label": "eip,routing", "javaType": "org.apache.camel.model.OnFallbackDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/pollEnrich.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/pollEnrich.json index c56f351..f691b34 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/pollEnrich.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/pollEnrich.json @@ -5,7 +5,7 @@ "title": "Poll Enrich", "description": "Enriches messages with data polled from a secondary resource", "deprecated": false, - "label": "eip,transformation", + "label": "eip,routing", "javaType": "org.apache.camel.model.PollEnrichDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json index c95e42d..16b38be 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json @@ -5,7 +5,7 @@ "title": "Recipient List", "description": "Route messages to a number of dynamically specified recipients (dynamic to)", "deprecated": false, - "label": "eip,endpoint,routing", + "label": "eip,routing", "javaType": "org.apache.camel.model.RecipientListDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/resequence.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/resequence.json index 8dad199..2b4dab7 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/resequence.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/resequence.json @@ -12,7 +12,7 @@ }, "properties": { "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", "joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired": false, "secret": false, "description": "Expression to [...] - "resequencerConfig": { "kind": "element", "displayName": "Resequencer Config", "required": false, "type": "object", "javaType": "org.apache.camel.model.config.ResequencerConfig", "oneOf": [ "batch-config", "stream-config" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure the resequencer in using either batch or stream configuration. Will by default use batch configuration." }, + "resequencerConfig": { "kind": "element", "displayName": "Resequencer Config", "required": true, "type": "object", "javaType": "org.apache.camel.model.config.ResequencerConfig", "oneOf": [ "batch-config", "stream-config" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure the resequencer in using either batch or stream configuration. Will by default use batch configuration." }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" } } diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json index ece4c9be..26cb45d 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json @@ -5,7 +5,7 @@ "title": "Resilience4j Configuration", "description": "Resilience4j Circuit Breaker EIP configuration", "deprecated": false, - "label": "eip,routing,circuitbreaker", + "label": "configuration", "javaType": "org.apache.camel.model.Resilience4jConfigurationDefinition", "input": false, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/routingSlip.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routingSlip.json index c961041..fa4c5bf 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/routingSlip.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routingSlip.json @@ -5,7 +5,7 @@ "title": "Routing Slip", "description": "Routes a message through a series of steps that are pre-determined (the slip)", "deprecated": false, - "label": "eip,endpoint,routing", + "label": "eip,routing", "javaType": "org.apache.camel.model.RoutingSlipDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json index 42b0242..4830bde 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json @@ -3,7 +3,7 @@ "kind": "model", "name": "saga", "title": "Saga", - "description": "Enables sagas on the route", + "description": "Enables Sagas on the route", "deprecated": false, "label": "eip,routing", "javaType": "org.apache.camel.model.SagaDefinition", diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json index 7400bb9..0df861d 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json @@ -5,7 +5,7 @@ "title": "To", "description": "Sends the message to a static endpoint", "deprecated": false, - "label": "eip,endpoint,routing", + "label": "eip,routing", "javaType": "org.apache.camel.model.ToDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json index 3a5b648..1cac1f2 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json @@ -3,9 +3,9 @@ "kind": "model", "name": "toD", "title": "To D", - "description": "Sends the message to a dynamic endpoint You can specify multiple languages in the uri separated by the plus sign, such as mock:language:xpath:\/order\/uri where mock: would be a prefix to a xpath expression. For more dynamic behavior use Recipient List or Dynamic Router EIP instead.", + "description": "Sends the message to a dynamic endpoint", "deprecated": false, - "label": "eip,endpoint,routing", + "label": "eip,routing", "javaType": "org.apache.camel.model.ToDynamicDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json index ec8d585..7904bfa 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json @@ -5,7 +5,7 @@ "title": "Wire Tap", "description": "Routes a copy of a message (or creates a new message) to a secondary destination while continue routing the original message.", "deprecated": false, - "label": "eip,endpoint,routing", + "label": "eip,routing", "javaType": "org.apache.camel.model.WireTapDefinition", "input": true, "output": false diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java index 75e35a9..4a8e317 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java @@ -33,7 +33,7 @@ import org.apache.camel.spi.annotations.DslProperty; /** * Route messages in a fault tolerance way using Circuit Breaker */ -@Metadata(label = "eip,routing,circuitbreaker") +@Metadata(label = "eip,routing") @XmlRootElement(name = "circuitBreaker") @XmlAccessorType(XmlAccessType.FIELD) public class CircuitBreakerDefinition extends OutputDefinition<CircuitBreakerDefinition> { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java index af27e05..dbabdac 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java @@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata; /** * Route messages based on dynamic rules */ -@Metadata(label = "eip,endpoint,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "dynamicRouter") @XmlAccessorType(XmlAccessType.FIELD) public class DynamicRouterDefinition<Type extends ProcessorDefinition<Type>> extends ExpressionNode { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java index 7d330d9..297253d 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java @@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata; /** * MicroProfile Fault Tolerance Circuit Breaker EIP configuration */ -@Metadata(label = "eip,routing,circuitbreaker") +@Metadata(label = "configuration") @XmlRootElement(name = "faultToleranceConfiguration") @XmlAccessorType(XmlAccessType.FIELD) @Configurer(extended = true) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java index 4965957..94389c7 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/FromDefinition.java @@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata; /** * Act as a message source as input to a route */ -@Metadata(label = "eip,endpoint,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "from") @XmlAccessorType(XmlAccessType.FIELD) public class FromDefinition extends OptionalIdentifiedDefinition<FromDefinition> implements EndpointRequiredDefinition { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java index c127fa6..fea460c 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java @@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata; /** * Hystrix Circuit Breaker EIP configuration */ -@Metadata(label = "eip,routing,circuitbreaker") +@Metadata(label = "configuration") @XmlRootElement(name = "hystrixConfiguration") @XmlAccessorType(XmlAccessType.FIELD) @Configurer(extended = true) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/InOnlyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/InOnlyDefinition.java index 486be6c..9605c06 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/InOnlyDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/InOnlyDefinition.java @@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata; /** * Marks the exchange pattern for the route to one way */ -@Metadata(label = "eip,endpoint,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "inOnly") @XmlAccessorType(XmlAccessType.FIELD) @Deprecated diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/InOutDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/InOutDefinition.java index fad827a..ff4e9ef 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/InOutDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/InOutDefinition.java @@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata; /** * Marks the exchange pattern for the route to request/reply */ -@Metadata(label = "eip,endpoint,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "inOut") @XmlAccessorType(XmlAccessType.FIELD) @Deprecated diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/KameletDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/KameletDefinition.java index cbfc9a0..bca46fa 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/KameletDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/KameletDefinition.java @@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata; /** * To call Kamelets */ -@Metadata(label = "eip,routing,kamelet") +@Metadata(label = "eip,routing") @XmlRootElement(name = "kamelet") @XmlAccessorType(XmlAccessType.FIELD) public class KameletDefinition extends OutputDefinition<KameletDefinition> { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/LogDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/LogDefinition.java index a6fa558..87ddee2 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/LogDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/LogDefinition.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; /** * Logs the defined message to the logger */ -@Metadata(label = "eip,configuration") +@Metadata(label = "eip,routing") @XmlRootElement(name = "log") @XmlAccessorType(XmlAccessType.FIELD) public class LogDefinition extends NoOutputDefinition<LogDefinition> { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java index 1812469..219a470 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java @@ -30,7 +30,7 @@ import org.apache.camel.spi.Metadata; /** * Route to be executed when Hystrix EIP executes fallback */ -@Metadata(label = "eip,routing,circuitbreaker") +@Metadata(label = "eip,routing") @XmlRootElement(name = "onFallback") @XmlAccessorType(XmlAccessType.FIELD) public class OnFallbackDefinition extends OutputDefinition<OnFallbackDefinition> { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/PollEnrichDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/PollEnrichDefinition.java index ca45db2..a6fcd3b 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/PollEnrichDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/PollEnrichDefinition.java @@ -33,7 +33,7 @@ import org.apache.camel.spi.Metadata; * * @see org.apache.camel.processor.Enricher */ -@Metadata(label = "eip,transformation") +@Metadata(label = "eip,routing") @XmlRootElement(name = "pollEnrich") @XmlAccessorType(XmlAccessType.FIELD) public class PollEnrichDefinition extends ExpressionNode { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java index 11781ac..3af87d1 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java @@ -35,7 +35,7 @@ import org.apache.camel.spi.Metadata; /** * Route messages to a number of dynamically specified recipients (dynamic to) */ -@Metadata(label = "eip,endpoint,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "recipientList") @XmlAccessorType(XmlAccessType.FIELD) public class RecipientListDefinition<Type extends ProcessorDefinition<Type>> extends ExpressionNode diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java index 370812f..8d495b8 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java @@ -43,7 +43,6 @@ import org.apache.camel.util.TimeUtils; @XmlRootElement(name = "resequence") @XmlAccessorType(XmlAccessType.FIELD) public class ResequenceDefinition extends OutputDefinition<ResequenceDefinition> implements HasExpressionType { - @Metadata(required = false) @XmlElements({ @XmlElement(name = "batch-config", type = BatchResequencerConfig.class), @XmlElement(name = "stream-config", type = StreamResequencerConfig.class) }) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java index 77468c2..707d6c8 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java @@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata; /** * Resilience4j Circuit Breaker EIP configuration */ -@Metadata(label = "eip,routing,circuitbreaker") +@Metadata(label = "configuration") @XmlRootElement(name = "resilience4jConfiguration") @XmlAccessorType(XmlAccessType.FIELD) @Configurer(extended = true) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java index dec8b41..a966434 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java @@ -32,7 +32,7 @@ import org.apache.camel.spi.Metadata; /** * Routes a message through a series of steps that are pre-determined (the slip) */ -@Metadata(label = "eip,endpoint,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "routingSlip") @XmlAccessorType(XmlAccessType.FIELD) public class RoutingSlipDefinition<Type extends ProcessorDefinition<Type>> extends ExpressionNode { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java index 12e0815..f1120bc 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java @@ -24,9 +24,10 @@ import org.apache.camel.spi.Metadata; /** * Allows to declare saga actions to complete or compensate a saga */ -@Metadata(label = "eip,routing") +@Metadata(label = "configuration") @XmlAccessorType(XmlAccessType.FIELD) public class SagaActionUriDefinition extends SendDefinition<SagaActionUriDefinition> { + public SagaActionUriDefinition() { } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java index 36d1348..6db8864 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java @@ -36,7 +36,7 @@ import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.TimeUtils; /** - * Enables sagas on the route + * Enables Sagas on the route */ @Metadata(label = "eip,routing") @XmlRootElement(name = "saga") diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java index 31cbe77..d8fb627 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java @@ -26,9 +26,9 @@ import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.spi.Metadata; /** - * Allows to declare options on sagas + * Allows declaring options on Sagas */ -@Metadata(label = "eip,routing") +@Metadata(label = "configuration") @XmlAccessorType(XmlAccessType.FIELD) public class SagaOptionDefinition implements HasExpressionType { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java index 3009773..9fd6cb8 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java @@ -35,9 +35,6 @@ import org.apache.camel.util.TimeUtils; @XmlAccessorType(XmlAccessType.FIELD) public class SamplingDefinition extends NoOutputDefinition<SamplingDefinition> { - // use Long to let it be optional in JAXB so when using XML the default is 1 - // second - @XmlAttribute @Metadata(defaultValue = "1s", javaType = "java.time.Duration") private String samplePeriod; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java index 377a22a..d330174 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java @@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata; /** * Sends the message to a static endpoint */ -@Metadata(label = "eip,endpoint,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "to") @XmlAccessorType(XmlAccessType.FIELD) public class ToDefinition extends SendDefinition<ToDefinition> { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java index 86e25ae..15625cf 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java @@ -29,14 +29,8 @@ import org.apache.camel.spi.Metadata; /** * Sends the message to a dynamic endpoint - * <p/> - * You can specify multiple languages in the uri separated by the plus sign, such as - * <tt>mock:+language:xpath:/order/@uri</tt> where <tt>mock:</tt> would be a prefix to a xpath expression. - * <p/> - * For more dynamic behavior use <a href="http://camel.apache.org/recipient-list.html">Recipient List</a> or - * <a href="http://camel.apache.org/dynamic-router.html">Dynamic Router</a> EIP instead. */ -@Metadata(label = "eip,endpoint,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "toD") @XmlAccessorType(XmlAccessType.FIELD) public class ToDynamicDefinition extends NoOutputDefinition<ToDynamicDefinition> { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/WireTapDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/WireTapDefinition.java index 0504f8e..da87d26 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/WireTapDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/WireTapDefinition.java @@ -37,7 +37,7 @@ import org.apache.camel.spi.Metadata; * Routes a copy of a message (or creates a new message) to a secondary destination while continue routing the original * message. */ -@Metadata(label = "eip,endpoint,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "wireTap") @XmlAccessorType(XmlAccessType.FIELD) public class WireTapDefinition<Type extends ProcessorDefinition<Type>> extends ToDynamicDefinition diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java index 0789ddb..d990373 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java @@ -26,7 +26,7 @@ import org.apache.camel.spi.Metadata; /** * Configures batch-processing resequence eip. */ -@Metadata(label = "eip,routing,resequence") +@Metadata(label = "configuration") @XmlRootElement(name = "batch-config") @XmlAccessorType(XmlAccessType.FIELD) public class BatchResequencerConfig extends ResequencerConfig { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java index 699b007..e525c06 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java @@ -28,7 +28,7 @@ import org.apache.camel.spi.Metadata; /** * Configures stream-processing resequence eip. */ -@Metadata(label = "eip,routing,resequence") +@Metadata(label = "configuration") @XmlRootElement(name = "stream-config") @XmlAccessorType(XmlAccessType.FIELD) public class StreamResequencerConfig extends ResequencerConfig { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java index 06c1c06..9147441 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java @@ -27,9 +27,9 @@ import org.apache.camel.processor.loadbalancer.LoadBalancer; import org.apache.camel.spi.Metadata; /** - * Custom load balancer + * To use a custom load balancer implementation. */ -@Metadata(label = "eip,routing,loadbalance") +@Metadata(label = "eip,routing") @XmlRootElement(name = "customLoadBalancer") @XmlAccessorType(XmlAccessType.FIELD) public class CustomLoadBalancerDefinition extends LoadBalancerDefinition { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java index a8aa605..c235711 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java @@ -30,12 +30,9 @@ import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.spi.Metadata; /** - * Failover load balancer The failover load balancer is capable of trying the next processor in case an Exchange failed - * with an exception during processing. You can constrain the failover to activate only when one exception of a list you - * specify occurs. If you do not specify a list any exception will cause fail over to occur. This balancer uses the same - * strategy for matching exceptions as the Exception Clause does for the onException. + * In case of failures the exchange will be tried on the next endpoint. */ -@Metadata(label = "eip,routing,loadbalance") +@Metadata(label = "eip,routing") @XmlRootElement(name = "failover") @XmlAccessorType(XmlAccessType.FIELD) public class FailoverLoadBalancerDefinition extends LoadBalancerDefinition { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java index 4e8d20e..b867281 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java @@ -24,9 +24,9 @@ import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.spi.Metadata; /** - * Random load balancer The random load balancer selects a random endpoint for each exchange. + * A random endpoint is selected for each exchange. */ -@Metadata(label = "eip,routing,loadbalance") +@Metadata(label = "eip,routing") @XmlRootElement(name = "random") @XmlAccessorType(XmlAccessType.FIELD) public class RandomLoadBalancerDefinition extends LoadBalancerDefinition { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java index ff40457..4c1dfa2 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java @@ -24,10 +24,10 @@ import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.spi.Metadata; /** - * Round robin load balancer The round robin load balancer will use the next endpoint for each message. This load - * balancer is not meant to work with failover, for that you should use the dedicated failover load balancer. + * The exchanges are selected in a round robin fashion. This is a well known and classic policy, which spreads the load + * evenly. */ -@Metadata(label = "eip,routing,loadbalance") +@Metadata(label = "eip,routing") @XmlRootElement(name = "roundRobin") @XmlAccessorType(XmlAccessType.FIELD) public class RoundRobinLoadBalancerDefinition extends LoadBalancerDefinition { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java index ca4cbe0..eb41137 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java @@ -29,10 +29,9 @@ import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.spi.Metadata; /** - * Sticky load balancer Sticky load balancing using an Expression to calculate a correlation key to perform the sticky - * load balancing; rather like jsessionid in the web or JMSXGroupID in JMS. + * Sticky load balancing using an expression to calculate a correlation key to perform the sticky load balancing. */ -@Metadata(label = "eip,routing,loadbalance") +@Metadata(label = "eip,routing") @XmlRootElement(name = "sticky") @XmlAccessorType(XmlAccessType.FIELD) public class StickyLoadBalancerDefinition extends LoadBalancerDefinition { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java index 3e305a3..89cd4f5 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java @@ -24,9 +24,9 @@ import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.spi.Metadata; /** - * Topic load balancer The topic load balancer sends to all destinations (rather like JMS Topics) + * Topic which sends to all destinations. */ -@Metadata(label = "eip,routing,loadbalance") +@Metadata(label = "eip,routing") @XmlRootElement(name = "topic") @XmlAccessorType(XmlAccessType.FIELD) public class TopicLoadBalancerDefinition extends LoadBalancerDefinition { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java index 5e81d8b..225817c 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java @@ -25,11 +25,9 @@ import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.spi.Metadata; /** - * Weighted load balancer The weighted load balancing policy allows you to specify a processing load distribution ratio - * for each server with respect to others. In addition to the weight, endpoint selection is then further refined using - * random distribution based on weight. + * Uses a weighted load distribution ratio for each server with respect to others. */ -@Metadata(label = "eip,routing,loadbalance") +@Metadata(label = "eip,routing") @XmlRootElement(name = "weighted") @XmlAccessorType(XmlAccessType.FIELD) public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition {