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 5396d84c294 CAMEL-16834: error handler in DSL model
5396d84c294 is described below
commit 5396d84c294044068f2a773591967c148d543e6c
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Apr 14 09:11:33 2022 +0200
CAMEL-16834: error handler in DSL model
---
.../resources/org/apache/camel/catalog/models/deadLetterChannel.json | 2 +-
.../resources/org/apache/camel/catalog/models/defaultErrorHandler.json | 2 +-
.../resources/org/apache/camel/catalog/models/errorHandler.json | 2 +-
.../resources/org/apache/camel/catalog/models/noErrorHandler.json | 2 +-
.../src/generated/resources/org/apache/camel/model/errorHandler.json | 2 +-
.../org/apache/camel/model/errorhandler/deadLetterChannel.json | 2 +-
.../org/apache/camel/model/errorhandler/defaultErrorHandler.json | 2 +-
.../resources/org/apache/camel/model/errorhandler/noErrorHandler.json | 2 +-
.../src/main/java/org/apache/camel/model/ErrorHandlerDefinition.java | 3 +++
.../apache/camel/model/errorhandler/DeadLetterChannelDefinition.java | 2 +-
.../apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java | 2 +-
.../org/apache/camel/model/errorhandler/NoErrorHandlerDefinition.java | 2 +-
12 files changed, 14 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
index 878983c5056..f7b27f65585 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "deadLetterChannel",
"title": "Dead Letter Channel",
- "description": "Dead letter channel error handler.",
+ "description": "Error handler with dead letter queue.",
"deprecated": false,
"label": "configuration,error",
"javaType":
"org.apache.camel.model.errorhandler.DeadLetterChannelDefinition",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/defaultErrorHandler.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/defaultErrorHandler.json
index 208e279035f..25dda486f6a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/defaultErrorHandler.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/defaultErrorHandler.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "defaultErrorHandler",
"title": "Default Error Handler",
- "description": "Default error handler.",
+ "description": "The default error handler.",
"deprecated": false,
"label": "configuration,error",
"javaType":
"org.apache.camel.model.errorhandler.DefaultErrorHandlerDefinition",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
index e7ae369ac74..ddcf5343eb1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
@@ -12,7 +12,7 @@
"output": false
},
"properties": {
- "errorHandlerType": { "kind": "element", "displayName": "Error Handler
Type", "required": true, "type": "object", "javaType":
"org.apache.camel.ErrorHandlerFactory", "oneOf": [ "deadLetterChannel",
"defaultErrorHandler", "jtaTransactionErrorHandler", "noErrorHandler",
"springTransactionErrorHandler" ], "deprecated": false, "autowired": false,
"secret": false },
+ "errorHandlerType": { "kind": "element", "displayName": "Error Handler
Type", "required": true, "type": "object", "javaType":
"org.apache.camel.ErrorHandlerFactory", "oneOf": [ "deadLetterChannel",
"defaultErrorHandler", "jtaTransactionErrorHandler", "noErrorHandler",
"springTransactionErrorHandler" ], "deprecated": false, "autowired": false,
"secret": false, "description": "The specific error handler in use." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/noErrorHandler.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/noErrorHandler.json
index f0e1feaaa4f..c203e0c4bd1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/noErrorHandler.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/noErrorHandler.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "noErrorHandler",
"title": "No Error Handler",
- "description": "No error handler.",
+ "description": "To not use an error handler.",
"deprecated": false,
"label": "configuration,error",
"javaType": "org.apache.camel.model.errorhandler.NoErrorHandlerDefinition",
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorHandler.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorHandler.json
index e7ae369ac74..ddcf5343eb1 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorHandler.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorHandler.json
@@ -12,7 +12,7 @@
"output": false
},
"properties": {
- "errorHandlerType": { "kind": "element", "displayName": "Error Handler
Type", "required": true, "type": "object", "javaType":
"org.apache.camel.ErrorHandlerFactory", "oneOf": [ "deadLetterChannel",
"defaultErrorHandler", "jtaTransactionErrorHandler", "noErrorHandler",
"springTransactionErrorHandler" ], "deprecated": false, "autowired": false,
"secret": false },
+ "errorHandlerType": { "kind": "element", "displayName": "Error Handler
Type", "required": true, "type": "object", "javaType":
"org.apache.camel.ErrorHandlerFactory", "oneOf": [ "deadLetterChannel",
"defaultErrorHandler", "jtaTransactionErrorHandler", "noErrorHandler",
"springTransactionErrorHandler" ], "deprecated": false, "autowired": false,
"secret": false, "description": "The specific error handler in use." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/deadLetterChannel.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/deadLetterChannel.json
index 878983c5056..f7b27f65585 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/deadLetterChannel.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/deadLetterChannel.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "deadLetterChannel",
"title": "Dead Letter Channel",
- "description": "Dead letter channel error handler.",
+ "description": "Error handler with dead letter queue.",
"deprecated": false,
"label": "configuration,error",
"javaType":
"org.apache.camel.model.errorhandler.DeadLetterChannelDefinition",
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/defaultErrorHandler.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/defaultErrorHandler.json
index 208e279035f..25dda486f6a 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/defaultErrorHandler.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/defaultErrorHandler.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "defaultErrorHandler",
"title": "Default Error Handler",
- "description": "Default error handler.",
+ "description": "The default error handler.",
"deprecated": false,
"label": "configuration,error",
"javaType":
"org.apache.camel.model.errorhandler.DefaultErrorHandlerDefinition",
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/noErrorHandler.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/noErrorHandler.json
index f0e1feaaa4f..c203e0c4bd1 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/noErrorHandler.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/noErrorHandler.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "noErrorHandler",
"title": "No Error Handler",
- "description": "No error handler.",
+ "description": "To not use an error handler.",
"deprecated": false,
"label": "configuration,error",
"javaType": "org.apache.camel.model.errorhandler.NoErrorHandlerDefinition",
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ErrorHandlerDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ErrorHandlerDefinition.java
index 03c642d9b5b..ca80dfb5088 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ErrorHandlerDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ErrorHandlerDefinition.java
@@ -50,6 +50,9 @@ public class ErrorHandlerDefinition extends IdentifiedType {
return errorHandlerType;
}
+ /**
+ * The specific error handler in use.
+ */
public void setErrorHandlerType(ErrorHandlerFactory errorHandlerType) {
this.errorHandlerType = errorHandlerType;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DeadLetterChannelDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DeadLetterChannelDefinition.java
index 9e90e396304..0e06bc23c16 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DeadLetterChannelDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DeadLetterChannelDefinition.java
@@ -27,7 +27,7 @@ import org.apache.camel.model.RedeliveryPolicyDefinition;
import org.apache.camel.spi.Metadata;
/**
- * Dead letter channel error handler.
+ * Error handler with dead letter queue.
*/
@Metadata(label = "configuration,error")
@XmlRootElement(name = "deadLetterChannel")
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java
index a88c6771cdb..2bfe1fef8fb 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java
@@ -39,7 +39,7 @@ import org.apache.camel.support.ExpressionToPredicateAdapter;
import org.slf4j.LoggerFactory;
/**
- * Default error handler.
+ * The default error handler.
*/
@Metadata(label = "configuration,error")
@XmlRootElement(name = "defaultErrorHandler")
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/NoErrorHandlerDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/NoErrorHandlerDefinition.java
index 849acce7b32..1e3f560609a 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/NoErrorHandlerDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/NoErrorHandlerDefinition.java
@@ -24,7 +24,7 @@ import org.apache.camel.ErrorHandlerFactory;
import org.apache.camel.spi.Metadata;
/**
- * No error handler.
+ * To not use an error handler.
*/
@Metadata(label = "configuration,error")
@XmlRootElement(name = "noErrorHandler")