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/06/08 09:34:19 UTC
[30/34] camel git commit: Experiment with generating spring-boot auto
configuration for the Camel components.
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
index 84e77c5..f664a2d 100644
--- a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
+++ b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.stomp.springboot;
-import org.springframework.boot.context.properties.ConfigurationProperties;
import org.apache.camel.component.stomp.StompConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* The stomp component is used for communicating with Stomp compliant message
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
index e854561..33e46ff 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.component.twitter.springboot;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.component.twitter.TwitterComponent;
import org.apache.camel.CamelContext;
+import org.apache.camel.component.twitter.TwitterComponent;
import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.context.annotation.Bean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java
index ea53436..68b4ac5 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.component.undertow.springboot;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.component.undertow.UndertowComponent;
import org.apache.camel.CamelContext;
+import org.apache.camel.component.undertow.UndertowComponent;
import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.context.annotation.Bean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
index a9db8d3..4bece05 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConfiguration.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.undertow.springboot;
-import org.springframework.boot.context.properties.ConfigurationProperties;
import org.apache.camel.component.undertow.UndertowHttpBinding;
import org.apache.camel.util.jsse.SSLContextParameters;
+import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* The undertow component provides HTTP-based endpoints for consuming and
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java
index fd682f2..0221cf4 100644
--- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java
+++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.component.velocity.springboot;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.component.velocity.VelocityComponent;
import org.apache.camel.CamelContext;
+import org.apache.camel.component.velocity.VelocityComponent;
import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.context.annotation.Bean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentConfiguration.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentConfiguration.java
index 536296a..70776ac 100644
--- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentConfiguration.java
+++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentConfiguration.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.velocity.springboot;
-import org.springframework.boot.context.properties.ConfigurationProperties;
import org.apache.velocity.app.VelocityEngine;
+import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* Transforms the message using a Velocity template.
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java
index 4641fd3..b8bf9e1 100644
--- a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java
+++ b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.component.vertx.springboot;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.component.vertx.VertxComponent;
import org.apache.camel.CamelContext;
+import org.apache.camel.component.vertx.VertxComponent;
import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.context.annotation.Bean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java
index 16e3779..1cd228b 100644
--- a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java
+++ b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConfiguration.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.vertx.springboot;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import io.vertx.core.spi.VertxFactory;
-import io.vertx.core.VertxOptions;
import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+import io.vertx.core.spi.VertxFactory;
+import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* The vertx component is used for sending and receive messages from a vertx
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
index e094710..a127ede 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.component.websocket.springboot;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.component.websocket.WebsocketComponent;
import org.apache.camel.CamelContext;
+import org.apache.camel.component.websocket.WebsocketComponent;
import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.context.annotation.Bean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
index 18d111e..76a2821 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.websocket.springboot;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.eclipse.jetty.util.thread.ThreadPool;
-import org.apache.camel.util.jsse.SSLContextParameters;
import java.util.Map;
import org.apache.camel.component.websocket.WebSocketFactory;
+import org.apache.camel.util.jsse.SSLContextParameters;
+import org.eclipse.jetty.util.thread.ThreadPool;
+import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* The websocket component provides websocket endpoints for communicating with
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-xmlbeans/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmlbeans/pom.xml b/components/camel-xmlbeans/pom.xml
index c40aa92..9353cf2 100644
--- a/components/camel-xmlbeans/pom.xml
+++ b/components/camel-xmlbeans/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -69,57 +70,79 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- xmlbeans-maven-plugin do not work with spring-boot so we need
+ to change the dependencies from provided to test so they are not in use -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot</artifactId>
+ <version>${spring-boot-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ <version>${spring-boot-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <version>${spring-boot-version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!-- Eclipse m2e Lifecycle Management -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>${lifecycle-mapping-version}</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xmlbeans-maven-plugin</artifactId>
- <versionRange>${xmlbeans-maven-plugin-version}</versionRange>
- <goals>
- <goal>xmlbeans-test</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xmlbeans-maven-plugin</artifactId>
- <version>${xmlbeans-maven-plugin-version}</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>xmlbeans-test</goal>
- </goals>
- </execution>
- </executions>
- <inherited>true</inherited>
- <configuration>
- <schemaDirectory>src/test/resources/xsd</schemaDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- Eclipse m2e Lifecycle Management -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>${lifecycle-mapping-version}</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xmlbeans-maven-plugin</artifactId>
+ <versionRange>${xmlbeans-maven-plugin-version}</versionRange>
+ <goals>
+ <goal>xmlbeans-test</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xmlbeans-maven-plugin</artifactId>
+ <version>${xmlbeans-maven-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>xmlbeans-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ <inherited>true</inherited>
+ <configuration>
+ <schemaDirectory>src/test/resources/xsd</schemaDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java
index 1973255..fab9d14 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.component.xmlsecurity.springboot;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.component.xmlsecurity.XmlSignatureComponent;
import org.apache.camel.CamelContext;
+import org.apache.camel.component.xmlsecurity.XmlSignatureComponent;
import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.context.annotation.Bean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java
index c49951f..0a34deb 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentConfiguration.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.xmlsecurity.springboot;
-import org.springframework.boot.context.properties.ConfigurationProperties;
import org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration;
import org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* Used to sign and verify exchanges using the XML signature specification.
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java
index ebd104a..aae8ff3 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.component.yammer.springboot;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.component.yammer.YammerComponent;
import org.apache.camel.CamelContext;
+import org.apache.camel.component.yammer.YammerComponent;
import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.context.annotation.Bean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentConfiguration.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentConfiguration.java
index 26bfa25..1ba82a4 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentConfiguration.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentConfiguration.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.yammer.springboot;
-import org.springframework.boot.context.properties.ConfigurationProperties;
import org.apache.camel.component.yammer.YammerConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* The yammer component allows you to interact with the Yammer enterprise social
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java
index fded42d..35d9d34 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java
@@ -16,16 +16,16 @@
*/
package org.apache.camel.component.zookeeper.springboot;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.component.zookeeper.ZooKeeperComponent;
import org.apache.camel.CamelContext;
+import org.apache.camel.component.zookeeper.ZooKeeperComponent;
import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.context.annotation.Bean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConfiguration.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConfiguration.java
index 50e047d..a3902ad 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConfiguration.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConfiguration.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.zookeeper.springboot;
-import org.springframework.boot.context.properties.ConfigurationProperties;
import org.apache.camel.component.zookeeper.ZooKeeperConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* The zookeeper component allows interaction with a ZooKeeper cluster.
http://git-wip-us.apache.org/repos/asf/camel/blob/d8951be4/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 78f5503..dc77360 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,6 +21,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -37,6 +38,7 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.AnnotationSource;
+import org.jboss.forge.roaster.model.source.Import;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
import org.jboss.forge.roaster.model.source.PropertySource;
@@ -160,6 +162,8 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
}
+ sortImports(javaClass);
+
String fileName = packageName.replaceAll("\\.", "\\/") + "/" + name + ".java";
File target = new File(srcDir, fileName);
@@ -228,6 +232,8 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
method.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class");
method.addAnnotation(ConditionalOnMissingBean.class).setLiteralValue("value", model.getShortJavaType() + ".class");
+ sortImports(javaClass);
+
String fileName = packageName.replaceAll("\\.", "\\/") + "/" + name + ".java";
File target = new File(srcDir, fileName);
@@ -307,6 +313,51 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
return sb.toString();
}
+ private static void sortImports(JavaClassSource javaClass) {
+ // sort imports
+ List<Import> imports = javaClass.getImports();
+
+ // sort imports
+ List<String> names = new ArrayList<>();
+ for (Import imp : imports) {
+ names.add(imp.getQualifiedName());
+ }
+ // sort
+ Collections.sort(names, (s1, s2) -> {
+ // java comes first
+ if (s1.startsWith("java.")) {
+ s1 = "___" + s1;
+ }
+ if (s2.startsWith("java.")) {
+ s2 = "___" + s2;
+ }
+ // then javax comes next
+ if (s1.startsWith("javax.")) {
+ s1 = "__" + s1;
+ }
+ if (s2.startsWith("javax.")) {
+ s2 = "__" + s2;
+ }
+ // org.w3c is for some odd reason also before others
+ if (s1.startsWith("org.w3c.")) {
+ s1 = "_" + s1;
+ }
+ if (s2.startsWith("org.w3c.")) {
+ s2 = "_" + s2;
+ }
+ return s1.compareTo(s2);
+ });
+
+ // remove all imports first
+ for (String name : names) {
+ javaClass.removeImport(name);
+ }
+ // and add them back in correct order
+ for (String name : names) {
+ javaClass.addImport(name);
+ }
+ }
+
private static String sourceToString(JavaClassSource javaClass) {
String code = javaClass.toString();
// convert tabs to 4 spaces