Merge branch 'master' into BAEL-3682

akka-http/pom.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>akka-http</artifactId>
     <name>akka-http</name>
@@ -38,8 +37,6 @@
     </dependencies>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <akka.http.version>10.0.11</akka.http.version>
         <akka.stream.version>2.5.11</akka.stream.version>
     </properties>

akka-streams/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

algorithms-genetic/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -44,18 +43,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <properties>
         <commons-math3.version>3.6.1</commons-math3.version>
         <io.jenetics.version>3.7.0</io.jenetics.version>

algorithms-miscellaneous-1/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -49,18 +48,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <reporting>
         <plugins>
             <plugin>

algorithms-miscellaneous-2/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -54,18 +53,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <reporting>
         <plugins>
             <plugin>

algorithms-miscellaneous-3/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -74,25 +73,11 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <properties>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-collections4.version>4.3</commons-collections4.version>
         <guava.version>28.0-jre</guava.version>
         <retrofit.version>2.6.0</retrofit.version>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator.version>1.19</jmh-generator.version>
         <commons.lang3.version>3.8.1</commons.lang3.version>
         <JUnitParams.version>1.1.0</JUnitParams.version>
     </properties>

algorithms-miscellaneous-4/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -34,18 +33,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <properties>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <guava.version>27.0.1-jre</guava.version>

algorithms-miscellaneous-5/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -49,18 +48,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <properties>
         <tradukisto.version>1.0.1</tradukisto.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>

algorithms-miscellaneous-6/pom.xml

@@ -1,6 +1,7 @@
 <?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"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    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>algorithms-miscellaneous-6</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -11,9 +12,9 @@
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-    
+
     <dependencies>
-    <dependency>
+        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
@@ -41,7 +42,7 @@
             <version>${commons-math3.version}</version>
         </dependency>
     </dependencies>
-    
+
     <properties>
         <guava.version>28.1-jre</guava.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
@@ -49,4 +50,4 @@
         <commons-math3.version>3.6.1</commons-math3.version>
     </properties>
 
-</project>
+</project>

algorithms-searching/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

algorithms-searching/src/main/java/com/baeldung/algorithms/binarysearch/BinarySearch.java

@@ -12,7 +12,7 @@ public class BinarySearch {
 
         while (low <= high) {
 
-            int mid = (low + high) / 2;
+            int mid = low + ((high - low) / 2);
 
             if (sortedArray[mid] < key) {
                 low = mid + 1;
@@ -28,7 +28,7 @@ public class BinarySearch {
 
     public int runBinarySearchRecursively(int[] sortedArray, int key, int low, int high) {
 
-        int middle = (low + high) / 2;
+        int middle = low + ((high - low) / 2);
         if (high < low) {
             return -1;
         }

algorithms-sorting-2/pom.xml

@@ -1,5 +1,4 @@
-<project
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="http://maven.apache.org/POM/4.0.0"
     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>
@@ -44,18 +43,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <properties>
         <commons-math3.version>3.6.1</commons-math3.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>

algorithms-sorting/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -45,18 +44,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <properties>
         <commons-math3.version>3.6.1</commons-math3.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>

animal-sniffer-mvn-plugin/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

annotations/annotation-processing/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="http://maven.apache.org/POM/4.0.0"
     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>

annotations/annotation-user/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

annotations/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

antlr/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

apache-cxf/cxf-aegis/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

apache-cxf/cxf-introduction/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

apache-cxf/cxf-jaxrs-implementation/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

apache-cxf/cxf-spring/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

apache-cxf/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -30,7 +29,6 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>${exec-maven-plugin.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>

apache-cxf/sse-jaxrs/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

apache-cxf/sse-jaxrs/sse-jaxrs-client/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -59,4 +58,4 @@
         <cxf-version>3.2.0</cxf-version>
     </properties>
 
-</project>
+</project>

apache-cxf/sse-jaxrs/sse-jaxrs-server/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

apache-libraries/pom.xml

@@ -1,5 +1,6 @@
 <?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"
+<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>apache-libraries</artifactId>
@@ -29,7 +30,6 @@
             <artifactId>avro-maven-plugin</artifactId>
             <version>${avro.version}</version>
         </dependency>
-
         <!-- beam -->
         <dependency>
             <groupId>org.apache.beam</groupId>
@@ -43,7 +43,6 @@
             <version>${beam.version}</version>
             <scope>runtime</scope>
         </dependency>
-
         <!-- bval -->
         <dependency>
             <groupId>org.apache.bval</groupId>
@@ -60,7 +59,6 @@
             <artifactId>bval-extras</artifactId>
             <version>${bval.version}</version>
         </dependency>
-
         <!-- meecrowave -->
         <dependency>
             <groupId>org.apache.meecrowave</groupId>
@@ -84,14 +82,12 @@
             <version>${meecrowave-junit.version}</version>
             <scope>test</scope>
         </dependency>
-        
         <!-- opennlp -->
         <dependency>
             <groupId>org.apache.opennlp</groupId>
             <artifactId>opennlp-tools</artifactId>
             <version>${opennlp.opennlp-tools.version}</version>
         </dependency>
-        
         <!-- pulsar -->
         <dependency>
             <groupId>org.apache.pulsar</groupId>
@@ -99,14 +95,12 @@
             <version>${pulsar-client.version}</version>
             <scope>compile</scope>
         </dependency>
-        
         <!-- zookeeper -->
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
             <version>${zookeeper.version}</version>
         </dependency>
-        
         <!-- curator -->
         <dependency>
             <groupId>org.apache.curator</groupId>
@@ -145,21 +139,18 @@
             <version>${avaitility.version}</version>
             <scope>test</scope>
         </dependency>
-        
         <!-- geode -->
         <dependency>
             <groupId>org.apache.geode</groupId>
             <artifactId>geode-core</artifactId>
             <version>${geode.core}</version>
         </dependency>
-        
         <!-- solr -->
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
             <version>${solr.solr-solrj.version}</version>
         </dependency>
-        
         <!-- common -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -171,7 +162,7 @@
 
     <build>
         <plugins>
-        <!-- avro -->
+            <!-- avro -->
             <plugin>
                 <groupId>org.apache.avro</groupId>
                 <artifactId>avro-maven-plugin</artifactId>
@@ -192,7 +183,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <!-- meecrowave -->
             <plugin>
                 <groupId>org.apache.meecrowave</groupId>

apache-libraries/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerIntegrationTest.java

@@ -13,7 +13,7 @@ import java.util.Objects;
 
 import static org.junit.Assert.*;
 
-public class AvroSerealizerDeSerealizerUnitTest {
+public class AvroSerealizerDeSerealizerIntegrationTest {
 
     AvroSerealizer serealizer;
     AvroDeSerealizer deSerealizer;

apache-libraries/src/test/java/com/baeldung/meecrowave/ArticleEndpointsIntegrationTest.java

@@ -17,7 +17,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 
 @RunWith(MonoMeecrowave.Runner.class)
-public class ArticleEndpointsUnitTest {
+public class ArticleEndpointsIntegrationTest {
     
     @ConfigurationInject
     private Meecrowave.Builder config;

apache-olingo/olingo2/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -40,7 +39,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <!-- Olingo 2 Dependencies -->
         <dependency>
             <groupId>org.apache.olingo</groupId>
@@ -85,4 +83,4 @@
         <olingo2.version>2.0.11</olingo2.version>
     </properties>
 
-</project>
+</project>

apache-poi/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -38,4 +37,4 @@
         <jexcel.version>1.0.6</jexcel.version>
     </properties>
 
-</project>
+</project>

apache-rocketmq/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -26,4 +25,4 @@
         <geode.core>1.6.0</geode.core>
         <rocketmq.version>2.0.4</rocketmq.version>
     </properties>
-</project>
+</project>

apache-shiro/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -55,4 +54,4 @@
         <log4j-version>1.2.17</log4j-version>
     </properties>
 
-</project>
+</project>

apache-spark/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -111,4 +110,4 @@
         <com.datastax.spark.spark-cassandra-connector-java.version>1.5.2</com.datastax.spark.spark-cassandra-connector-java.version>
     </properties>
 
-</project>
+</project>

apache-tapestry/pom.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    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/maven-v4_0_0.xsd">
-    xmlns="http://maven.apache.org/POM/4.0.0">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
     <artifactId>apache-tapestry</artifactId>
@@ -12,45 +11,43 @@
 
     <dependencies>
         <!-- To set up an application with a database, change the artifactId below to tapestry-hibernate, 
-        and add a dependency on your JDBC driver. You'll also need to add Hibernate configuration files, such as hibernate.cfg.xml. -->
+            and add a dependency on your JDBC driver. You'll also need to add Hibernate configuration files, such 
+            as hibernate.cfg.xml. -->
         <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-core</artifactId>
             <version>${tapestry-release-version}</version>
         </dependency>
-
         <!-- Include the Log4j implementation for the SLF4J logging framework -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>${slf4j-release-version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-webresources</artifactId>
             <version>${tapestry-release-version}</version>
         </dependency>
-
         <!-- Uncomment this to add support for file uploads: -->
-        <!-- <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> <version>${tapestry-release-version}</version> </dependency> -->
+        <!-- <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> 
+            <version>${tapestry-release-version}</version> </dependency> -->
 
-        <!-- A dependency on either JUnit or TestNG is required, or the surefire plugin (which runs the tests) will fail, preventing Maven from packaging the WAR. Tapestry includes 
+        <!-- A dependency on either JUnit or TestNG is required, or the surefire plugin (which runs the 
-            a large number of testing facilities designed for use with TestNG (http://testng.org/), so it's recommended. -->
+            tests) will fail, preventing Maven from packaging the WAR. Tapestry includes a large number of testing 
+            facilities designed for use with TestNG (http://testng.org/), so it's recommended. -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>${testng-release-version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-test</artifactId>
             <version>${tapestry-release-version}</version>
             <scope>test</scope>
         </dependency>
-
         <!-- Provided by the servlet container, but sometimes referenced in the application code. -->
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -58,7 +55,6 @@
             <version>${servlet-api-release-version}</version>
             <scope>provided</scope>
         </dependency>
-
         <!-- Provide dependency to the Tapestry javadoc taglet which replaces the Maven component report -->
         <dependency>
             <groupId>org.apache.tapestry</groupId>
@@ -101,7 +97,8 @@
                 <configuration>
                     <!-- Log to the console. -->
                     <requestLog implementation="org.mortbay.jetty.NCSARequestLog">
-                        <!-- This doesn't do anything for Jetty, but is a workaround for a Maven bug that prevents the requestLog from being set. -->
+                        <!-- This doesn't do anything for Jetty, but is a workaround for a Maven bug 
+                            that prevents the requestLog from being set. -->
                         <append>true</append>
                     </requestLog>
                     <systemProperties>
@@ -123,7 +120,8 @@
             <url>http://repository.jboss.org/nexus/content/groups/public/</url>
         </repository>
 
-        <!-- This repository is only needed when the Tapestry version is a preview release, rather than a final release. -->
+        <!-- This repository is only needed when the Tapestry version is a preview release, rather than 
+            a final release. -->
         <repository>
             <id>apache-staging</id>
             <url>https://repository.apache.org/content/groups/staging/</url>
@@ -142,4 +140,4 @@
         <slf4j-release-version>1.7.19</slf4j-release-version>
     </properties>
 
-</project>
+</project>

apache-thrift/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -27,7 +26,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
@@ -67,4 +65,4 @@
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
     </properties>
 
-</project>
+</project>

apache-tika/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

apache-velocity/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

asciidoctor/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

asm/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

atomikos/pom.xml

@@ -1,128 +1,128 @@
 <?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"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
-	<artifactId>atomikos</artifactId>
+    <artifactId>atomikos</artifactId>
-	<name>atomikos</name>
+    <name>atomikos</name>
 
-	<parent>
+    <parent>
-		<groupId>com.baeldung</groupId>
+        <groupId>com.baeldung</groupId>
-		<artifactId>parent-modules</artifactId>
+        <artifactId>parent-modules</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-	</parent>
+    </parent>
 
-	<dependencies>
+    <dependencies>
-		<dependency>
+        <dependency>
-			<groupId>com.atomikos</groupId>
+            <groupId>com.atomikos</groupId>
-			<artifactId>transactions-jdbc</artifactId>
+            <artifactId>transactions-jdbc</artifactId>
-			<version>${atomikos-version}</version>
+            <version>${atomikos-version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>com.atomikos</groupId>
+            <groupId>com.atomikos</groupId>
-			<artifactId>transactions-jms</artifactId>
+            <artifactId>transactions-jms</artifactId>
-			<version>${atomikos-version}</version>
+            <version>${atomikos-version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>com.atomikos</groupId>
+            <groupId>com.atomikos</groupId>
-			<artifactId>transactions-hibernate4</artifactId>
+            <artifactId>transactions-hibernate4</artifactId>
-			<version>${atomikos-version}</version>
+            <version>${atomikos-version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.springframework</groupId>
+            <groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
+            <artifactId>spring-context</artifactId>
-			<version>${spring-version}</version>
+            <version>${spring-version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.springframework</groupId>
+            <groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
+            <artifactId>spring-tx</artifactId>
-			<version>${spring-version}</version>
+            <version>${spring-version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.springframework.data</groupId>
+            <groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-jpa</artifactId>
+            <artifactId>spring-data-jpa</artifactId>
-			<version>${spring-data-jpa.version}</version>
+            <version>${spring-data-jpa.version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.springframework</groupId>
+            <groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
+            <artifactId>spring-test</artifactId>
-			<version>${spring-version}</version>
+            <version>${spring-version}</version>
-			<scope>test</scope>
+            <scope>test</scope>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.hibernate</groupId>
+            <groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
+            <artifactId>hibernate-core</artifactId>
-			<version>${hibernate.version}</version>
+            <version>${hibernate.version}</version>
-			<scope>provided</scope>
+            <scope>provided</scope>
-			<exclusions>
+            <exclusions>
-				<exclusion>
+                <exclusion>
-					<groupId>javax.transaction</groupId>
+                    <groupId>javax.transaction</groupId>
-					<artifactId>jta</artifactId>
+                    <artifactId>jta</artifactId>
-				</exclusion>
+                </exclusion>
-			</exclusions>
+            </exclusions>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.apache.activemq</groupId>
+            <groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
+            <artifactId>activemq-core</artifactId>
-			<version>${activemq-core.version}</version>
+            <version>${activemq-core.version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.apache.derby</groupId>
+            <groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
+            <artifactId>derby</artifactId>
-			<version>${derby.version}</version>
+            <version>${derby.version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>junit</groupId>
+            <groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+            <artifactId>junit</artifactId>
-			<version>${junit.version}</version>
+            <version>${junit.version}</version>
-			<scope>test</scope>
+            <scope>test</scope>
-		</dependency>
+        </dependency>
-		<!-- the JTA API -->
+        <!-- the JTA API -->
-		<dependency>
+        <dependency>
-			<groupId>javax.transaction</groupId>
+            <groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
+            <artifactId>jta</artifactId>
-			<version>${jta.version}</version>
+            <version>${jta.version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
+            <groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-			<version>${geronimo.version}</version>
+            <version>${geronimo.version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>javax.validation</groupId>
+            <groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
+            <artifactId>validation-api</artifactId>
-			<version>${validation-api.version}</version>
+            <version>${validation-api.version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.hibernate.validator</groupId>
+            <groupId>org.hibernate.validator</groupId>
-			<artifactId>hibernate-validator</artifactId>
+            <artifactId>hibernate-validator</artifactId>
-			<version>${hibernate-validator.version}</version>
+            <version>${hibernate-validator.version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>javax.el</groupId>
+            <groupId>javax.el</groupId>
-			<artifactId>javax.el-api</artifactId>
+            <artifactId>javax.el-api</artifactId>
-			<version>${javax.el-api.version}</version>
+            <version>${javax.el-api.version}</version>
-		</dependency>
+        </dependency>
-		<dependency>
+        <dependency>
-			<groupId>org.glassfish.web</groupId>
+            <groupId>org.glassfish.web</groupId>
-			<artifactId>javax.el</artifactId>
+            <artifactId>javax.el</artifactId>
-			<version>${javax.el.version}</version>
+            <version>${javax.el.version}</version>
-		</dependency>
+        </dependency>
-	</dependencies>
+    </dependencies>
 
-	<properties>
+    <properties>
-		<atomikos-version>5.0.6</atomikos-version>
+        <atomikos-version>5.0.6</atomikos-version>
-		<spring-version>5.1.6.RELEASE</spring-version>
+        <spring-version>5.1.6.RELEASE</spring-version>
-		<hibernate.version>5.4.3.Final</hibernate.version>
+        <hibernate.version>5.4.3.Final</hibernate.version>
-		<spring-data-jpa.version>1.11.23.RELEASE</spring-data-jpa.version>
+        <spring-data-jpa.version>1.11.23.RELEASE</spring-data-jpa.version>
-		<activemq-core.version>5.7.0</activemq-core.version>
+        <activemq-core.version>5.7.0</activemq-core.version>
-		<derby.version>10.8.1.2</derby.version>
+        <derby.version>10.8.1.2</derby.version>
-		<jta.version>1.1</jta.version>
+        <jta.version>1.1</jta.version>
-		<geronimo.version>1.0</geronimo.version>
+        <geronimo.version>1.0</geronimo.version>
-		<validation-api.version>2.0.1.Final</validation-api.version>
+        <validation-api.version>2.0.1.Final</validation-api.version>
-		<hibernate-validator.version>6.1.2.Final</hibernate-validator.version>
+        <hibernate-validator.version>6.1.2.Final</hibernate-validator.version>
-		<javax.el-api.version>3.0.0</javax.el-api.version>
+        <javax.el-api.version>3.0.0</javax.el-api.version>
-		<javax.el.version>2.2.4</javax.el.version>
+        <javax.el.version>2.2.4</javax.el.version>
-	</properties>
+    </properties>
 
 </project>

atomix/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

aws-app-sync/pom.xml

@@ -1,11 +1,12 @@
 <?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"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    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>
     <artifactId>aws-app-sync</artifactId>
     <name>aws-app-sync</name>
     <description>Spring Boot using AWS App Sync</description>
-    
+
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
@@ -14,12 +15,10 @@
     </parent>
 
     <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>
@@ -46,4 +45,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

aws-lambda/.gitignore

@@ -0,0 +1 @@
+.aws-sam/

aws-lambda/README.md

@@ -6,3 +6,4 @@ This module contains articles about AWS Lambda
 - [Using AWS Lambda with API Gateway](https://www.baeldung.com/aws-lambda-api-gateway)
 - [Introduction to AWS Serverless Application Model](https://www.baeldung.com/aws-serverless)
 - [How to Implement Hibernate in an AWS Lambda Function in Java](https://www.baeldung.com/java-aws-lambda-hibernate)
+- [Writing an Enterprise-Grade AWS Lambda in Java](https://www.baeldung.com/java-enterprise-aws-lambda)

aws-lambda/lambda/pom.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>aws-lambda-examples</artifactId>
+    <artifactId>lambda</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <name>aws-lambda-examples</name>
+    <name>lambda</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -96,4 +95,4 @@
         <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
     </properties>
 
-</project>
+</project>

aws-lambda/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -18,6 +17,7 @@
     <modules>
         <module>lambda</module>
         <module>shipping-tracker/ShippingFunction</module>
+        <module>todo-reminder/ToDoFunction</module>
     </modules>
 
 </project>

aws-lambda/shipping-tracker/ShippingFunction/pom.xml

@@ -1,16 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
     <artifactId>ShippingFunction</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
-    <name>Shipping Tracker Lambda Function</name>
+    <name>ShippingFunction</name>
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <hibernate.version>5.4.21.Final</hibernate.version>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -19,9 +15,9 @@
             <version>1.2.0</version>
         </dependency>
         <dependency>
-          <groupId>com.amazonaws</groupId>
+            <groupId>com.amazonaws</groupId>
-          <artifactId>aws-lambda-java-events</artifactId>
+            <artifactId>aws-lambda-java-events</artifactId>
-          <version>3.1.0</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -29,10 +25,10 @@
             <version>2.11.2</version>
         </dependency>
         <dependency>
-          <groupId>junit</groupId>
+            <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
+            <artifactId>junit</artifactId>
-          <version>4.12</version>
+            <version>4.12</version>
-          <scope>test</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -52,22 +48,29 @@
     </dependencies>
 
     <build>
-      <plugins>
+        <plugins>
-        <plugin>
+            <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
+                <artifactId>maven-shade-plugin</artifactId>
-          <version>3.1.1</version>
+                <version>3.1.1</version>
-          <configuration>
+                <configuration>
-          </configuration>
+                </configuration>
-          <executions>
+                <executions>
-            <execution>
+                    <execution>
-              <phase>package</phase>
+                        <phase>package</phase>
-              <goals>
+                        <goals>
-                <goal>shade</goal>
+                            <goal>shade</goal>
-              </goals>
+                        </goals>
-            </execution>
+                    </execution>
-          </executions>
+                </executions>
-        </plugin>
+            </plugin>
-      </plugins>
+        </plugins>
     </build>
-</project>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <hibernate.version>5.4.21.Final</hibernate.version>
+    </properties>
+
+</project>

aws-lambda/todo-reminder/ToDoFunction/pom.xml

@@ -0,0 +1,105 @@
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>helloworld</groupId>
+    <artifactId>HelloWorld</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>To Do Application Example.</name>
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>aws-lambda-java-events</artifactId>
+          <version>3.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.org.webcompere</groupId>
+            <artifactId>lightweight-config</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-log4j2</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.13.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-core</artifactId>
+            <version>11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-slf4j</artifactId>
+            <version>11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-gson</artifactId>
+            <version>11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>5.0.1</version>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.13.1</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.org.webcompere</groupId>
+            <artifactId>system-stubs-junit4</artifactId>
+            <version>1.2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.3.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.19.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.2.4</version>
+          <configuration>
+          </configuration>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>shade</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+</project>

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java

@@ -0,0 +1,43 @@
+package com.baeldung.lambda.todo;
+
+import java.io.*;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+import com.baeldung.lambda.todo.config.ExecutionContext;
+import com.baeldung.lambda.todo.service.PostService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Handler for requests to Lambda function.
+ */
+public class App implements RequestStreamHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
+    private String environmentName = System.getenv("ENV_NAME");
+    private ExecutionContext executionContext = new ExecutionContext();
+
+    @Override
+    public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
+        context.getLogger().log("App starting\n");
+        context.getLogger().log("Environment: "
+          + environmentName + "\n");
+
+        try {
+            PostService postService = executionContext.getPostService();
+            executionContext.getToDoReaderService()
+              .getOldestToDo()
+              .ifPresent(postService::makePost);
+        } catch (Exception e) {
+            LOGGER.error("Failed: {}", e.getMessage(), e);
+        }
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java

@@ -0,0 +1,8 @@
+package com.baeldung.lambda.todo.api;
+
+import feign.RequestLine;
+
+public interface PostApi {
+    @RequestLine("POST /posts")
+    void makePost(PostItem item);
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java

@@ -0,0 +1,40 @@
+package com.baeldung.lambda.todo.api;
+
+public class PostItem {
+    private String title;
+    private String body;
+    private int userId;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public void setBody(String body) {
+        this.body = body;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public String toString() {
+        return "PostItem{"
+          + "title='" + title + '\''
+          + ", body='" + body + '\''
+          + ", userId=" + userId +
+          '}';
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java

@@ -0,0 +1,10 @@
+package com.baeldung.lambda.todo.api;
+
+import feign.RequestLine;
+
+import java.util.List;
+
+public interface ToDoApi {
+    @RequestLine("GET /todos")
+    List<ToDoItem> getAllTodos();
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java

@@ -0,0 +1,50 @@
+package com.baeldung.lambda.todo.api;
+
+public class ToDoItem {
+    private int userId;
+    private int id;
+    private String title;
+    private boolean completed;
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public boolean isCompleted() {
+        return completed;
+    }
+
+    public void setCompleted(boolean completed) {
+        this.completed = completed;
+    }
+
+    @Override
+    public String toString() {
+        return "ToDoItem{"
+          + "userId=" + userId
+          + ", id=" + id
+          + ", title='" + title + '\''
+          + ", completed=" + completed +
+          '}';
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java

@@ -0,0 +1,50 @@
+package com.baeldung.lambda.todo.config;
+
+public class Config {
+    private String toDoEndpoint;
+    private String postEndpoint;
+    private String environmentName;
+
+    private Credentials toDoCredentials;
+    private Credentials postCredentials;
+
+    public String getToDoEndpoint() {
+        return toDoEndpoint;
+    }
+
+    public void setToDoEndpoint(String toDoEndpoint) {
+        this.toDoEndpoint = toDoEndpoint;
+    }
+
+    public String getPostEndpoint() {
+        return postEndpoint;
+    }
+
+    public void setPostEndpoint(String postEndpoint) {
+        this.postEndpoint = postEndpoint;
+    }
+
+    public String getEnvironmentName() {
+        return environmentName;
+    }
+
+    public void setEnvironmentName(String environmentName) {
+        this.environmentName = environmentName;
+    }
+
+    public Credentials getToDoCredentials() {
+        return toDoCredentials;
+    }
+
+    public void setToDoCredentials(Credentials toDoCredentials) {
+        this.toDoCredentials = toDoCredentials;
+    }
+
+    public Credentials getPostCredentials() {
+        return postCredentials;
+    }
+
+    public void setPostCredentials(Credentials postCredentials) {
+        this.postCredentials = postCredentials;
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java

@@ -0,0 +1,22 @@
+package com.baeldung.lambda.todo.config;
+
+public class Credentials {
+    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;
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java

@@ -0,0 +1,36 @@
+package com.baeldung.lambda.todo.config;
+
+import com.baeldung.lambda.todo.service.PostService;
+import com.baeldung.lambda.todo.service.ToDoReaderService;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExecutionContext {
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(ExecutionContext.class);
+
+    private ToDoReaderService toDoReaderService;
+    private PostService postService;
+
+    public ExecutionContext() {
+        LOGGER.info("Loading configuration");
+
+        try {
+            Injector injector = Guice.createInjector(new Services());
+            this.toDoReaderService = injector.getInstance(ToDoReaderService.class);
+            this.postService = injector.getInstance(PostService.class);
+        } catch (Exception e) {
+            LOGGER.error("Could not start", e);
+        }
+    }
+
+    public ToDoReaderService getToDoReaderService() {
+        return toDoReaderService;
+    }
+
+    public PostService getPostService() {
+        return postService;
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java

@@ -0,0 +1,38 @@
+package com.baeldung.lambda.todo.config;
+
+import com.baeldung.lambda.todo.api.PostApi;
+import com.baeldung.lambda.todo.api.ToDoApi;
+import com.google.inject.AbstractModule;
+import feign.Feign;
+import feign.auth.BasicAuthRequestInterceptor;
+import feign.gson.GsonDecoder;
+import feign.gson.GsonEncoder;
+import feign.slf4j.Slf4jLogger;
+import uk.org.webcompere.lightweightconfig.ConfigLoader;
+
+import static feign.Logger.Level.FULL;
+
+public class Services extends AbstractModule {
+    @Override
+    protected void configure() {
+        Config config = ConfigLoader.loadYmlConfigFromResource("configuration.yml", Config.class);
+
+        ToDoApi toDoApi = Feign.builder()
+          .decoder(new GsonDecoder())
+          .logger(new Slf4jLogger())
+          .logLevel(FULL)
+          .requestInterceptor(new BasicAuthRequestInterceptor(config.getToDoCredentials().getUsername(), config.getToDoCredentials().getPassword()))
+          .target(ToDoApi.class, config.getToDoEndpoint());
+
+        PostApi postApi = Feign.builder()
+          .encoder(new GsonEncoder())
+          .logger(new Slf4jLogger())
+          .logLevel(FULL)
+          .requestInterceptor(new BasicAuthRequestInterceptor(config.getPostCredentials().getUsername(), config.getPostCredentials().getPassword()))
+          .target(PostApi.class, config.getPostEndpoint());
+
+        bind(Config.class).toInstance(config);
+        bind(ToDoApi.class).toInstance(toDoApi);
+        bind(PostApi.class).toInstance(postApi);
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java

@@ -0,0 +1,30 @@
+package com.baeldung.lambda.todo.service;
+
+import com.baeldung.lambda.todo.api.PostApi;
+import com.baeldung.lambda.todo.api.PostItem;
+import com.baeldung.lambda.todo.api.ToDoItem;
+import com.google.inject.Inject;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+
+public class PostService {
+    private static final Logger LOGGER = LogManager.getLogger(PostService.class);
+    private PostApi postApi;
+
+    @Inject
+    public PostService(PostApi postApi) {
+        this.postApi = postApi;
+    }
+
+    public void makePost(ToDoItem toDoItem) {
+        LOGGER.info("Posting about: {}", toDoItem);
+        PostItem item = new PostItem();
+        item.setTitle("To Do is Out Of Date: " + toDoItem.getId());
+        item.setUserId(toDoItem.getUserId());
+        item.setBody("Not done: " + toDoItem.getTitle());
+
+        LOGGER.info("Post: {}", item);
+        postApi.makePost(item);
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java

@@ -0,0 +1,30 @@
+package com.baeldung.lambda.todo.service;
+
+import com.baeldung.lambda.todo.api.ToDoApi;
+import com.baeldung.lambda.todo.api.ToDoItem;
+import com.baeldung.lambda.todo.config.Config;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.inject.Inject;
+import java.util.Optional;
+
+public class ToDoReaderService {
+    // Log4j logger
+    private static final Logger LOGGER = LogManager.getLogger(ToDoReaderService.class);
+
+    private ToDoApi toDoApi;
+
+    @Inject
+    public ToDoReaderService(Config configuration, ToDoApi toDoApi) {
+        LOGGER.info("ToDo Endpoint on: {}", configuration.getToDoEndpoint());
+
+        this.toDoApi = toDoApi;
+    }
+
+    public Optional<ToDoItem> getOldestToDo() {
+        return toDoApi.getAllTodos().stream()
+          .filter(item -> !item.isCompleted())
+          .findFirst();
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/main/resources/configuration.yml

@@ -0,0 +1,9 @@
+toDoEndpoint: https://jsonplaceholder.typicode.com
+postEndpoint: https://jsonplaceholder.typicode.com
+environmentName: ${ENV_NAME}
+toDoCredentials:
+  username: baeldung
+  password: ${TODO_PASSWORD:-password}
+postCredentials:
+  username: baeldung
+  password: ${POST_PASSWORD:-password}

aws-lambda/todo-reminder/ToDoFunction/src/main/resources/log4j2.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration packages="com.amazonaws.services.lambda.runtime.log4j2">
+    <Appenders>
+        <Lambda name="Lambda">
+            <PatternLayout>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss} %X{AWSRequestId} %-5p %c{1} - %m%n</pattern>
+            </PatternLayout>
+        </Lambda>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="Lambda" />
+        </Root>
+    </Loggers>
+</Configuration>

aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java

@@ -0,0 +1,58 @@
+package com.baeldung.lambda.todo;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.baeldung.lambda.todo.config.Config;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import uk.org.webcompere.lightweightconfig.ConfigLoader;
+import uk.org.webcompere.systemstubs.rules.EnvironmentVariablesRule;
+import uk.org.webcompere.systemstubs.stream.input.LinesAltStream;
+import uk.org.webcompere.systemstubs.stream.output.NoopStream;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AppTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mockContext;
+
+    @Rule
+    public EnvironmentVariablesRule environmentVariablesRule = new EnvironmentVariablesRule();
+
+    private InputStream fakeInputStream = new LinesAltStream();
+    private OutputStream fakeOutputStream = new NoopStream();
+
+    @Test
+    public void whenTheEnvironmentVariableIsSet_thenItIsLogged() throws Exception {
+        environmentVariablesRule.set("ENV_NAME", "unitTest");
+        new App().handleRequest(fakeInputStream, fakeOutputStream, mockContext);
+
+        verify(mockContext.getLogger())
+          .log("Environment: unitTest\n");
+    }
+
+    @Test
+    public void givenEnvironmentVariableIsNotSet_thenUseDefault() {
+        String setting = Optional.ofNullable(System.getenv("SETTING"))
+          .orElse("default");
+
+        assertThat(setting).isEqualTo("default");
+    }
+
+    @Test
+    public void givenConfiguration_canLoadIntoPojo() {
+        environmentVariablesRule.set("ENV_NAME", "unitTest");
+        Config config = ConfigLoader.loadYmlConfigFromResource("configuration.yml", Config.class);
+        assertThat(config.getEnvironmentName()).isEqualTo("unitTest");
+    }
+}

aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java

@@ -0,0 +1,24 @@
+package com.baeldung.lambda.todo.service;
+
+import com.baeldung.lambda.todo.config.Config;
+import org.junit.Rule;
+import org.junit.Test;
+import uk.org.webcompere.systemstubs.rules.SystemOutRule;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+public class ToDoReaderServiceTest {
+
+    @Rule
+    public SystemOutRule systemOutRule = new SystemOutRule();
+
+    @Test
+    public void whenTheServiceStarts_thenItOutputsEndpoint() {
+        Config config = new Config();
+        config.setToDoEndpoint("https://todo-endpoint.com");
+        ToDoReaderService service = new ToDoReaderService(config, null);
+
+        assertThat(systemOutRule.getLinesNormalized())
+          .contains("ToDo Endpoint on: https://todo-endpoint.com");
+    }
+}

aws-lambda/todo-reminder/template.yaml

@@ -0,0 +1,22 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: todo-reminder application
+
+Parameters:
+  EnvironmentName:
+    Type: String
+    Default: dev
+
+Resources:
+  ToDoFunction:
+    Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+    Properties:
+      Timeout: 20
+      CodeUri: ToDoFunction
+      Handler: com.baeldung.lambda.todo.App::handleRequest
+      Runtime: java8
+      MemorySize: 512
+      Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+        Variables:
+          PARAM1: VALUE
+          ENV_NAME: !Ref EnvironmentName

aws-reactive/pom.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
+    <artifactId>aws-reactive</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>aws-reactive</name>
+    <description>AWS Reactive Sample</description>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -11,14 +14,8 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>aws-reactive</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>aws-reactive</name>
-    <description>AWS Reactive Sample</description>
-
     <dependencyManagement>
         <dependencies>
-
             <dependency>
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
@@ -27,7 +24,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
@@ -43,20 +39,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
-
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <artifactId>netty-nio-client</artifactId>
             <groupId>software.amazon.awssdk</groupId>
             <scope>compile</scope>
         </dependency>
-
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -68,8 +60,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
@@ -100,8 +90,7 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring.version>2.2.1.RELEASE</spring.version>
         <awssdk.version>2.10.27</awssdk.version>
     </properties>
-</project>
+</project>

aws/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

axon/README.md

@@ -5,3 +5,4 @@ This module contains articles about Axon
 ### Relevant articles
 
 - [A Guide to the Axon Framework](https://www.baeldung.com/axon-cqrs-event-sourcing)
+- [Multi-Entity Aggregates in Axon](https://www.baeldung.com/java-axon-multi-entity-aggregates)

axon/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -15,36 +14,41 @@
         <relativePath>../parent-boot-2</relativePath>
     </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.axonframework</groupId>
+                <artifactId>axon-bom</artifactId>
+                <version>4.5.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.axonframework</groupId>
             <artifactId>axon-spring-boot-starter</artifactId>
-            <version>${axon.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.axonframework</groupId>
             <artifactId>axon-test</artifactId>
-            <version>${axon.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -52,8 +56,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <axon.version>4.1.2</axon.version>
-    </properties>
-
 </project>

axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java

@@ -1,59 +0,0 @@
-package com.baeldung.axon.commandmodel;
-
-import static org.axonframework.modelling.command.AggregateLifecycle.apply;
-
-import org.axonframework.commandhandling.CommandHandler;
-import org.axonframework.eventsourcing.EventSourcingHandler;
-import org.axonframework.modelling.command.AggregateIdentifier;
-import org.axonframework.spring.stereotype.Aggregate;
-
-import com.baeldung.axon.coreapi.commands.ConfirmOrderCommand;
-import com.baeldung.axon.coreapi.commands.PlaceOrderCommand;
-import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
-import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
-import com.baeldung.axon.coreapi.events.OrderPlacedEvent;
-import com.baeldung.axon.coreapi.events.OrderShippedEvent;
-import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;
-
-@Aggregate
-public class OrderAggregate {
-
-    @AggregateIdentifier
-    private String orderId;
-    private boolean orderConfirmed;
-
-    @CommandHandler
-    public OrderAggregate(PlaceOrderCommand command) {
-        apply(new OrderPlacedEvent(command.getOrderId(), command.getProduct()));
-    }
-
-    @CommandHandler
-    public void handle(ConfirmOrderCommand command) {
-        apply(new OrderConfirmedEvent(orderId));
-    }
-
-    @CommandHandler
-    public void handle(ShipOrderCommand command) {
-        if (!orderConfirmed) {
-            throw new UnconfirmedOrderException();
-        }
-
-        apply(new OrderShippedEvent(orderId));
-    }
-
-    @EventSourcingHandler
-    public void on(OrderPlacedEvent event) {
-        this.orderId = event.getOrderId();
-        this.orderConfirmed = false;
-    }
-
-    @EventSourcingHandler
-    public void on(OrderConfirmedEvent event) {
-        this.orderConfirmed = true;
-    }
-
-    protected OrderAggregate() {
-        // Required by Axon to build a default Aggregate prior to Event Sourcing
-    }
-
-}

axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderAggregate.java

@@ -0,0 +1,98 @@
+package com.baeldung.axon.commandmodel.order;
+
+import com.baeldung.axon.coreapi.commands.AddProductCommand;
+import com.baeldung.axon.coreapi.commands.ConfirmOrderCommand;
+import com.baeldung.axon.coreapi.commands.CreateOrderCommand;
+import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
+import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
+import com.baeldung.axon.coreapi.events.OrderCreatedEvent;
+import com.baeldung.axon.coreapi.events.OrderShippedEvent;
+import com.baeldung.axon.coreapi.events.ProductAddedEvent;
+import com.baeldung.axon.coreapi.events.ProductRemovedEvent;
+import com.baeldung.axon.coreapi.exceptions.DuplicateOrderLineException;
+import com.baeldung.axon.coreapi.exceptions.OrderAlreadyConfirmedException;
+import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;
+import org.axonframework.commandhandling.CommandHandler;
+import org.axonframework.eventsourcing.EventSourcingHandler;
+import org.axonframework.modelling.command.AggregateIdentifier;
+import org.axonframework.modelling.command.AggregateMember;
+import org.axonframework.spring.stereotype.Aggregate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.axonframework.modelling.command.AggregateLifecycle.apply;
+
+@Aggregate
+public class OrderAggregate {
+
+    @AggregateIdentifier
+    private String orderId;
+    private boolean orderConfirmed;
+
+    @AggregateMember
+    private Map<String, OrderLine> orderLines;
+
+    @CommandHandler
+    public OrderAggregate(CreateOrderCommand command) {
+        apply(new OrderCreatedEvent(command.getOrderId()));
+    }
+
+    @CommandHandler
+    public void handle(AddProductCommand command) {
+        if (orderConfirmed) {
+            throw new OrderAlreadyConfirmedException(orderId);
+        }
+
+        String productId = command.getProductId();
+        if (orderLines.containsKey(productId)) {
+            throw new DuplicateOrderLineException(productId);
+        }
+        apply(new ProductAddedEvent(orderId, productId));
+    }
+
+    @CommandHandler
+    public void handle(ConfirmOrderCommand command) {
+        if (orderConfirmed) {
+            return;
+        }
+
+        apply(new OrderConfirmedEvent(orderId));
+    }
+
+    @CommandHandler
+    public void handle(ShipOrderCommand command) {
+        if (!orderConfirmed) {
+            throw new UnconfirmedOrderException();
+        }
+
+        apply(new OrderShippedEvent(orderId));
+    }
+
+    @EventSourcingHandler
+    public void on(OrderCreatedEvent event) {
+        this.orderId = event.getOrderId();
+        this.orderConfirmed = false;
+        this.orderLines = new HashMap<>();
+    }
+
+    @EventSourcingHandler
+    public void on(OrderConfirmedEvent event) {
+        this.orderConfirmed = true;
+    }
+
+    @EventSourcingHandler
+    public void on(ProductAddedEvent event) {
+        String productId = event.getProductId();
+        this.orderLines.put(productId, new OrderLine(productId));
+    }
+
+    @EventSourcingHandler
+    public void on(ProductRemovedEvent event) {
+        this.orderLines.remove(event.getProductId());
+    }
+
+    protected OrderAggregate() {
+        // Required by Axon to build a default Aggregate prior to Event Sourcing
+    }
+}

axon/src/main/java/com/baeldung/axon/commandmodel/order/OrderLine.java

@@ -0,0 +1,83 @@
+package com.baeldung.axon.commandmodel.order;
+
+import com.baeldung.axon.coreapi.commands.DecrementProductCountCommand;
+import com.baeldung.axon.coreapi.commands.IncrementProductCountCommand;
+import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
+import com.baeldung.axon.coreapi.events.ProductCountDecrementedEvent;
+import com.baeldung.axon.coreapi.events.ProductCountIncrementedEvent;
+import com.baeldung.axon.coreapi.events.ProductRemovedEvent;
+import com.baeldung.axon.coreapi.exceptions.OrderAlreadyConfirmedException;
+import org.axonframework.commandhandling.CommandHandler;
+import org.axonframework.eventsourcing.EventSourcingHandler;
+import org.axonframework.modelling.command.EntityId;
+
+import java.util.Objects;
+
+import static org.axonframework.modelling.command.AggregateLifecycle.apply;
+
+public class OrderLine {
+
+    @EntityId
+    private final String productId;
+    private Integer count;
+    private boolean orderConfirmed;
+
+    public OrderLine(String productId) {
+        this.productId = productId;
+        this.count = 1;
+    }
+
+    @CommandHandler
+    public void handle(IncrementProductCountCommand command) {
+        if (orderConfirmed) {
+            throw new OrderAlreadyConfirmedException(command.getOrderId());
+        }
+
+        apply(new ProductCountIncrementedEvent(command.getOrderId(), productId));
+    }
+
+    @CommandHandler
+    public void handle(DecrementProductCountCommand command) {
+        if (orderConfirmed) {
+            throw new OrderAlreadyConfirmedException(command.getOrderId());
+        }
+
+        if (count <= 1) {
+            apply(new ProductRemovedEvent(command.getOrderId(), productId));
+        } else {
+            apply(new ProductCountDecrementedEvent(command.getOrderId(), productId));
+        }
+    }
+
+    @EventSourcingHandler
+    public void on(ProductCountIncrementedEvent event) {
+        this.count++;
+    }
+
+    @EventSourcingHandler
+    public void on(ProductCountDecrementedEvent event) {
+        this.count--;
+    }
+
+    @EventSourcingHandler
+    public void on(OrderConfirmedEvent event) {
+        this.orderConfirmed = true;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        OrderLine orderLine = (OrderLine) o;
+        return Objects.equals(productId, orderLine.productId) && Objects.equals(count, orderLine.count);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(productId, count);
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/commands/AddProductCommand.java

@@ -0,0 +1,50 @@
+package com.baeldung.axon.coreapi.commands;
+
+import org.axonframework.modelling.command.TargetAggregateIdentifier;
+
+import java.util.Objects;
+
+public class AddProductCommand {
+
+    @TargetAggregateIdentifier
+    private final String orderId;
+    private final String productId;
+
+    public AddProductCommand(String orderId, String productId) {
+        this.orderId = orderId;
+        this.productId = productId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        AddProductCommand that = (AddProductCommand) o;
+        return Objects.equals(orderId, that.orderId) && Objects.equals(productId, that.productId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, productId);
+    }
+
+    @Override
+    public String toString() {
+        return "AddProductCommand{" +
+                "orderId='" + orderId + '\'' +
+                ", productId='" + productId + '\'' +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/commands/CreateOrderCommand.java

@@ -0,0 +1,43 @@
+package com.baeldung.axon.coreapi.commands;
+
+import org.axonframework.modelling.command.TargetAggregateIdentifier;
+
+import java.util.Objects;
+
+public class CreateOrderCommand {
+
+    @TargetAggregateIdentifier
+    private final String orderId;
+
+    public CreateOrderCommand(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CreateOrderCommand that = (CreateOrderCommand) o;
+        return Objects.equals(orderId, that.orderId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId);
+    }
+
+    @Override
+    public String toString() {
+        return "CreateOrderCommand{" +
+                "orderId='" + orderId + '\'' +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/commands/DecrementProductCountCommand.java

@@ -0,0 +1,50 @@
+package com.baeldung.axon.coreapi.commands;
+
+import org.axonframework.modelling.command.TargetAggregateIdentifier;
+
+import java.util.Objects;
+
+public class DecrementProductCountCommand {
+
+    @TargetAggregateIdentifier
+    private final String orderId;
+    private final String productId;
+
+    public DecrementProductCountCommand(String orderId, String productId) {
+        this.orderId = orderId;
+        this.productId = productId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DecrementProductCountCommand that = (DecrementProductCountCommand) o;
+        return Objects.equals(orderId, that.orderId) && Objects.equals(productId, that.productId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, productId);
+    }
+
+    @Override
+    public String toString() {
+        return "DecrementProductCountCommand{" +
+                "orderId='" + orderId + '\'' +
+                ", productId='" + productId + '\'' +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/commands/IncrementProductCountCommand.java

@@ -0,0 +1,50 @@
+package com.baeldung.axon.coreapi.commands;
+
+import org.axonframework.modelling.command.TargetAggregateIdentifier;
+
+import java.util.Objects;
+
+public class IncrementProductCountCommand {
+
+    @TargetAggregateIdentifier
+    private final String orderId;
+    private final String productId;
+
+    public IncrementProductCountCommand(String orderId, String productId) {
+        this.orderId = orderId;
+        this.productId = productId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        IncrementProductCountCommand that = (IncrementProductCountCommand) o;
+        return Objects.equals(orderId, that.orderId) && Objects.equals(productId, that.productId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, productId);
+    }
+
+    @Override
+    public String toString() {
+        return "IncrementProductCountCommand{" +
+                "orderId='" + orderId + '\'' +
+                ", productId='" + productId + '\'' +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/commands/PlaceOrderCommand.java

@@ -1,51 +0,0 @@
-package com.baeldung.axon.coreapi.commands;
-
-import java.util.Objects;
-
-import org.axonframework.modelling.command.TargetAggregateIdentifier;
-
-public class PlaceOrderCommand {
-
-    @TargetAggregateIdentifier
-    private final String orderId;
-    private final String product;
-
-    public PlaceOrderCommand(String orderId, String product) {
-        this.orderId = orderId;
-        this.product = product;
-    }
-
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public String getProduct() {
-        return product;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(orderId, product);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final PlaceOrderCommand other = (PlaceOrderCommand) obj;
-        return Objects.equals(this.orderId, other.orderId)
-                && Objects.equals(this.product, other.product);
-    }
-
-    @Override
-    public String toString() {
-        return "PlaceOrderCommand{" +
-                "orderId='" + orderId + '\'' +
-                ", product='" + product + '\'' +
-                '}';
-    }
-}

axon/src/main/java/com/baeldung/axon/coreapi/events/OrderCreatedEvent.java

@@ -0,0 +1,40 @@
+package com.baeldung.axon.coreapi.events;
+
+import java.util.Objects;
+
+public class OrderCreatedEvent {
+
+    private final String orderId;
+
+    public OrderCreatedEvent(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        OrderCreatedEvent that = (OrderCreatedEvent) o;
+        return Objects.equals(orderId, that.orderId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId);
+    }
+
+    @Override
+    public String toString() {
+        return "OrderCreatedEvent{" +
+                "orderId='" + orderId + '\'' +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/events/OrderPlacedEvent.java

@@ -1,48 +0,0 @@
-package com.baeldung.axon.coreapi.events;
-
-import java.util.Objects;
-
-public class OrderPlacedEvent {
-
-    private final String orderId;
-    private final String product;
-
-    public OrderPlacedEvent(String orderId, String product) {
-        this.orderId = orderId;
-        this.product = product;
-    }
-
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public String getProduct() {
-        return product;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(orderId, product);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final OrderPlacedEvent other = (OrderPlacedEvent) obj;
-        return Objects.equals(this.orderId, other.orderId)
-                && Objects.equals(this.product, other.product);
-    }
-
-    @Override
-    public String toString() {
-        return "OrderPlacedEvent{" +
-                "orderId='" + orderId + '\'' +
-                ", product='" + product + '\'' +
-                '}';
-    }
-}

axon/src/main/java/com/baeldung/axon/coreapi/events/ProductAddedEvent.java

@@ -0,0 +1,47 @@
+package com.baeldung.axon.coreapi.events;
+
+import java.util.Objects;
+
+public class ProductAddedEvent {
+
+    private final String orderId;
+    private final String productId;
+
+    public ProductAddedEvent(String orderId, String productId) {
+        this.orderId = orderId;
+        this.productId = productId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ProductAddedEvent that = (ProductAddedEvent) o;
+        return Objects.equals(orderId, that.orderId) && Objects.equals(productId, that.productId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, productId);
+    }
+
+    @Override
+    public String toString() {
+        return "ProductAddedEvent{" +
+                "orderId='" + orderId + '\'' +
+                ", productId='" + productId + '\'' +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountDecrementedEvent.java

@@ -0,0 +1,47 @@
+package com.baeldung.axon.coreapi.events;
+
+import java.util.Objects;
+
+public class ProductCountDecrementedEvent {
+
+    private final String orderId;
+    private final String productId;
+
+    public ProductCountDecrementedEvent(String orderId, String productId) {
+        this.orderId = orderId;
+        this.productId = productId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ProductCountDecrementedEvent that = (ProductCountDecrementedEvent) o;
+        return Objects.equals(orderId, that.orderId) && Objects.equals(productId, that.productId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, productId);
+    }
+
+    @Override
+    public String toString() {
+        return "ProductCountDecrementedEvent{" +
+                "orderId='" + orderId + '\'' +
+                ", productId='" + productId + '\'' +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/events/ProductCountIncrementedEvent.java

@@ -0,0 +1,47 @@
+package com.baeldung.axon.coreapi.events;
+
+import java.util.Objects;
+
+public class ProductCountIncrementedEvent {
+
+    private final String orderId;
+    private final String productId;
+
+    public ProductCountIncrementedEvent(String orderId, String productId) {
+        this.orderId = orderId;
+        this.productId = productId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ProductCountIncrementedEvent that = (ProductCountIncrementedEvent) o;
+        return Objects.equals(orderId, that.orderId) && Objects.equals(productId, that.productId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, productId);
+    }
+
+    @Override
+    public String toString() {
+        return "ProductCountIncrementedEvent{" +
+                "orderId='" + orderId + '\'' +
+                ", productId='" + productId + '\'' +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/events/ProductRemovedEvent.java

@@ -0,0 +1,47 @@
+package com.baeldung.axon.coreapi.events;
+
+import java.util.Objects;
+
+public class ProductRemovedEvent {
+
+    private final String orderId;
+    private final String productId;
+
+    public ProductRemovedEvent(String orderId, String productId) {
+        this.orderId = orderId;
+        this.productId = productId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ProductRemovedEvent that = (ProductRemovedEvent) o;
+        return Objects.equals(orderId, that.orderId) && Objects.equals(productId, that.productId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, productId);
+    }
+
+    @Override
+    public String toString() {
+        return "ProductRemovedEvent{" +
+                "orderId='" + orderId + '\'' +
+                ", productId='" + productId + '\'' +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/exceptions/DuplicateOrderLineException.java

@@ -0,0 +1,8 @@
+package com.baeldung.axon.coreapi.exceptions;
+
+public class DuplicateOrderLineException extends IllegalStateException {
+
+    public DuplicateOrderLineException(String productId) {
+        super("Cannot duplicate order line for product identifier [" + productId + "]");
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/exceptions/OrderAlreadyConfirmedException.java

@@ -0,0 +1,8 @@
+package com.baeldung.axon.coreapi.exceptions;
+
+public class OrderAlreadyConfirmedException extends IllegalStateException {
+
+    public OrderAlreadyConfirmedException(String orderId) {
+        super("Cannot perform operation because order [" + orderId + "] is already confirmed.");
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/queries/Order.java

@@ -0,0 +1,83 @@
+package com.baeldung.axon.coreapi.queries;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class Order {
+
+    private final String orderId;
+    private final Map<String, Integer> products;
+    private OrderStatus orderStatus;
+
+    public Order(String orderId) {
+        this.orderId = orderId;
+        this.products = new HashMap<>();
+        orderStatus = OrderStatus.CREATED;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public Map<String, Integer> getProducts() {
+        return products;
+    }
+
+    public OrderStatus getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void addProduct(String productId) {
+        products.putIfAbsent(productId, 1);
+    }
+
+    public void incrementProductInstance(String productId) {
+        products.computeIfPresent(productId, (id, count) -> ++count);
+    }
+
+    public void decrementProductInstance(String productId) {
+        products.computeIfPresent(productId, (id, count) -> --count);
+    }
+
+
+    public void removeProduct(String productId) {
+        products.remove(productId);
+    }
+
+    public void setOrderConfirmed() {
+        this.orderStatus = OrderStatus.CONFIRMED;
+    }
+
+    public void setOrderShipped() {
+        this.orderStatus = OrderStatus.SHIPPED;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Order that = (Order) o;
+        return Objects.equals(orderId, that.orderId)
+                && Objects.equals(products, that.products)
+                && orderStatus == that.orderStatus;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, products, orderStatus);
+    }
+
+    @Override
+    public String toString() {
+        return "Order{" +
+                "orderId='" + orderId + '\'' +
+                ", products=" + products +
+                ", orderStatus=" + orderStatus +
+                '}';
+    }
+}

axon/src/main/java/com/baeldung/axon/coreapi/queries/OrderStatus.java

@@ -2,6 +2,5 @@ package com.baeldung.axon.coreapi.queries;
 
 public enum OrderStatus {
 
-    PLACED, CONFIRMED, SHIPPED
+    CREATED, CONFIRMED, SHIPPED
-
 }

axon/src/main/java/com/baeldung/axon/coreapi/queries/OrderedProduct.java

@@ -1,64 +0,0 @@
-package com.baeldung.axon.coreapi.queries;
-
-import java.util.Objects;
-
-public class OrderedProduct {
-
-    private final String orderId;
-    private final String product;
-    private OrderStatus orderStatus;
-
-    public OrderedProduct(String orderId, String product) {
-        this.orderId = orderId;
-        this.product = product;
-        orderStatus = OrderStatus.PLACED;
-    }
-
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public String getProduct() {
-        return product;
-    }
-
-    public OrderStatus getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderConfirmed() {
-        this.orderStatus = OrderStatus.CONFIRMED;
-    }
-
-    public void setOrderShipped() {
-        this.orderStatus = OrderStatus.SHIPPED;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(orderId, product, orderStatus);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final OrderedProduct other = (OrderedProduct) obj;
-        return Objects.equals(this.orderId, other.orderId)
-                && Objects.equals(this.product, other.product)
-                && Objects.equals(this.orderStatus, other.orderStatus);
-    }
-
-    @Override
-    public String toString() {
-        return "OrderedProduct{" +
-                "orderId='" + orderId + '\'' +
-                ", product='" + product + '\'' +
-                ", orderStatus=" + orderStatus +
-                '}';
-    }
-}

axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java

@@ -1,20 +1,24 @@
 package com.baeldung.axon.gui;
 
-import java.util.List;
+import com.baeldung.axon.coreapi.commands.AddProductCommand;
-import java.util.UUID;
+import com.baeldung.axon.coreapi.commands.ConfirmOrderCommand;
-
+import com.baeldung.axon.coreapi.commands.CreateOrderCommand;
+import com.baeldung.axon.coreapi.commands.DecrementProductCountCommand;
+import com.baeldung.axon.coreapi.commands.IncrementProductCountCommand;
+import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
+import com.baeldung.axon.coreapi.queries.FindAllOrderedProductsQuery;
+import com.baeldung.axon.coreapi.queries.Order;
 import org.axonframework.commandhandling.gateway.CommandGateway;
 import org.axonframework.messaging.responsetypes.ResponseTypes;
 import org.axonframework.queryhandling.QueryGateway;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baeldung.axon.coreapi.commands.ConfirmOrderCommand;
+import java.util.List;
-import com.baeldung.axon.coreapi.commands.PlaceOrderCommand;
+import java.util.UUID;
-import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
+import java.util.concurrent.CompletableFuture;
-import com.baeldung.axon.coreapi.queries.FindAllOrderedProductsQuery;
-import com.baeldung.axon.coreapi.queries.OrderedProduct;
 
 @RestController
 public class OrderRestEndpoint {
@@ -28,25 +32,63 @@ public class OrderRestEndpoint {
     }
 
     @PostMapping("/ship-order")
-    public void shipOrder() {
+    public CompletableFuture<Void> shipOrder() {
         String orderId = UUID.randomUUID().toString();
-        commandGateway.send(new PlaceOrderCommand(orderId, "Deluxe Chair"));
+        return commandGateway.send(new CreateOrderCommand(orderId))
-        commandGateway.send(new ConfirmOrderCommand(orderId));
+                             .thenCompose(result -> commandGateway.send(new AddProductCommand(orderId, "Deluxe Chair")))
-        commandGateway.send(new ShipOrderCommand(orderId));
+                             .thenCompose(result -> commandGateway.send(new ConfirmOrderCommand(orderId)))
+                             .thenCompose(result -> commandGateway.send(new ShipOrderCommand(orderId)));
     }
 
     @PostMapping("/ship-unconfirmed-order")
-    public void shipUnconfirmedOrder() {
+    public CompletableFuture<Void> shipUnconfirmedOrder() {
         String orderId = UUID.randomUUID().toString();
-        commandGateway.send(new PlaceOrderCommand(orderId, "Deluxe Chair"));
+        return commandGateway.send(new CreateOrderCommand(orderId))
-        // This throws an exception, as an Order cannot be shipped if it has not been confirmed yet.
+                             .thenCompose(result -> commandGateway.send(new AddProductCommand(orderId, "Deluxe Chair")))
-        commandGateway.send(new ShipOrderCommand(orderId));
+                             // This throws an exception, as an Order cannot be shipped if it has not been confirmed yet.
+                             .thenCompose(result -> commandGateway.send(new ShipOrderCommand(orderId)));
+    }
+
+    @PostMapping("/order")
+    public CompletableFuture<String> createOrder() {
+        return createOrder(UUID.randomUUID().toString());
+    }
+
+    @PostMapping("/order/{order-id}")
+    public CompletableFuture<String> createOrder(@PathVariable("order-id") String orderId) {
+        return commandGateway.send(new CreateOrderCommand(orderId));
+    }
+
+    @PostMapping("/order/{order-id}/product/{product-id}")
+    public CompletableFuture<Void> addProduct(@PathVariable("order-id") String orderId,
+                                              @PathVariable("product-id") String productId) {
+        return commandGateway.send(new AddProductCommand(orderId, productId));
+    }
+
+    @PostMapping("/order/{order-id}/product/{product-id}/increment")
+    public CompletableFuture<Void> incrementProduct(@PathVariable("order-id") String orderId,
+                                                    @PathVariable("product-id") String productId) {
+        return commandGateway.send(new IncrementProductCountCommand(orderId, productId));
+    }
+
+    @PostMapping("/order/{order-id}/product/{product-id}/decrement")
+    public CompletableFuture<Void> decrementProduct(@PathVariable("order-id") String orderId,
+                                                    @PathVariable("product-id") String productId) {
+        return commandGateway.send(new DecrementProductCountCommand(orderId, productId));
+    }
+
+    @PostMapping("/order/{order-id}/confirm")
+    public CompletableFuture<Void> confirmOrder(@PathVariable("order-id") String orderId) {
+        return commandGateway.send(new ConfirmOrderCommand(orderId));
+    }
+
+    @PostMapping("/order/{order-id}/ship")
+    public CompletableFuture<Void> shipOrder(@PathVariable("order-id") String orderId) {
+        return commandGateway.send(new ShipOrderCommand(orderId));
     }
 
     @GetMapping("/all-orders")
-    public List<OrderedProduct> findAllOrderedProducts() {
+    public CompletableFuture<List<Order>> findAllOrders() {
-        return queryGateway.query(new FindAllOrderedProductsQuery(), ResponseTypes.multipleInstancesOf(OrderedProduct.class))
+        return queryGateway.query(new FindAllOrderedProductsQuery(), ResponseTypes.multipleInstancesOf(Order.class));
-                           .join();
     }
-
 }

axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java

@@ -1,52 +0,0 @@
-package com.baeldung.axon.querymodel;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.axonframework.config.ProcessingGroup;
-import org.axonframework.eventhandling.EventHandler;
-import org.axonframework.queryhandling.QueryHandler;
-import org.springframework.stereotype.Service;
-
-import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
-import com.baeldung.axon.coreapi.events.OrderPlacedEvent;
-import com.baeldung.axon.coreapi.events.OrderShippedEvent;
-import com.baeldung.axon.coreapi.queries.FindAllOrderedProductsQuery;
-import com.baeldung.axon.coreapi.queries.OrderedProduct;
-
-@Service
-@ProcessingGroup("ordered-products")
-public class OrderedProductsEventHandler {
-
-    private final Map<String, OrderedProduct> orderedProducts = new HashMap<>();
-
-    @EventHandler
-    public void on(OrderPlacedEvent event) {
-        String orderId = event.getOrderId();
-        orderedProducts.put(orderId, new OrderedProduct(orderId, event.getProduct()));
-    }
-
-    @EventHandler
-    public void on(OrderConfirmedEvent event) {
-        orderedProducts.computeIfPresent(event.getOrderId(), (orderId, orderedProduct) -> {
-            orderedProduct.setOrderConfirmed();
-            return orderedProduct;
-        });
-    }
-
-    @EventHandler
-    public void on(OrderShippedEvent event) {
-        orderedProducts.computeIfPresent(event.getOrderId(), (orderId, orderedProduct) -> {
-            orderedProduct.setOrderShipped();
-            return orderedProduct;
-        });
-    }
-
-    @QueryHandler
-    public List<OrderedProduct> handle(FindAllOrderedProductsQuery query) {
-        return new ArrayList<>(orderedProducts.values());
-    }
-
-}

axon/src/main/java/com/baeldung/axon/querymodel/OrdersEventHandler.java

@@ -0,0 +1,86 @@
+package com.baeldung.axon.querymodel;
+
+import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
+import com.baeldung.axon.coreapi.events.OrderCreatedEvent;
+import com.baeldung.axon.coreapi.events.OrderShippedEvent;
+import com.baeldung.axon.coreapi.events.ProductAddedEvent;
+import com.baeldung.axon.coreapi.events.ProductCountDecrementedEvent;
+import com.baeldung.axon.coreapi.events.ProductCountIncrementedEvent;
+import com.baeldung.axon.coreapi.events.ProductRemovedEvent;
+import com.baeldung.axon.coreapi.queries.FindAllOrderedProductsQuery;
+import com.baeldung.axon.coreapi.queries.Order;
+import org.axonframework.config.ProcessingGroup;
+import org.axonframework.eventhandling.EventHandler;
+import org.axonframework.queryhandling.QueryHandler;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@ProcessingGroup("orders")
+public class OrdersEventHandler {
+
+    private final Map<String, Order> orders = new HashMap<>();
+
+    @EventHandler
+    public void on(OrderCreatedEvent event) {
+        String orderId = event.getOrderId();
+        orders.put(orderId, new Order(orderId));
+    }
+
+    @EventHandler
+    public void on(ProductAddedEvent event) {
+        orders.computeIfPresent(event.getOrderId(), (orderId, order) -> {
+            order.addProduct(event.getProductId());
+            return order;
+        });
+    }
+
+    @EventHandler
+    public void on(ProductCountIncrementedEvent event) {
+        orders.computeIfPresent(event.getOrderId(), (orderId, order) -> {
+            order.incrementProductInstance(event.getProductId());
+            return order;
+        });
+    }
+
+    @EventHandler
+    public void on(ProductCountDecrementedEvent event) {
+        orders.computeIfPresent(event.getOrderId(), (orderId, order) -> {
+            order.decrementProductInstance(event.getProductId());
+            return order;
+        });
+    }
+
+    @EventHandler
+    public void on(ProductRemovedEvent event) {
+        orders.computeIfPresent(event.getOrderId(), (orderId, order) -> {
+            order.removeProduct(event.getProductId());
+            return order;
+        });
+    }
+
+    @EventHandler
+    public void on(OrderConfirmedEvent event) {
+        orders.computeIfPresent(event.getOrderId(), (orderId, order) -> {
+            order.setOrderConfirmed();
+            return order;
+        });
+    }
+
+    @EventHandler
+    public void on(OrderShippedEvent event) {
+        orders.computeIfPresent(event.getOrderId(), (orderId, order) -> {
+            order.setOrderShipped();
+            return order;
+        });
+    }
+
+    @QueryHandler
+    public List<Order> handle(FindAllOrderedProductsQuery query) {
+        return new ArrayList<>(orders.values());
+    }
+}

axon/src/main/resources/order-api.http

@@ -1,11 +1,37 @@
+### Create Order, Add Product, Confirm and Ship Order
+
 POST http://localhost:8080/ship-order
 
-###
+### Create Order, Add Product and Ship Order
 
 POST http://localhost:8080/ship-unconfirmed-order
 
-###
+### Retrieve all existing Orders
 
 GET http://localhost:8080/all-orders
 
+### Create Order with id 666a1661-474d-4046-8b12-8b5896312768
+
+POST http://localhost:8080/order/666a1661-474d-4046-8b12-8b5896312768
+
+### Add Product a6aa01eb-4e38-4dfb-b53b-b5b82961fbf3 to Order 666a1661-474d-4046-8b12-8b5896312768
+
+POST http://localhost:8080/order/666a1661-474d-4046-8b12-8b5896312768/product/a6aa01eb-4e38-4dfb-b53b-b5b82961fbf3
+
+### Increment Product a6aa01eb-4e38-4dfb-b53b-b5b82961fbf3 to Order 666a1661-474d-4046-8b12-8b5896312768
+
+POST http://localhost:8080/order/666a1661-474d-4046-8b12-8b5896312768/product/a6aa01eb-4e38-4dfb-b53b-b5b82961fbf3/increment
+
+### Decrement Product a6aa01eb-4e38-4dfb-b53b-b5b82961fbf3 to Order 666a1661-474d-4046-8b12-8b5896312768
+
+POST http://localhost:8080/order/666a1661-474d-4046-8b12-8b5896312768/product/a6aa01eb-4e38-4dfb-b53b-b5b82961fbf3/decrement
+
+### Confirm Order 666a1661-474d-4046-8b12-8b5896312768
+
+POST http://localhost:8080/order/666a1661-474d-4046-8b12-8b5896312768/confirm
+
+### Ship Order 666a1661-474d-4046-8b12-8b5896312768
+
+POST http://localhost:8080/order/666a1661-474d-4046-8b12-8b5896312768/ship
+
 ###

axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java

@@ -1,62 +1,139 @@
 package com.baeldung.axon.commandmodel;
 
-import java.util.UUID;
+import com.baeldung.axon.commandmodel.order.OrderAggregate;
-
+import com.baeldung.axon.coreapi.commands.AddProductCommand;
+import com.baeldung.axon.coreapi.commands.ConfirmOrderCommand;
+import com.baeldung.axon.coreapi.commands.CreateOrderCommand;
+import com.baeldung.axon.coreapi.commands.DecrementProductCountCommand;
+import com.baeldung.axon.coreapi.commands.IncrementProductCountCommand;
+import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
+import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
+import com.baeldung.axon.coreapi.events.OrderCreatedEvent;
+import com.baeldung.axon.coreapi.events.OrderShippedEvent;
+import com.baeldung.axon.coreapi.events.ProductAddedEvent;
+import com.baeldung.axon.coreapi.events.ProductCountDecrementedEvent;
+import com.baeldung.axon.coreapi.events.ProductCountIncrementedEvent;
+import com.baeldung.axon.coreapi.events.ProductRemovedEvent;
+import com.baeldung.axon.coreapi.exceptions.DuplicateOrderLineException;
+import com.baeldung.axon.coreapi.exceptions.OrderAlreadyConfirmedException;
 import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;
 import org.axonframework.test.aggregate.AggregateTestFixture;
 import org.axonframework.test.aggregate.FixtureConfiguration;
-import org.junit.*;
+import org.axonframework.test.matchers.Matchers;
+import org.junit.jupiter.api.*;
 
-import com.baeldung.axon.coreapi.commands.ConfirmOrderCommand;
+import java.util.UUID;
-import com.baeldung.axon.coreapi.commands.PlaceOrderCommand;
-import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
-import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
-import com.baeldung.axon.coreapi.events.OrderPlacedEvent;
-import com.baeldung.axon.coreapi.events.OrderShippedEvent;
 
-public class OrderAggregateUnitTest {
+class OrderAggregateUnitTest {
+
+    private static final String ORDER_ID = UUID.randomUUID().toString();
+    private static final String PRODUCT_ID = UUID.randomUUID().toString();
 
     private FixtureConfiguration<OrderAggregate> fixture;
 
-    @Before
+    @BeforeEach
-    public void setUp() {
+    void setUp() {
         fixture = new AggregateTestFixture<>(OrderAggregate.class);
     }
 
     @Test
-    public void giveNoPriorActivity_whenPlaceOrderCommand_thenShouldPublishOrderPlacedEvent() {
+    void giveNoPriorActivity_whenCreateOrderCommand_thenShouldPublishOrderCreatedEvent() {
-        String orderId = UUID.randomUUID().toString();
-        String product = "Deluxe Chair";
         fixture.givenNoPriorActivity()
-               .when(new PlaceOrderCommand(orderId, product))
+               .when(new CreateOrderCommand(ORDER_ID))
-               .expectEvents(new OrderPlacedEvent(orderId, product));
+               .expectEvents(new OrderCreatedEvent(ORDER_ID));
     }
 
     @Test
-    public void givenOrderPlacedEvent_whenConfirmOrderCommand_thenShouldPublishOrderConfirmedEvent() {
+    void givenOrderCreatedEvent_whenAddProductCommand_thenShouldPublishProductAddedEvent() {
-        String orderId = UUID.randomUUID().toString();
+        fixture.given(new OrderCreatedEvent(ORDER_ID))
-        String product = "Deluxe Chair";
+               .when(new AddProductCommand(ORDER_ID, PRODUCT_ID))
-        fixture.given(new OrderPlacedEvent(orderId, product))
+               .expectEvents(new ProductAddedEvent(ORDER_ID, PRODUCT_ID));
-               .when(new ConfirmOrderCommand(orderId))
-               .expectEvents(new OrderConfirmedEvent(orderId));
     }
 
     @Test
-    public void givenOrderPlacedEvent_whenShipOrderCommand_thenShouldThrowUnconfirmedOrderException() {
+    void givenOrderCreatedEventAndProductAddedEvent_whenAddProductCommandForSameProductId_thenShouldThrowDuplicateOrderLineException() {
-        String orderId = UUID.randomUUID().toString();
+        fixture.given(new OrderCreatedEvent(ORDER_ID), new ProductAddedEvent(ORDER_ID, PRODUCT_ID))
-        String product = "Deluxe Chair";
+               .when(new AddProductCommand(ORDER_ID, PRODUCT_ID))
-        fixture.given(new OrderPlacedEvent(orderId, product))
+               .expectException(DuplicateOrderLineException.class)
-               .when(new ShipOrderCommand(orderId))
+               .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(PRODUCT_ID)));
+    }
+
+    @Test
+    void givenOrderCreatedEventAndProductAddedEvent_whenIncrementProductCountCommand_thenShouldPublishProductCountIncrementedEvent() {
+        fixture.given(new OrderCreatedEvent(ORDER_ID), new ProductAddedEvent(ORDER_ID, PRODUCT_ID))
+               .when(new IncrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+               .expectEvents(new ProductCountIncrementedEvent(ORDER_ID, PRODUCT_ID));
+    }
+
+    @Test
+    void givenOrderCreatedEventProductAddedEventAndProductCountIncrementedEvent_whenDecrementProductCountCommand_thenShouldPublishProductCountDecrementedEvent() {
+        fixture.given(new OrderCreatedEvent(ORDER_ID),
+                      new ProductAddedEvent(ORDER_ID, PRODUCT_ID),
+                      new ProductCountIncrementedEvent(ORDER_ID, PRODUCT_ID))
+               .when(new DecrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+               .expectEvents(new ProductCountDecrementedEvent(ORDER_ID, PRODUCT_ID));
+    }
+
+    @Test
+    void givenOrderCreatedEventAndProductAddedEvent_whenDecrementProductCountCommand_thenShouldPublishProductRemovedEvent() {
+        fixture.given(new OrderCreatedEvent(ORDER_ID), new ProductAddedEvent(ORDER_ID, PRODUCT_ID))
+               .when(new DecrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+               .expectEvents(new ProductRemovedEvent(ORDER_ID, PRODUCT_ID));
+    }
+
+    @Test
+    void givenOrderCreatedEvent_whenConfirmOrderCommand_thenShouldPublishOrderConfirmedEvent() {
+        fixture.given(new OrderCreatedEvent(ORDER_ID))
+               .when(new ConfirmOrderCommand(ORDER_ID))
+               .expectEvents(new OrderConfirmedEvent(ORDER_ID));
+    }
+
+    @Test
+    void givenOrderCreatedEventAndOrderConfirmedEvent_whenConfirmOrderCommand_thenExpectNoEvents() {
+        fixture.given(new OrderCreatedEvent(ORDER_ID), new OrderConfirmedEvent(ORDER_ID))
+               .when(new ConfirmOrderCommand(ORDER_ID))
+               .expectNoEvents();
+    }
+
+    @Test
+    void givenOrderCreatedEvent_whenShipOrderCommand_thenShouldThrowUnconfirmedOrderException() {
+        fixture.given(new OrderCreatedEvent(ORDER_ID))
+               .when(new ShipOrderCommand(ORDER_ID))
                .expectException(UnconfirmedOrderException.class);
     }
 
     @Test
-    public void givenOrderPlacedEventAndOrderConfirmedEvent_whenShipOrderCommand_thenShouldPublishOrderShippedEvent() {
+    void givenOrderCreatedEventAndOrderConfirmedEvent_whenShipOrderCommand_thenShouldPublishOrderShippedEvent() {
-        String orderId = UUID.randomUUID().toString();
+        fixture.given(new OrderCreatedEvent(ORDER_ID), new OrderConfirmedEvent(ORDER_ID))
-        String product = "Deluxe Chair";
+               .when(new ShipOrderCommand(ORDER_ID))
-        fixture.given(new OrderPlacedEvent(orderId, product), new OrderConfirmedEvent(orderId))
+               .expectEvents(new OrderShippedEvent(ORDER_ID));
-               .when(new ShipOrderCommand(orderId))
-               .expectEvents(new OrderShippedEvent(orderId));
     }
 
+    @Test
+    void givenOrderCreatedEventProductAndOrderConfirmedEvent_whenAddProductCommand_thenShouldThrowOrderAlreadyConfirmedException() {
+        fixture.given(new OrderCreatedEvent(ORDER_ID), new OrderConfirmedEvent(ORDER_ID))
+               .when(new AddProductCommand(ORDER_ID, PRODUCT_ID))
+               .expectException(OrderAlreadyConfirmedException.class)
+               .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(ORDER_ID)));
+    }
+
+    @Test
+    void givenOrderCreatedEventProductAddedEventAndOrderConfirmedEvent_whenIncrementProductCountCommand_thenShouldThrowOrderAlreadyConfirmedException() {
+        fixture.given(new OrderCreatedEvent(ORDER_ID),
+                      new ProductAddedEvent(ORDER_ID, PRODUCT_ID),
+                      new OrderConfirmedEvent(ORDER_ID))
+               .when(new IncrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+               .expectException(OrderAlreadyConfirmedException.class)
+               .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(ORDER_ID)));
+    }
+
+    @Test
+    void givenOrderCreatedEventProductAddedEventAndOrderConfirmedEvent_whenDecrementProductCountCommand_thenShouldThrowOrderAlreadyConfirmedException() {
+        fixture.given(new OrderCreatedEvent(ORDER_ID),
+                      new ProductAddedEvent(ORDER_ID, PRODUCT_ID),
+                      new OrderConfirmedEvent(ORDER_ID))
+               .when(new DecrementProductCountCommand(ORDER_ID, PRODUCT_ID))
+               .expectException(OrderAlreadyConfirmedException.class)
+               .expectExceptionMessage(Matchers.predicate(message -> ((String) message).contains(ORDER_ID)));
+    }
 }

azure/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
@@ -22,24 +21,20 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -129,4 +124,4 @@
         <azure-webapp-maven-plugin.version>1.1.0</azure-webapp-maven-plugin.version>
     </properties>
 
-</project>
+</project>

bazel/bazelapp/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

bazel/bazelgreeting/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

bazel/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>

blade/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -19,19 +18,16 @@
             <artifactId>blade-mvc</artifactId>
             <version>${blade-mvc.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>bootstrap</artifactId>
             <version>${bootstrap.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
-
         <!-- PROVIDED -->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -39,7 +35,6 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <!-- TEST -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -111,7 +106,6 @@
                             </arguments>
                         </configuration>
                     </execution>
-
                     <!--Stop all processes in reverse order -->
                     <execution>
                         <id>stop-all</id>
@@ -122,7 +116,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>${assembly.plugin.version}</version>
@@ -164,4 +157,4 @@
         <assembly.plugin.version>3.1.0</assembly.plugin.version>
     </properties>
 
-</project>
+</project>

bootique/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

cdi/pom.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        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">
-        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>cdi</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -57,4 +56,4 @@
         <assertj-core.version>3.10.0</assertj-core.version>
     </properties>
 
-</project>
+</project>