Merge remote-tracking branch 'upstream/master'

spring-boot-modules/pom.xml

@@ -41,6 +41,7 @@
         <module>spring-boot-environment</module>
         <module>spring-boot-exceptions</module>
         <module>spring-boot-flowable</module>
+        <module>spring-boot-groovy</module>
         <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
         <module>spring-boot-jasypt</module>
         <module>spring-boot-keycloak</module>
@@ -61,6 +62,7 @@
         <module>spring-boot-runtime</module>
         <module>spring-boot-security</module>
         <module>spring-boot-springdoc</module>
+        <module>spring-boot-swagger</module>
         <module>spring-boot-testing</module>
         <module>spring-boot-vue</module>
         <module>spring-boot-xml</module>

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-actuator/README.md

@@ -8,3 +8,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant Articles:
 
 - [Liveness and Readiness Probes in Spring Boot](https://www.baeldung.com/spring-liveness-readiness-probes)
+- [Custom Information in Spring Boot Info Endpoint](https://www.baeldung.com/spring-boot-info-actuator-custom)

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

@@ -24,6 +24,14 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/info/Application.java

@@ -0,0 +1,13 @@
+package com.baeldung.endpoints.info;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}

spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/info/TotalUsersInfoContributor.java

@@ -3,7 +3,6 @@ package com.baeldung.endpoints.info;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.baeldung.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.info.Info;
 import org.springframework.boot.actuate.info.InfoContributor;

spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/info/User.java

@@ -0,0 +1,49 @@
+package com.baeldung.endpoints.info;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "users")
+public class User {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+    private String name;
+    private Integer status;
+
+    public User() {
+    }
+
+    public User(String name, Integer status) {
+        this.name = name;
+        this.status = status;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/info/UserRepository.java

@@ -0,0 +1,78 @@
+package com.baeldung.endpoints.info;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+@Repository("userRepository")
+public interface UserRepository extends JpaRepository<User, Integer> {
+
+    int countByStatus(int status);
+
+    Optional<User> findOneByName(String name);
+
+    @Async
+    CompletableFuture<User> findOneByStatus(Integer status);
+
+    @Query("SELECT u FROM User u WHERE u.status = 1")
+    Collection<User> findAllActiveUsers();
+
+    @Query(value = "SELECT * FROM USERS u WHERE u.status = 1", nativeQuery = true)
+    Collection<User> findAllActiveUsersNative();
+
+    @Query("SELECT u FROM User u WHERE u.status = ?1")
+    User findUserByStatus(Integer status);
+
+    @Query(value = "SELECT * FROM Users u WHERE u.status = ?1", nativeQuery = true)
+    User findUserByStatusNative(Integer status);
+
+    @Query("SELECT u FROM User u WHERE u.status = ?1 and u.name = ?2")
+    User findUserByStatusAndName(Integer status, String name);
+
+    @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
+    User findUserByStatusAndNameNamedParams(@Param("status") Integer status, @Param("name") String name);
+
+    @Query(value = "SELECT * FROM Users u WHERE u.status = :status AND u.name = :name", nativeQuery = true)
+    User findUserByStatusAndNameNamedParamsNative(@Param("status") Integer status, @Param("name") String name);
+
+    @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
+    User findUserByUserStatusAndUserName(@Param("status") Integer userStatus, @Param("name") String userName);
+
+    @Query("SELECT u FROM User u WHERE u.name like ?1%")
+    User findUserByNameLike(String name);
+
+    @Query("SELECT u FROM User u WHERE u.name like :name%")
+    User findUserByNameLikeNamedParam(@Param("name") String name);
+
+    @Query(value = "SELECT * FROM users u WHERE u.name LIKE ?1%", nativeQuery = true)
+    User findUserByNameLikeNative(String name);
+
+    @Query(value = "SELECT u FROM User u")
+    List<User> findAllUsers(Sort sort);
+
+    @Query(value = "SELECT u FROM User u ORDER BY id")
+    Page<User> findAllUsersWithPagination(Pageable pageable);
+
+    @Query(value = "SELECT * FROM Users ORDER BY id \n-- #pageable\n", countQuery = "SELECT count(*) FROM Users", nativeQuery = true)
+    Page<User> findAllUsersWithPaginationNative(Pageable pageable);
+
+    @Modifying
+    @Query("update User u set u.status = :status where u.name = :name")
+    int updateUserSetStatusForName(@Param("status") Integer status, @Param("name") String name);
+
+    @Modifying
+    @Query(value = "UPDATE Users u SET u.status = ? WHERE u.name = ?", nativeQuery = true)
+    int updateUserSetStatusForNameNative(Integer status, String name);
+
+}

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

@@ -2,4 +2,10 @@ management.health.probes.enabled=true
 management.endpoint.health.show-details=always
 management.endpoint.health.status.http-mapping.down=500
 management.endpoint.health.status.http-mapping.out_of_service=503
-management.endpoint.health.status.http-mapping.warning=500
+management.endpoint.health.status.http-mapping.warning=500
+
+## Configuring info endpoint
+info.app.name=Spring Sample Application
+info.app.description=This is my first spring boot application G1
+info.app.version=1.0.0
+info.java-vendor = ${java.specification.vendor}

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

@@ -26,6 +26,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>

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

@@ -26,6 +26,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>

spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/conditionalonproperty/NotificationApplication.java

@@ -0,0 +1,12 @@
+package com.baeldung.conditionalonproperty;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class NotificationApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(NotificationApplication.class, args);
+    }
+}

spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/conditionalonproperty/config/NotificationConfig.java

@@ -0,0 +1,26 @@
+package com.baeldung.conditionalonproperty.config;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.conditionalonproperty.service.EmailNotification;
+import com.baeldung.conditionalonproperty.service.NotificationSender;
+import com.baeldung.conditionalonproperty.service.SmsNotification;
+
+@Configuration
+public class NotificationConfig {
+
+    @Bean(name = "emailNotification")
+    @ConditionalOnProperty(prefix = "notification", name = "service", havingValue = "email")
+    public NotificationSender notificationSender() {
+        return new EmailNotification();
+    }
+
+    @Bean(name = "smsNotification")
+    @ConditionalOnProperty(prefix = "notification", name = "service", havingValue = "sms")
+    public NotificationSender notificationSender2() {
+        return new SmsNotification();
+    }
+
+}

spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/conditionalonproperty/service/EmailNotification.java

@@ -0,0 +1,10 @@
+package com.baeldung.conditionalonproperty.service;
+
+public class EmailNotification implements NotificationSender {
+
+    @Override
+    public String send(String message) {
+        return "Email Notification: " + message;
+    }
+
+}

spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/conditionalonproperty/service/NotificationSender.java

@@ -0,0 +1,5 @@
+package com.baeldung.conditionalonproperty.service;
+
+public interface NotificationSender {
+    String send(String message);
+}

spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/conditionalonproperty/service/SmsNotification.java

@@ -0,0 +1,10 @@
+package com.baeldung.conditionalonproperty.service;
+
+public class SmsNotification implements NotificationSender {
+
+    @Override
+    public String send(String message) {
+        return "SMS notification: " + message;
+    }
+
+}

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

@@ -1,2 +1,4 @@
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto = update
+
+notification.service=email

spring-boot-modules/spring-boot-autoconfiguration/src/test/java/com/baeldung/conditionalonproperty/NotificationUnitTest.java

@@ -0,0 +1,27 @@
+package com.baeldung.conditionalonproperty;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import com.baeldung.conditionalonproperty.config.NotificationConfig;
+import com.baeldung.conditionalonproperty.service.EmailNotification;
+import com.baeldung.conditionalonproperty.service.NotificationSender;
+
+public class NotificationUnitTest {
+
+    private final ApplicationContextRunner contextRunner = new ApplicationContextRunner();
+
+    @Test
+    public void whenValueSetToEmail_thenCreateEmailNotification() {
+        this.contextRunner.withPropertyValues("notification.service=email")
+            .withUserConfiguration(NotificationConfig.class)
+            .run(context -> {
+                assertThat(context).hasBean("emailNotification");
+                NotificationSender notificationSender = context.getBean(EmailNotification.class);
+                assertThat(notificationSender.send("Hello From Baeldung!")).isEqualTo("Email Notification: Hello From Baeldung!");
+                assertThat(context).doesNotHaveBean("smsNotification");
+            });
+    }
+}

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

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

@@ -20,6 +20,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>

spring-boot-modules/spring-boot-di/README.md

@@ -9,3 +9,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 - [Spring Component Scanning](https://www.baeldung.com/spring-component-scanning)
 - [Spring @ComponentScan – Filter Types](https://www.baeldung.com/spring-componentscan-filter-type)
+- [How to Get All Spring-Managed Beans?](https://www.baeldung.com/spring-show-all-beans)

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

@@ -27,6 +27,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>

spring-boot-modules/spring-boot-groovy/README.md

@@ -0,0 +1,9 @@
+## Spring Boot Groovy
+
+This module contains articles about Spring with Groovy
+
+
+### Relevant Articles:
+
+- [Building a Simple Web Application with Spring Boot and Groovy](https://www.baeldung.com/spring-boot-groovy-web-app)
+- [Groovy Bean Definitions](https://www.baeldung.com/spring-groovy-beans)