Merge pull request #9925 from sampada07/JAVA-33

JAVA-33: move all spring-... modules to Boot 2

spring-boot-modules/spring-boot-1/pom.xml

@@ -7,6 +7,7 @@
     <description>Module for Spring Boot version 1.x</description>
 
     <parent>
+    <!-- This module contains article about Spring Boot Actuator in Spring Boot version 1.x -->
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-1</artifactId>
         <version>0.0.1-SNAPSHOT</version>

spring-boot-modules/spring-boot-camel/pom.xml

@@ -9,9 +9,9 @@
 	
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -38,12 +38,10 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring-boot-starter.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring-boot-starter.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -55,7 +53,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-starter.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -68,8 +65,7 @@
     </build>
 
     <properties>
-        <camel.version>2.19.1</camel.version>
-        <spring-boot-starter.version>1.5.4.RELEASE</spring-boot-starter.version>
+        <camel.version>3.0.0-M4</camel.version>
     </properties>
 
 </project>

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

@@ -12,33 +12,36 @@ import org.apache.camel.model.rest.RestBindingMode;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.embedded.EmbeddedWebServerFactoryCustomizerAutoConfiguration;
+import org.springframework.boot.autoconfigure.websocket.servlet.WebSocketServletAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Component;
 
-@SpringBootApplication
-@ComponentScan(basePackages="com.baeldung.camel")
-public class Application{
+@SpringBootApplication(exclude = { WebSocketServletAutoConfiguration.class, AopAutoConfiguration.class, OAuth2ResourceServerAutoConfiguration.class, EmbeddedWebServerFactoryCustomizerAutoConfiguration.class })
+@ComponentScan(basePackages = "com.baeldung.camel")
+public class Application {
 
     @Value("${server.port}")
     String serverPort;
-    
+
     @Value("${baeldung.api.path}")
     String contextPath;
-    
+
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
 
     @Bean
     ServletRegistrationBean servletRegistrationBean() {
-        ServletRegistrationBean servlet = new ServletRegistrationBean(new CamelHttpTransportServlet(), contextPath+"/*");
+        ServletRegistrationBean servlet = new ServletRegistrationBean(new CamelHttpTransportServlet(), contextPath + "/*");
         servlet.setName("CamelServlet");
         return servlet;
     }
 
-
     @Component
     class RestApi extends RouteBuilder {
 
@@ -47,7 +50,6 @@ public class Application{
 
             CamelContext context = new DefaultCamelContext();
 
-            
             // http://localhost:8080/camel/api-doc
             restConfiguration().contextPath(contextPath) //
                 .port(serverPort)
@@ -60,43 +62,43 @@ public class Application{
                 .component("servlet")
                 .bindingMode(RestBindingMode.json)
                 .dataFormatProperty("prettyPrint", "true");
-/** 
-The Rest DSL supports automatic binding json/xml contents to/from 
-POJOs using Camels Data Format.
-By default the binding mode is off, meaning there is no automatic 
-binding happening for incoming and outgoing messages.
-You may want to use binding if you develop POJOs that maps to 
-your REST services request and response types. 
-*/         
-            
+            /** 
+            The Rest DSL supports automatic binding json/xml contents to/from 
+            POJOs using Camels Data Format.
+            By default the binding mode is off, meaning there is no automatic 
+            binding happening for incoming and outgoing messages.
+            You may want to use binding if you develop POJOs that maps to 
+            your REST services request and response types. 
+            */
+
             rest("/api/").description("Teste REST Service")
                 .id("api-route")
                 .post("/bean")
                 .produces(MediaType.APPLICATION_JSON)
                 .consumes(MediaType.APPLICATION_JSON)
-//                .get("/hello/{place}")
+                // .get("/hello/{place}")
                 .bindingMode(RestBindingMode.auto)
                 .type(MyBean.class)
                 .enableCORS(true)
-//                .outType(OutBean.class)
+                // .outType(OutBean.class)
 
                 .to("direct:remoteService");
-            
-       
-            from("direct:remoteService")
-                .routeId("direct-route")
+
+            from("direct:remoteService").routeId("direct-route")
                 .tracing()
                 .log(">>> ${body.id}")
                 .log(">>> ${body.name}")
-//                .transform().simple("blue ${in.body.name}")                
+                // .transform().simple("blue ${in.body.name}")
                 .process(new Processor() {
                     @Override
                     public void process(Exchange exchange) throws Exception {
-                        MyBean bodyIn = (MyBean) exchange.getIn().getBody();
-                        
+                        MyBean bodyIn = (MyBean) exchange.getIn()
+                            .getBody();
+
                         ExampleServices.example(bodyIn);
 
-                        exchange.getIn().setBody(bodyIn);
+                        exchange.getIn()
+                            .setBody(bodyIn);
                     }
                 })
                 .setHeader(Exchange.HTTP_RESPONSE_CODE, constant(201));

spring-boot-modules/spring-boot-camel/src/main/resources/application.properties

@@ -12,4 +12,6 @@ management.port=8081
 
 # disable all management enpoints except health
 endpoints.enabled = true
-endpoints.health.enabled = true
+endpoints.health.enabled = true
+
+spring.main.allow-bean-definition-overriding=true