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
The following commit(s) were added to refs/heads/main by this push:
new 0d5e56a CAMEL-17638: EIP model options with old fashioned naming
xxxRef style should be made modern style.
0d5e56a is described below
commit 0d5e56aad15ab309c105b9f9f9900694ebda2d08
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Feb 24 16:10:26 2022 +0100
CAMEL-17638: EIP model options with old fashioned naming xxxRef style
should be made modern style.
---
.../org/apache/camel/catalog/models/circuitBreaker.json | 2 +-
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
.../resources/org/apache/camel/model/circuitBreaker.json | 2 +-
.../java/org/apache/camel/model/AggregateDefinition.java | 8 ++++----
.../org/apache/camel/model/CircuitBreakerDefinition.java | 12 ++++++------
.../main/java/org/apache/camel/model/DelayDefinition.java | 4 ++--
.../main/java/org/apache/camel/model/EnrichDefinition.java | 4 ++--
.../apache/camel/model/ExecutorServiceAwareDefinition.java | 8 ++++----
.../src/main/java/org/apache/camel/model/SagaDefinition.java | 4 ++--
.../main/java/org/apache/camel/model/SplitDefinition.java | 12 ++++++------
.../main/java/org/apache/camel/model/ThrottleDefinition.java | 8 ++++----
.../generated/java/org/apache/camel/xml/in/ModelParser.java | 4 ++--
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 6 +++---
.../src/generated/resources/camel-yaml-dsl.json | 2 +-
.../camel-yaml-dsl/src/generated/resources/camelYamlDsl.json | 2 +-
.../org/apache/camel/dsl/yaml/CircuitBreakerTest.groovy | 8 ++++----
16 files changed, 44 insertions(+), 44 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/circuitBreaker.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/circuitBreaker.json
index d42ee33..be6a9df 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/circuitBreaker.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/circuitBreaker.json
@@ -15,7 +15,7 @@
"hystrixConfiguration": { "kind": "element", "displayName": "Hystrix
Configuration", "required": false, "type": "object", "javaType":
"org.apache.camel.model.HystrixConfigurationDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Configures the circuit
breaker to use Hystrix with the given configuration." },
"resilience4jConfiguration": { "kind": "element", "displayName":
"Resilience4j Configuration", "required": false, "type": "object", "javaType":
"org.apache.camel.model.Resilience4jConfigurationDefinition", "deprecated":
false, "autowired": false, "secret": false, "description": "Configures the
circuit breaker to use Resilience4j with the given configuration." },
"faultToleranceConfiguration": { "kind": "element", "displayName": "Fault
Tolerance Configuration", "required": false, "type": "object", "javaType":
"org.apache.camel.model.FaultToleranceConfigurationDefinition", "deprecated":
false, "autowired": false, "secret": false, "description": "Configures the
circuit breaker to use MicroProfile Fault Tolerance with the given
configuration." },
- "configurationRef": { "kind": "attribute", "displayName": "Configuration
Ref", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to a circuit breaker configuration (such as hystrix, resillience4j, or
microprofile-fault-tolerance) to use for configuring the circuit breaker EIP."
},
+ "configuration": { "kind": "attribute", "displayName": "Configuration",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to a circuit breaker configuration (such as hystrix, resillience4j, or
microprofile-fault-tolerance) to use for configuring the circuit breaker EIP."
},
"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/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index a4de55e..f585015 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -3846,7 +3846,7 @@ should be intercepted by this exception type or not.
<xs:element ref="tns:serviceCall"/>
</xs:choice>
</xs:sequence>
- <xs:attribute name="configurationRef" type="xs:string">
+ <xs:attribute name="configuration" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
Refers to a circuit breaker configuration (such as hystrix, resillience4j, or
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 d42ee33..be6a9df 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
@@ -15,7 +15,7 @@
"hystrixConfiguration": { "kind": "element", "displayName": "Hystrix
Configuration", "required": false, "type": "object", "javaType":
"org.apache.camel.model.HystrixConfigurationDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Configures the circuit
breaker to use Hystrix with the given configuration." },
"resilience4jConfiguration": { "kind": "element", "displayName":
"Resilience4j Configuration", "required": false, "type": "object", "javaType":
"org.apache.camel.model.Resilience4jConfigurationDefinition", "deprecated":
false, "autowired": false, "secret": false, "description": "Configures the
circuit breaker to use Resilience4j with the given configuration." },
"faultToleranceConfiguration": { "kind": "element", "displayName": "Fault
Tolerance Configuration", "required": false, "type": "object", "javaType":
"org.apache.camel.model.FaultToleranceConfigurationDefinition", "deprecated":
false, "autowired": false, "secret": false, "description": "Configures the
circuit breaker to use MicroProfile Fault Tolerance with the given
configuration." },
- "configurationRef": { "kind": "attribute", "displayName": "Configuration
Ref", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to a circuit breaker configuration (such as hystrix, resillience4j, or
microprofile-fault-tolerance) to use for configuring the circuit breaker EIP."
},
+ "configuration": { "kind": "attribute", "displayName": "Configuration",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to a circuit breaker configuration (such as hystrix, resillience4j, or
microprofile-fault-tolerance) to use for configuring the circuit breaker EIP."
},
"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/main/java/org/apache/camel/model/AggregateDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/AggregateDefinition.java
index 3598951..f2a0355 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -847,11 +847,11 @@ public class AggregateDefinition extends
OutputDefinition<AggregateDefinition>
* <p/>
* Will by default use {@link
org.apache.camel.processor.aggregate.MemoryAggregationRepository}
*
- * @param aggregationRepositoryRef reference to the repository to lookup
in the registry
- * @return the builder
+ * @param aggregationRepository reference to the repository to lookup in
the registry
+ * @return the builder
*/
- public AggregateDefinition aggregationRepository(String
aggregationRepositoryRef) {
- this.aggregationRepository = aggregationRepositoryRef;
+ public AggregateDefinition aggregationRepository(String
aggregationRepository) {
+ this.aggregationRepository = aggregationRepository;
return this;
}
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 4a8e317..56ac206 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
@@ -45,7 +45,7 @@ public class CircuitBreakerDefinition extends
OutputDefinition<CircuitBreakerDef
@XmlElement
private FaultToleranceConfigurationDefinition faultToleranceConfiguration;
@XmlAttribute
- private String configurationRef;
+ private String configuration;
@DslProperty
@XmlTransient
private OnFallbackDefinition onFallback;
@@ -144,16 +144,16 @@ public class CircuitBreakerDefinition extends
OutputDefinition<CircuitBreakerDef
this.faultToleranceConfiguration = faultToleranceConfiguration;
}
- public String getConfigurationRef() {
- return configurationRef;
+ public String getConfiguration() {
+ return configuration;
}
/**
* Refers to a circuit breaker configuration (such as hystrix,
resillience4j, or microprofile-fault-tolerance) to
* use for configuring the circuit breaker EIP.
*/
- public void setConfigurationRef(String configurationRef) {
- this.configurationRef = configurationRef;
+ public void setConfiguration(String configuration) {
+ this.configuration = configuration;
}
public OnFallbackDefinition getOnFallback() {
@@ -229,7 +229,7 @@ public class CircuitBreakerDefinition extends
OutputDefinition<CircuitBreakerDef
* Refers to a configuration to use for configuring the circuit breaker.
*/
public CircuitBreakerDefinition configuration(String ref) {
- configurationRef = ref;
+ configuration = ref;
return this;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/DelayDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/DelayDefinition.java
index 70eb63e..c45a524 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/DelayDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/DelayDefinition.java
@@ -128,8 +128,8 @@ public class DelayDefinition extends ExpressionNode
implements ExecutorServiceAw
* Refers to a custom Thread Pool if asyncDelay has been enabled.
*/
@Override
- public DelayDefinition executorService(String executorServiceRef) {
- setExecutorService(executorServiceRef);
+ public DelayDefinition executorService(String executorService) {
+ setExecutorService(executorService);
return this;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
index a89e774..852da04 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
@@ -105,8 +105,8 @@ public class EnrichDefinition extends ExpressionNode
implements AggregationStrat
* message. By default Camel will use the reply from the external service
as outgoing message.
*/
@Override
- public EnrichDefinition aggregationStrategy(String aggregationStrategyRef)
{
- setAggregationStrategy(aggregationStrategyRef);
+ public EnrichDefinition aggregationStrategy(String aggregationStrategy) {
+ setAggregationStrategy(aggregationStrategy);
return this;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
index 53d3fe5..9eef477 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
@@ -34,11 +34,11 @@ public interface ExecutorServiceAwareDefinition<Type
extends ProcessorDefinition
/**
* Setting the executor service for executing
*
- * @param executorServiceRef reference for a {@link
java.util.concurrent.ExecutorService} to lookup in the
- * {@link org.apache.camel.spi.Registry}
- * @return the builder
+ * @param executorService reference for a {@link
java.util.concurrent.ExecutorService} to lookup in the
+ * {@link org.apache.camel.spi.Registry}
+ * @return the builder
*/
- Type executorService(String executorServiceRef);
+ Type executorService(String executorService);
/**
* Gets the executor service for executing
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 e46fac9..3131415 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
@@ -238,8 +238,8 @@ public class SagaDefinition extends
OutputDefinition<SagaDefinition> {
return this;
}
- public SagaDefinition sagaService(String sagaServiceRef) {
- setSagaService(sagaServiceRef);
+ public SagaDefinition sagaService(String sagaService) {
+ setSagaService(sagaService);
return this;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
index 29c13df..fc97ab7 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
@@ -383,8 +383,8 @@ public class SplitDefinition extends OutputExpressionNode
implements ExecutorSer
* processing is automatically implied, and you do not have to enable that
option as well.
*/
@Override
- public SplitDefinition executorService(String executorServiceRef) {
- setExecutorService(executorServiceRef);
+ public SplitDefinition executorService(String executorService) {
+ setExecutorService(executorService);
return this;
}
@@ -404,11 +404,11 @@ public class SplitDefinition extends OutputExpressionNode
implements ExecutorSer
* Uses the {@link Processor} when preparing the {@link
org.apache.camel.Exchange} to be sent. This can be used to
* deep-clone messages that should be sent, or any custom logic needed
before the exchange is sent.
*
- * @param onPrepareRef reference to the processor to lookup in the {@link
org.apache.camel.spi.Registry}
- * @return the builder
+ * @param onPrepare reference to the processor to lookup in the {@link
org.apache.camel.spi.Registry}
+ * @return the builder
*/
- public SplitDefinition onPrepareRef(String onPrepareRef) {
- setOnPrepare(onPrepareRef);
+ public SplitDefinition onPrepare(String onPrepare) {
+ setOnPrepare(onPrepare);
return this;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
index cdc6faa..ccdd0fe 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
@@ -267,12 +267,12 @@ public class ThrottleDefinition extends ExpressionNode
implements ExecutorServic
/**
* To use a custom thread pool (ScheduledExecutorService) by the throttler.
*
- * @param executorServiceRef the reference id of the thread pool (must be
scheduled)
- * @return the builder
+ * @param executorService the reference id of the thread pool (must be
scheduled)
+ * @return the builder
*/
@Override
- public ThrottleDefinition executorService(String executorServiceRef) {
- setExecutorService(executorServiceRef);
+ public ThrottleDefinition executorService(String executorService) {
+ setExecutorService(executorService);
return this;
}
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 458fcc7..36580ae 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -240,8 +240,8 @@ public class ModelParser extends BaseParser {
}
protected CircuitBreakerDefinition doParseCircuitBreakerDefinition()
throws IOException, XmlPullParserException {
return doParse(new CircuitBreakerDefinition(), (def, key, val) -> {
- if ("configurationRef".equals(key)) {
- def.setConfigurationRef(val);
+ if ("configuration".equals(key)) {
+ def.setConfiguration(val);
return true;
}
return processorDefinitionAttributeHandler().accept(def, key, val);
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index f1d6e23..869faf7 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -1582,7 +1582,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
"circuitBreaker"
},
properties = {
- @YamlProperty(name = "configuration-ref", type = "string"),
+ @YamlProperty(name = "configuration", type = "string"),
@YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "fault-tolerance-configuration", type
= "object:org.apache.camel.model.FaultToleranceConfigurationDefinition"),
@YamlProperty(name = "hystrix-configuration", type =
"object:org.apache.camel.model.HystrixConfigurationDefinition"),
@@ -1607,9 +1607,9 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
protected boolean setProperty(CircuitBreakerDefinition target, String
propertyKey,
String propertyName, Node node) {
switch(propertyKey) {
- case "configuration-ref": {
+ case "configuration": {
String val = asText(node);
- target.setConfigurationRef(val);
+ target.setConfiguration(val);
break;
}
case "fault-tolerance-configuration": {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index eba8603..56f9f0e 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -645,7 +645,7 @@
"org.apache.camel.model.CircuitBreakerDefinition" : {
"type" : "object",
"properties" : {
- "configuration-ref" : {
+ "configuration" : {
"type" : "string"
},
"description" : {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index 3166b36..56b8bc6 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -549,7 +549,7 @@
"org.apache.camel.model.CircuitBreakerDefinition" : {
"type" : "object",
"properties" : {
- "configurationRef" : {
+ "configuration" : {
"type" : "string"
},
"description" : {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/CircuitBreakerTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/CircuitBreakerTest.groovy
index 9c85757..58ad132 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/CircuitBreakerTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/CircuitBreakerTest.groovy
@@ -33,7 +33,7 @@ class CircuitBreakerTest extends YamlTestSupport {
- circuit-breaker:
steps:
- log: "test"
- configuration-ref: "my-config"
+ configuration: "my-config"
resilience4j-configuration:
failure-rate-threshold: 10
on-fallback:
@@ -44,7 +44,7 @@ class CircuitBreakerTest extends YamlTestSupport {
input.endpointUri == 'direct:start'
with(outputs[0], CircuitBreakerDefinition) {
- configurationRef == 'my-config'
+ configuration == 'my-config'
resilience4jConfiguration != null
resilience4jConfiguration.failureRateThreshold == '10'
@@ -67,7 +67,7 @@ class CircuitBreakerTest extends YamlTestSupport {
- circuitBreaker:
steps:
- log: "test"
- configurationRef: "my-config"
+ configuration: "my-config"
resilience4jConfiguration:
failureRateThreshold: 10
onFallback:
@@ -78,7 +78,7 @@ class CircuitBreakerTest extends YamlTestSupport {
input.endpointUri == 'direct:start'
with(outputs[0], CircuitBreakerDefinition) {
- configurationRef == 'my-config'
+ configuration == 'my-config'
resilience4jConfiguration != null
resilience4jConfiguration.failureRateThreshold == '10'
