Merge remote-tracking branch 'upstream/master'

spring-boot-modules/pom.xml

@@ -58,6 +58,7 @@
         <module>spring-boot-testing</module>
         <module>spring-boot-vue</module>
         <module>spring-boot-xml</module>
+        <module>spring-boot-actuator</module>
     </modules>
 
 </project>

spring-boot-modules/spring-boot-actuator/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if (mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if (mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if (!outputFile
+          .getParentFile()
+          .exists()) {
+            if (!outputFile
+              .getParentFile()
+              .mkdirs()) {
+                System.out.println("- ERROR creating output directory '" + outputFile
+                  .getParentFile()
+                  .getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System
+              .getenv("MVNW_PASSWORD")
+              .toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos
+          .getChannel()
+          .transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

spring-boot-modules/spring-boot-actuator/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

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

@@ -0,0 +1,8 @@
+## Spring Boot Actuator
+
+This module contains articles about Spring Boot Actuator
+
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles:

spring-boot-modules/spring-boot-actuator/mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

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

@@ -0,0 +1,50 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-boot-actuator</artifactId>
+    <name>spring-boot-actuator</name>
+    <description>This is simple boot application for Spring boot actuator test</description>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.0.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</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>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/probes/ProbesApplication.java

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

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

@@ -0,0 +1 @@
+management.health.probes.enabled=true

spring-boot-modules/spring-boot-actuator/src/test/java/com/baeldung/probes/ApplicationAvailabilityIntegrationTest.java

@@ -0,0 +1,70 @@
+package com.baeldung.probes;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.availability.ApplicationAvailability;
+import org.springframework.boot.availability.AvailabilityChangeEvent;
+import org.springframework.boot.availability.LivenessState;
+import org.springframework.boot.availability.ReadinessState;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.web.servlet.MockMvc;
+
+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.MethodMode.AFTER_METHOD;
+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
+@DirtiesContext(classMode = AFTER_CLASS)
+public class ApplicationAvailabilityIntegrationTest {
+
+    @Autowired private MockMvc mockMvc;
+    @Autowired private ApplicationContext context;
+    @Autowired private ApplicationAvailability applicationAvailability;
+
+    @Test
+    public void givenApplication_whenStarted_thenShouldBeAbleToRetrieveReadinessAndLiveness() {
+        assertThat(applicationAvailability.getLivenessState()).isEqualTo(LivenessState.CORRECT);
+        assertThat(applicationAvailability.getReadinessState()).isEqualTo(ReadinessState.ACCEPTING_TRAFFIC);
+
+        assertThat(applicationAvailability.getState(ReadinessState.class)).isEqualTo(ReadinessState.ACCEPTING_TRAFFIC);
+    }
+
+    @Test
+    @DirtiesContext(methodMode = AFTER_METHOD)
+    public void givenCorrectState_whenPublishingTheEvent_thenShouldTransitToBrokenState() throws Exception {
+        assertThat(applicationAvailability.getLivenessState()).isEqualTo(LivenessState.CORRECT);
+        mockMvc.perform(get("/actuator/health/liveness"))
+          .andExpect(status().isOk())
+          .andExpect(jsonPath("$.status").value("UP"));
+
+        AvailabilityChangeEvent.publish(context, LivenessState.BROKEN);
+
+        assertThat(applicationAvailability.getLivenessState()).isEqualTo(LivenessState.BROKEN);
+        mockMvc.perform(get("/actuator/health/liveness"))
+          .andExpect(status().isServiceUnavailable())
+          .andExpect(jsonPath("$.status").value("DOWN"));
+    }
+
+    @Test
+    @DirtiesContext(methodMode = AFTER_METHOD)
+    public void givenAcceptingState_whenPublishingTheEvent_thenShouldTransitToRefusingState() throws Exception {
+        assertThat(applicationAvailability.getReadinessState()).isEqualTo(ReadinessState.ACCEPTING_TRAFFIC);
+        mockMvc.perform(get("/actuator/health/readiness"))
+          .andExpect(status().isOk())
+          .andExpect(jsonPath("$.status").value("UP"));
+
+        AvailabilityChangeEvent.publish(context, ReadinessState.REFUSING_TRAFFIC);
+
+        assertThat(applicationAvailability.getReadinessState()).isEqualTo(ReadinessState.REFUSING_TRAFFIC);
+        mockMvc.perform(get("/actuator/health/readiness"))
+          .andExpect(status().isServiceUnavailable())
+          .andExpect(jsonPath("$.status").value("OUT_OF_SERVICE"));
+    }
+}

spring-boot-modules/spring-boot-actuator/src/test/java/com/baeldung/probes/LivenessEventListener.java

@@ -0,0 +1,19 @@
+package com.baeldung.probes;
+
+import org.springframework.boot.availability.AvailabilityChangeEvent;
+import org.springframework.boot.availability.LivenessState;
+import org.springframework.context.event.EventListener;
+
+public class LivenessEventListener {
+
+    @EventListener
+    public void onEvent(AvailabilityChangeEvent<LivenessState> event) {
+        switch (event.getState()) {
+        case BROKEN:
+            // notify others
+            break;
+        case CORRECT:
+            // we're back
+        }
+    }
+}

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

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.197</version>
+            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

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

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>1.9.1</version>
+            <version>${aspectjweaver.version}</version>
         </dependency>
 
         <dependency>

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

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>2.2.3.RELEASE</version>
+            <version>${spring-boot.version}</version>
         </dependency>
     </dependencies>
 
@@ -92,5 +92,6 @@
     <properties>
         <!-- The main class to start by executing java -jar -->
         <start-class>com.baeldung.intro.App</start-class>
+        <spring-boot.version>2.2.3.RELEASE</spring-boot.version>
     </properties>
 </project>

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

@@ -10,3 +10,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Guide to ShedLock with Spring](https://www.baeldung.com/shedlock-spring)
 - [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-modules/spring-boot-libraries/src/main/java/com/baeldung/caffeine/AddressController.java

@@ -0,0 +1,24 @@
+package com.baeldung.caffeine;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class AddressController
+{
+    @Autowired
+    private AddressService addressService;
+
+    @GetMapping("/address/{id}")
+    public ResponseEntity<String> getAddress(@PathVariable("id") long customerId) {
+        return ResponseEntity.ok(addressService.getAddress(customerId));
+    }
+
+    @GetMapping("/address2/{id}")
+    public ResponseEntity<String> getAddress2(@PathVariable("id") long customerId) {
+        return ResponseEntity.ok(addressService.getAddress2(customerId));
+    }
+}

spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/caffeine/AddressService.java

@@ -0,0 +1,41 @@
+package com.baeldung.caffeine;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+/**
+ * Service that uses caching.
+ */
+@Service
+public class AddressService
+{
+    private final static Logger LOG = LoggerFactory.getLogger(AddressService.class);
+
+    @Autowired
+    private CacheManager cacheManager;
+
+    @Cacheable(cacheNames = "addresses")
+    public String getAddress(long customerId)  {
+        LOG.info("Method getAddress is invoked for customer {}", customerId);
+
+        return "123 Main St";
+    }
+
+    public String getAddress2(long customerId) {
+        if(cacheManager.getCache("addresses2").get(customerId) != null) {
+            return cacheManager.getCache("addresses2").get(customerId).get().toString();
+        }
+
+        LOG.info("Method getAddress2 is invoked for customer {}", customerId);
+
+        String address = "123 Main St";
+
+        cacheManager.getCache("addresses2").put(customerId, address);
+
+        return address;
+    }
+}

spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/caffeine/CaffeineConfiguration.java

@@ -0,0 +1,28 @@
+package com.baeldung.caffeine;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.concurrent.TimeUnit;
+
+@EnableCaching
+@Configuration
+public class CaffeineConfiguration {
+    @Bean
+    public Caffeine caffeineConfig() {
+        return Caffeine.newBuilder()
+                .expireAfterWrite(60, TimeUnit.MINUTES);
+    }
+
+    @Bean
+    public CacheManager cacheManager(Caffeine caffeine) {
+        CaffeineCacheManager caffeineCacheManager = new CaffeineCacheManager();
+        caffeineCacheManager.getCache("addresses");
+        caffeineCacheManager.setCaffeine(caffeine);
+        return caffeineCacheManager;
+    }
+}

spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/caffeine/CaffieneTutorialApp.java

@@ -0,0 +1,11 @@
+package com.baeldung.caffeine;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+
+@SpringBootApplication
+public class CaffieneTutorialApp {
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(CaffieneTutorialApp.class).run(args);
+    }
+}

spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/caffeine/SecurityConfiguration.java

@@ -0,0 +1,24 @@
+package com.baeldung.caffeine;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+/**
+ * Because the POM imports Spring Security, we need a simple security
+ * configuration for this example application to allow all HTTP requests.
+ */
+@Configuration
+@EnableWebSecurity
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.csrf().disable();
+
+        http.authorizeRequests()
+                .antMatchers("/**")
+                .permitAll();
+    }
+}

spring-boot-modules/spring-boot-mvc-3/README.md

@@ -4,4 +4,5 @@ This module contains articles about Spring Web MVC in Spring Boot projects.
 
 ### Relevant Articles:
 
-- More articles: [[prev -->]](/spring-boot-modules/spring-boot-mvc-2)
+- [Circular View Path Error](https://www.baeldung.com/spring-circular-view-path-error)
+- More articles: [[prev -->]](/spring-boot-modules/spring-boot-mvc-2)

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

@@ -122,12 +122,12 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.9.1</version>
+            <version>${aspectjweaver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>1.9.1</version>
+            <version>${aspectjweaver.version}</version>
         </dependency>
 
     </dependencies>

spring-boot-modules/spring-boot-properties-2/README.md

@@ -8,4 +8,5 @@ This module contains articles about Properties in Spring Boot.
 - [Using Spring @Value with Defaults](https://www.baeldung.com/spring-value-defaults)
 - [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)
 - More articles: [[<-- prev]](../spring-boot-properties)

spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/yamlmap/MapFromYaml.java

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

spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/yamlmap/factory/YamlPropertySourceFactory.java

@@ -0,0 +1,25 @@
+package com.baeldung.properties.yamlmap.factory;
+
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.env.PropertiesPropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.support.EncodedResource;
+import org.springframework.core.io.support.PropertySourceFactory;
+
+import java.io.IOException;
+import java.util.Properties;
+
+public class YamlPropertySourceFactory implements PropertySourceFactory {
+
+    @Override
+    public PropertySource<?> createPropertySource(String name, EncodedResource encodedResource) throws IOException {
+        YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
+        factory.setResources(encodedResource.getResource());
+
+        Properties properties = factory.getObject();
+
+        return new PropertiesPropertySource(encodedResource.getResource()
+            .getFilename(), properties);
+    }
+
+}

spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/yamlmap/pojo/ServerProperties.java

@@ -0,0 +1,66 @@
+package com.baeldung.properties.yamlmap.pojo;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+import com.baeldung.properties.yamlmap.factory.YamlPropertySourceFactory;
+
+@Component
+@PropertySource(value = "classpath:server.yml", factory = YamlPropertySourceFactory.class)
+@ConfigurationProperties(prefix = "server")
+public class ServerProperties {
+
+    private Map<String, String> application;
+    private Map<String, List<String>> config;
+    private Map<String, Credential> users;
+
+    public Map<String, String> getApplication() {
+        return application;
+    }
+
+    public void setApplication(Map<String, String> application) {
+        this.application = application;
+    }
+
+    public Map<String, List<String>> getConfig() {
+        return config;
+    }
+
+    public void setConfig(Map<String, List<String>> config) {
+        this.config = config;
+    }
+
+    public Map<String, Credential> getUsers() {
+        return users;
+    }
+
+    public void setUsers(Map<String, Credential> users) {
+        this.users = users;
+    }
+
+    public static class Credential {
+
+        private String username;
+        private String password;
+
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(String username) {
+            this.username = username;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public void setPassword(String password) {
+            this.password = password;
+        }
+    }
+}

spring-boot-modules/spring-boot-properties-2/src/main/resources/server.yml

@@ -0,0 +1,22 @@
+server:
+  application:
+    name: InjectMapFromYAML
+    url: http://injectmapfromyaml.dev
+    description: How To Inject a map from a YAML File in Spring Boot
+  config:
+    ips:
+      - 10.10.10.10
+      - 10.10.10.11
+      - 10.10.10.12
+      - 10.10.10.13
+    filesystem:
+      - /dev/root
+      - /dev/md2
+      - /dev/md4
+  users: 
+    root:
+      username: root
+      password: rootpass
+    guest:
+      username: guest
+      password: guestpass

spring-boot-modules/spring-boot-properties-2/src/test/java/com/baeldung/properties/yamlmap/MapFromYamlIntegrationTest.java

@@ -0,0 +1,43 @@
+package com.baeldung.properties.yamlmap;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.properties.yamlmap.pojo.ServerProperties;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+class MapFromYamlIntegrationTest {
+
+    @Autowired
+    private ServerProperties serverProperties;
+
+    @Test
+    public void whenYamlFileProvidedThenInjectSimpleMap() {
+
+        assertThat(serverProperties.getApplication()).containsOnlyKeys("name", "url", "description");
+
+        assertThat(serverProperties.getApplication()
+            .get("name")).isEqualTo("InjectMapFromYAML");
+    }
+
+    @Test
+    public void whenYamlFileProvidedThenInjectComplexMap() {
+
+        assertThat(serverProperties.getConfig()).hasSize(2);
+
+        assertThat(serverProperties.getConfig()
+            .get("ips")
+            .get(0)).isEqualTo("10.10.10.10");
+
+        assertThat(serverProperties.getUsers()
+            .get("root")
+            .getUsername()).isEqualTo("root");
+    }
+
+}

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

@@ -10,4 +10,5 @@ This module contains articles about Properties in Spring Boot.
 - [Spring YAML Configuration](https://www.baeldung.com/spring-yaml)
 - [Add Build Properties to a Spring Boot Application](https://www.baeldung.com/spring-boot-build-properties)
 - [IntelliJ – Cannot Resolve Spring Boot Configuration Properties Error](https://www.baeldung.com/intellij-resolve-spring-boot-configuration-properties)
-- More articles: [[more -->]](../spring-boot-properties-2)
+- [Spring YAML vs Properties](https://www.baeldung.com/spring-yaml-vs-properties)
+- More articles: [[more -->]](../spring-boot-properties-2)

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

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>${commons-io.version}</version>
         </dependency>
 
         <dependency>
@@ -170,6 +170,7 @@
         <springcloud.version>2.0.2.RELEASE</springcloud.version>
         <httpclient.version>4.5.8</httpclient.version>
         <spring-boot-admin-starter-client.version>2.1.6</spring-boot-admin-starter-client.version>
+        <commons-io.version>2.6</commons-io.version>
     </properties>
 
 </project>