No more skipping components
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6154518a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6154518a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6154518a Branch: refs/heads/master Commit: 6154518a97522902f79e552d801731bf49fb12b4 Parents: 8d5fb02 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Thu Jul 28 10:05:01 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 28 15:24:18 2016 +0200 ---------------------------------------------------------------------- .../springboot/WsComponentAutoConfiguration.java | 2 +- .../CometdComponentAutoConfiguration.java | 2 +- .../HttpComponentAutoConfiguration.java | 2 +- .../SmppComponentAutoConfiguration.java | 2 +- .../SpringBootAutoConfigurationMojo.java | 18 ++++-------------- 5 files changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java index 6617cb3..71e19bb 100644 --- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java +++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(WsComponentConfiguration.class) public class WsComponentAutoConfiguration { - @Bean(name = "ahc-ws-component") + @Bean(name = {"ahc-ws-component", "ahc-wss-component"}) @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(WsComponent.class) public WsComponent configureWsComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java index 2e58368..4d1a950 100644 --- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java +++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(CometdComponentConfiguration.class) public class CometdComponentAutoConfiguration { - @Bean(name = "cometd-component") + @Bean(name = {"cometds-component", "cometd-component"}) @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(CometdComponent.class) public CometdComponent configureCometdComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java b/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java index 90b789e..b90977e 100644 --- a/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java +++ b/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(HttpComponentConfiguration.class) public class HttpComponentAutoConfiguration { - @Bean(name = "http-component") + @Bean(name = {"http-component", "https-component"}) @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HttpComponent.class) public HttpComponent configureHttpComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java index 0e91188..d7e47e1 100644 --- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java +++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(SmppComponentConfiguration.class) public class SmppComponentAutoConfiguration { - @Bean(name = "smpp-component") + @Bean(name = {"smpps-component", "smpp-component"}) @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SmppComponent.class) public SmppComponent configureSmppComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java ---------------------------------------------------------------------- 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 06ccde5..1008d1c 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 @@ -21,9 +21,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -68,8 +66,6 @@ import static org.apache.camel.maven.packaging.PackageHelper.loadText; */ public class SpringBootAutoConfigurationMojo extends AbstractMojo { - private static final String[] SKIP_COMPONENTS = new String[]{"ahc-wss", "cometds", "https", "http4s", "smpps", "solrs", "solrCloud"}; - /** * The maven project. * @@ -128,13 +124,6 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { List<ComponentModel> allModels = new LinkedList<>(); for (String componentName : componentNames) { - - // skip some components which is duplicates - boolean skip = Arrays.asList(SKIP_COMPONENTS).contains(componentName); - if (skip) { - continue; - } - String json = loadComponentJson(jsonFiles, componentName); if (json != null) { ComponentModel model = generateComponentModel(componentName, json); @@ -144,7 +133,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { // Group the models by implementing classes Map<String, List<ComponentModel>> grModels = allModels.stream().collect(Collectors.groupingBy(m -> m.getJavaType())); - for(String componentClass : grModels.keySet()) { + for (String componentClass : grModels.keySet()) { List<ComponentModel> compModels = grModels.get(componentClass); ComponentModel model = compModels.get(0); // They should be equivalent List<String> aliases = compModels.stream().map(m -> m.getScheme()).collect(Collectors.toList()); @@ -158,7 +147,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { String pkg = model.getJavaType().substring(0, pos) + ".springboot"; String overrideComponentName = null; - if(aliases.size()>1) { + if (aliases.size() > 1) { // determine component name when there are multiple ones overrideComponentName = model.getArtifactId().replace("camel-", ""); } @@ -502,7 +491,8 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { method.addParameter(configurationName, "configuration"); // adding the '-dataformat' suffix to prevent collision with component names - method.addAnnotation(Bean.class).setStringValue("name", model.getModelName() + "-dataformat");; + method.addAnnotation(Bean.class).setStringValue("name", model.getModelName() + "-dataformat"); + ; method.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class"); method.addAnnotation(ConditionalOnMissingBean.class).setLiteralValue("value", model.getShortJavaType() + ".class");
