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 2016/07/28 13:24:39 UTC
[9/9] camel git commit: Sorting aliases to always get the same result
Sorting aliases to always get the same result
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59a71304
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59a71304
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59a71304
Branch: refs/heads/master
Commit: 59a713043587d7df5cf9d3f7ae390a027cf2492e
Parents: 6154518
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 10:07:11 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../cometd/springboot/CometdComponentAutoConfiguration.java | 2 +-
.../mail/springboot/MailComponentAutoConfiguration.java | 4 ++--
.../smpp/springboot/SmppComponentAutoConfiguration.java | 2 +-
.../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/59a71304/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 4d1a950..004fbd7 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 = {"cometds-component", "cometd-component"})
+ @Bean(name = {"cometd-component", "cometds-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CometdComponent.class)
public CometdComponent configureCometdComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/59a71304/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
index d39dea1..4746a0a 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
@@ -34,8 +34,8 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MailComponentConfiguration.class)
public class MailComponentAutoConfiguration {
- @Bean(name = {"imaps-component", "imap-component", "pop3-component",
- "smtps-component", "pop3s-component", "smtp-component"})
+ @Bean(name = {"imap-component", "imaps-component", "pop3-component",
+ "pop3s-component", "smtp-component", "smtps-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MailComponent.class)
public MailComponent configureMailComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/59a71304/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 d7e47e1..d4b4816 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 = {"smpps-component", "smpp-component"})
+ @Bean(name = {"smpp-component", "smpps-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SmppComponent.class)
public SmppComponent configureSmppComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/59a71304/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 1008d1c..164f870 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
@@ -136,7 +136,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
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());
+ List<String> aliases = compModels.stream().map(m -> m.getScheme()).sorted().collect(Collectors.toList());
// only create source code if the component has options that can be used in auto configuration
if (!model.getComponentOptions().isEmpty()) {