diff --git a/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/character/IsLetterOrAlphabetUnitTest.java b/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/character/IsLetterOrAlphabetUnitTest.java
new file mode 100644
index 0000000000..44c712a17f
--- /dev/null
+++ b/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/character/IsLetterOrAlphabetUnitTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.java14.character;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+public class IsLetterOrAlphabetUnitTest {
+
+    @Test
+    public void givenACharacter_whenLetter_thenAssertIsLetterTrue() {
+        assertTrue(Character.isLetter(65));
+    }
+
+    @Test
+    public void givenACharacter_whenLetter_thenAssertIsAlphabeticTrue() {
+        assertTrue(Character.isAlphabetic(65));
+    }
+
+    @Test
+    public void givenACharacter_whenAlphabeticAndNotLetter_thenAssertIsLetterFalse() {
+        assertFalse(Character.isLetter(837));
+    }
+
+    @Test
+    public void givenACharacter_whenAlphabeticAndNotLetter_thenAssertIsAlphabeticTrue() {
+        assertTrue(Character.isAlphabetic(837));
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-guides/src/main/java/com/baeldung/genericarrays/MyStack.java b/core-java-modules/core-java-arrays-guides/src/main/java/com/baeldung/genericarrays/MyStack.java
new file mode 100644
index 0000000000..02659f13bc
--- /dev/null
+++ b/core-java-modules/core-java-arrays-guides/src/main/java/com/baeldung/genericarrays/MyStack.java
@@ -0,0 +1,30 @@
+package com.baeldung.genericarrays;
+
+import java.lang.reflect.Array;
+
+public class MyStack<E> {
+    private E[] elements;
+    private int size = 0;
+
+    public MyStack(Class<E> clazz, int capacity) {
+        elements = (E[]) Array.newInstance(clazz, capacity);
+    }
+
+    public void push(E item) {
+        if (size == elements.length) {
+            throw new RuntimeException();
+        }
+        elements[size++] = item;
+    }
+
+    public E pop() {
+        if (size == 0) {
+            throw new RuntimeException();
+        }
+        return elements[--size];
+    }
+
+    public E[] getAllElements() {
+        return elements;
+    }
+}
diff --git a/core-java-modules/core-java-arrays-guides/src/test/java/com/baeldung/genericarrays/ListToArrayUnitTest.java b/core-java-modules/core-java-arrays-guides/src/test/java/com/baeldung/genericarrays/ListToArrayUnitTest.java
new file mode 100644
index 0000000000..5fd0385181
--- /dev/null
+++ b/core-java-modules/core-java-arrays-guides/src/test/java/com/baeldung/genericarrays/ListToArrayUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.genericarrays;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class ListToArrayUnitTest {
+
+    @Test
+    public void givenListOfItems_whenToArray_thenReturnArrayOfItems() {
+        List<String> items = new LinkedList<>();
+        items.add("first item");
+        items.add("second item");
+
+        String[] itemsAsArray = items.toArray(new String[0]);
+
+        assertEquals("first item", itemsAsArray[0]);
+        assertEquals("second item", itemsAsArray[1]);
+    }
+}
diff --git a/core-java-modules/core-java-arrays-guides/src/test/java/com/baeldung/genericarrays/MyStackUnitTest.java b/core-java-modules/core-java-arrays-guides/src/test/java/com/baeldung/genericarrays/MyStackUnitTest.java
new file mode 100644
index 0000000000..e36c5169a5
--- /dev/null
+++ b/core-java-modules/core-java-arrays-guides/src/test/java/com/baeldung/genericarrays/MyStackUnitTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.genericarrays;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class MyStackUnitTest {
+
+    @Test
+    public void givenStackWithTwoItems_whenPop_thenReturnLastAdded() {
+        MyStack<String> myStack = new MyStack<>(String.class, 2);
+        myStack.push("hello");
+        myStack.push("example");
+
+        assertEquals("example", myStack.pop());
+    }
+
+    @Test (expected = RuntimeException.class)
+    public void givenStackWithFixedCapacity_whenExceedCapacity_thenThrowException() {
+        MyStack<Integer> myStack = new MyStack<>(Integer.class, 2);
+        myStack.push(100);
+        myStack.push(200);
+        myStack.push(300);
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void givenStack_whenPopOnEmptyStack_thenThrowException() {
+        MyStack<Integer> myStack = new MyStack<>(Integer.class, 1);
+        myStack.push(100);
+        myStack.pop();
+        myStack.pop();
+    }
+
+    @Test
+    public void givenStackWithItems_whenGetAllElements_thenSizeShouldEqualTotal() {
+        MyStack<String> myStack = new MyStack<>(String.class, 2);
+        myStack.push("hello");
+        myStack.push("example");
+
+        String[] items = myStack.getAllElements();
+
+        assertEquals(2, items.length);
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-types/pom.xml b/core-java-modules/core-java-lang-oop-types/pom.xml
index ee167bbae2..c4efd9b8d2 100644
--- a/core-java-modules/core-java-lang-oop-types/pom.xml
+++ b/core-java-modules/core-java-lang-oop-types/pom.xml
@@ -12,12 +12,20 @@
     <artifactId>core-java-lang-oop-types</artifactId>
     <name>core-java-lang-oop-types</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec.version}</version>
+        </dependency>
     </dependencies>
+    <properties>
+        <commons-codec.version>1.15</commons-codec.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/Application.java b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/Application.java
new file mode 100644
index 0000000000..ad3d861d6a
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/Application.java
@@ -0,0 +1,35 @@
+package com.baeldung.enums.extendenum;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Arrays;
+import java.util.EnumMap;
+import java.util.Map;
+
+public class Application {
+    private static final Map<ImmutableOperation, Operator> OPERATION_MAP;
+
+    static {
+        OPERATION_MAP = new EnumMap<>(ImmutableOperation.class);
+        OPERATION_MAP.put(ImmutableOperation.TO_LOWER, String::toLowerCase);
+        OPERATION_MAP.put(ImmutableOperation.INVERT_CASE, StringUtils::swapCase);
+        OPERATION_MAP.put(ImmutableOperation.REMOVE_WHITESPACES, input -> input.replaceAll("\\s", ""));
+
+        if (Arrays.stream(ImmutableOperation.values()).anyMatch(it -> !OPERATION_MAP.containsKey(it))) {
+            throw new IllegalStateException("Unmapped enum constant found!");
+        }
+    }
+
+    public String applyImmutableOperation(ImmutableOperation operation, String input) {
+        return OPERATION_MAP.get(operation).apply(input);
+    }
+
+    public String getDescription(StringOperation stringOperation) {
+        return stringOperation.getDescription();
+    }
+
+    public String applyOperation(StringOperation operation, String input) {
+        return operation.apply(input);
+    }
+
+}
diff --git a/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/ApplicationWithEx.java b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/ApplicationWithEx.java
new file mode 100644
index 0000000000..e9cbad6b7c
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/ApplicationWithEx.java
@@ -0,0 +1,26 @@
+package com.baeldung.enums.extendenum;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Arrays;
+import java.util.EnumMap;
+import java.util.Map;
+
+public class ApplicationWithEx {
+    private static final Map<ImmutableOperation, Operator> OPERATION_MAP;
+
+    static {
+        OPERATION_MAP = new EnumMap<>(ImmutableOperation.class);
+        OPERATION_MAP.put(ImmutableOperation.TO_LOWER, String::toLowerCase);
+        OPERATION_MAP.put(ImmutableOperation.INVERT_CASE, StringUtils::swapCase);
+        // ImmutableOperation.REMOVE_WHITESPACES is not mapped
+
+        if (Arrays.stream(ImmutableOperation.values()).anyMatch(it -> !OPERATION_MAP.containsKey(it))) {
+            throw new IllegalStateException("Unmapped enum constant found!");
+        }
+    }
+
+    public String applyImmutableOperation(ImmutableOperation operation, String input) {
+        return OPERATION_MAP.get(operation).apply(input);
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/BasicStringOperation.java b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/BasicStringOperation.java
new file mode 100644
index 0000000000..267b02daf4
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/BasicStringOperation.java
@@ -0,0 +1,33 @@
+package com.baeldung.enums.extendenum;
+
+public enum BasicStringOperation implements StringOperation {
+    TRIM("Removing leading and trailing spaces.") {
+        @Override
+        public String apply(String input) {
+            return input.trim();
+        }
+    },
+    TO_UPPER("Changing all characters into upper case.") {
+        @Override
+        public String apply(String input) {
+            return input.toUpperCase();
+        }
+    },
+    REVERSE("Reversing the given string.") {
+        @Override
+        public String apply(String input) {
+            return new StringBuilder(input).reverse().toString();
+        }
+    };
+
+    private String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    BasicStringOperation(String description) {
+        this.description = description;
+    }
+}
+
diff --git a/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/ExtendedStringOperation.java b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/ExtendedStringOperation.java
new file mode 100644
index 0000000000..6184837b26
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/ExtendedStringOperation.java
@@ -0,0 +1,31 @@
+package com.baeldung.enums.extendenum;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+
+public enum ExtendedStringOperation implements StringOperation {
+    MD5_ENCODE("Encoding the given string using the MD5 algorithm.") {
+        @Override
+        public String apply(String input) {
+            return DigestUtils.md5Hex(input);
+        }
+    },
+    BASE64_ENCODE("Encoding the given string using the BASE64 algorithm.") {
+        @Override
+        public String apply(String input) {
+            return new String(new Base64().encode(input.getBytes()));
+        }
+    };
+
+    private String description;
+
+    ExtendedStringOperation(String description) {
+        this.description = description;
+    }
+
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/ImmutableOperation.java b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/ImmutableOperation.java
new file mode 100644
index 0000000000..66f26a4806
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/ImmutableOperation.java
@@ -0,0 +1,6 @@
+package com.baeldung.enums.extendenum;
+
+public enum ImmutableOperation {
+    REMOVE_WHITESPACES, TO_LOWER, INVERT_CASE
+}
+
diff --git a/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/Operator.java b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/Operator.java
new file mode 100644
index 0000000000..a65fea4f92
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/Operator.java
@@ -0,0 +1,5 @@
+package com.baeldung.enums.extendenum;
+
+public interface Operator {
+    String apply(String input);
+}
diff --git a/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/StringOperation.java b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/StringOperation.java
new file mode 100644
index 0000000000..faf4f38274
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types/src/main/java/com/baeldung/enums/extendenum/StringOperation.java
@@ -0,0 +1,7 @@
+package com.baeldung.enums.extendenum;
+
+public interface StringOperation {
+    String getDescription();
+
+    String apply(String input);
+}
diff --git a/core-java-modules/core-java-lang-oop-types/src/test/java/com/baeldung/enums/extendenum/ExtendEnumUnitTest.java b/core-java-modules/core-java-lang-oop-types/src/test/java/com/baeldung/enums/extendenum/ExtendEnumUnitTest.java
new file mode 100644
index 0000000000..0b5ed1e826
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types/src/test/java/com/baeldung/enums/extendenum/ExtendEnumUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.enums.extendenum;
+
+import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ExtendEnumUnitTest {
+    private Application app = new Application();
+
+    @Test
+    public void givenAStringAndOperation_whenApplyOperation_thenGetExpectedResult() {
+        String input = " hello";
+        String expectedToUpper = " HELLO";
+        String expectedReverse = "olleh ";
+        String expectedTrim = "hello";
+        String expectedBase64 = "IGhlbGxv";
+        String expectedMd5 = "292a5af68d31c10e31ad449bd8f51263";
+        assertEquals(expectedTrim, app.applyOperation(BasicStringOperation.TRIM, input));
+        assertEquals(expectedToUpper, app.applyOperation(BasicStringOperation.TO_UPPER, input));
+        assertEquals(expectedReverse, app.applyOperation(BasicStringOperation.REVERSE, input));
+        assertEquals(expectedBase64, app.applyOperation(ExtendedStringOperation.BASE64_ENCODE, input));
+        assertEquals(expectedMd5, app.applyOperation(ExtendedStringOperation.MD5_ENCODE, input));
+    }
+
+    @Test
+    public void givenAStringAndImmutableOperation_whenApplyOperation_thenGetExpectedResult() {
+        String input = " He ll O ";
+        String expectedToLower = " he ll o ";
+        String expectedRmWhitespace = "HellO";
+        String expectedInvertCase = " hE LL o ";
+        assertEquals(expectedToLower, app.applyImmutableOperation(ImmutableOperation.TO_LOWER, input));
+        assertEquals(expectedRmWhitespace, app.applyImmutableOperation(ImmutableOperation.REMOVE_WHITESPACES, input));
+        assertEquals(expectedInvertCase, app.applyImmutableOperation(ImmutableOperation.INVERT_CASE, input));
+    }
+
+    @Test
+    public void givenUnmappedImmutableOperationValue_whenAppStarts_thenGetException() {
+        Throwable throwable = assertThrows(ExceptionInInitializerError.class, () -> {
+            ApplicationWithEx appEx = new ApplicationWithEx();
+        });
+        assertTrue(throwable.getCause() instanceof IllegalStateException);
+    }
+}
\ No newline at end of file
diff --git a/discord4j/.gitignore b/discord4j/.gitignore
index b56f1dd0d0..7ed0d6b679 100644
--- a/discord4j/.gitignore
+++ b/discord4j/.gitignore
@@ -1,4 +1,3 @@
-README.md
 target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
diff --git a/discord4j/README.md b/discord4j/README.md
new file mode 100644
index 0000000000..58a9924666
--- /dev/null
+++ b/discord4j/README.md
@@ -0,0 +1,7 @@
+## DISCORD4J
+
+This module contains articles about Discord4J
+
+### Relevant Articles: 
+
+- [Creating a Discord Bot with Discord4J + Spring Boot](https://www.baeldung.com/spring-discord4j-bot)
\ No newline at end of file
diff --git a/discord4j/pom.xml b/discord4j/pom.xml
index 7687f63ad5..664692f60a 100644
--- a/discord4j/pom.xml
+++ b/discord4j/pom.xml
@@ -23,6 +23,14 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java b/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java
index a60005e9b5..901308605b 100644
--- a/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java
+++ b/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java
@@ -36,8 +36,6 @@ public class BotConfiguration {
                   .onErrorResume(listener::handleError)
                   .subscribe();
             }
-
-            client.onDisconnect().block();
         }
         catch ( Exception exception ) {
             log.error( "Be sure to use a valid bot token!", exception );
diff --git a/docker/docker-internal-dto/pom.xml b/docker/docker-internal-dto/pom.xml
new file mode 100644
index 0000000000..55cef257fe
--- /dev/null
+++ b/docker/docker-internal-dto/pom.xml
@@ -0,0 +1,15 @@
+<?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>
+    <parent>
+        <groupId>com.baeldung.docker</groupId>
+        <artifactId>docker</artifactId>
+        <version>0.0.1</version>
+    </parent>
+
+    <artifactId>docker-internal-dto</artifactId>
+    <name>docker-internal-dto</name>
+
+</project>
diff --git a/docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java b/docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
new file mode 100644
index 0000000000..2de3b734ea
--- /dev/null
+++ b/docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
@@ -0,0 +1,14 @@
+package com.baeldung.docker.dto;
+
+public class VariableDto {
+
+    private final String value;
+
+    public VariableDto(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/docker/docker-spring-boot/pom.xml b/docker/docker-spring-boot/pom.xml
index b9c80bc43a..74bd1561cf 100644
--- a/docker/docker-spring-boot/pom.xml
+++ b/docker/docker-spring-boot/pom.xml
@@ -1,21 +1,21 @@
 <?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">
+<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>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.1.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>com.baeldung.docker</groupId>
+        <artifactId>docker</artifactId>
+        <version>0.0.1</version>
     </parent>
-    <groupId>com.baeldung.docker</groupId>
-    <artifactId>spring-boot-docker</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-boot-docker</name>
+
+    <artifactId>docker-spring-boot</artifactId>
+
+    <name>docker-spring-boot</name>
     <description>Demo project showing Spring Boot and Docker</description>
 
     <properties>
-        <java.version>8</java.version>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
@@ -24,6 +24,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.baeldung.docker</groupId>
+            <artifactId>docker-internal-dto</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -45,6 +51,7 @@
                 <configuration>
                     <layers>
                         <enabled>true</enabled>
+                        <configuration>${project.basedir}/src/layers.xml</configuration>
                     </layers>
                 </configuration>
             </plugin>
diff --git a/docker/docker-spring-boot/src/layers.xml b/docker/docker-spring-boot/src/layers.xml
new file mode 100644
index 0000000000..61c9bd9c39
--- /dev/null
+++ b/docker/docker-spring-boot/src/layers.xml
@@ -0,0 +1,27 @@
+<layers xmlns="http://www.springframework.org/schema/boot/layers"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
+                     https://www.springframework.org/schema/boot/layers/layers-2.3.xsd">
+    <application>
+        <into layer="spring-boot-loader">
+            <include>org/springframework/boot/loader/**</include>
+        </into>
+        <into layer="application" />
+    </application>
+    <dependencies>
+        <into layer="snapshot-dependencies">
+            <include>*:*:*SNAPSHOT</include>
+        </into>
+        <into layer="internal-dependencies">
+            <include>com.baeldung.docker:*:*</include>
+        </into>
+        <into layer="dependencies" />
+    </dependencies>
+    <layerOrder>
+        <layer>dependencies</layer>
+        <layer>spring-boot-loader</layer>
+        <layer>internal-dependencies</layer>
+        <layer>snapshot-dependencies</layer>
+        <layer>application</layer>
+    </layerOrder>
+</layers>
\ No newline at end of file
diff --git a/docker/docker-spring-boot/src/main/docker/Dockerfile b/docker/docker-spring-boot/src/main/docker/Dockerfile
index fa147dd69b..c0fd9c9cdb 100644
--- a/docker/docker-spring-boot/src/main/docker/Dockerfile
+++ b/docker/docker-spring-boot/src/main/docker/Dockerfile
@@ -9,7 +9,8 @@ RUN java -Djarmode=layertools -jar application.jar extract
 
 FROM adoptopenjdk:11-jre-hotspot
 COPY --from=builder dependencies/ ./
-COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder internal-dependencies/ ./
+COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder application/ ./
 ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
\ No newline at end of file
diff --git a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/DemoApplication.java b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
similarity index 88%
rename from docker/docker-spring-boot/src/main/java/com/baeldung/docker/DemoApplication.java
rename to docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
index e0c1d57e89..9210cabbb3 100644
--- a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/DemoApplication.java
+++ b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung.docker;
+package com.baeldung.docker.spring;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/HelloController.java b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
similarity index 90%
rename from docker/docker-spring-boot/src/main/java/com/baeldung/docker/HelloController.java
rename to docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
index b463bb557f..430a158011 100644
--- a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/HelloController.java
+++ b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
@@ -1,4 +1,4 @@
-package com.baeldung.docker;
+package com.baeldung.docker.spring;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/docker/pom.xml b/docker/pom.xml
new file mode 100644
index 0000000000..f05c303938
--- /dev/null
+++ b/docker/pom.xml
@@ -0,0 +1,30 @@
+<?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>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.1.RELEASE</version>
+        <relativePath /> <!-- lookup parent from repository -->
+    </parent>
+
+    <groupId>com.baeldung.docker</groupId>
+    <artifactId>docker</artifactId>
+    <version>0.0.1</version>
+    <name>docker</name>
+    <description>Demo project showing Spring Boot and Docker</description>
+    <packaging>pom</packaging>
+
+    <properties>
+        <java.version>11</java.version>
+    </properties>
+
+    <modules>
+        <module>docker-internal-dto</module>
+        <module>docker-spring-boot</module>
+    </modules>
+
+</project>
diff --git a/persistence-modules/java-jpa-3/src/main/java/com/baeldung/jpa/index/Student.java b/persistence-modules/java-jpa-3/src/main/java/com/baeldung/jpa/index/Student.java
new file mode 100644
index 0000000000..45de3f3fc4
--- /dev/null
+++ b/persistence-modules/java-jpa-3/src/main/java/com/baeldung/jpa/index/Student.java
@@ -0,0 +1,70 @@
+package com.baeldung.jpa.index;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Objects;
+
+@Entity
+@Table(indexes = {
+  @Index(columnList = "firstName"),
+  @Index(name = "fn_index", columnList = "id"),
+  @Index(name = "multiIndex1", columnList = "firstName, lastName"),
+  @Index(name = "multiIndex2", columnList = "lastName, firstName"),
+  @Index(name = "multiSortIndex", columnList = "firstName, lastName DESC"),
+  @Index(name = "uniqueIndex", columnList = "firstName", unique = true),
+  @Index(name = "uniqueMultiIndex", columnList = "firstName, lastName", unique = true)
+})
+public class Student implements Serializable {
+    @Id
+    @GeneratedValue
+    private Long id;
+    private String firstName;
+    private String lastName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Student student = (Student) o;
+        return Objects.equals(id, student.id) &&
+                Objects.equals(firstName, student.firstName) &&
+                Objects.equals(lastName, student.lastName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, firstName, lastName);
+    }
+}
diff --git a/persistence-modules/java-jpa-3/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa-3/src/main/resources/META-INF/persistence.xml
index 88378bd8db..1a53fb8e82 100644
--- a/persistence-modules/java-jpa-3/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/java-jpa-3/src/main/resources/META-INF/persistence.xml
@@ -40,4 +40,19 @@
             <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
         </properties>
     </persistence-unit>
+    <persistence-unit name="jpa-index">
+            <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+            <class>com.baeldung.jpa.index.Student</class>
+            <exclude-unlisted-classes>true</exclude-unlisted-classes>
+            <properties>
+                <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+                <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test" />
+                <property name="javax.persistence.jdbc.user" value="sa" />
+                <property name="javax.persistence.jdbc.password" value="" />
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false" />
+        </properties>
+    </persistence-unit>
 </persistence>
diff --git a/persistence-modules/java-jpa-3/src/main/resources/logback.xml b/persistence-modules/java-jpa-3/src/main/resources/logback.xml
index 2527fea245..8000740dd1 100644
--- a/persistence-modules/java-jpa-3/src/main/resources/logback.xml
+++ b/persistence-modules/java-jpa-3/src/main/resources/logback.xml
@@ -8,7 +8,7 @@
             </pattern>
         </encoder>
     </appender>
-
+    <logger name="org.hibernate.SQL" level="DEBUG" />
     <root level="INFO">
         <appender-ref ref="STDOUT" />
     </root>
diff --git a/persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/index/IndexIntegrationTest.java b/persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/index/IndexIntegrationTest.java
new file mode 100644
index 0000000000..f59450567b
--- /dev/null
+++ b/persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/index/IndexIntegrationTest.java
@@ -0,0 +1,50 @@
+package com.baeldung.jpa.index;
+
+import org.hibernate.exception.ConstraintViolationException;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import java.util.Optional;
+
+public class IndexIntegrationTest {
+    private static EntityManagerFactory factory;
+    private static EntityManager entityManager;
+
+    @BeforeClass
+    public static void setup() {
+        factory = Persistence.createEntityManagerFactory("jpa-index");
+        entityManager = factory.createEntityManager();
+    }
+
+    @Test
+    public void givenStudent_whenPersistStudentWithSameFirstName_thenConstraintViolationException() {
+        Student student = new Student();
+        student.setFirstName("FirstName");
+        student.setLastName("LastName");
+
+        Student student2 = new Student();
+        student2.setFirstName("FirstName");
+        student2.setLastName("LastName2");
+
+        entityManager.getTransaction().begin();
+        entityManager.persist(student);
+        entityManager.getTransaction().commit();
+
+        Assert.assertEquals(1L, (long) student.getId());
+
+        entityManager.getTransaction().begin();
+        try {
+            entityManager.persist(student2);
+            entityManager.getTransaction().commit();
+            Assert.fail("Should raise an exception - unique key violation");
+        } catch (Exception ex) {
+            Assert.assertTrue(Optional.of(ex).map(Throwable::getCause).map(Throwable::getCause).filter(x -> x instanceof ConstraintViolationException).isPresent());
+        } finally {
+            entityManager.getTransaction().rollback();
+        }
+    }
+}
diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java
index 82f3abc04d..9d98d6b86f 100644
--- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java
+++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java
@@ -7,7 +7,9 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Persistence;
+import javax.persistence.TypedQuery;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -19,7 +21,7 @@ public class ArticleUnitTest {
 
     @BeforeClass
     public static void setup() {
-        Map properties = new HashMap();
+        Map<String, String> properties = new HashMap<>();
         properties.put("hibernate.show_sql", "true");
         properties.put("hibernate.format_sql", "true");
         emFactory = Persistence.createEntityManagerFactory("jpa-h2", properties);
@@ -115,4 +117,53 @@ public class ArticleUnitTest {
         assertEquals(Category.MUSIC, persistedArticle.getCategory());
     }
 
+    @Test
+    public void shouldFindArticleByCategory() {
+        // given
+        Article article = new Article();
+        article.setId(5);
+        article.setTitle("static");
+        article.setCategory(Category.SPORT);
+
+        EntityTransaction tx = em.getTransaction();
+        tx.begin();
+        em.persist(article);
+        tx.commit();
+
+        String jpql = "select a from Article a where a.category = com.baeldung.jpa.enums.Category.SPORT";
+
+        // when
+        List<Article> articles = em.createQuery(jpql, Article.class).getResultList();
+
+        // then
+        assertEquals(1, articles.size());
+        assertEquals(Category.SPORT, articles.get(0).getCategory());
+        assertEquals("static", articles.get(0).getTitle());
+    }
+
+    @Test
+    public void shouldFindArticleByCategoryParameter() {
+        // given
+        Article article = new Article();
+        article.setId(6);
+        article.setTitle("dynamic");
+        article.setCategory(Category.TECHNOLOGY);
+
+        EntityTransaction tx = em.getTransaction();
+        tx.begin();
+        em.persist(article);
+        tx.commit();
+
+        String jpql = "select a from Article a where a.category = :category";
+
+        // when
+        TypedQuery<Article> query = em.createQuery(jpql, Article.class);
+        query.setParameter("category", Category.TECHNOLOGY);
+        List<Article> articles = query.getResultList();
+
+        // then
+        assertEquals(1, articles.size());
+        assertEquals(Category.TECHNOLOGY, articles.get(0).getCategory());
+        assertEquals("dynamic", articles.get(0).getTitle());
+    }
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6c96d8d77e..82e242b9af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -697,7 +697,6 @@
                 <module>spring-reactor</module>
                 <module>spring-remoting</module>
                 <module>spring-rest-angular</module>
-                <module>spring-rest-compress</module>
                 <module>spring-rest-http</module>
                 <module>spring-rest-http-2</module>
                 <module>spring-rest-query-language</module>
@@ -1200,7 +1199,6 @@
                 <module>spring-reactor</module>
                 <module>spring-remoting</module>
                 <module>spring-rest-angular</module>
-                <module>spring-rest-compress</module>
                 <module>spring-rest-http</module>
                 <module>spring-rest-query-language</module>
                 <module>spring-rest-shell</module>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 0d6e434713..622a5c0f42 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -26,6 +26,7 @@
         <module>spring-boot-artifacts</module>
         <module>spring-boot-autoconfiguration</module>
         <module>spring-boot-basic-customization</module>
+        <module>spring-boot-basic-customization-2</module>
         <module>spring-boot-bootstrap</module>
         <module>spring-boot-client</module>
         <module>spring-boot-config-jpa-error</module>
diff --git a/spring-boot-modules/spring-boot-basic-customization-2/README.md b/spring-boot-modules/spring-boot-basic-customization-2/README.md
new file mode 100644
index 0000000000..faaee0962e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-basic-customization-2/README.md
@@ -0,0 +1,7 @@
+## Spring Boot Basic Customization 2
+
+This module contains articles about Spring Boot customization 2
+
+### Relevant Articles:
+
+ - [DispatcherServlet and web.xml in Spring Boot](https://www.baeldung.com/)
diff --git a/spring-boot-modules/spring-boot-basic-customization-2/pom.xml b/spring-boot-modules/spring-boot-basic-customization-2/pom.xml
new file mode 100644
index 0000000000..3ce9266ebe
--- /dev/null
+++ b/spring-boot-modules/spring-boot-basic-customization-2/pom.xml
@@ -0,0 +1,33 @@
+<?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>
+
+    <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-basic-customization-2</artifactId>
+    <packaging>jar</packaging>
+
+    <name>spring-boot-basic-customization-2</name>
+    <description>Module For Spring Boot Basic Customization 2</description>
+
+    <dependencies>
+        <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>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/DispatchServletApplication.java b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/DispatchServletApplication.java
new file mode 100644
index 0000000000..4d58715d88
--- /dev/null
+++ b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/DispatchServletApplication.java
@@ -0,0 +1,15 @@
+package com.baeldung.dispatchservlet;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@SpringBootApplication
+public class DispatchServletApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(DispatchServletApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/conf/WebConf.java b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/conf/WebConf.java
new file mode 100644
index 0000000000..7c52b117fd
--- /dev/null
+++ b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/conf/WebConf.java
@@ -0,0 +1,29 @@
+package com.baeldung.dispatchservlet.conf;
+
+import com.baeldung.dispatchservlet.listener.CustomListener;
+import com.baeldung.dispatchservlet.servlet.CustomServlet;
+import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.ServletContextListener;
+
+@Configuration
+public class WebConf {
+
+    @Bean
+    public ServletRegistrationBean customServletBean() {
+        ServletRegistrationBean bean
+                = new ServletRegistrationBean(new CustomServlet(), "/servlet");
+        return bean;
+    }
+
+    @Bean
+    public ServletListenerRegistrationBean<ServletContextListener> customListenerBean() {
+        ServletListenerRegistrationBean<ServletContextListener> bean = new ServletListenerRegistrationBean();
+        bean.setListener(new CustomListener());
+        return bean;
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/controller/Controller.java b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/controller/Controller.java
new file mode 100644
index 0000000000..14d71c60fb
--- /dev/null
+++ b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/controller/Controller.java
@@ -0,0 +1,15 @@
+package com.baeldung.dispatchservlet.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/")
+public class Controller {
+
+    @GetMapping
+    public String getRequest(){
+        return "Baeldung DispatcherServlet";
+    }
+}
diff --git a/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/filter/CustomFilter.java b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/filter/CustomFilter.java
new file mode 100644
index 0000000000..8429fc855f
--- /dev/null
+++ b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/filter/CustomFilter.java
@@ -0,0 +1,30 @@
+package com.baeldung.dispatchservlet.filter;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+@Component
+public class CustomFilter implements Filter {
+
+    Logger logger = LoggerFactory.getLogger(CustomFilter.class);
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        logger.info("CustomFilter is invoked");
+        chain.doFilter(request, response);
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}
diff --git a/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/listener/CustomListener.java b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/listener/CustomListener.java
new file mode 100644
index 0000000000..62b316c012
--- /dev/null
+++ b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/listener/CustomListener.java
@@ -0,0 +1,22 @@
+package com.baeldung.dispatchservlet.listener;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+public class CustomListener implements ServletContextListener {
+
+    Logger logger = LoggerFactory.getLogger(CustomListener.class);
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+        logger.info("CustomListener is initialized");
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+        logger.info("CustomListener is destroyed");
+    }
+}
diff --git a/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/servlet/CustomServlet.java b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/servlet/CustomServlet.java
new file mode 100644
index 0000000000..2a99e797ce
--- /dev/null
+++ b/spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/servlet/CustomServlet.java
@@ -0,0 +1,29 @@
+package com.baeldung.dispatchservlet.servlet;
+
+import com.baeldung.dispatchservlet.filter.CustomFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class CustomServlet extends HttpServlet {
+
+    Logger logger = LoggerFactory.getLogger(CustomServlet.class);
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        logger.info("CustomServlet doGet() method is invoked");
+        super.doGet(req, resp);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        logger.info("CustomServlet doPost() method is invoked");
+        super.doPost(req, resp);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-basic-customization-2/src/main/resources/application.properties b/spring-boot-modules/spring-boot-basic-customization-2/src/main/resources/application.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spring-rest-compress/README.md b/spring-rest-compress/README.md
deleted file mode 100644
index ce627d8595..0000000000
--- a/spring-rest-compress/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Spring REST Compress
-
-This module contains articles about request compression with Spring
-
-### Relevant Articles:
-- [How to compress requests using the Spring RestTemplate](https://www.baeldung.com/spring-resttemplate-compressing-requests)
diff --git a/spring-rest-compress/pom.xml b/spring-rest-compress/pom.xml
deleted file mode 100644
index 9ff0be9682..0000000000
--- a/spring-rest-compress/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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-rest-compress</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-rest-compress</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <java.version>1.8</java.version>
-        <commons-io.version>2.6</commons-io.version>
-    </properties>
-
-</project>
diff --git a/spring-resttemplate-2/README.md b/spring-resttemplate-2/README.md
index e1e0ba40b0..37d8ac9740 100644
--- a/spring-resttemplate-2/README.md
+++ b/spring-resttemplate-2/README.md
@@ -8,3 +8,4 @@ This module contains articles about Spring RestTemplate
 - [Proxies With RestTemplate](https://www.baeldung.com/java-resttemplate-proxy)
 - [A Custom Media Type for a Spring REST API](https://www.baeldung.com/spring-rest-custom-media-type)
 - [RestTemplate Post Request with JSON](https://www.baeldung.com/spring-resttemplate-post-json)
+- [How to compress requests using the Spring RestTemplate](https://www.baeldung.com/spring-resttemplate-compressing-requests)
diff --git a/spring-resttemplate-2/pom.xml b/spring-resttemplate-2/pom.xml
index b1d6f60c53..2aed154be6 100644
--- a/spring-resttemplate-2/pom.xml
+++ b/spring-resttemplate-2/pom.xml
@@ -20,7 +20,30 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/CompressingClientHttpRequestInterceptor.java b/spring-resttemplate-2/src/main/java/com/baeldung/compress/CompressingClientHttpRequestInterceptor.java
similarity index 96%
rename from spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/CompressingClientHttpRequestInterceptor.java
rename to spring-resttemplate-2/src/main/java/com/baeldung/compress/CompressingClientHttpRequestInterceptor.java
index 78b77256af..e880e8f915 100644
--- a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/CompressingClientHttpRequestInterceptor.java
+++ b/spring-resttemplate-2/src/main/java/com/baeldung/compress/CompressingClientHttpRequestInterceptor.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.rest.compress;
+package com.baeldung.compress;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/GzipUtils.java b/spring-resttemplate-2/src/main/java/com/baeldung/compress/GzipUtils.java
similarity index 83%
rename from spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/GzipUtils.java
rename to spring-resttemplate-2/src/main/java/com/baeldung/compress/GzipUtils.java
index b9731535b2..50c565d92c 100644
--- a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/GzipUtils.java
+++ b/spring-resttemplate-2/src/main/java/com/baeldung/compress/GzipUtils.java
@@ -1,14 +1,14 @@
-package com.baeldung.spring.rest.compress;
-
-import org.apache.commons.codec.Charsets;
-import org.apache.commons.io.IOUtils;
+package com.baeldung.compress;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
+import org.apache.commons.io.IOUtils;
+
 public class GzipUtils {
 
     /**
@@ -19,7 +19,7 @@ public class GzipUtils {
      * @throws Exception
      */
     public static byte[] compress(String text) throws Exception {
-        return GzipUtils.compress(text.getBytes(Charsets.UTF_8));
+        return GzipUtils.compress(text.getBytes(StandardCharsets.UTF_8));
     }
 
     /**
@@ -46,7 +46,7 @@ public class GzipUtils {
      */
     public static String decompress(byte[] body) throws IOException {
         try (GZIPInputStream gzipInputStream = new GZIPInputStream(new ByteArrayInputStream(body))) {
-            return IOUtils.toString(gzipInputStream, Charsets.UTF_8);
+            return IOUtils.toString(gzipInputStream, StandardCharsets.UTF_8);
         }
     }
 }
diff --git a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/JettyWebServerConfiguration.java b/spring-resttemplate-2/src/main/java/com/baeldung/compress/JettyWebServerConfiguration.java
similarity index 96%
rename from spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/JettyWebServerConfiguration.java
rename to spring-resttemplate-2/src/main/java/com/baeldung/compress/JettyWebServerConfiguration.java
index 8de8e5b523..3ac8c31ab3 100644
--- a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/JettyWebServerConfiguration.java
+++ b/spring-resttemplate-2/src/main/java/com/baeldung/compress/JettyWebServerConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.rest.compress;
+package com.baeldung.compress;
 
 import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.server.handler.gzip.GzipHandler;
diff --git a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/Message.java b/spring-resttemplate-2/src/main/java/com/baeldung/compress/Message.java
similarity index 92%
rename from spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/Message.java
rename to spring-resttemplate-2/src/main/java/com/baeldung/compress/Message.java
index 24272a4fca..f43d06c2fc 100644
--- a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/Message.java
+++ b/spring-resttemplate-2/src/main/java/com/baeldung/compress/Message.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.rest.compress;
+package com.baeldung.compress;
 
 public class Message {
 
diff --git a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/MessageController.java b/spring-resttemplate-2/src/main/java/com/baeldung/compress/MessageController.java
similarity index 96%
rename from spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/MessageController.java
rename to spring-resttemplate-2/src/main/java/com/baeldung/compress/MessageController.java
index 2fc2ca8272..ec574d9dec 100644
--- a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/MessageController.java
+++ b/spring-resttemplate-2/src/main/java/com/baeldung/compress/MessageController.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.rest.compress;
+package com.baeldung.compress;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/RestTemplateConfiguration.java b/spring-resttemplate-2/src/main/java/com/baeldung/compress/RestTemplateConfiguration.java
similarity index 92%
rename from spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/RestTemplateConfiguration.java
rename to spring-resttemplate-2/src/main/java/com/baeldung/compress/RestTemplateConfiguration.java
index c1e3c89ae9..12b1e4249e 100644
--- a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/RestTemplateConfiguration.java
+++ b/spring-resttemplate-2/src/main/java/com/baeldung/compress/RestTemplateConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.rest.compress;
+package com.baeldung.compress;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/SpringCompressRequestApplication.java b/spring-resttemplate-2/src/main/java/com/baeldung/compress/SpringCompressRequestApplication.java
similarity index 90%
rename from spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/SpringCompressRequestApplication.java
rename to spring-resttemplate-2/src/main/java/com/baeldung/compress/SpringCompressRequestApplication.java
index 9b1b71979d..9ff88ab257 100644
--- a/spring-rest-compress/src/main/java/com/baeldung/spring/rest/compress/SpringCompressRequestApplication.java
+++ b/spring-resttemplate-2/src/main/java/com/baeldung/compress/SpringCompressRequestApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.rest.compress;
+package com.baeldung.compress;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/spring-rest-compress/src/test/java/com/baeldung/spring/rest/compress/GzipUtilsUnitTest.java b/spring-resttemplate-2/src/test/java/com/baeldung/compress/GzipUtilsUnitTest.java
similarity index 92%
rename from spring-rest-compress/src/test/java/com/baeldung/spring/rest/compress/GzipUtilsUnitTest.java
rename to spring-resttemplate-2/src/test/java/com/baeldung/compress/GzipUtilsUnitTest.java
index 431758d358..10c2eeb748 100644
--- a/spring-rest-compress/src/test/java/com/baeldung/spring/rest/compress/GzipUtilsUnitTest.java
+++ b/spring-resttemplate-2/src/test/java/com/baeldung/compress/GzipUtilsUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.rest.compress;
+package com.baeldung.compress;
 
 import org.junit.Test;
 
diff --git a/spring-rest-compress/src/test/java/com/baeldung/spring/rest/compress/MessageControllerUnitTest.java b/spring-resttemplate-2/src/test/java/com/baeldung/compress/MessageControllerUnitTest.java
similarity index 97%
rename from spring-rest-compress/src/test/java/com/baeldung/spring/rest/compress/MessageControllerUnitTest.java
rename to spring-resttemplate-2/src/test/java/com/baeldung/compress/MessageControllerUnitTest.java
index 50b2b7ccd7..643e3f6881 100644
--- a/spring-rest-compress/src/test/java/com/baeldung/spring/rest/compress/MessageControllerUnitTest.java
+++ b/spring-resttemplate-2/src/test/java/com/baeldung/compress/MessageControllerUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.rest.compress;
+package com.baeldung.compress;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;