You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/08/12 07:14:31 UTC

(camel) 01/02: CAMEL-21055: camel-core-model - Adjust label on EIP nodes so they are more accurte and we have marshal/unmarshal as EIPs

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 fea3fe87a20aebd229bb53208844c576c3ca4edc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 12 09:12:18 2024 +0200

    CAMEL-21055: camel-core-model - Adjust label on EIP nodes so they are more accurte and we have marshal/unmarshal as EIPs
---
 .../org/apache/camel/catalog/models/faultToleranceConfiguration.json    | 2 +-
 .../generated/resources/org/apache/camel/catalog/models/onFallback.json | 2 +-
 .../org/apache/camel/catalog/models/resilience4jConfiguration.json      | 2 +-
 .../docs/modules/eips/examples/json/faultToleranceConfiguration.json    | 1 +
 .../src/main/docs/modules/eips/examples/json/onFallback.json            | 1 +
 .../main/docs/modules/eips/examples/json/resilience4jConfiguration.json | 1 +
 .../META-INF/org/apache/camel/model/faultToleranceConfiguration.json    | 2 +-
 .../generated/resources/META-INF/org/apache/camel/model/onFallback.json | 2 +-
 .../META-INF/org/apache/camel/model/resilience4jConfiguration.json      | 2 +-
 .../org/apache/camel/model/FaultToleranceConfigurationDefinition.java   | 2 +-
 .../src/main/java/org/apache/camel/model/OnFallbackDefinition.java      | 2 +-
 .../org/apache/camel/model/Resilience4jConfigurationDefinition.java     | 2 +-
 12 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
index 167680c801b..6bf202e8c90 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
@@ -5,7 +5,7 @@
     "title": "Fault Tolerance Configuration",
     "description": "MicroProfile Fault Tolerance Circuit Breaker EIP configuration",
     "deprecated": false,
-    "label": "configuration,error",
+    "label": "configuration,eip,error",
     "javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition",
     "abstract": false,
     "input": false,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onFallback.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onFallback.json
index 4ad122be0f5..233028772e6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onFallback.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onFallback.json
@@ -5,7 +5,7 @@
     "title": "On Fallback",
     "description": "Route to be executed when Circuit Breaker EIP executes fallback",
     "deprecated": false,
-    "label": "error",
+    "label": "eip,routing,error",
     "javaType": "org.apache.camel.model.OnFallbackDefinition",
     "abstract": false,
     "input": true,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/resilience4jConfiguration.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/resilience4jConfiguration.json
index 7a8667b9dcc..dc6cdad47b8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/resilience4jConfiguration.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/resilience4jConfiguration.json
@@ -5,7 +5,7 @@
     "title": "Resilience4j Configuration",
     "description": "Resilience4j Circuit Breaker EIP configuration",
     "deprecated": false,
-    "label": "configuration,error",
+    "label": "configuration,eip,error",
     "javaType": "org.apache.camel.model.Resilience4jConfigurationDefinition",
     "abstract": false,
     "input": false,
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/faultToleranceConfiguration.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/faultToleranceConfiguration.json
new file mode 120000
index 00000000000..e40c4225f8e
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/faultToleranceConfiguration.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/faultToleranceConfiguration.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/onFallback.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/onFallback.json
new file mode 120000
index 00000000000..334a8e1ee43
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/onFallback.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/resilience4jConfiguration.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/resilience4jConfiguration.json
new file mode 120000
index 00000000000..45e40e50921
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/resilience4jConfiguration.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json
\ No newline at end of file
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/faultToleranceConfiguration.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/faultToleranceConfiguration.json
index 167680c801b..6bf202e8c90 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/faultToleranceConfiguration.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/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": "configuration,error",
+    "label": "configuration,eip,error",
     "javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition",
     "abstract": false,
     "input": false,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json
index 4ad122be0f5..233028772e6 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json
@@ -5,7 +5,7 @@
     "title": "On Fallback",
     "description": "Route to be executed when Circuit Breaker EIP executes fallback",
     "deprecated": false,
-    "label": "error",
+    "label": "eip,routing,error",
     "javaType": "org.apache.camel.model.OnFallbackDefinition",
     "abstract": false,
     "input": true,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json
index 7a8667b9dcc..dc6cdad47b8 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json
@@ -5,7 +5,7 @@
     "title": "Resilience4j Configuration",
     "description": "Resilience4j Circuit Breaker EIP configuration",
     "deprecated": false,
-    "label": "configuration,error",
+    "label": "configuration,eip,error",
     "javaType": "org.apache.camel.model.Resilience4jConfigurationDefinition",
     "abstract": false,
     "input": false,
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 5754541829c..f92a83399d3 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 = "configuration,error")
+@Metadata(label = "configuration,eip,error")
 @XmlRootElement(name = "faultToleranceConfiguration")
 @XmlAccessorType(XmlAccessType.FIELD)
 @Configurer(extended = true)
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 361670d8ef6..ff88365d570 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
@@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Route to be executed when Circuit Breaker EIP executes fallback
  */
-@Metadata(label = "error")
+@Metadata(label = "eip,routing,error")
 @XmlRootElement(name = "onFallback")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class OnFallbackDefinition extends ProcessorDefinition<OnFallbackDefinition> implements OutputNode {
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 ac8ab25a075..1d632ab77c7 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 = "configuration,error")
+@Metadata(label = "configuration,eip,error")
 @XmlRootElement(name = "resilience4jConfiguration")
 @XmlAccessorType(XmlAccessType.FIELD)
 @Configurer(extended = true)