JAVA-2420 Merge spring-apache-camel and spring-boot-camel modules (#13409)

* JAVA-2420 Merge spring-apache-camel and spring-boot-camel modules

* JAVA-2420 Migrate spring-boot-camel to spring-apache camel

* JAVA-2420 Update README.md file

* JAVA-2420 Remove spring-boot-camel

---------

Co-authored-by: timis1 <[email protected]>

messaging-modules/pom.xml

@@ -18,7 +18,6 @@
         <module>jgroups</module>
         <module>rabbitmq</module>
         <module>spring-amqp</module>
-        <module>spring-apache-camel</module>
         <module>spring-jms</module>
     </modules>
 

messaging-modules/spring-apache-camel/.gitignore

@@ -1 +1,2 @@
-/src/test/destination-folder/*
+/src/test/destination-folder/*
+/output/

messaging-modules/spring-apache-camel/README.md

@@ -4,17 +4,19 @@ This module contains articles about Spring with Apache Camel
 
 ### Relevant Articles
 
-- [Apache Camel](http://camel.apache.org/)
-- [Enterprise Integration Patterns](http://www.enterpriseintegrationpatterns.com/patterns/messaging/toc.html)
 - [Introduction To Apache Camel](http://www.baeldung.com/apache-camel-intro)
 - [Integration Patterns With Apache Camel](http://www.baeldung.com/camel-integration-patterns)
 - [Using Apache Camel with Spring](http://www.baeldung.com/spring-apache-camel-tutorial)
 - [Unmarshalling a JSON Array Using camel-jackson](https://www.baeldung.com/java-camel-jackson-json-array)
+- [Apache Camel with Spring Boot](https://www.baeldung.com/apache-camel-spring-boot)
+- [Apache Camel Routes Testing in Spring Boot](https://www.baeldung.com/spring-boot-apache-camel-routes-testing)
+- [Apache Camel Conditional Routing](https://www.baeldung.com/spring-apache-camel-conditional-routing)
+- [Apache Camel Exception Handling](https://www.baeldung.com/java-apache-camel-exception-handling)
 
 ### Framework Versions:
 
-- Spring 4.2.4
-- Apache Camel 2.16.1
+- Spring 5.3.25
+- Apache Camel 3.14.7
 
 ### Build and Run Application
 

messaging-modules/spring-apache-camel/pom.xml

@@ -58,11 +58,67 @@
             <version>${env.camel.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-servlet-starter</artifactId>
+            <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-jackson-starter</artifactId>
+            <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-swagger-java-starter</artifactId>
+            <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-spring-boot-starter</artifactId>
+            <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-spring-junit5</artifactId>
+            <version>${camel.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>
-        <env.camel.version>2.18.1</env.camel.version>
-        <env.spring.version>4.3.4.RELEASE</env.spring.version>
+        <env.camel.version>3.14.7</env.camel.version>
+        <env.spring.version>5.3.25</env.spring.version>
+        <camel.version>3.15.0</camel.version>
     </properties>
 
+   <profiles>
+        <profile>
+            <id>spring-boot</id>
+            <build>
+                <defaultGoal>spring-boot:run</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>repackage</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>com.baeldung.camel.boot.boot.testing.GreetingsFileSpringApplication</mainClass>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/ContentBasedFileRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.file;
+package com.baeldung.camel.apache.file;
 
 import org.apache.camel.builder.RouteBuilder;
 

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/DeadLetterChannelFileRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.file;
+package com.baeldung.camel.apache.file;
 
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.RouteBuilder;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/FileProcessor.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.file;
+package com.baeldung.camel.apache.file;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/FileRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.file;
+package com.baeldung.camel.apache.file;
 
 import org.apache.camel.builder.RouteBuilder;
 

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/MessageTranslatorFileRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.file;
+package com.baeldung.camel.apache.file;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/MulticastFileRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.file;
+package com.baeldung.camel.apache.file;
 
 import org.apache.camel.builder.RouteBuilder;
 

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/SplitterFileRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.file;
+package com.baeldung.camel.apache.file;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/cfg/ContentBasedFileRouterConfig.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.file.cfg;
+package com.baeldung.camel.apache.file.cfg;
 
 import java.util.Arrays;
 import java.util.List;
@@ -8,7 +8,7 @@ import org.apache.camel.spring.javaconfig.CamelConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.baeldung.camel.file.ContentBasedFileRouter;
+import com.baeldung.camel.apache.file.ContentBasedFileRouter;
 
 @Configuration
 public class ContentBasedFileRouterConfig extends CamelConfiguration {

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/jackson/Fruit.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.jackson;
+package com.baeldung.camel.apache.jackson;
 
 public class Fruit {
 

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/jackson/FruitList.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.jackson;
+package com.baeldung.camel.apache.jackson;
 
 import java.util.List;
 

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/main/App.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.main;
+package com.baeldung.camel.apache.main;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/processor/FileProcessor.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.processor;
+package com.baeldung.camel.apache.processor;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/Application.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel;
+package com.baeldung.camel.boot;
 
 import javax.ws.rs.core.MediaType;
 
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Component;
 
 @SpringBootApplication(exclude = { WebSocketServletAutoConfiguration.class, AopAutoConfiguration.class, OAuth2ResourceServerAutoConfiguration.class, EmbeddedWebServerFactoryCustomizerAutoConfiguration.class })
-@ComponentScan(basePackages = "com.baeldung.camel")
+@ComponentScan(basePackages = "com.baeldung.camel.boot")
 public class Application {
 
     @Value("${server.port}")

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/ExampleServices.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel;
+package com.baeldung.camel.boot;
 
 /**
  * a Mock class to show how some other layer

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/MyBean.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel;
+package com.baeldung.camel.boot;
 
 public class MyBean {
     private Integer id;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/boot/testing/GreetingsFileRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.boot.testing;
+package com.baeldung.camel.boot.boot.testing;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.stereotype.Component;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/boot/testing/GreetingsFileSpringApplication.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.boot.testing;
+package com.baeldung.camel.boot.boot.testing;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/conditional/ConditionalBeanRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.conditional;
+package com.baeldung.camel.boot.conditional;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.stereotype.Component;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/conditional/ConditionalBodyRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.conditional;
+package com.baeldung.camel.boot.conditional;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.stereotype.Component;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/conditional/ConditionalHeaderRouter.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.conditional;
+package com.baeldung.camel.boot.conditional;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.stereotype.Component;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/conditional/ConditionalRoutingSpringApplication.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.conditional;
+package com.baeldung.camel.boot.conditional;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/conditional/FruitBean.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.conditional;
+package com.baeldung.camel.boot.conditional;
 
 import org.apache.camel.Exchange;
 

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/exception/ExceptionHandlingSpringApplication.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.exception;
+package com.baeldung.camel.boot.exception;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/exception/ExceptionHandlingWithDoTryRoute.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.exception;
+package com.baeldung.camel.boot.exception;
 
 import java.io.IOException;
 

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/exception/ExceptionHandlingWithExceptionClauseRoute.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.exception;
+package com.baeldung.camel.boot.exception;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.beans.factory.annotation.Autowired;

messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/boot/exception/ExceptionLoggingProcessor.java

@@ -1,4 +1,4 @@
-package com.baeldung.camel.exception;
+package com.baeldung.camel.boot.exception;
 
 import java.util.Map;