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 4e8ea9dc666fa3019ecc1192add4aa4281bf9e18 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sun Nov 17 09:16:33 2019 +0100 CAMEL-13691: camel-resilience4j - WIP --- .../java/org/apache/camel/maven/PrepareCamelMainMojo.java | 13 ++++++++++--- .../maven/packaging/SpringBootAutoConfigurationMojo.java | 13 +++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java b/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java index 00809b5..cd35afc 100644 --- a/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java +++ b/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java @@ -74,6 +74,8 @@ public class PrepareCamelMainMojo extends AbstractMojo { String prefix; if (file.getName().contains("Hystrix")) { prefix = "camel.hystrix."; + } else if (file.getName().contains("Resilience")) { + prefix = "camel.resilience4j."; } else if (file.getName().contains("Rest")) { prefix = "camel.rest."; } else { @@ -143,12 +145,17 @@ public class PrepareCamelMainMojo extends AbstractMojo { group2.put("description", "camel-hystrix configurations."); group2.put("sourceType", "org.apache.camel.main.HystrixConfigurationProperties"); Map group3 = new LinkedHashMap(); - group3.put("name", "camel.rest"); - group3.put("description", "camel-rest configurations."); - group3.put("sourceType", "org.apache.camel.spi.RestConfiguration"); + group3.put("name", "camel.resilience4j"); + group3.put("description", "camel-resilience4j configurations."); + group3.put("sourceType", "org.apache.camel.main.Resilience4jConfigurationProperties"); + Map group4 = new LinkedHashMap(); + group4.put("name", "camel.rest"); + group4.put("description", "camel-rest configurations."); + group4.put("sourceType", "org.apache.camel.spi.RestConfiguration"); groups.add(group1); groups.add(group2); groups.add(group3); + groups.add(group4); Map map = new LinkedHashMap(); map.put("groups", groups); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java index 0b022bc..32d6dce 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java @@ -255,6 +255,19 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { createOtherModelConfigurationSource(pkg, model, "camel.hystrix", true); } + // Resilience4j + json = loadModelJson(files, "resilience4jConfiguration"); + if (json != null) { + OtherModel model = generateOtherModel(json); + + int pos = model.getJavaType().lastIndexOf("."); + String pkg = model.getJavaType().substring(0, pos) + ".springboot"; + + // Generate properties, auto-configuration happens in + // camel-resilience4j-starter + createOtherModelConfigurationSource(pkg, model, "camel.resilience4j", true); + } + // Consul json = loadModelJson(files, "consulServiceDiscovery"); if (json != null) {