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 ec4b442 CAMEL-17638: EIP model options with old fashioned naming
xxxRef style should be made modern style.
ec4b442 is described below
commit ec4b44220ac4f66a05af4f223a27fd46f4e5f792
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Feb 24 15:59:54 2022 +0100
CAMEL-17638: EIP model options with old fashioned naming xxxRef style
should be made modern style.
---
.../apache/camel/catalog/models/stream-config.json | 4 +--
.../apache/camel/catalog/schemas/camel-spring.xsd | 12 ++++-----
.../apache/camel/model/config/stream-config.json | 4 +--
.../apache/camel/model/ResequenceDefinition.java | 12 +++++----
.../model/config/StreamResequencerConfig.java | 30 ++++++++++++----------
.../apache/camel/reifier/ResequenceReifier.java | 6 ++---
.../java/org/apache/camel/xml/in/ModelParser.java | 2 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc | 12 ++++++---
.../dsl/yaml/deserializers/ModelDeserializers.java | 6 ++---
.../src/generated/resources/camel-yaml-dsl.json | 2 +-
.../src/generated/resources/camelYamlDsl.json | 2 +-
11 files changed, 50 insertions(+), 42 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stream-config.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stream-config.json
index 5b9477a..ab37785 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stream-config.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stream-config.json
@@ -16,7 +16,7 @@
"timeout": { "kind": "attribute", "displayName": "Timeout", "required":
false, "type": "duration", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1000", "description":
"Sets minimum time (milliseconds) to wait for missing elements (messages)." },
"deliveryAttemptInterval": { "kind": "attribute", "displayName": "Delivery
Attempt Interval", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1000", "description": "Sets the interval in milliseconds the
stream resequencer will at most wait while waiting for condition of being able
to deliver." },
"ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore
Invalid Exchanges", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to ignore invalid exchanges" },
- "comparatorRef": { "kind": "attribute", "displayName": "Comparator Ref",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To use a custom comparator as a
org.apache.camel.processor.resequencer.ExpressionResultComparator type." },
- "rejectOld": { "kind": "attribute", "displayName": "Reject Old",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If true, throws an exception when messages older than
the last delivered message are processed" }
+ "rejectOld": { "kind": "attribute", "displayName": "Reject Old",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If true, throws an exception when messages older than
the last delivered message are processed" },
+ "comparator": { "kind": "attribute", "displayName": "Comparator", "label":
"advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.processor.resequencer.ExpressionResultComparator",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom comparator as a
org.apache.camel.processor.resequencer.ExpressionResultComparator type." }
}
}
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 40cc62f..a4de55e 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
@@ -10478,19 +10478,19 @@ Whether to ignore invalid exchanges. Default value:
false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="comparatorRef" type="xs:string">
+ <xs:attribute name="rejectOld" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-To use a custom comparator as a
-org.apache.camel.processor.resequencer.ExpressionResultComparator type.
+If true, throws an exception when messages older than the last delivered
message
+are processed. Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="rejectOld" type="xs:string">
+ <xs:attribute name="comparator" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-If true, throws an exception when messages older than the last delivered
message
-are processed. Default value: false
+To use a custom comparator as a
+org.apache.camel.processor.resequencer.ExpressionResultComparator type.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
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 5b9477a..ab37785 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
@@ -16,7 +16,7 @@
"timeout": { "kind": "attribute", "displayName": "Timeout", "required":
false, "type": "duration", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1000", "description":
"Sets minimum time (milliseconds) to wait for missing elements (messages)." },
"deliveryAttemptInterval": { "kind": "attribute", "displayName": "Delivery
Attempt Interval", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1000", "description": "Sets the interval in milliseconds the
stream resequencer will at most wait while waiting for condition of being able
to deliver." },
"ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore
Invalid Exchanges", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to ignore invalid exchanges" },
- "comparatorRef": { "kind": "attribute", "displayName": "Comparator Ref",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To use a custom comparator as a
org.apache.camel.processor.resequencer.ExpressionResultComparator type." },
- "rejectOld": { "kind": "attribute", "displayName": "Reject Old",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If true, throws an exception when messages older than
the last delivered message are processed" }
+ "rejectOld": { "kind": "attribute", "displayName": "Reject Old",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If true, throws an exception when messages older than
the last delivered message are processed" },
+ "comparator": { "kind": "attribute", "displayName": "Comparator", "label":
"advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.processor.resequencer.ExpressionResultComparator",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom comparator as a
org.apache.camel.processor.resequencer.ExpressionResultComparator type." }
}
}
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 8d495b8..36df314 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,14 +43,16 @@ import org.apache.camel.util.TimeUtils;
@XmlRootElement(name = "resequence")
@XmlAccessorType(XmlAccessType.FIELD)
public class ResequenceDefinition extends
OutputDefinition<ResequenceDefinition> implements HasExpressionType {
- @XmlElements({
- @XmlElement(name = "batch-config", type =
BatchResequencerConfig.class),
- @XmlElement(name = "stream-config", type =
StreamResequencerConfig.class) })
- private ResequencerConfig resequencerConfig;
+
@XmlTransient
private BatchResequencerConfig batchConfig;
@XmlTransient
private StreamResequencerConfig streamConfig;
+
+ @XmlElements({
+ @XmlElement(name = "batch-config", type =
BatchResequencerConfig.class),
+ @XmlElement(name = "stream-config", type =
StreamResequencerConfig.class) })
+ private ResequencerConfig resequencerConfig;
@XmlElementRef
@Metadata(required = true)
private ExpressionDefinition expression;
@@ -284,7 +286,7 @@ public class ResequenceDefinition extends
OutputDefinition<ResequenceDefinition>
if (streamConfig == null) {
throw new IllegalStateException("comparator() only supported for
stream resequencer");
}
- streamConfig.setComparator(comparator);
+ streamConfig.setComparatorBean(comparator);
return this;
}
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 c60b7b6..ecfd115 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
@@ -32,6 +32,10 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "stream-config")
@XmlAccessorType(XmlAccessType.FIELD)
public class StreamResequencerConfig extends ResequencerConfig {
+
+ @XmlTransient
+ private ExpressionResultComparator comparatorBean;
+
@XmlAttribute
@Metadata(defaultValue = "1000", javaType = "java.lang.Integer")
private String capacity;
@@ -44,14 +48,12 @@ public class StreamResequencerConfig extends
ResequencerConfig {
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean")
private String ignoreInvalidExchanges;
- @XmlTransient
- private ExpressionResultComparator comparator;
- @XmlAttribute
- @Metadata(label = "advanced")
- private String comparatorRef;
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean")
private String rejectOld;
+ @XmlAttribute
+ @Metadata(label = "advanced", javaType =
"org.apache.camel.processor.resequencer.ExpressionResultComparator")
+ private String comparator;
/**
* Creates a new {@link StreamResequencerConfig} instance using default
values for <code>capacity</code> (1000) and
@@ -110,7 +112,7 @@ public class StreamResequencerConfig extends
ResequencerConfig {
this.capacity = Integer.toString(capacity);
this.timeout = Long.toString(timeout);
this.rejectOld = rejectOld != null ? Boolean.toString(rejectOld) :
null;
- this.comparator = comparator;
+ this.comparatorBean = comparator;
}
/**
@@ -169,26 +171,26 @@ public class StreamResequencerConfig extends
ResequencerConfig {
this.ignoreInvalidExchanges = ignoreInvalidExchanges;
}
- public ExpressionResultComparator getComparator() {
- return comparator;
+ public ExpressionResultComparator getComparatorBean() {
+ return comparatorBean;
}
/**
* To use a custom comparator
*/
- public void setComparator(ExpressionResultComparator comparator) {
- this.comparator = comparator;
+ public void setComparatorBean(ExpressionResultComparator comparatorBean) {
+ this.comparatorBean = comparatorBean;
}
- public String getComparatorRef() {
- return comparatorRef;
+ public String getComparator() {
+ return comparator;
}
/**
* To use a custom comparator as a
org.apache.camel.processor.resequencer.ExpressionResultComparator type.
*/
- public void setComparatorRef(String comparatorRef) {
- this.comparatorRef = comparatorRef;
+ public void setComparator(String comparator) {
+ this.comparator = comparator;
}
/**
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
index c7b8d06..bdcdb9f 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
@@ -118,10 +118,10 @@ public class ResequenceReifier extends
ProcessorReifier<ResequenceDefinition> {
ObjectHelper.notNull(expression, "expression", this);
ExpressionResultComparator comparator;
- if (config.getComparatorRef() != null) {
- comparator = mandatoryLookup(config.getComparatorRef(),
ExpressionResultComparator.class);
+ if (config.getComparator() != null) {
+ comparator = mandatoryLookup(config.getComparator(),
ExpressionResultComparator.class);
} else {
- comparator = config.getComparator();
+ comparator = config.getComparatorBean();
if (comparator == null) {
comparator = new DefaultExchangeComparator();
}
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 0c4da44..458fcc7 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
@@ -1884,7 +1884,7 @@ public class ModelParser extends BaseParser {
return doParse(new StreamResequencerConfig(), (def, key, val) -> {
switch (key) {
case "capacity": def.setCapacity(val); break;
- case "comparatorRef": def.setComparatorRef(val); break;
+ case "comparator": def.setComparator(val); break;
case "deliveryAttemptInterval":
def.setDeliveryAttemptInterval(val); break;
case "ignoreInvalidExchanges":
def.setIgnoreInvalidExchanges(val); break;
case "rejectOld": def.setRejectOld(val); break;
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
index d5833ef..5c10c09 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
@@ -157,16 +157,16 @@ Renamed `configRef` to `config`.
Renamed `bulkheadExecutorServiceRef` to `bulkheadExecutorService`.
Renamed `timeoutScheduledExecutorServiceRef` to
`timeoutScheduledExecutorService`.
-=== Delay EIP
-
-Renamed `executorServiceRef` to `executorService`.
-
=== Claim Check EIP
Renamed `strategyRef` to `aggregationStrategy`, and marked this option as
required.
Renamed `strategyMethodName` to `aggregationStrategyMethodName`.
Removed some unnecessary methods in Java DSL.
+=== Delay EIP
+
+Renamed `executorServiceRef` to `executorService`.
+
=== Enrich & Poll Enrich EIPs
Renamed `strategyRef` to `aggregationStrategy`, and marked this option as
required.
@@ -196,6 +196,10 @@ Removed some deprecated methods, and some unnecessary
methods in Java DSL.
Renamed `executorServiceRef` to `executorService`.
+=== Resequence EIP
+
+Renamed `comparatorRef` to `comparator`.
+
=== Sort EIP
Renamed `comparatorRef` to `comparator`.
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 d30e103..f1d6e23 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
@@ -15023,7 +15023,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
nodes = "stream-config",
properties = {
@YamlProperty(name = "capacity", type = "number"),
- @YamlProperty(name = "comparator-ref", type = "string"),
+ @YamlProperty(name = "comparator", type = "string"),
@YamlProperty(name = "delivery-attempt-interval", type =
"string"),
@YamlProperty(name = "ignore-invalid-exchanges", type =
"boolean"),
@YamlProperty(name = "reject-old", type = "boolean"),
@@ -15049,9 +15049,9 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setCapacity(val);
break;
}
- case "comparator-ref": {
+ case "comparator": {
String val = asText(node);
- target.setComparatorRef(val);
+ target.setComparator(val);
break;
}
case "delivery-attempt-interval": {
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 6c16f3e..eba8603 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
@@ -4267,7 +4267,7 @@
"capacity" : {
"type" : "number"
},
- "comparator-ref" : {
+ "comparator" : {
"type" : "string"
},
"delivery-attempt-interval" : {
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 612568f..3166b36 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
@@ -4168,7 +4168,7 @@
"capacity" : {
"type" : "number"
},
- "comparatorRef" : {
+ "comparator" : {
"type" : "string"
},
"deliveryAttemptInterval" : {
