This is an automated email from the ASF dual-hosted git repository. acosentino 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 f7d12822610 Regen for commit 321e84e17d870da40645c52974b86a9b63f3473f f7d12822610 is described below commit f7d1282261013f0172e90a3ddaa4fd0f1b1d6a94 Author: davsclaus <davscl...@users.noreply.github.com> AuthorDate: Wed Sep 14 14:37:17 2022 +0000 Regen for commit 321e84e17d870da40645c52974b86a9b63f3473f Signed-off-by: GitHub <nore...@github.com> --- .../catalog/main/camel-main-configuration-metadata.json | 1 + .../camel/catalog/models/resilience4jConfiguration.json | 1 + .../org/apache/camel/catalog/schemas/camel-spring.xsd | 12 ++++++++++++ .../apache/camel/model/Resilience4jConfigurationCommon.java | 4 ++-- .../camel/model/Resilience4jConfigurationDefinition.java | 4 ++-- .../camel/main/Resilience4jConfigurationProperties.java | 8 ++++---- .../camel/dsl/yaml/deserializers/ModelDeserializers.java | 6 ++++++ .../src/generated/resources/schema/camel-yaml-dsl.json | 3 +++ .../src/generated/resources/schema/camelYamlDsl.json | 3 +++ 9 files changed, 34 insertions(+), 8 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json index 244dd57d7c9..326888ac898 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json @@ -167,6 +167,7 @@ { "name": "camel.resilience4j.slidingWindowType", "description": "Configures the type of the sliding window which is used to record the outcome of calls when the CircuitBreaker is closed. Sliding window can either be count-based or time-based. If slidingWindowType is COUNT_BASED, the last slidingWindowSize calls are recorded and aggregated. If slidingWindowType is TIME_BASED, the calls of the last slidingWindowSize seconds are recorded and aggregated. Default slidingWindowType is COU [...] { "name": "camel.resilience4j.slowCallDurationThreshold", "description": "Configures the duration threshold (seconds) above which calls are considered as slow and increase the slow calls percentage. Default value is 60 seconds.", "sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "defaultValue": 60 }, { "name": "camel.resilience4j.slowCallRateThreshold", "description": "Configures a threshold in percentage. The CircuitBreaker considers a call as slow when the call duration is greater than slowCallDurationThreshold(Duration. When the percentage of slow calls is equal or greater the threshold, the CircuitBreaker transitions to open and starts short-circuiting calls. The threshold must be greater than 0 and not greater than 100. Default value is 100 percentage which means that all re [...] + { "name": "camel.resilience4j.throwExceptionWhenHalfOpenOrOpenState", "description": "Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call is rejected due circuit breaker is half open or open.", "sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false }, { "name": "camel.resilience4j.timeoutCancelRunningFuture", "description": "Configures whether cancel is called on the running future. Defaults to true.", "sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": true }, { "name": "camel.resilience4j.timeoutDuration", "description": "Configures the thread execution timeout (millis). Default value is 1000 millis (1 second).", "sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties", "type": "integer", "javaType": "java.lang.Integer", "defaultValue": 1000 }, { "name": "camel.resilience4j.timeoutEnabled", "description": "Whether timeout is enabled or not on the circuit breaker. Default is false.", "sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false }, 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 de134cf0125..fa87423edeb 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 @@ -16,6 +16,7 @@ "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." }, + "throwExceptionWhenHalfOpenOrOpenState": { "kind": "attribute", "displayName": "Throw Exception When Half Open Or Open State", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call is rejected due circuit breaker is half open or open." }, "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. [...] "slidingWindowType": { "kind": "attribute", "displayName": "Sliding Window Type", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "TIME_BASED", "COUNT_BASED" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "COUNT_BASED", "description": "Configures the type of the sliding window which is used to record the outcome of calls when the CircuitBreaker is closed. Sliding window can either be count-based or time-b [...] "minimumNumberOfCalls": { "kind": "attribute", "displayName": "Minimum Number Of Calls", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "description": "Configures the minimum number of calls which are required (per sliding window period) before the CircuitBreaker can calculate the error rate. For example, if minimumNumberOfCalls is 10, then at least 10 calls must be recorded, befo [...] 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 2d0757b9044..82624a87ed9 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 @@ -5546,6 +5546,18 @@ The size must be greater than 0. Default size is 10. Default value: 10 </xs:annotation> </xs:attribute> + <xs:attribute name="throwExceptionWhenHalfOpenOrOpenState" type="xs:string"> + <xs:annotation> + <xs:documentation xml:lang="en"> + <![CDATA[ +Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException +when the call is rejected due circuit breaker is half open or open. Default +value: false + ]]> + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="slidingWindowSize" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> 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 ba5994ef43b..ee25efa38f4 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 @@ -140,8 +140,8 @@ public class Resilience4jConfigurationCommon extends IdentifiedType { } /** - * Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call - * is rejected due circuit breaker is half open or open. + * Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call is rejected due + * circuit breaker is half open or open. */ public void setThrowExceptionWhenHalfOpenOrOpenState(String throwExceptionWhenHalfOpenOrOpenState) { this.throwExceptionWhenHalfOpenOrOpenState = throwExceptionWhenHalfOpenOrOpenState; 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 9bd4f7ba9fd..77fcf1ab2b0 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 @@ -89,8 +89,8 @@ public class Resilience4jConfigurationDefinition extends Resilience4jConfigurati } /** - * Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call - * is rejected due circuit breaker is half open or open. + * Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call is rejected due + * circuit breaker is half open or open. */ public Resilience4jConfigurationDefinition throwExceptionWhenHalfOpenOrOpenState( boolean throwExceptionWhenHalfOpenOrOpenState) { diff --git a/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java index 51a1aaaa42f..553d1e3a90a 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java @@ -136,8 +136,8 @@ public class Resilience4jConfigurationProperties implements BootstrapCloseable { } /** - * Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call - * is rejected due circuit breaker is half open or open. + * Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call is rejected due + * circuit breaker is half open or open. */ public void setThrowExceptionWhenHalfOpenOrOpenState(Boolean throwExceptionWhenHalfOpenOrOpenState) { this.throwExceptionWhenHalfOpenOrOpenState = throwExceptionWhenHalfOpenOrOpenState; @@ -389,8 +389,8 @@ public class Resilience4jConfigurationProperties implements BootstrapCloseable { } /** - * Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call - * is rejected due circuit breaker is half open or open. + * Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException when the call is rejected due + * circuit breaker is half open or open. */ public Resilience4jConfigurationProperties withThrowExceptionWhenHalfOpenOrOpenState( Boolean throwExceptionWhenHalfOpenOrOpenState) { 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 8eb0bfad0e5..cb87cf34c1d 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 @@ -11548,6 +11548,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "sliding-window-type", type = "enum:TIME_BASED,COUNT_BASED"), @YamlProperty(name = "slow-call-duration-threshold", type = "number"), @YamlProperty(name = "slow-call-rate-threshold", type = "number"), + @YamlProperty(name = "throw-exception-when-half-open-or-open-state", type = "boolean"), @YamlProperty(name = "wait-duration-in-open-state", type = "number"), @YamlProperty(name = "writable-stack-trace-enabled", type = "boolean") } @@ -11621,6 +11622,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setSlowCallRateThreshold(val); break; } + case "throw-exception-when-half-open-or-open-state": { + String val = asText(node); + target.setThrowExceptionWhenHalfOpenOrOpenState(val); + break; + } case "wait-duration-in-open-state": { String val = asText(node); target.setWaitDurationInOpenState(val); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json index abb996ff519..633bad5b7a5 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json @@ -2244,6 +2244,9 @@ "slow-call-rate-threshold" : { "type" : "number" }, + "throw-exception-when-half-open-or-open-state" : { + "type" : "boolean" + }, "wait-duration-in-open-state" : { "type" : "number" }, diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json index 9a159975e99..84e596f400f 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json @@ -2148,6 +2148,9 @@ "slowCallRateThreshold" : { "type" : "number" }, + "throwExceptionWhenHalfOpenOrOpenState" : { + "type" : "boolean" + }, "waitDurationInOpenState" : { "type" : "number" },