Merge remote-tracking branch 'upstream/master'

spring-boot-modules/pom.xml

@@ -56,12 +56,14 @@
         <module>spring-boot-performance</module>
         <module>spring-boot-properties</module>
         <module>spring-boot-properties-2</module>
+        <module>spring-boot-properties-3</module>
         <module>spring-boot-property-exp</module>
         <module>spring-boot-runtime</module>
         <module>spring-boot-security</module>
         <module>spring-boot-springdoc</module>
         <module>spring-boot-testing</module>
         <module>spring-boot-vue</module>
+        <module>spring-boot-xml</module>
         <module>spring-boot-actuator</module>
     </modules>
 

spring-boot-modules/spring-boot-actuator/README.MD

@@ -6,3 +6,5 @@ This module contains articles about Spring Boot Actuator
 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)

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

@@ -43,6 +43,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.probes.ProbesApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/health/CustomStatusCodeMapper.java

@@ -0,0 +1,30 @@
+package com.baeldung.health;
+
+import org.springframework.boot.actuate.health.HttpCodeStatusMapper;
+import org.springframework.boot.actuate.health.Status;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CustomStatusCodeMapper implements HttpCodeStatusMapper {
+
+    @Override
+    public int getStatusCode(Status status) {
+        if (status == Status.DOWN) {
+            return 500;
+        }
+
+        if (status == Status.OUT_OF_SERVICE) {
+            return 503;
+        }
+
+        if (status == Status.UNKNOWN) {
+            return 500;
+        }
+
+        if (status.getCode().equals("WARNING")) {
+            return 500;
+        }
+
+        return 200;
+    }
+}

spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/health/HealthApplication.java

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

spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/health/RandomHealthIndicator.java

@@ -0,0 +1,30 @@
+package com.baeldung.health;
+
+import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
+
+@Component
+@ConditionalOnEnabledHealthIndicator("random")
+public class RandomHealthIndicator implements HealthIndicator {
+
+    @Override
+    public Health health() {
+        double chance = ThreadLocalRandom.current().nextDouble();
+        Health.Builder status = Health.up();
+        if (chance > 0.9) {
+            status = Health.down(new RuntimeException("Bad Luck"));
+        }
+
+        Map<String, Object> details = new HashMap<>();
+        details.put("chance", chance);
+        details.put("strategy", "thread-local");
+
+        return status.withDetails(details).build();
+    }
+}

spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/health/WarningHealthIndicator.java

@@ -0,0 +1,14 @@
+package com.baeldung.health;
+
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WarningHealthIndicator implements HealthIndicator {
+
+    @Override
+    public Health health() {
+        return Health.status("WARNING").build();
+    }
+}

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

@@ -1 +1,5 @@
-management.health.probes.enabled=true
+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

spring-boot-modules/spring-boot-actuator/src/test/java/com/baeldung/health/DisabledRandomHealthIndicatorIntegrationTest.java

@@ -0,0 +1,26 @@
+package com.baeldung.health;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@TestPropertySource(properties = "management.health.random.enabled=false")
+class DisabledRandomHealthIndicatorIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    void givenADisabledIndicator_whenSendingRequest_thenReturns404() throws Exception {
+        mockMvc.perform(get("/actuator/health/random"))
+          .andExpect(status().isNotFound());
+    }
+}

spring-boot-modules/spring-boot-actuator/src/test/java/com/baeldung/health/RandomHealthIndicatorIntegrationTest.java

@@ -0,0 +1,26 @@
+package com.baeldung.health;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+class RandomHealthIndicatorIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    void givenRandomIndicator_whenCallingTheAPI_thenReturnsExpectedDetails() throws Exception {
+        mockMvc.perform(get("/actuator/health/random"))
+          .andExpect(jsonPath("$.status").exists())
+          .andExpect(jsonPath("$.details.strategy").value("thread-local"))
+          .andExpect(jsonPath("$.details.chance").exists());
+    }
+}

spring-boot-modules/spring-boot-actuator/src/test/java/com/baeldung/health/WarningHealthIndicatorIntegrationTest.java

@@ -0,0 +1,26 @@
+package com.baeldung.health;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+class WarningHealthIndicatorIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    void givenCustomMapping_whenCallingTheAPI_thenTheStatusCodeIsAsExpected() throws Exception {
+        mockMvc.perform(get("/actuator/health/warning"))
+          .andExpect(jsonPath("$.status").value("WARNING"))
+          .andExpect(status().isInternalServerError());
+    }
+}

spring-boot-modules/spring-boot-basic-customization/src/main/java/com/baeldung/errorhandling/controllers/MyErrorController.java

@@ -34,7 +34,7 @@ public class MyErrorController implements ErrorController {
 
     @Override
     public String getErrorPath() {
-        return "/error";
+        return null;
     }
 
 }

spring-boot-modules/spring-boot-basic-customization/src/main/java/com/baeldung/exitcode/exceptionexitgen/ExceptionExitCodeGeneratorApplication.java

@@ -0,0 +1,21 @@
+package com.baeldung.exitcode.exceptionexitgen;
+
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+@SpringBootApplication
+public class ExceptionExitCodeGeneratorApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ExceptionExitCodeGeneratorApplication.class, args);
+    }
+
+    @Bean
+    CommandLineRunner failApplication() {
+        return args -> {
+            throw new FailedToStartException();
+        };
+    }
+}

spring-boot-modules/spring-boot-basic-customization/src/main/java/com/baeldung/exitcode/exceptionexitgen/FailedToStartException.java

@@ -0,0 +1,11 @@
+package com.baeldung.exitcode.exceptionexitgen;
+
+import org.springframework.boot.ExitCodeGenerator;
+
+public class FailedToStartException extends RuntimeException implements ExitCodeGenerator {
+
+    @Override
+    public int getExitCode() {
+        return 127;
+    }
+}

spring-boot-modules/spring-boot-basic-customization/src/main/resources/application.properties

@@ -5,3 +5,4 @@
 #spring.banner.image.height= //TODO
 #spring.banner.image.margin= //TODO
 #spring.banner.image.invert= //TODO
+server.error.path=/error

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

@@ -63,6 +63,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>

spring-boot-modules/spring-boot-custom-starter/pom.xml

@@ -18,6 +18,7 @@
 
     <modules>
         <module>greeter-library</module>
+        <module>greeter</module>
         <module>greeter-spring-boot-autoconfigure</module>
         <module>greeter-spring-boot-starter</module>
         <module>greeter-spring-boot-sample-app</module>

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

@@ -10,3 +10,4 @@ This module contains articles about Spring Boot with Spring Data
 - [Repositories with Multiple Spring Data Modules](https://www.baeldung.com/spring-multiple-data-modules)
 - [Spring Custom Property Editor](https://www.baeldung.com/spring-mvc-custom-property-editor)
 - [Using @JsonComponent in Spring Boot](https://www.baeldung.com/spring-boot-jsoncomponent)
+- [Running Setup Data on Startup in Spring](https://www.baeldung.com/running-setup-logic-on-startup-in-spring)

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/AllStrategiesExampleBean.java

@@ -0,0 +1,34 @@
+package com.baeldung.startup;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+@Scope(value = "prototype")
+public class AllStrategiesExampleBean implements InitializingBean {
+
+    private static final Logger LOG = LoggerFactory.getLogger(AllStrategiesExampleBean.class);
+
+    public AllStrategiesExampleBean() {
+        LOG.info("Constructor");
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        LOG.info("InitializingBean");
+    }
+
+    @PostConstruct
+    public void postConstruct() {
+        LOG.info("PostConstruct");
+    }
+
+    public void init() {
+        LOG.info("init-method");
+    }
+}

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/EventListenerExampleBean.java

@@ -0,0 +1,20 @@
+package com.baeldung.startup;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class EventListenerExampleBean {
+    private static final Logger LOG = LoggerFactory.getLogger(EventListenerExampleBean.class);
+
+    public static int counter;
+
+    @EventListener
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        LOG.info("Increment counter");
+        counter++;
+    }
+}

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/InitMethodExampleBean.java

@@ -0,0 +1,24 @@
+package com.baeldung.startup;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+
+@Component
+@Scope(value = "prototype")
+public class InitMethodExampleBean {
+
+    private static final Logger LOG = LoggerFactory.getLogger(InitMethodExampleBean.class);
+
+    @Autowired
+    private Environment environment;
+
+    public void init() {
+        LOG.info("Env Default Profiles", Arrays.asList(environment.getDefaultProfiles()));
+    }
+}

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/InitializingBeanExampleBean.java

@@ -0,0 +1,26 @@
+package com.baeldung.startup;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+
+@Component
+@Scope(value = "prototype")
+public class InitializingBeanExampleBean implements InitializingBean {
+
+    private static final Logger LOG = LoggerFactory.getLogger(InitializingBeanExampleBean.class);
+
+    @Autowired
+    private Environment environment;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        LOG.info("Env Default Profiles", Arrays.asList(environment.getDefaultProfiles()));
+    }
+}

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/InvalidInitExampleBean.java

@@ -0,0 +1,18 @@
+package com.baeldung.startup;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope("prototype")
+public class InvalidInitExampleBean {
+
+    @Autowired
+    private Environment environment;
+
+    public InvalidInitExampleBean() {
+        environment.getActiveProfiles();
+    }
+}

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/LogicInConstructorExampleBean.java

@@ -0,0 +1,22 @@
+package com.baeldung.startup;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+
+@Component
+@Scope(value = "prototype")
+public class LogicInConstructorExampleBean {
+
+    private static final Logger LOG = LoggerFactory.getLogger(LogicInConstructorExampleBean.class);
+
+    @Autowired
+    public LogicInConstructorExampleBean(Environment environment) {
+        LOG.info("Env Default Profiles", Arrays.asList(environment.getDefaultProfiles()));
+    }
+}

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/PostConstructExampleBean.java

@@ -0,0 +1,26 @@
+package com.baeldung.startup;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.Arrays;
+
+@Component
+@Scope(value = "prototype")
+public class PostConstructExampleBean {
+
+    private static final Logger LOG = LoggerFactory.getLogger(PostConstructExampleBean.class);
+
+    @Autowired
+    private Environment environment;
+
+    @PostConstruct
+    public void init() {
+        LOG.info("Env Default Profiles", Arrays.asList(environment.getDefaultProfiles()));
+    }
+}

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/SpringStartupConfig.java

@@ -0,0 +1,9 @@
+package com.baeldung.startup;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan("com.baeldung.startup")
+public class SpringStartupConfig {
+}

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/StartupApplicationListenerExample.java

@@ -0,0 +1,21 @@
+package com.baeldung.startup;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StartupApplicationListenerExample implements ApplicationListener<ContextRefreshedEvent> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(StartupApplicationListenerExample.class);
+
+    public static int counter;
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        LOG.info("Increment counter");
+        counter++;
+    }
+}

spring-boot-modules/spring-boot-data/src/main/resources/startupConfig.xml

@@ -0,0 +1,16 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+    <bean id="initMethodExampleBean"
+          class="com.baeldung.startup.InitMethodExampleBean"
+          scope="prototype"
+          init-method="init">
+    </bean>
+
+    <bean id="allStrategiesExampleBean"
+          class="com.baeldung.startup.AllStrategiesExampleBean"
+          init-method="init">
+    </bean>
+</beans>

spring-boot-modules/spring-boot-data/src/test/java/com/baeldung/startup/SpringStartupIntegrationTest.java

@@ -0,0 +1,44 @@
+package com.baeldung.startup;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SpringStartupConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class SpringStartupIntegrationTest {
+
+    @Autowired
+    private ApplicationContext ctx;
+
+    @Test(expected = BeanCreationException.class)
+    public void whenInstantiating_shouldThrowBCE() throws Exception {
+        ctx.getBean(InvalidInitExampleBean.class);
+    }
+
+    @Test
+    public void whenPostConstruct_shouldLogEnv() throws Exception {
+        ctx.getBean(PostConstructExampleBean.class);
+    }
+
+    @Test
+    public void whenConstructorInjection_shouldLogEnv() throws Exception {
+        ctx.getBean(LogicInConstructorExampleBean.class);
+    }
+
+    @Test
+    public void whenInitializingBean_shouldLogEnv() throws Exception {
+        ctx.getBean(InitializingBeanExampleBean.class);
+    }
+
+    @Test
+    public void whenApplicationListener_shouldRunOnce() throws Exception {
+        Assertions.assertThat(StartupApplicationListenerExample.counter).isEqualTo(1);
+    }
+}

spring-boot-modules/spring-boot-data/src/test/java/com/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java

@@ -0,0 +1,26 @@
+package com.baeldung.startup;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:startupConfig.xml")
+public class SpringStartupXMLConfigIntegrationTest {
+
+    @Autowired
+    private ApplicationContext ctx;
+
+    @Test
+    public void whenPostConstruct_shouldLogEnv() throws Exception {
+        ctx.getBean(InitMethodExampleBean.class);
+    }
+
+    @Test
+    public void whenAllStrategies_shouldLogOrder() throws Exception {
+        ctx.getBean(AllStrategiesExampleBean.class);
+    }
+}