[camel] branch main updated: [CAMEL-17743] Set correct javaTypes in schema

[jp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jpoth 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 4fcfff5  [CAMEL-17743] Set correct javaTypes in schema
4fcfff5 is described below

commit 4fcfff58418ccbdd6409529827fbd31611d8842e
Author: John Poth <po...@gmail.com>
AuthorDate: Fri Mar 4 12:07:13 2022 +0100

    [CAMEL-17743] Set correct javaTypes in schema
---
 .../resources/org/apache/camel/model/faultToleranceConfiguration.json | 2 +-
 .../resources/org/apache/camel/model/resilience4jConfiguration.json   | 4 ++--
 .../org/apache/camel/model/FaultToleranceConfigurationCommon.java     | 2 +-
 .../java/org/apache/camel/model/Resilience4jConfigurationCommon.java  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

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 ccb1a99..15dfd2c 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
@@ -12,7 +12,7 @@
     "output": false
   },
   "properties": {
-    "circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker", "label": "advanced", "required": false, "type": "object", "javaType": "io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an existing io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker instance to lookup and use from the registry. When using this, then any other circuit breaker options are not in use." },
+    "circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an existing io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker instance to lookup and use from the registry. When using this, then any other circuit breaker options are not in use." },
     "delay": { "kind": "attribute", "displayName": "Delay", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Control how long the circuit breaker stays open. The default is 5 seconds." },
     "successThreshold": { "kind": "attribute", "displayName": "Success Threshold", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "Controls the number of trial calls which are allowed when the circuit breaker is half-open" },
     "requestVolumeThreshold": { "kind": "attribute", "displayName": "Request Volume Threshold", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20", "description": "Controls the size of the rolling window used when the circuit breaker is closed" },
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 1989a5a..de134cf 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
@@ -12,8 +12,8 @@
     "output": false
   },
   "properties": {
-    "circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker", "label": "advanced", "required": false, "type": "object", "javaType": "io.github.resilience4j.circuitbreaker.CircuitBreaker", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an existing io.github.resilience4j.circuitbreaker.CircuitBreaker instance to lookup and use from the registry. When using this, then any other circuit breaker options are not in use." },
-    "config": { "kind": "attribute", "displayName": "Config", "label": "advanced", "required": false, "type": "object", "javaType": "io.github.resilience4j.circuitbreaker.CircuitBreakerConfig", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an existing io.github.resilience4j.circuitbreaker.CircuitBreakerConfig instance to lookup and use from the registry." },
+    "circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an existing io.github.resilience4j.circuitbreaker.CircuitBreaker instance to lookup and use from the registry. When using this, then any other circuit breaker options are not in use." },
+    "config": { "kind": "attribute", "displayName": "Config", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an existing io.github.resilience4j.circuitbreaker.CircuitBreakerConfig instance to lookup and use from the registry." },
     "failureRateThreshold": { "kind": "attribute", "displayName": "Failure Rate Threshold", "required": false, "type": "number", "javaType": "java.lang.Float", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "50", "description": "Configures the failure rate threshold in percentage. If the failure rate is equal or greater than the threshold the CircuitBreaker transitions to open and starts short-circuiting calls. The threshold must be greater than 0 and not great [...]
     "permittedNumberOfCallsInHalfOpenState": { "kind": "attribute", "displayName": "Permitted Number Of Calls In Half Open State", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10", "description": "Configures the number of permitted calls when the CircuitBreaker is half open. The size must be greater than 0. Default size is 10." },
     "slidingWindowSize": { "kind": "attribute", "displayName": "Sliding Window Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "description": "Configures the size of the sliding window which is used to record the outcome of calls when the CircuitBreaker is closed. slidingWindowSize configures the size of the sliding window. Sliding window can either be count-based or time-based. [...]
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
index a17421c..0f8e9f7 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.Metadata;
 public class FaultToleranceConfigurationCommon extends IdentifiedType {
 
     @XmlAttribute
-    @Metadata(label = "advanced", javaType = "io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker")
+    @Metadata(label = "advanced")
     private String circuitBreaker;
     @XmlAttribute
     @Metadata(defaultValue = "5000", javaType = "java.time.Duration")
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
index f8c3548..dacb08e 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
@@ -28,10 +28,10 @@ import org.apache.camel.spi.Metadata;
 public class Resilience4jConfigurationCommon extends IdentifiedType {
 
     @XmlAttribute
-    @Metadata(label = "advanced", javaType = "io.github.resilience4j.circuitbreaker.CircuitBreaker")
+    @Metadata(label = "advanced")
     private String circuitBreaker;
     @XmlAttribute
-    @Metadata(label = "advanced", javaType = "io.github.resilience4j.circuitbreaker.CircuitBreakerConfig")
+    @Metadata(label = "advanced")
     private String config;
     @XmlAttribute
     @Metadata(defaultValue = "50", javaType = "java.lang.Float")