Merge remote-tracking branch 'upstream/master'

2020-08-22 23:31:14 +05:30
parent 8febb192a3 88ae525fab
commit 56fe1e809a
1640 changed files with 11417 additions and 3055 deletions
@@ -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>

@@ -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)
@@ -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>
@@ -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;
+    }
+}
@@ -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);
+    }
+}
@@ -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();
+    }
+}
@@ -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();
+    }
+}
@@ -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
@@ -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());
+    }
+}
@@ -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());
+    }
+}
@@ -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());
+    }
+}
@@ -34,7 +34,7 @@ public class MyErrorController implements ErrorController {

    @Override
    public String getErrorPath() {
-        return "/error";
+        return null;
    }

 }
@@ -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();
+        };
+    }
+}
@@ -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;
+    }
+}
@@ -5,3 +5,4 @@
 #spring.banner.image.height= //TODO
 #spring.banner.image.margin= //TODO
 #spring.banner.image.invert= //TODO
+server.error.path=/error
@@ -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>
@@ -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>
@@ -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)
@@ -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");
+    }
+}
@@ -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++;
+    }
+}
@@ -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()));
+    }
+}
@@ -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()));
+    }
+}
@@ -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();
+    }
+}
@@ -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()));
+    }
+}
@@ -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()));
+    }
+}
@@ -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 {
+}
@@ -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++;
+    }
+}
@@ -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>
@@ -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);
+    }
+}
@@ -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);
+    }
+}
@@ -2,22 +2,20 @@
 <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/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
    <groupId>com.baeldung.keycloak</groupId>
    <artifactId>spring-boot-keycloak</artifactId>
    <version>0.0.1</version>
-    <packaging>jar</packaging>
-
    <name>spring-boot-keycloak</name>
+    <packaging>jar</packaging>
    <description>This is a simple application demonstrating integration between Keycloak and Spring Boot.</description>

+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
+
    <dependencyManagement>
        <dependencies>
            <dependency>
@@ -78,7 +76,7 @@
    </build>

    <properties>
-        <keycloak-adapter-bom.version>10.0.1</keycloak-adapter-bom.version>
+        <keycloak-adapter-bom.version>10.0.2</keycloak-adapter-bom.version>
    </properties>

 </project>
@@ -6,4 +6,6 @@ keycloak.auth-server-url=http://localhost:8180/auth
 keycloak.realm=SpringBootKeycloak
 keycloak.resource=login-app
 keycloak.public-client=true
+#keycloak.security-constraints[0].authRoles[0]=user
+#keycloak.security-constraints[0].securityCollections[0].patterns[0]=/customers/*
 keycloak.principal-attribute=preferred_username
@@ -11,3 +11,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [A Guide to the Problem Spring Web Library](https://www.baeldung.com/problem-spring-web)
 - [Generating Barcodes and QR Codes in Java](https://www.baeldung.com/java-generating-barcodes-qr-codes)
 - [Rate Limiting a Spring API Using Bucket4j](https://www.baeldung.com/spring-bucket4j)
+- [Spring Boot and Caffeine Cache](https://www.baeldung.com/spring-boot-caffeine-cache)
@@ -11,4 +11,5 @@ This module contains articles about Spring Web MVC in Spring Boot projects.
 - [Testing REST with multiple MIME types](https://www.baeldung.com/testing-rest-api-with-multiple-media-types)
 - [Testing Web APIs with Postman Collections](https://www.baeldung.com/postman-testing-collections)
 - [Spring Boot Consuming and Producing JSON](https://www.baeldung.com/spring-boot-json)
+- [Serve Static Resources with Spring](https://www.baeldung.com/spring-mvc-static-resources)
 - More articles: [[prev -->]](/spring-boot-modules/spring-boot-mvc)
@@ -90,15 +90,15 @@

    <repositories>
        <repository>
-            <id>jcenter-snapshots</id>
+            <id>jcenter-release</id>
            <name>jcenter</name>
-            <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
+            <url>http://oss.jfrog.org/artifactory/oss-release-local/</url>
        </repository>
    </repositories>


    <properties>
-        <spring.fox.version>3.0.0-SNAPSHOT</spring.fox.version>
+        <spring.fox.version>3.0.0</spring.fox.version>
        <start-class>com.baeldung.swagger2boot.SpringBootSwaggerApplication</start-class>
        <!-- <start-class>com.baeldung.springbootmvc.SpringBootMvcFnApplication</start-class> -->
        <xstream.version>1.4.11.1</xstream.version>
@@ -5,4 +5,5 @@ This module contains articles about Spring Web MVC in Spring Boot projects.
 ### Relevant Articles:

 - [Circular View Path Error](https://www.baeldung.com/spring-circular-view-path-error)
+- [Download an Image or a File with Spring MVC](https://www.baeldung.com/spring-controller-return-image-file)
 - More articles: [[prev -->]](/spring-boot-modules/spring-boot-mvc-2)
@@ -26,6 +26,15 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-thymeleaf</artifactId>
        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
    </dependencies>

+    <properties>
+        <commons-io.version>2.7</commons-io.version>
+    </properties>
+
 </project>
@@ -0,0 +1,13 @@
+package com.baeldung.produceimage;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+
+@EnableAutoConfiguration
+@ComponentScan("com.baeldung.produceimage")
+public class ImageApplication {
+    public static void main(final String[] args) {
+        SpringApplication.run(ImageApplication.class, args);
+    }
+}
@@ -0,0 +1,38 @@
+package com.baeldung.produceimage.controller;
+
+import org.apache.commons.io.IOUtils;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+@Controller
+public class DataProducerController {
+
+    @GetMapping("/get-text")
+    public @ResponseBody String getText() {
+        return "Hello world";
+    }
+
+    @GetMapping("/get-image")
+    public @ResponseBody byte[] getImage() throws IOException {
+        final InputStream in = getClass().getResourceAsStream("/com/baeldung/produceimage/image.jpg");
+        return IOUtils.toByteArray(in);
+    }
+
+    @GetMapping(value = "/get-image-with-media-type", produces = MediaType.IMAGE_JPEG_VALUE)
+    public @ResponseBody byte[] getImageWithMediaType() throws IOException {
+        final InputStream in = getClass().getResourceAsStream("/com/baeldung/produceimage/image.jpg");
+        return IOUtils.toByteArray(in);
+    }
+
+    @GetMapping(value = "/get-file", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+    public @ResponseBody byte[] getFile() throws IOException {
+        final InputStream in = getClass().getResourceAsStream("/com/baeldung/produceimage/data.txt");
+        return IOUtils.toByteArray(in);
+    }
+
+}
@@ -20,9 +20,9 @@
    <repositories>
        <!-- Snapshot repository location -->
        <repository>
-            <id>jcenter-snapshots</id>
+            <id>jcenter-release</id>
            <name>jcenter</name>
-            <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
+            <url>http://oss.jfrog.org/artifactory/oss-release-local/</url>
        </repository>
    </repositories>

@@ -148,7 +148,7 @@
    </build>

    <properties>
-        <spring.fox.version>3.0.0-SNAPSHOT</spring.fox.version>
+        <spring.fox.version>3.0.0</spring.fox.version>
        <!-- ROME for RSS -->
        <rome.version>1.10.0</rome.version>
        <javax.faces.version>2.3.7</javax.faces.version>
@@ -20,7 +20,7 @@ public class User {
    @Max(value = 65, message = "Age should not be greater than 65")
    private int age;

-    @Email(regexp=".@.\\..*", message = "Email should be valid")
+    @Email(regexp=".*@.*\\..*", message = "Email should be valid")
    private String email;

    public Long getId() {
@@ -9,4 +9,6 @@ This module contains articles about Properties in Spring Boot.
 - [How to Inject a Property Value Into a Class Not Managed by Spring?](https://www.baeldung.com/inject-properties-value-non-spring-class)
 - [@PropertySource with YAML Files in Spring Boot](https://www.baeldung.com/spring-yaml-propertysource)
 - [Inject Arrays and Lists From Spring Properties Files](https://www.baeldung.com/spring-inject-arrays-lists)
+- [Inject a Map from a YAML File with Spring](https://www.baeldung.com/spring-yaml-inject-map)
+- [YAML to List of Objects in Spring Boot](https://www.baeldung.com/spring-boot-yaml-list)
 - More articles: [[<-- prev]](../spring-boot-properties)
@@ -0,0 +1,9 @@
+
+## Spring Boot Properties
+
+
+
+### Relevant Articles:
+
+- [How to Define a Map in YAML for a POJO?](https://www.baeldung.com/yaml-map-pojo)
+
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <artifactId>spring-boot-properties-3</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-properties-3</name>
+    <description>Spring Boot Properties Module</description>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,16 @@
+package com.baeldung.boot.properties;
+
+import com.baeldung.boot.properties.config.TshirtSizeConfig;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+@SpringBootApplication
+@EnableConfigurationProperties(TshirtSizeConfig.class)
+public class DemoApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(DemoApplication.class, args);
+    }
+
+}
@@ -0,0 +1,27 @@
+package com.baeldung.boot.properties.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.Map;
+
+@ConfigurationProperties(prefix = "t-shirt-size")
+public class TshirtSizeConfig {
+
+    private final Map<String, Integer> simpleMapping;
+
+    private final Map<String, Map<String, Integer>> complexMapping;
+
+
+    public TshirtSizeConfig(Map<String, Integer> simpleMapping, Map<String, Map<String, Integer>> complexMapping) {
+        this.simpleMapping = simpleMapping;
+        this.complexMapping = complexMapping;
+    }
+
+    public Map<String, Integer> getSimpleMapping() {
+        return simpleMapping;
+    }
+
+    public Map<String, Map<String, Integer>> getComplexMapping() {
+        return complexMapping;
+    }
+}
@@ -0,0 +1,21 @@
+package com.baeldung.boot.properties.controller;
+
+import org.springframework.web.bind.annotation.*;
+import com.baeldung.boot.properties.service.SizeConverterService;
+
+@RestController
+@RequestMapping(value = "/")
+public class TshirtSizeController {
+
+    private final SizeConverterService service;
+
+    public TshirtSizeController(SizeConverterService service) {
+        this.service = service;
+    }
+
+    @RequestMapping(value ="convertSize", method = RequestMethod.GET)
+    public int convertSize(@RequestParam(value = "label") final String label, @RequestParam(value = "countryCode", required = false) final String countryCode) {
+        return service.convertSize(label, countryCode);
+    }
+
+}
@@ -0,0 +1,22 @@
+package com.baeldung.boot.properties.service;
+
+import org.springframework.stereotype.Service;
+import com.baeldung.boot.properties.config.TshirtSizeConfig;
+
+
+@Service
+public class SizeConverterImpl implements SizeConverterService {
+
+    private final TshirtSizeConfig tshirtSizeConfig;
+
+    public SizeConverterImpl(TshirtSizeConfig tshirtSizeConfig) {
+        this.tshirtSizeConfig = tshirtSizeConfig;
+    }
+
+    public int  convertSize(String label, String countryCode) {
+        if(countryCode == null) {
+            return tshirtSizeConfig.getSimpleMapping().get(label);
+        }
+        return tshirtSizeConfig.getComplexMapping().get(label).get(countryCode.toLowerCase());
+    }
+}
@@ -0,0 +1,8 @@
+package com.baeldung.boot.properties.service;
+
+
+public interface SizeConverterService {
+
+    int convertSize(String label, String countryCode);
+
+}
@@ -0,0 +1,27 @@
+package com.baeldung.propertiesvsyaml;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+
+@ConfigurationProperties(prefix = "app")
+public class ConfigProperties {
+
+    String name;
+    String description;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}
@@ -0,0 +1,16 @@
+package com.baeldung.propertiesvsyaml;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Component
+public class EnvironmentProperties {
+
+    @Autowired
+    private Environment env;
+
+    public String getSomeKey() {
+        return env.getProperty("key.something");
+    }
+}
@@ -0,0 +1,13 @@
+package com.baeldung.propertiesvsyaml;
+
+import org.springframework.beans.factory.annotation.Value;
+
+public class ValueProperties {
+
+    @Value("${key.something}")
+    private String injectedProperty;
+
+    public String getAppName() {
+        return injectedProperty;
+    }
+}
@@ -0,0 +1,11 @@
+application.servers[0].ip=127.0.0.1
+application.servers[0].path=/path1
+application.servers[1].ip=127.0.0.2
+application.servers[1].path=/path2
+application.servers[2].ip=127.0.0.3
+application.servers[2].path=/path3
+spring.datasource.url=jdbc:h2:dev
+spring.datasource.username=SA
+spring.datasource.password=password
+app.name=MyApp
+app.description=${app.name} is a Spring Boot application
@@ -0,0 +1,52 @@
+logging:
+  file:
+    name: myapplication.log
+spring:
+  datasource:
+    password: 'password'
+    url: jdbc:h2:dev
+    username: SA
+---
+spring:
+  datasource:
+    password: 'password'
+    url: jdbc:mysql://localhost:3306/db_production
+    username: user
+application:
+  servers:
+    -   ip: '127.0.0.1'
+        path: '/path1'
+    -   ip: '127.0.0.2'
+        path: '/path2'
+    -   ip: '127.0.0.3'
+        path: '/path3'
+  t-shirt-size:
+    simple-mapping:
+      XS: 6
+      S:  8
+      M:  10
+      L:  12
+      XL: 14
+
+
+  complex-mapping:
+    XS:
+      uk: 6
+      fr: 34
+      us: 2
+    S:
+      uk: 8
+      fr: 36
+      us: 4
+    M:
+      uk: 10
+      fr: 38
+      us: 6
+    L:
+      uk: 12
+      fr: 40
+      us: 8
+    XL:
+      uk: 14
+      fr: 42
+      us: 10
@@ -0,0 +1,38 @@
+package com.baeldung.boot.properties.controller;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import com.baeldung.boot.properties.service.SizeConverterService;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class TshirtSizeControllerUnitTest {
+
+    @Mock
+    private SizeConverterService service;
+
+    @InjectMocks
+    private TshirtSizeController tested;
+
+    @Test
+    void whenConvertSize_thenOK() {
+
+        // Given
+        String label = "S";
+        String countryCode = "fr";
+        int result = 36;
+
+        // When
+        when(service.convertSize(label, countryCode)).thenReturn(result);
+        int actual = tested.convertSize(label, countryCode);
+
+        // Then
+        assertEquals(actual, result);
+
+    }
+}
@@ -1,30 +0,0 @@
-package com.baeldung.springbootsecurity.oauth2resource;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@EnableResourceServer
-@SpringBootApplication(scanBasePackages = "com.baeldung.springbootsecurity.oauth2resource")
-public class SpringBootOAuth2ResourceApplication {
-
-    public static void main(String[] args) {
-        new SpringApplicationBuilder()
-          .profiles("resource")
-          .sources(SpringBootOAuth2ResourceApplication.class)
-          .build()
-          .run(args);
-    }
-
-    @RestController
-    class SecuredResourceController {
-
-        @GetMapping("/securedResource")
-        public String securedResource() {
-            return "Baeldung Secured Resource OK";
-        }
-
-    }
-}
@@ -1,47 +0,0 @@
-package com.baeldung.springbootsecurity.oauth2server;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.annotation.CurrentSecurityContext;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.security.Principal;
-
-@EnableResourceServer
-@EnableAuthorizationServer
-@SpringBootApplication(scanBasePackages = "com.baeldung.springbootsecurity.oauth2server")
-public class SpringBootAuthorizationServerApplication {
-
-    private static final Logger logger = LoggerFactory.getLogger(SpringBootAuthorizationServerApplication.class);
-
-    public static void main(String[] args) {
-        SpringApplication.run(SpringBootAuthorizationServerApplication.class, args);
-    }
-
-    @RestController
-    class UserController {
-
-        @GetMapping("/user")
-        public Principal user(Principal user) {
-            return user;
-        }
-
-        @GetMapping("/authentication")
-        public Object getAuthentication(@CurrentSecurityContext(expression = "authentication") Authentication authentication) {
-            logger.info("authentication -> {}", authentication);
-            return authentication.getDetails();
-        }
-
-        @GetMapping("/principal")
-        public String getPrincipal(@CurrentSecurityContext(expression = "authentication.principal") Principal principal) {
-            logger.info("principal -> {}", principal);
-            return principal.getName();
-        }
-    }
-}
@@ -1,18 +0,0 @@
-package com.baeldung.springbootsecurity.oauth2server.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@Profile("authz")
-public class AuthenticationMananagerConfig extends WebSecurityConfigurerAdapter {
-
-    @Bean
-    @Override
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return super.authenticationManagerBean();
-    }
-}
@@ -1,46 +0,0 @@
-package com.baeldung.springbootsecurity.oauth2server.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
-import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
-import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
-
-@Configuration
-@Profile("authz")
-public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter {
-
-    @Autowired
-    private AuthenticationManager authenticationManager;
-
-    @Override
-    public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception {
-        endpoints.authenticationManager(authenticationManager);
-    }
-
-    @Override
-    public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
-        clients
-          .inMemory()
-          .withClient("baeldung")
-          .secret(passwordEncoder().encode("baeldung"))
-          .authorizedGrantTypes("client_credentials", "password", "authorization_code")
-          .scopes("openid", "read")
-          .autoApprove(true)
-          .and()
-          .withClient("baeldung-admin")
-          .secret(passwordEncoder().encode("baeldung"))
-          .authorizedGrantTypes("authorization_code", "client_credentials", "refresh_token")
-          .scopes("read", "write")
-          .autoApprove(true);
-    }
-    
-    @Bean
-    public BCryptPasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
-}
@@ -1,17 +0,0 @@
-package com.baeldung.springbootsecurity.oauth2server.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@Profile("!authz")
-public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
-
-    @Bean
-    public AuthenticationManager customAuthenticationManager() throws Exception {
-        return authenticationManager();
-    }
-}
@@ -1,19 +0,0 @@
-package com.baeldung.springbootsecurity.oauth2sso;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-
-@EnableOAuth2Sso
-@SpringBootApplication(scanBasePackages = "com.baeldung.springbootsecurity.oauth2sso")
-public class SpringBootOAuth2SsoApplication {
-
-    public static void main(String[] args) {
-        new SpringApplicationBuilder()
-          .profiles("sso")
-          .sources(SpringBootOAuth2SsoApplication.class)
-          .build()
-          .run(args);
-    }
-}
@@ -1,89 +0,0 @@
-package com.baeldung.springbootsecurity.oauth2server;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
-import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails;
-import org.springframework.security.oauth2.common.OAuth2AccessToken;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.net.URL;
-import java.util.regex.Pattern;
-
-import static java.util.Collections.singletonList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = RANDOM_PORT, classes = SpringBootAuthorizationServerApplication.class)
-@ActiveProfiles("authz")
-public class CustomConfigAuthorizationServerIntegrationTest extends OAuth2IntegrationTestSupport {
-
-    @LocalServerPort
-    private int port;
-
-    @Before
-    public void setUp() throws Exception {
-        base = new URL("http://localhost:" + port);
-    }
-
-    @Test
-    public void givenOAuth2Context_whenAccessTokenIsRequested_ThenAccessTokenValueIsNotNull() {
-        ClientCredentialsResourceDetails resourceDetails = getClientCredentialsResourceDetails("baeldung", singletonList("read"));
-        OAuth2RestTemplate restTemplate = getOAuth2RestTemplate(resourceDetails);
-
-        OAuth2AccessToken accessToken = restTemplate.getAccessToken();
-
-        assertNotNull(accessToken);
-    }
-
-    @Test
-    public void givenOAuth2Context_whenAccessingAuthentication_ThenRespondTokenDetails() {
-        ClientCredentialsResourceDetails resourceDetails = getClientCredentialsResourceDetails("baeldung", singletonList("read"));
-        OAuth2RestTemplate restTemplate = getOAuth2RestTemplate(resourceDetails);
-
-        String authentication = executeGetRequest(restTemplate, "/authentication");
-
-        Pattern pattern = Pattern.compile("\\{\"remoteAddress\":\".*" +
-                "\",\"sessionId\":null,\"tokenValue\":\".*" +
-                "\",\"tokenType\":\"Bearer\",\"decodedDetails\":null}");
-        assertTrue("authentication", pattern.matcher(authentication).matches());
-    }
-
-    @Test
-    public void givenOAuth2Context_whenAccessingPrincipal_ThenRespondBaeldung() {
-        ClientCredentialsResourceDetails resourceDetails = getClientCredentialsResourceDetails("baeldung", singletonList("read"));
-        OAuth2RestTemplate restTemplate = getOAuth2RestTemplate(resourceDetails);
-
-        String principal = executeGetRequest(restTemplate, "/principal");
-
-        assertEquals("baeldung", principal);
-    }
-
-    @Test(expected = OAuth2AccessDeniedException.class)
-    public void givenOAuth2Context_whenAccessTokenIsRequestedWithInvalidException_ThenExceptionIsThrown() {
-        ClientCredentialsResourceDetails resourceDetails = getClientCredentialsResourceDetails("baeldung", singletonList("write"));
-        OAuth2RestTemplate restTemplate = getOAuth2RestTemplate(resourceDetails);
-
-        restTemplate.getAccessToken();
-    }
-
-    @Test
-    public void givenOAuth2Context_whenAccessTokenIsRequestedByClientWithWriteScope_ThenAccessTokenIsNotNull() {
-        ClientCredentialsResourceDetails resourceDetails = getClientCredentialsResourceDetails("baeldung-admin", singletonList("write"));
-        OAuth2RestTemplate restTemplate = getOAuth2RestTemplate(resourceDetails);
-
-        OAuth2AccessToken accessToken = restTemplate.getAccessToken();
-
-        assertNotNull(accessToken);
-    }
-
-}
-
@@ -1,32 +0,0 @@
-package com.baeldung.springbootsecurity.oauth2server;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails;
-import org.springframework.security.oauth2.common.OAuth2AccessToken;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static java.util.Arrays.asList;
-import static org.junit.Assert.assertNotNull;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = RANDOM_PORT, classes = SpringBootAuthorizationServerApplication.class,
-                properties = { "security.oauth2.client.client-id=client", "security.oauth2.client.client-secret=baeldung" })
-public class DefaultConfigAuthorizationServerIntegrationTest extends OAuth2IntegrationTestSupport {
-
-    @Test
-    public void givenOAuth2Context_whenAccessTokenIsRequested_ThenAccessTokenValueIsNotNull() {
-        ClientCredentialsResourceDetails resourceDetails = getClientCredentialsResourceDetails("client", asList("read", "write"));
-        OAuth2RestTemplate restTemplate = getOAuth2RestTemplate(resourceDetails);
-
-        OAuth2AccessToken accessToken = restTemplate.getAccessToken();
-
-        assertNotNull(accessToken);
-
-    }
-
-}
-
@@ -1,53 +0,0 @@
-package com.baeldung.springbootsecurity.oauth2server;
-
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
-import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails;
-import org.springframework.web.client.RequestCallback;
-import org.springframework.web.client.ResponseExtractor;
-
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.List;
-
-import static java.lang.String.format;
-import static java.util.Collections.singletonList;
-import static org.springframework.http.HttpMethod.GET;
-
-public class OAuth2IntegrationTestSupport {
-
-    public static final ResponseExtractor<String> EXTRACT_BODY_AS_STRING = clientHttpResponse ->
-            IOUtils.toString(clientHttpResponse.getBody(), Charset.defaultCharset());
-    private static final RequestCallback DO_NOTHING_CALLBACK = request -> {
-    };
-
-    @Value("${local.server.port}")
-    protected int port;
-
-    protected URL base;
-
-    protected ClientCredentialsResourceDetails getClientCredentialsResourceDetails(final String clientId, final List<String> scopes) {
-        ClientCredentialsResourceDetails resourceDetails = new ClientCredentialsResourceDetails();
-        resourceDetails.setAccessTokenUri(format("http://localhost:%d/oauth/token", port));
-        resourceDetails.setClientId(clientId);
-        resourceDetails.setClientSecret("baeldung");
-        resourceDetails.setScope(scopes);
-        resourceDetails.setGrantType("client_credentials");
-        return resourceDetails;
-    }
-
-    protected OAuth2RestTemplate getOAuth2RestTemplate(final ClientCredentialsResourceDetails resourceDetails) {
-        DefaultOAuth2ClientContext clientContext = new DefaultOAuth2ClientContext();
-        OAuth2RestTemplate restTemplate = new OAuth2RestTemplate(resourceDetails, clientContext);
-        restTemplate.setMessageConverters(singletonList(new MappingJackson2HttpMessageConverter()));
-        return restTemplate;
-    }
-
-    protected String executeGetRequest(OAuth2RestTemplate restTemplate, String path) {
-        return restTemplate.execute(base.toString() + path, GET, DO_NOTHING_CALLBACK, EXTRACT_BODY_AS_STRING);
-    }
-
-}
@@ -3,13 +3,11 @@ package com.baeldung.testloglevel;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

-import com.baeldung.boot.Application;
-
@SpringBootApplication(scanBasePackages = {"com.baeldung.testloglevel", "com.baeldung.component"})
 public class TestLogLevelApplication {

    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+        SpringApplication.run(TestLogLevelApplication.class, args);
    }

 }
@@ -16,9 +16,9 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_CLASS;
+import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;

-@DirtiesContext(classMode = AFTER_CLASS)
+@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = TestLogLevelApplication.class)
@EnableAutoConfiguration(exclude = SecurityAutoConfiguration.class)
@@ -16,9 +16,9 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_CLASS;
+import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;

-@DirtiesContext(classMode = AFTER_CLASS)
+@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = TestLogLevelApplication.class)
@EnableAutoConfiguration(exclude = SecurityAutoConfiguration.class)
@@ -16,10 +16,10 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_CLASS;
+import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;

@RunWith(SpringRunner.class)
-@DirtiesContext(classMode = AFTER_CLASS)
+@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = TestLogLevelApplication.class)
@EnableAutoConfiguration(exclude = SecurityAutoConfiguration.class)
@ActiveProfiles("logging-test")
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [XML Defined Beans in Spring Boot](https://www.baeldung.com/spring-boot-xml-beans)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>spring-boot-xml</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
@@ -0,0 +1,17 @@
+package com.baeldung.springbootxml;
+
+public class Pojo {
+
+    private String field;
+
+    public Pojo() {
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public void setField(String field) {
+        this.field = field;
+    }
+}
@@ -0,0 +1,29 @@
+package com.baeldung.springbootxml;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+
+@Configuration
+@EnableAutoConfiguration
+@ImportResource("classpath:beans.xml")
+public class SpringBootXmlApplication implements CommandLineRunner {
+
+    private static final Logger logger = LoggerFactory.getLogger(SpringBootXmlApplication.class);
+
+    @Autowired private Pojo pojo;
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootXmlApplication.class, args);
+    }
+
+    public void run(String... args) {
+        logger.info(pojo.getField());
+    }
+
+}
@@ -0,0 +1,26 @@
+package com.baeldung.springbootxml;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootXmlApplication.class)
+public class SpringBootXmlApplicationIntegrationTest {
+
+    @Autowired private Pojo pojo;
+    @Value("${sample}") private String sample;
+
+    @Test
+    public void whenCallingGetter_thenPrintingProperty() {
+        assertThat(pojo.getField())
+                .isNotBlank()
+                .isEqualTo(sample);
+    }
+
+}
@@ -0,0 +1 @@
+sample=string loaded from properties!
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <bean class="com.baeldung.springbootxml.Pojo">
+        <property name="field" value="${sample}"></property>
+    </bean>
+</beans>
@@ -25,4 +25,3 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring Shutdown Callbacks](https://www.baeldung.com/spring-shutdown-callbacks)
 - [Container Configuration in Spring Boot 2](https://www.baeldung.com/embeddedservletcontainercustomizer-configurableembeddedservletcontainer-spring-boot)
 - [Validation in Spring Boot](https://www.baeldung.com/spring-boot-bean-validation)
- [Running Setup Data on Startup in Spring](https://www.baeldung.com/running-setup-logic-on-startup-in-spring)