This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 88f46b1 CAMEL-15112: Deprecate camel-hystrix 88f46b1 is described below commit 88f46b1ce46f5cdace73b2721a1cb96a290d42dd Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue May 26 16:25:25 2020 +0200 CAMEL-15112: Deprecate camel-hystrix --- components/camel-hystrix/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-hystrix/src/generated/resources/hystrix.json | 2 +- components/camel-hystrix/src/main/docs/hystrix.adoc | 5 +++-- .../resources/org/apache/camel/model/hystrixConfiguration.json | 2 +- core/camel-core-engine/src/main/docs/modules/eips/nav.adoc | 2 +- .../src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc | 4 ++-- .../src/main/docs/modules/eips/pages/hystrix-eip.adoc | 2 +- .../main/java/org/apache/camel/model/CircuitBreakerDefinition.java | 4 ++++ .../main/java/org/apache/camel/model/HystrixConfigurationCommon.java | 1 + .../java/org/apache/camel/model/HystrixConfigurationDefinition.java | 1 + docs/components/modules/others/pages/hystrix.adoc | 5 +++-- 12 files changed, 20 insertions(+), 12 deletions(-) diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml index 6d9dba1..0117a4e 100644 --- a/components/camel-hystrix/pom.xml +++ b/components/camel-hystrix/pom.xml @@ -29,7 +29,7 @@ <artifactId>camel-hystrix</artifactId> <packaging>jar</packaging> - <name>Camel :: Hystrix</name> + <name>Camel :: Hystrix (deprecated)</name> <description>Circuit Breaker EIP using Netflix Hystrix</description> <properties> diff --git a/components/camel-hystrix/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-hystrix/src/generated/resources/META-INF/services/org/apache/camel/other.properties index 920748a..207d1e3 100644 --- a/components/camel-hystrix/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/components/camel-hystrix/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=hystrix groupId=org.apache.camel artifactId=camel-hystrix version=3.4.0-SNAPSHOT -projectName=Camel :: Hystrix +projectName=Camel :: Hystrix (deprecated) projectDescription=Circuit Breaker EIP using Netflix Hystrix diff --git a/components/camel-hystrix/src/generated/resources/hystrix.json b/components/camel-hystrix/src/generated/resources/hystrix.json index ccee1a4..0688c11 100644 --- a/components/camel-hystrix/src/generated/resources/hystrix.json +++ b/components/camel-hystrix/src/generated/resources/hystrix.json @@ -4,7 +4,7 @@ "name": "hystrix", "title": "Hystrix", "description": "Circuit Breaker EIP using Netflix Hystrix", - "deprecated": false, + "deprecated": true, "firstVersion": "2.18.0", "label": "eip,microservice", "supportLevel": "Stable", diff --git a/components/camel-hystrix/src/main/docs/hystrix.adoc b/components/camel-hystrix/src/main/docs/hystrix.adoc index 80ba9af..2ff57b8 100644 --- a/components/camel-hystrix/src/main/docs/hystrix.adoc +++ b/components/camel-hystrix/src/main/docs/hystrix.adoc @@ -1,10 +1,11 @@ [[hystrix-component]] -= Hystrix Component += Hystrix Component (deprecated) :docTitle: Hystrix :artifactId: camel-hystrix :description: Circuit Breaker EIP using Netflix Hystrix :since: 2.18 -:supportLevel: Stable +:supportLevel: Stable-deprecated +:deprecated: *deprecated* *Since Camel {since}* diff --git a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json index 5852ec0..2faaab6 100644 --- a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json +++ b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json @@ -4,7 +4,7 @@ "name": "hystrixConfiguration", "title": "Hystrix Configuration", "description": "Hystrix Circuit Breaker EIP configuration", - "deprecated": false, + "deprecated": true, "label": "eip,routing,circuitbreaker", "javaType": "org.apache.camel.model.HystrixConfigurationDefinition", "input": false, diff --git a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc index 8065aa4..54ad1c9 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc @@ -33,7 +33,7 @@ ** xref:eips:from-eip.adoc[From] ** xref:eips:guaranteed-delivery.adoc[Guaranteed Delivery] ** xref:eips:hystrixConfiguration-eip.adoc[Hystrix Configuration] - ** xref:eips:hystrix-eip.adoc[Hystrix EIP] + ** xref:eips:hystrix-eip.adoc[Hystrix EIP (deprecated)] ** xref:eips:idempotentConsumer-eip.adoc[Idempotent Consumer] ** xref:eips:inOnly-eip.adoc[In Only] ** xref:eips:inOut-eip.adoc[In Out] diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc index ad57ef8..ba55f49 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc @@ -29,7 +29,7 @@ The Circuit Breaker EIP supports 4 options which are listed below: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *hystrixConfiguration* | Configures the circuit breaker to use Hystrix with the given configuration. | | HystrixConfigurationDefinition +| *hystrixConfiguration* | *Deprecated:* Configures the circuit breaker to use Hystrix with the given configuration. | | HystrixConfigurationDefinition | *resilience4jConfiguration* | Configures the circuit breaker to use Resilience4j with the given configuration. | | Resilience4jConfigurationDefinition | *faultToleranceConfiguration* | Configures the circuit breaker to use MicroProfile Fault Tolerance with the given configuration. | | FaultToleranceConfigurationDefinition | *configurationRef* | Refers to a circuit breaker configuration (such as hystrix, resillience4j, or microprofile-fault-tolerance) to use for configuring the circuit breaker EIP. | | String @@ -73,6 +73,6 @@ And in XML DSL: Camel provides three implementations of this pattern: -* xref:hystrix-eip.adoc[Hystrix] - Using the Netflix Hystrix implementation +* xref:hystrix-eip.adoc[Hystrix] - *Deprecated:* Using the Netflix Hystrix implementation * xref:resilience4j-eip.adoc[Resilience4j] - Using the Resilience4j implementation * xref:fault-tolerance-eip.adoc[Fault Tolerance] - Using the MicroProfile Fault Tolerance implementation diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/hystrix-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/hystrix-eip.adoc index 72e0fad..e2a0acb 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/hystrix-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/hystrix-eip.adoc @@ -1,5 +1,5 @@ [[hystrix-eip]] -= Hystrix EIP += Hystrix EIP (deprecated) The Hystrix EIP provides integration with Netflix https://github.com/Netflix/Hystrix[Hystrix] to be used as circuit breaker in the Camel routes. Hystrix is a latency and fault tolerance library designed to isolate points of access to remote systems, services and 3rd party libraries, stop cascading failure and enable resilience in complex distributed systems where failure is inevitable. diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java index 0ec2094..2437892 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java @@ -113,10 +113,12 @@ public class CircuitBreakerDefinition extends OutputDefinition<CircuitBreakerDef // Getter/Setter // ------------------------------------------------------------------------- + @Deprecated public HystrixConfigurationDefinition getHystrixConfiguration() { return hystrixConfiguration; } + @Deprecated public void setHystrixConfiguration(HystrixConfigurationDefinition hystrixConfiguration) { this.hystrixConfiguration = hystrixConfiguration; } @@ -166,6 +168,7 @@ public class CircuitBreakerDefinition extends OutputDefinition<CircuitBreakerDef * Use <tt>end</tt> when configuration is complete, to return back to the * Circuit Breaker EIP. */ + @Deprecated public HystrixConfigurationDefinition hystrixConfiguration() { hystrixConfiguration = hystrixConfiguration == null ? new HystrixConfigurationDefinition(this) : hystrixConfiguration; return hystrixConfiguration; @@ -174,6 +177,7 @@ public class CircuitBreakerDefinition extends OutputDefinition<CircuitBreakerDef /** * Configures the circuit breaker to use Hystrix with the given configuration. */ + @Deprecated public CircuitBreakerDefinition hystrixConfiguration(HystrixConfigurationDefinition configuration) { hystrixConfiguration = configuration; return this; diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java index d3bf054..07b2f2b 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java @@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlAttribute; import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) +@Deprecated public class HystrixConfigurationCommon extends IdentifiedType { @XmlAttribute diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java index 1a08b07..a8656a9 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java @@ -33,6 +33,7 @@ import org.apache.camel.spi.Metadata; @XmlRootElement(name = "hystrixConfiguration") @XmlAccessorType(XmlAccessType.FIELD) @Configurer +@Deprecated public class HystrixConfigurationDefinition extends HystrixConfigurationCommon { public static final String DEFAULT_GROUP_KEY = "CamelHystrix"; diff --git a/docs/components/modules/others/pages/hystrix.adoc b/docs/components/modules/others/pages/hystrix.adoc index 53add1f..c79a268 100644 --- a/docs/components/modules/others/pages/hystrix.adoc +++ b/docs/components/modules/others/pages/hystrix.adoc @@ -1,12 +1,13 @@ [[hystrix-component]] -= Hystrix Component += Hystrix Component (deprecated) //THIS FILE IS COPIED: EDIT THE SOURCE FILE: :page-source: components/camel-hystrix/src/main/docs/hystrix.adoc :docTitle: Hystrix :artifactId: camel-hystrix :description: Circuit Breaker EIP using Netflix Hystrix :since: 2.18 -:supportLevel: Stable +:supportLevel: Stable-deprecated +:deprecated: *deprecated* *Since Camel {since}*