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 2019/11/18 09:01:03 UTC
[camel] 21/23: CAMEL-13691: camel-resilience4j - WIP
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13691
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 008e02dd3937f2cec4152b6a287f6785c69173fc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 18 09:22:37 2019 +0100
CAMEL-13691: camel-resilience4j - WIP
---
.../component/resilience4j/ResilienceReifier.java | 3 -
.../org/apache/camel/main/BaseMainSupport.java | 2 +-
examples/camel-example-resilience4j/README.adoc | 13 ++
.../src/main/resources/application.properties | 4 +-
.../client/src/main/resources/log4j2.properties | 2 -
.../camel-example-resilience4j/client2/pom.xml | 109 +++++++++++
.../java/sample/camel/Client2Application.java} | 9 +-
.../src/main/java/sample/camel/Client2Route.java | 42 +++++
.../src/main/java/sample/camel/CounterBean.java} | 15 +-
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++++
.../client2/src/main/resources/META-INF/NOTICE.txt | 11 ++
.../client2/src/main/resources/META-INF/beans.xml | 20 ++
.../src/main/resources/application.properties | 6 +-
.../src/main/resources/log4j2.properties | 2 -
examples/camel-example-resilience4j/pom.xml | 1 +
.../java/sample/camel/Service2Application.java | 2 +-
16 files changed, 413 insertions(+), 31 deletions(-)
diff --git a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
index c7d31d8..00817f4 100644
--- a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
+++ b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
@@ -47,9 +47,6 @@ import static org.apache.camel.support.CamelContextHelper.mandatoryLookup;
public class ResilienceReifier extends ProcessorReifier<CircuitBreakerDefinition> {
- // TODO: spring-boot allow to configure via resilience4j-spring-boot
- // TODO: camel-main - configure hystrix/resilience/rest via java code fluent builder (does it work)
-
public ResilienceReifier(CircuitBreakerDefinition definition) {
super(definition);
}
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index a87c01b..c1c8825 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -712,7 +712,7 @@ public abstract class BaseMainSupport extends ServiceSupport {
resilience4j = new Resilience4jConfigurationDefinition();
model.setResilience4jConfiguration(resilience4j);
}
- setPropertiesOnTarget(camelContext, resilience4j, hystrixProperties, null, "camel.resilience4j.",
+ setPropertiesOnTarget(camelContext, resilience4j, resilience4jProperties, null, "camel.resilience4j.",
mainConfigurationProperties.isAutoConfigurationFailFast(), true, autoConfiguredProperties);
}
if (!restProperties.isEmpty()) {
diff --git a/examples/camel-example-resilience4j/README.adoc b/examples/camel-example-resilience4j/README.adoc
index 6330443..7cc1a75 100644
--- a/examples/camel-example-resilience4j/README.adoc
+++ b/examples/camel-example-resilience4j/README.adoc
@@ -50,12 +50,25 @@ $ mvn compile camel:run
And then start the client that calls service1 every second.
+We have provided two clients, one is using Spring Boot, the other Camel Main.
+You can run either one of them.
+
+To use Spring Boot
+
[source,sh]
----
$ cd client
$ mvn compile spring-boot:run
----
+Or to use Camel Main
+
+[source,sh]
+----
+$ cd client2
+$ mvn compile camel:run
+----
+
You can then stop service1 and see that the client should fallback to
call service2 in the Resilience EIP circuit breaker. And then start service
1 again and see the Resilience EIP go back to normal.
diff --git a/examples/camel-example-resilience4j/client/src/main/resources/application.properties b/examples/camel-example-resilience4j/client/src/main/resources/application.properties
index eafb09b..bd20d5c 100644
--- a/examples/camel-example-resilience4j/client/src/main/resources/application.properties
+++ b/examples/camel-example-resilience4j/client/src/main/resources/application.properties
@@ -24,8 +24,8 @@ camel.resilience4j.minimum-number-of-calls=5
camel.resilience4j.sliding-window-size=10
camel.resilience4j.sliding-window-type=TIME_BASED
camel.resilience4j.failure-rate-threshold=50
-# stay in open for 10s before switching back to half-open
-camel.resilience4j.wait-duration-in-open-state=10
+# stay in open for 20s before switching back to half-open
+camel.resilience4j.wait-duration-in-open-state=20
# resilience4j logging
#logging.level.org.apache.camel.component.resilience=DEBUG
diff --git a/examples/camel-example-resilience4j/client/src/main/resources/log4j2.properties b/examples/camel-example-resilience4j/client/src/main/resources/log4j2.properties
index 6f76518..f02e7ae 100644
--- a/examples/camel-example-resilience4j/client/src/main/resources/log4j2.properties
+++ b/examples/camel-example-resilience4j/client/src/main/resources/log4j2.properties
@@ -19,7 +19,5 @@ appender.stdout.type = Console
appender.stdout.name = stdout
appender.stdout.layout.type = PatternLayout
appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-logger.zipkin.name = org.apache.camel.zipkin
-logger.zipkin.level = DEBUG
rootLogger.level = INFO
rootLogger.appenderRef.stdout.ref = stdout
diff --git a/examples/camel-example-resilience4j/client2/pom.xml b/examples/camel-example-resilience4j/client2/pom.xml
new file mode 100644
index 0000000..2b12340
--- /dev/null
+++ b/examples/camel-example-resilience4j/client2/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel.example</groupId>
+ <artifactId>camel-example-resilience4j</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-example-resilience4j-client2</artifactId>
+ <name>Camel :: Example :: Resilience4j :: Client 2</name>
+ <description>An example showing how to use Resilience4j EIP as circuit breaker in Camel routes</description>
+
+ <!-- import Camel BOM -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+ <!-- camel-core -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-resilience4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+
+ <plugins>
+ <!-- allows the routes to be run via 'mvn camel:run' -->
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <mainClass>sample.camel.Client2Application</mainClass>
+ </configuration>
+ <dependencies>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j2-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+
+ </build>
+
+</project>
diff --git a/examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java b/examples/camel-example-resilience4j/client2/src/main/java/sample/camel/Client2Application.java
similarity index 78%
copy from examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
copy to examples/camel-example-resilience4j/client2/src/main/java/sample/camel/Client2Application.java
index 2fee2d9..e477d54 100644
--- a/examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
+++ b/examples/camel-example-resilience4j/client2/src/main/java/sample/camel/Client2Application.java
@@ -18,17 +18,16 @@ package sample.camel;
import org.apache.camel.main.Main;
-//CHECKSTYLE:OFF
/**
- * A Java main that runs Camel service 2
+ * A Camel Main application that runs the Camel Resilience client application that calls service 1 and service 2 (as fallback)
*/
-public class Service2Application {
+public class Client2Application {
public static void main(String[] args) throws Exception {
Main main = new Main();
- main.addRoutesBuilder(new Service2Route());
+ main.addRoutesBuilder(new Client2Route());
+ main.bind("counterBean", new CounterBean());
main.run();
}
}
-//CHECKSTYLE:ON
\ No newline at end of file
diff --git a/examples/camel-example-resilience4j/client2/src/main/java/sample/camel/Client2Route.java b/examples/camel-example-resilience4j/client2/src/main/java/sample/camel/Client2Route.java
new file mode 100644
index 0000000..8e7065b
--- /dev/null
+++ b/examples/camel-example-resilience4j/client2/src/main/java/sample/camel/Client2Route.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample.camel;
+
+import org.apache.camel.builder.RouteBuilder;
+
+public class Client2Route extends RouteBuilder {
+
+ @Override
+ public void configure() {
+ // you can configure the route rule with Java DSL here
+ from("timer:trigger?period=500").streamCaching()
+ .bean("counterBean")
+ .log(" Client request: ${body}")
+ .circuitBreaker()
+ // see application.properties how resilience is configured
+ .to("http://localhost:9090/service1")
+ //.onFallback()
+ // we use a fallback without network that provides a response message immediately
+ // .transform().simple("Fallback ${body}")
+ .onFallback()
+ // we use fallback via network where we call a 2nd service
+ .to("http://localhost:7070/service2")
+ .end()
+ .log("Client response: ${body}");
+ }
+
+}
diff --git a/examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java b/examples/camel-example-resilience4j/client2/src/main/java/sample/camel/CounterBean.java
similarity index 72%
copy from examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
copy to examples/camel-example-resilience4j/client2/src/main/java/sample/camel/CounterBean.java
index 2fee2d9..c6868c3 100644
--- a/examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
+++ b/examples/camel-example-resilience4j/client2/src/main/java/sample/camel/CounterBean.java
@@ -16,19 +16,12 @@
*/
package sample.camel;
-import org.apache.camel.main.Main;
+public class CounterBean {
-//CHECKSTYLE:OFF
-/**
- * A Java main that runs Camel service 2
- */
-public class Service2Application {
+ private int counter;
- public static void main(String[] args) throws Exception {
- Main main = new Main();
- main.addRoutesBuilder(new Service2Route());
- main.run();
+ public String someMethod(String body) {
+ return "" + ++counter;
}
}
-//CHECKSTYLE:ON
\ No newline at end of file
diff --git a/examples/camel-example-resilience4j/client2/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-resilience4j/client2/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/examples/camel-example-resilience4j/client2/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff --git a/examples/camel-example-resilience4j/client2/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-resilience4j/client2/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/examples/camel-example-resilience4j/client2/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
diff --git a/examples/camel-example-resilience4j/client2/src/main/resources/META-INF/beans.xml b/examples/camel-example-resilience4j/client2/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..4d1f3eb
--- /dev/null
+++ b/examples/camel-example-resilience4j/client2/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<beans/>
\ No newline at end of file
diff --git a/examples/camel-example-resilience4j/client/src/main/resources/application.properties b/examples/camel-example-resilience4j/client2/src/main/resources/application.properties
similarity index 91%
copy from examples/camel-example-resilience4j/client/src/main/resources/application.properties
copy to examples/camel-example-resilience4j/client2/src/main/resources/application.properties
index eafb09b..3e60f28 100644
--- a/examples/camel-example-resilience4j/client/src/main/resources/application.properties
+++ b/examples/camel-example-resilience4j/client2/src/main/resources/application.properties
@@ -15,8 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-server.port=8080
-
# configure resilience4j
# when we have more than 5 requests per 10 seconds that 50%+ fails
# then open circuit and call fallback immediately
@@ -24,8 +22,8 @@ camel.resilience4j.minimum-number-of-calls=5
camel.resilience4j.sliding-window-size=10
camel.resilience4j.sliding-window-type=TIME_BASED
camel.resilience4j.failure-rate-threshold=50
-# stay in open for 10s before switching back to half-open
-camel.resilience4j.wait-duration-in-open-state=10
+# stay in open for 20s before switching back to half-open
+camel.resilience4j.wait-duration-in-open-state=20
# resilience4j logging
#logging.level.org.apache.camel.component.resilience=DEBUG
diff --git a/examples/camel-example-resilience4j/client/src/main/resources/log4j2.properties b/examples/camel-example-resilience4j/client2/src/main/resources/log4j2.properties
similarity index 94%
copy from examples/camel-example-resilience4j/client/src/main/resources/log4j2.properties
copy to examples/camel-example-resilience4j/client2/src/main/resources/log4j2.properties
index 6f76518..f02e7ae 100644
--- a/examples/camel-example-resilience4j/client/src/main/resources/log4j2.properties
+++ b/examples/camel-example-resilience4j/client2/src/main/resources/log4j2.properties
@@ -19,7 +19,5 @@ appender.stdout.type = Console
appender.stdout.name = stdout
appender.stdout.layout.type = PatternLayout
appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-logger.zipkin.name = org.apache.camel.zipkin
-logger.zipkin.level = DEBUG
rootLogger.level = INFO
rootLogger.appenderRef.stdout.ref = stdout
diff --git a/examples/camel-example-resilience4j/pom.xml b/examples/camel-example-resilience4j/pom.xml
index 4473c22..d52daa6 100644
--- a/examples/camel-example-resilience4j/pom.xml
+++ b/examples/camel-example-resilience4j/pom.xml
@@ -39,6 +39,7 @@
<modules>
<module>client</module>
+ <module>client2</module>
<module>service1</module>
<module>service2</module>
</modules>
diff --git a/examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java b/examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
index 2fee2d9..b0b3fcc 100644
--- a/examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
+++ b/examples/camel-example-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
@@ -20,7 +20,7 @@ import org.apache.camel.main.Main;
//CHECKSTYLE:OFF
/**
- * A Java main that runs Camel service 2
+ * A Java main that runs Camel service 2 using Camel Main
*/
public class Service2Application {