docs: update .all-contributorsrc [skip ci]

* Use lombok, reformat, and optimize the code

* Fix merge conflicts and some sonar issues

Co-authored-by: va1m <va1m@email.com>

.all-contributorsrc

@@ -1404,6 +1404,24 @@
       "contributions": [
         "translation"
       ]
+    },
+    {
+      "login": "richardmr36",
+      "name": "Martel Richard",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19147333?v=4",
+      "profile": "https://github.com/richardmr36",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "va1m",
+      "name": "va1m",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17025445?v=4",
+      "profile": "https://github.com/va1m",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 4,

.circleci/config.yml

@@ -0,0 +1,52 @@
+#
+# The MIT License
+# Copyright © 2014-2021 Ilkka Seppälä
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+version: 2
+
+jobs:
+  sonar-pr:
+    docker:
+      - image: circleci/openjdk:11-node
+    steps:
+    - checkout
+    - restore_cache:
+        key: jdp-sonar-pr-{{ checksum "pom.xml" }}
+    - run: |
+        if [ -n "${CIRCLE_PR_NUMBER}" ]; then
+          MAVEN_OPTS="-Xmx3000m" xvfb-run ./mvnw -B clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
+             -Dsonar.pullrequest.key=${CIRCLE_PR_NUMBER} \
+             -Dsonar.pullrequest.branch=${CIRCLE_BRANCH} \
+             -Dsonar.pullrequest.base=master
+        else
+          echo "No Sonar PR analysis as this is not a pull request"
+        fi
+    - save_cache:
+        key: jdp-sonar-pr-{{ checksum "pom.xml" }}
+        paths:
+        - ~/.m2
+
+workflows:
+  version: 2
+  all:
+    jobs:
+    - sonar-pr

.github/workflows/maven-ci.yml

@@ -40,25 +40,25 @@ jobs:
     steps:
 
     - name: Checkout Code
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
       with:
         # Disabling shallow clone for improving relevancy of SonarQube reporting
         fetch-depth: 0
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@master
       with:
         java-version: 11
 
     - name: Cache SonarCloud packages
-      uses: actions/cache@v2
+      uses: actions/cache@master
       with:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
 
     - name: Cache Maven dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@master
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -69,9 +69,6 @@ jobs:
     - name: Install xvfb
       run: sudo apt-get install -y xvfb
 
-    # The SonarQube analysis is only for the master branch of the main repository.
-    # SonarQube scan does not work for forked repositories try changing it to xvfb-run mvn clean verify
-    # See https://jira.sonarsource.com/browse/MMF-1371
     - name: Build with Maven and run SonarQube analysis
       run: xvfb-run ./mvnw clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
       env:

.github/workflows/maven-pr-builder.yml

@@ -29,7 +29,7 @@ name: Java PR Builder
 on:
   pull_request:
     branches: [ master ]
-    types: [ opened, reopened, synchronize, labeled, unlabeled ]
+    types: [ opened, reopened, synchronize ]
 
 jobs:
   build:
@@ -38,15 +38,15 @@ jobs:
 
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
     
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@master
       with:
         java-version: 11
     
     - name: Cache Maven Dependecies
-      uses: actions/cache@v2
+      uses: actions/cache@master
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -57,8 +57,5 @@ jobs:
     - name: Install xvfb
       run: sudo apt-get install -y xvfb
     
-    # This worflow is only for building Pull Requests, the master branch runs Sonar analysis on the main repository.
-    # SonarQube scan does not work for forked repositories.
-    # See https://jira.sonarsource.com/browse/MMF-1371
     - name: Build with Maven
       run: xvfb-run ./mvnw clean verify

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,18 +1,26 @@
 /*
- * Copyright 2007-present the original author or authors.
+ * The MIT License
+ * Copyright © 2014-2021 Ilkka Seppälä
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
+
 import java.net.*;
 import java.io.*;
 import java.nio.channels.*;

README.md

@@ -4,18 +4,18 @@
 
 # Design patterns implemented in Java
 
-![Java CI with Maven](https://github.com/iluwatar/java-design-patterns/workflows/Java%20CI%20with%20Maven/badge.svg)
+![Java CI](https://github.com/iluwatar/java-design-patterns/workflows/Java%20CI/badge.svg)
 [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/iluwatar/java-design-patterns/master/LICENSE.md)
 [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=ncloc)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) 
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=coverage)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns)
 [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-154-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-156-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <br/>
 
-Read in different language : [![CN](/assets/flags/CN.png)**CN**](/zh/README.md),[![KR](/assets/flags/KR.png)**KR**](/ko/README.md),[![FR](/assets/flags/FR.png)**FR**](/fr/README.md),[![TR](/assets/flags/TR.png)**TR**](/tr/README.md),[![AR](/assets/flags/AR.png)**AR**](/ar/README.md),
+Read in different language : [![CN](/assets/flags/CN.png)**CN**](/zh/README.md), [![KR](/assets/flags/KR.png)**KR**](/ko/README.md), [![FR](/assets/flags/FR.png)**FR**](/fr/README.md), [![TR](/assets/flags/TR.png)**TR**](/tr/README.md), [![AR](/assets/flags/AR.png)**AR**](/ar/README.md)
 
 <br/>
 
@@ -306,6 +306,8 @@ This project is licensed under the terms of the MIT license.
   <tr>
     <td align="center"><a href="https://github.com/byoungju94"><img src="https://avatars.githubusercontent.com/u/42516378?v=4?s=100" width="100px;" alt=""/><br /><sub><b>byoungju94</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=byoungju94" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/moustafafarhat"><img src="https://avatars.githubusercontent.com/u/38836727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Moustafa Farhat</b></sub></a><br /><a href="#translation-moustafafarhat" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/richardmr36"><img src="https://avatars.githubusercontent.com/u/19147333?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martel Richard</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=richardmr36" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/va1m"><img src="https://avatars.githubusercontent.com/u/17025445?v=4?s=100" width="100px;" alt=""/><br /><sub><b>va1m</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=va1m" title="Code">💻</a></td>
   </tr>
 </table>
 

abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java

@@ -27,8 +27,7 @@ import com.iluwatar.abstractdocument.domain.Car;
 import com.iluwatar.abstractdocument.domain.enums.Property;
 import java.util.List;
 import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * The Abstract Document pattern enables handling additional, non-static properties. This pattern
@@ -38,10 +37,9 @@ import org.slf4j.LoggerFactory;
  * <p>In Abstract Document pattern,({@link AbstractDocument}) fully implements {@link Document})
  * interface. Traits are then defined to enable access to properties in usual, static way.
  */
+@Slf4j
 public class App {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
-
   /**
    * Program entry point.
    *

abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java

@@ -23,19 +23,18 @@
 
 package com.iluwatar.abstractdocument;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * AbstractDocument test class
  */
-public class AbstractDocumentTest {
+class AbstractDocumentTest {
 
   private static final String KEY = "key";
   private static final String VALUE = "value";
@@ -50,13 +49,13 @@ public class AbstractDocumentTest {
   private final DocumentImplementation document = new DocumentImplementation(new HashMap<>());
 
   @Test
-  public void shouldPutAndGetValue() {
+  void shouldPutAndGetValue() {
     document.put(KEY, VALUE);
     assertEquals(VALUE, document.get(KEY));
   }
 
   @Test
-  public void shouldRetrieveChildren() {
+  void shouldRetrieveChildren() {
     var children = List.of(Map.of(), Map.of());
 
     document.put(KEY, children);
@@ -67,14 +66,14 @@ public class AbstractDocumentTest {
   }
 
   @Test
-  public void shouldRetrieveEmptyStreamForNonExistingChildren() {
+  void shouldRetrieveEmptyStreamForNonExistingChildren() {
     var children = document.children(KEY, DocumentImplementation::new);
     assertNotNull(children);
     assertEquals(0, children.count());
   }
 
   @Test
-  public void shouldIncludePropsInToString() {
+  void shouldIncludePropsInToString() {
     var props = Map.of(KEY, (Object) VALUE);
     var document = new DocumentImplementation(props);
     assertTrue(document.toString().contains(KEY));

abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java

@@ -23,19 +23,20 @@
 
 package com.iluwatar.abstractdocument;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import com.iluwatar.abstractdocument.domain.Car;
 import com.iluwatar.abstractdocument.domain.Part;
 import com.iluwatar.abstractdocument.domain.enums.Property;
+import org.junit.jupiter.api.Test;
+
 import java.util.List;
 import java.util.Map;
-import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test for Part and Car
  */
-public class DomainTest {
+class DomainTest {
 
   private static final String TEST_PART_TYPE = "test-part-type";
   private static final String TEST_PART_MODEL = "test-part-model";
@@ -45,7 +46,7 @@ public class DomainTest {
   private static final long TEST_CAR_PRICE = 1L;
 
   @Test
-  public void shouldConstructPart() {
+  void shouldConstructPart() {
     var partProperties = Map.of(
         Property.TYPE.toString(), TEST_PART_TYPE,
         Property.MODEL.toString(), TEST_PART_MODEL,
@@ -58,7 +59,7 @@ public class DomainTest {
   }
 
   @Test
-  public void shouldConstructCar() {
+  void shouldConstructCar() {
     var carProperties = Map.of(
         Property.MODEL.toString(), TEST_CAR_MODEL,
         Property.PRICE.toString(), TEST_CAR_PRICE,

abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java

@@ -23,8 +23,7 @@
 
 package com.iluwatar.abstractfactory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * The Abstract Factory pattern provides a way to encapsulate a group of individual factories that
@@ -40,10 +39,9 @@ import org.slf4j.LoggerFactory;
  * and its implementations ( {@link ElfKingdomFactory}, {@link OrcKingdomFactory}). The example uses
  * both concrete implementations to create a king, a castle and an army.
  */
+@Slf4j
 public class App implements Runnable {
 
-  private static Logger log = LoggerFactory.getLogger(App.class);
-
   private final Kingdom kingdom = new Kingdom();
 
   public Kingdom getKingdom() {
@@ -62,17 +60,17 @@ public class App implements Runnable {
 
   @Override
   public void run() {
-    log.info("Elf Kingdom");
+    LOGGER.info("Elf Kingdom");
     createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
-    log.info(kingdom.getArmy().getDescription());
-    log.info(kingdom.getCastle().getDescription());
-    log.info(kingdom.getKing().getDescription());
+    LOGGER.info(kingdom.getArmy().getDescription());
+    LOGGER.info(kingdom.getCastle().getDescription());
+    LOGGER.info(kingdom.getKing().getDescription());
 
-    log.info("Orc Kingdom");
+    LOGGER.info("Orc Kingdom");
     createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
-    log.info(kingdom.getArmy().getDescription());
-    log.info(kingdom.getCastle().getDescription());
-    log.info(kingdom.getKing().getDescription());
+    LOGGER.info(kingdom.getArmy().getDescription());
+    LOGGER.info(kingdom.getCastle().getDescription());
+    LOGGER.info(kingdom.getKing().getDescription());
   }
 
   /**

abstract-factory/src/main/java/com/iluwatar/abstractfactory/Kingdom.java

@@ -23,36 +23,17 @@
 
 package com.iluwatar.abstractfactory;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
 public class Kingdom {
 
   private King king;
   private Castle castle;
   private Army army;
 
-  public King getKing() {
-    return king;
-  }
-
-  public Castle getCastle() {
-    return castle;
-  }
-
-  public Army getArmy() {
-    return army;
-  }
-
-  public void setKing(King king) {
-    this.king = king;
-  }
-
-  public void setCastle(Castle castle) {
-    this.castle = castle;
-  }
-
-  public void setArmy(Army army) {
-    this.army = army;
-  }
-
   /**
    * The factory of kingdom factories.
    */

abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java

@@ -31,12 +31,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * Test for abstract factory.
  */
-public class AbstractFactoryTest {
+class AbstractFactoryTest {
 
   private final App app = new App();
 
   @Test
-  public void king() {
+  void king() {
     app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
     final var kingdom = app.getKingdom();
 
@@ -51,7 +51,7 @@ public class AbstractFactoryTest {
   }
 
   @Test
-  public void castle() {
+  void castle() {
     app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
     final var kingdom = app.getKingdom();
 
@@ -66,7 +66,7 @@ public class AbstractFactoryTest {
   }
 
   @Test
-  public void army() {
+  void army() {
     app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
     final var kingdom = app.getKingdom();
 
@@ -81,7 +81,7 @@ public class AbstractFactoryTest {
   }
 
   @Test
-  public void createElfKingdom() {
+  void createElfKingdom() {
     app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
     final var kingdom = app.getKingdom();
 
@@ -97,7 +97,7 @@ public class AbstractFactoryTest {
   }
 
   @Test
-  public void createOrcKingdom() {
+  void createOrcKingdom() {
     app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
     final var kingdom = app.getKingdom();
 

acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitor.java

@@ -23,17 +23,15 @@
 
 package com.iluwatar.acyclicvisitor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * ConfigureForDosVisitor class implements both zoom's and  hayes' visit method for Dos
  * manufacturer.
  */
+@Slf4j
 public class ConfigureForDosVisitor implements AllModemVisitor {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConfigureForDosVisitor.class);
-
   @Override
   public void visit(Hayes hayes) {
     LOGGER.info(hayes + " used with Dos configurator.");

acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitor.java

@@ -23,17 +23,15 @@
 
 package com.iluwatar.acyclicvisitor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * ConfigureForUnixVisitor class implements zoom's visit method for Unix manufacturer, unlike
  * traditional visitor pattern, this class may selectively implement visit for other modems.
  */
+@Slf4j
 public class ConfigureForUnixVisitor implements ZoomVisitor {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConfigureForUnixVisitor.class);
-
   @Override
   public void visit(Zoom zoom) {
     LOGGER.info(zoom + " used with Unix configurator.");

acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/Hayes.java

@@ -23,16 +23,14 @@
 
 package com.iluwatar.acyclicvisitor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Hayes class implements its accept method.
  */
+@Slf4j
 public class Hayes extends Modem {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConfigureForDosVisitor.class);
-
   /**
    * Accepts all visitors but honors only HayesVisitor.
    */

acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/Zoom.java

@@ -23,16 +23,14 @@
 
 package com.iluwatar.acyclicvisitor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Zoom class implements its accept method.
  */
+@Slf4j
 public class Zoom extends Modem {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConfigureForDosVisitor.class);
-
   /**
    * Accepts all visitors but honors only ZoomVisitor.
    */

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java

@@ -35,34 +35,34 @@ import uk.org.lidalia.slf4jtest.TestLoggerFactory;
 /**
  * ConfigureForDosVisitor test class
  */
-public class ConfigureForDosVisitorTest {
+class ConfigureForDosVisitorTest {
 
   private final TestLogger logger = TestLoggerFactory.getTestLogger(ConfigureForDosVisitor.class);
-  
+
   @Test
-  public void testVisitForZoom() {    
+  void testVisitForZoom() {
     var conDos = new ConfigureForDosVisitor();
     var zoom = new Zoom();
-    
+
     conDos.visit(zoom);
-    
+
     assertThat(logger.getLoggingEvents())
         .extracting("level", "message")
         .contains(tuple(INFO, zoom + " used with Dos configurator."));
   }
-  
+
   @Test
-  public void testVisitForHayes() {
+  void testVisitForHayes() {
     var conDos = new ConfigureForDosVisitor();
     var hayes = new Hayes();
-    
+
     conDos.visit(hayes);
-    
+
     assertThat(logger.getLoggingEvents())
         .extracting("level", "message")
         .contains(tuple(INFO, hayes + " used with Dos configurator."));
   }
-  
+
   @AfterEach
   public void clearLoggers() {
     TestLoggerFactory.clear();

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java

@@ -23,35 +23,34 @@
 
 package com.iluwatar.acyclicvisitor;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import uk.org.lidalia.slf4jtest.TestLogger;
+import uk.org.lidalia.slf4jtest.TestLoggerFactory;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.groups.Tuple.tuple;
 import static uk.org.lidalia.slf4jext.Level.INFO;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-
-import uk.org.lidalia.slf4jtest.TestLogger;
-import uk.org.lidalia.slf4jtest.TestLoggerFactory;
-
 /**
  * ConfigureForUnixVisitor test class
  */
-public class ConfigureForUnixVisitorTest {
-  
+class ConfigureForUnixVisitorTest {
+
   private static final TestLogger LOGGER = TestLoggerFactory.getTestLogger(ConfigureForUnixVisitor.class);
-  
+
   @AfterEach
   public void clearLoggers() {
     TestLoggerFactory.clear();
   }
-  
+
   @Test
-  public void testVisitForZoom() {
+  void testVisitForZoom() {
     var conUnix = new ConfigureForUnixVisitor();
     var zoom = new Zoom();
-    
+
     conUnix.visit(zoom);
-    
+
     assertThat(LOGGER.getLoggingEvents())
         .extracting("level", "message")
         .contains(tuple(INFO, zoom + " used with Unix configurator."));

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java

@@ -23,34 +23,32 @@
 
 package com.iluwatar.acyclicvisitor;
 
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-
 import org.junit.jupiter.api.Test;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.*;
+
 /**
  * Hayes test class
  */
-public class HayesTest {
+class HayesTest {
 
   @Test
-  public void testAcceptForDos() {  
+  void testAcceptForDos() {
     var hayes = new Hayes();
     var mockVisitor = mock(ConfigureForDosVisitor.class);
-    
+
     hayes.accept(mockVisitor);
-    verify((HayesVisitor)mockVisitor).visit(eq(hayes));
+    verify((HayesVisitor) mockVisitor).visit(eq(hayes));
   }
-  
+
   @Test
-  public void testAcceptForUnix() {    
+  void testAcceptForUnix() {
     var hayes = new Hayes();
     var mockVisitor = mock(ConfigureForUnixVisitor.class);
-    
+
     hayes.accept(mockVisitor);
-    
+
     verifyZeroInteractions(mockVisitor);
   }
 }

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java

@@ -24,32 +24,32 @@
 package com.iluwatar.acyclicvisitor;
 
 
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.mock;
-
 import org.junit.jupiter.api.Test;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 /**
  * Zoom test class
  */
-public class ZoomTest {
-  
+class ZoomTest {
+
   @Test
-  public void testAcceptForDos() {  
+  void testAcceptForDos() {
     var zoom = new Zoom();
     var mockVisitor = mock(ConfigureForDosVisitor.class);
-    
+
     zoom.accept(mockVisitor);
-    verify((ZoomVisitor)mockVisitor).visit(eq(zoom));
+    verify((ZoomVisitor) mockVisitor).visit(eq(zoom));
   }
-  
+
   @Test
-  public void testAcceptForUnix() {
+  void testAcceptForUnix() {
     var zoom = new Zoom();
     var mockVisitor = mock(ConfigureForUnixVisitor.class);
-    
+
     zoom.accept(mockVisitor);
-    verify((ZoomVisitor)mockVisitor).visit(eq(zoom));
+    verify((ZoomVisitor) mockVisitor).visit(eq(zoom));
   }
 }

adapter/README.md

@@ -42,8 +42,8 @@ public interface RowingBoat {
   void row();
 }
 
+@Slf4j
 public class FishingBoat {
-  private static final Logger LOGGER = LoggerFactory.getLogger(FishingBoat.class);
   public void sail() {
     LOGGER.info("The fishing boat is sailing");
   }
@@ -70,10 +70,9 @@ public class Captain {
 Now let's say the pirates are coming and our captain needs to escape but there is only fishing boat available. We need to create an adapter that allows the captain to operate the fishing boat with his rowing boat skills.
 
 ```java
+@Slf4j
 public class FishingBoatAdapter implements RowingBoat {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(FishingBoatAdapter.class);
-
   private final FishingBoat boat;
 
   public FishingBoatAdapter() {

adapter/src/main/java/com/iluwatar/adapter/Captain.java

@@ -23,24 +23,20 @@
 
 package com.iluwatar.adapter;
 
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 /**
  * The Captain uses {@link RowingBoat} to sail. <br> This is the client in the pattern.
  */
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public final class Captain {
 
   private RowingBoat rowingBoat;
 
-  public Captain() {
-  }
-
-  public Captain(final RowingBoat boat) {
-    this.rowingBoat = boat;
-  }
-
-  void setRowingBoat(final RowingBoat boat) {
-    this.rowingBoat = boat;
-  }
-
   void row() {
     rowingBoat.row();
   }

adapter/src/main/java/com/iluwatar/adapter/FishingBoat.java

@@ -23,18 +23,15 @@
 
 package com.iluwatar.adapter;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Device class (adaptee in the pattern). We want to reuse this class. Fishing boat moves by
  * sailing.
  */
+@Slf4j
 final class FishingBoat {
 
-  private static final Logger LOGGER = getLogger(FishingBoat.class);
-
   void sail() {
     LOGGER.info("The fishing boat is sailing");
   }

adapter/src/main/java/com/iluwatar/adapter/FishingBoatAdapter.java

@@ -29,11 +29,7 @@ package com.iluwatar.adapter;
  */
 public class FishingBoatAdapter implements RowingBoat {
 
-  private final FishingBoat boat;
-
-  public FishingBoatAdapter() {
-    boat = new FishingBoat();
-  }
+  private final FishingBoat boat = new FishingBoat();
 
   public final void row() {
     boat.sail();

adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java

@@ -23,18 +23,19 @@
 
 package com.iluwatar.adapter;
 
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test class
  */
-public class AdapterPatternTest {
+class AdapterPatternTest {
 
   private Map<String, Object> beans;
 
@@ -64,7 +65,7 @@ public class AdapterPatternTest {
    * by the client ({@link Captain} ).
    */
   @Test
-  public void testAdapter() {
+  void testAdapter() {
     var captain = (Captain) beans.get(ROWING_BEAN);
 
     // when captain moves

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java

@@ -26,8 +26,7 @@ package com.iluwatar.aggregator.microservices;
 import static java.util.Objects.requireNonNullElse;
 
 import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -37,20 +36,18 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class Aggregator {
 
-
   @Resource
   private ProductInformationClient informationClient;
 
   @Resource
   private ProductInventoryClient inventoryClient;
 
-
   /**
    * Retrieves product data.
    *
    * @return a Product.
    */
-  @RequestMapping(path = "/product", method = RequestMethod.GET)
+  @GetMapping("/product")
   public Product getProduct() {
 
     var product = new Product();

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Product.java

@@ -23,9 +23,14 @@
 
 package com.iluwatar.aggregator.microservices;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * Encapsulates all the data for a Product that clients will request.
  */
+@Getter
+@Setter
 public class Product {
 
   /**
@@ -39,20 +44,4 @@ public class Product {
    */
   private int productInventories;
 
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public int getProductInventories() {
-    return productInventories;
-  }
-
-  public void setProductInventories(int productInventories) {
-    this.productInventories = productInventories;
-  }
-
 }

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java

@@ -28,18 +28,16 @@ import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
  * An adapter to communicate with information micro-service.
  */
+@Slf4j
 @Component
 public class ProductInformationClientImpl implements ProductInformationClient {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ProductInformationClientImpl.class);
-
   @Override
   public String getProductTitle() {
     var request = HttpRequest.newBuilder()
@@ -54,6 +52,7 @@ public class ProductInformationClientImpl implements ProductInformationClient {
       LOGGER.error("IOException Occurred", ioe);
     } catch (InterruptedException ie) {
       LOGGER.error("InterruptedException Occurred", ie);
+      Thread.currentThread().interrupt();
     }
     return null;
   }

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java

@@ -28,18 +28,16 @@ import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
  * An adapter to communicate with inventory micro-service.
  */
+@Slf4j
 @Component
 public class ProductInventoryClientImpl implements ProductInventoryClient {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ProductInventoryClientImpl.class);
-
   @Override
   public Integer getProductInventories() {
     var response = "";
@@ -56,6 +54,7 @@ public class ProductInventoryClientImpl implements ProductInventoryClient {
       LOGGER.error("IOException Occurred", ioe);
     } catch (InterruptedException ie) {
       LOGGER.error("InterruptedException Occurred", ie);
+      Thread.currentThread().interrupt();
     }
     if ("".equalsIgnoreCase(response)) {
       return null;

aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java

@@ -23,19 +23,19 @@
 
 package com.iluwatar.aggregator.microservices;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.when;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
 /**
  * Test Aggregation of domain objects
  */
-public class AggregatorTest {
+class AggregatorTest {
 
   @InjectMocks
   private Aggregator aggregator;
@@ -55,7 +55,7 @@ public class AggregatorTest {
    * Tests getting the data for a desktop client
    */
   @Test
-  public void testGetProduct() {
+  void testGetProduct() {
     var title = "The Product Title.";
     var inventories = 5;
 

aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java

@@ -23,8 +23,7 @@
 
 package com.iluwatar.information.microservice;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -38,7 +37,7 @@ public class InformationController {
    *
    * @return product inventory.
    */
-  @RequestMapping(value = "/information", method = RequestMethod.GET)
+  @GetMapping("/information")
   public String getProductTitle() {
     return "The Product Title.";
   }

aggregator-microservices/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java

@@ -23,17 +23,17 @@
 
 package com.iluwatar.information.microservice;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Test for Information Rest Controller
  */
-public class InformationControllerTest {
+class InformationControllerTest {
 
   @Test
-  public void shouldGetProductTitle() {
+  void shouldGetProductTitle() {
     var infoController = new InformationController();
     var title = infoController.getProductTitle();
     assertEquals("The Product Title.", title);

aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryController.java

@@ -23,8 +23,7 @@
 
 package com.iluwatar.inventory.microservice;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -38,7 +37,7 @@ public class InventoryController {
    *
    * @return product inventory.
    */
-  @RequestMapping(value = "/inventories", method = RequestMethod.GET)
+  @GetMapping("/inventories")
   public int getProductInventories() {
     return 5;
   }

aggregator-microservices/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java

@@ -23,16 +23,17 @@
 
 package com.iluwatar.inventory.microservice;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Test Inventory Rest Controller
  */
-public class InventoryControllerTest {
+class InventoryControllerTest {
+
   @Test
-  public void testGetProductInventories() {
+  void testGetProductInventories() {
     var inventoryController = new InventoryController();
     var numberOfInventories = inventoryController.getProductInventories();
     assertEquals(5, numberOfInventories);

ambassador/README.md

@@ -48,9 +48,8 @@ interface RemoteServiceInterface {
 A remote services represented as a singleton.
 
 ```java
+@Slf4j
 public class RemoteService implements RemoteServiceInterface {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteService.class);
     private static RemoteService service = null;
 
     static synchronized RemoteService getRemoteService() {
@@ -80,9 +79,8 @@ public class RemoteService implements RemoteServiceInterface {
 A service ambassador adding additional features such as logging, latency checks
 
 ```java
+@Slf4j
 public class ServiceAmbassador implements RemoteServiceInterface {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(ServiceAmbassador.class);
   private static final int RETRIES = 3;
   private static final int DELAY_MS = 3000;
 
@@ -132,9 +130,8 @@ public class ServiceAmbassador implements RemoteServiceInterface {
 A client has a local service ambassador used to interact with the remote service:
 
 ```java
+@Slf4j
 public class Client {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(Client.class);
   private final ServiceAmbassador serviceAmbassador = new ServiceAmbassador();
 
   long useService(int value) {

ambassador/src/main/java/com/iluwatar/ambassador/Client.java

@@ -23,20 +23,19 @@
 
 package com.iluwatar.ambassador;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * A simple Client.
  */
+@Slf4j
 public class Client {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Client.class);
   private final ServiceAmbassador serviceAmbassador = new ServiceAmbassador();
 
   long useService(int value) {
     var result = serviceAmbassador.doRemoteFunction(value);
-    LOGGER.info("Service result: " + result);
+    LOGGER.info("Service result: {}", result);
     return result;
   }
 }

ambassador/src/main/java/com/iluwatar/ambassador/RemoteService.java

@@ -26,15 +26,14 @@ package com.iluwatar.ambassador;
 import static java.lang.Thread.sleep;
 
 import com.iluwatar.ambassador.util.RandomProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * A remote legacy application represented by a Singleton implementation.
  */
+@Slf4j
 public class RemoteService implements RemoteServiceInterface {
   private static final int THRESHOLD = 200;
-  private static final Logger LOGGER = LoggerFactory.getLogger(RemoteService.class);
   private static RemoteService service = null;
   private final RandomProvider randomProvider;
 
@@ -73,8 +72,9 @@ public class RemoteService implements RemoteServiceInterface {
       sleep(waitTime);
     } catch (InterruptedException e) {
       LOGGER.error("Thread sleep state interrupted", e);
+      Thread.currentThread().interrupt();
     }
     return waitTime <= THRESHOLD ? value * 10
-            : RemoteServiceStatus.FAILURE.getRemoteServiceStatusValue();
+        : RemoteServiceStatus.FAILURE.getRemoteServiceStatusValue();
   }
 }

ambassador/src/main/java/com/iluwatar/ambassador/RemoteServiceStatus.java

@@ -33,8 +33,7 @@ package com.iluwatar.ambassador;
  */
 
 public enum RemoteServiceStatus {
-  FAILURE(-1)
-  ;
+  FAILURE(-1);
 
   private final long remoteServiceStatusValue;
 

ambassador/src/main/java/com/iluwatar/ambassador/ServiceAmbassador.java

@@ -26,17 +26,16 @@ package com.iluwatar.ambassador;
 import static com.iluwatar.ambassador.RemoteServiceStatus.FAILURE;
 import static java.lang.Thread.sleep;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * ServiceAmbassador provides an interface for a ({@link Client}) to access ({@link RemoteService}).
  * The interface adds logging, latency testing and usage of the service in a safe way that will not
  * add stress to the remote service when connectivity issues occur.
  */
+@Slf4j
 public class ServiceAmbassador implements RemoteServiceInterface {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ServiceAmbassador.class);
   private static final int RETRIES = 3;
   private static final int DELAY_MS = 3000;
 
@@ -53,7 +52,7 @@ public class ServiceAmbassador implements RemoteServiceInterface {
     var result = RemoteService.getRemoteService().doRemoteFunction(value);
     var timeTaken = System.currentTimeMillis() - startTime;
 
-    LOGGER.info("Time taken (ms): " + timeTaken);
+    LOGGER.info("Time taken (ms): {}", timeTaken);
     return result;
   }
 
@@ -67,12 +66,13 @@ public class ServiceAmbassador implements RemoteServiceInterface {
       }
 
       if ((result = checkLatency(value)) == FAILURE.getRemoteServiceStatusValue()) {
-        LOGGER.info("Failed to reach remote: (" + (i + 1) + ")");
+        LOGGER.info("Failed to reach remote: ({})", i + 1);
         retries++;
         try {
           sleep(DELAY_MS);
         } catch (InterruptedException e) {
           LOGGER.error("Thread sleep state interrupted", e);
+          Thread.currentThread().interrupt();
         }
       } else {
         break;

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java

@@ -24,8 +24,7 @@
 package com.iluwatar.api.gateway;
 
 import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -45,7 +44,7 @@ public class ApiGateway {
    *
    * @return Product information for clients on a desktop
    */
-  @RequestMapping(path = "/desktop", method = RequestMethod.GET)
+  @GetMapping("/desktop")
   public DesktopProduct getProductDesktop() {
     var desktopProduct = new DesktopProduct();
     desktopProduct.setImagePath(imageClient.getImagePath());
@@ -58,7 +57,7 @@ public class ApiGateway {
    *
    * @return Product information for clients on a mobile device
    */
-  @RequestMapping(path = "/mobile", method = RequestMethod.GET)
+  @GetMapping("/mobile")
   public MobileProduct getProductMobile() {
     var mobileProduct = new MobileProduct();
     mobileProduct.setPrice(priceClient.getPrice());

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/DesktopProduct.java

@@ -23,10 +23,16 @@
 
 package com.iluwatar.api.gateway;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * Encapsulates all of the information that a desktop client needs to display a product.
  */
+@Getter
+@Setter
 public class DesktopProduct {
+
   /**
    * The price of the product.
    */
@@ -37,19 +43,4 @@ public class DesktopProduct {
    */
   private String imagePath;
 
-  public String getPrice() {
-    return price;
-  }
-
-  public void setPrice(String price) {
-    this.price = price;
-  }
-
-  public String getImagePath() {
-    return imagePath;
-  }
-
-  public void setImagePath(String imagePath) {
-    this.imagePath = imagePath;
-  }
 }

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClientImpl.java

@@ -23,24 +23,21 @@
 
 package com.iluwatar.api.gateway;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
  * An adapter to communicate with the Image microservice.
  */
+@Slf4j
 @Component
 public class ImageClientImpl implements ImageClient {
-  private static final Logger LOGGER = getLogger(ImageClientImpl.class);
 
   /**
    * Makes a simple HTTP Get request to the Image microservice.
@@ -60,8 +57,11 @@ public class ImageClientImpl implements ImageClient {
       var httpResponse = httpClient.send(httpGet, BodyHandlers.ofString());
       logResponse(httpResponse);
       return httpResponse.body();
-    } catch (IOException | InterruptedException e) {
-      LOGGER.error("Failure occurred while getting image path", e);
+    } catch (IOException ioe) {
+      LOGGER.error("Failure occurred while getting image path", ioe);
+    } catch (InterruptedException ie) {
+      LOGGER.error("Failure occurred while getting image path", ie);
+      Thread.currentThread().interrupt();
     }
 
     return null;

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/MobileProduct.java

@@ -23,20 +23,17 @@
 
 package com.iluwatar.api.gateway;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * Encapsulates all of the information that mobile client needs to display a product.
  */
+@Getter
+@Setter
 public class MobileProduct {
   /**
    * The price of the product.
    */
   private String price;
-
-  public String getPrice() {
-    return price;
-  }
-
-  public void setPrice(String price) {
-    this.price = price;
-  }
 }

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClientImpl.java

@@ -23,25 +23,22 @@
 
 package com.iluwatar.api.gateway;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 
 /**
  * An adapter to communicate with the Price microservice.
  */
+@Slf4j
 @Component
 public class PriceClientImpl implements PriceClient {
-  private static final Logger LOGGER = getLogger(PriceClientImpl.class);
 
   /**
    * Makes a simple HTTP Get request to the Price microservice.
@@ -61,8 +58,11 @@ public class PriceClientImpl implements PriceClient {
       var httpResponse = httpClient.send(httpGet, BodyHandlers.ofString());
       logResponse(httpResponse);
       return httpResponse.body();
-    } catch (IOException | InterruptedException e) {
+    } catch (IOException e) {
       LOGGER.error("Failure occurred while getting price info", e);
+    } catch (InterruptedException e) {
+      LOGGER.error("Failure occurred while getting price info", e);
+      Thread.currentThread().interrupt();
     }
 
     return null;

api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java

@@ -35,7 +35,7 @@ import org.mockito.MockitoAnnotations;
 /**
  * Test API Gateway Pattern
  */
-public class ApiGatewayTest {
+class ApiGatewayTest {
 
   @InjectMocks
   private ApiGateway apiGateway;
@@ -55,7 +55,7 @@ public class ApiGatewayTest {
    * Tests getting the data for a desktop client
    */
   @Test
-  public void testGetProductDesktop() {
+  void testGetProductDesktop() {
     var imagePath = "/product-image.png";
     var price = "20";
     when(imageClient.getImagePath()).thenReturn(imagePath);
@@ -71,7 +71,7 @@ public class ApiGatewayTest {
    * Tests getting the data for a mobile client
    */
   @Test
-  public void testGetProductMobile() {
+  void testGetProductMobile() {
     var price = "20";
     when(priceClient.getPrice()).thenReturn(price);
 

api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageController.java

@@ -23,27 +23,24 @@
 
 package com.iluwatar.image.microservice;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.slf4j.Logger;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 
 /**
  * Exposes the Image microservice's endpoints.
  */
+@Slf4j
 @RestController
 public class ImageController {
-  private static final Logger LOGGER = getLogger(ImageController.class);
 
   /**
    * An endpoint for a user to retrieve an image path.
    *
    * @return An image path
    */
-  @RequestMapping(value = "/image-path", method = RequestMethod.GET)
+  @GetMapping("/image-path")
   public String getImagePath() {
     LOGGER.info("Successfully found image path");
     return "/product-image.png";

api-gateway/image-microservice/src/test/java/com/iluwatar/image/microservice/ImageControllerTest.java

@@ -23,16 +23,17 @@
 
 package com.iluwatar.image.microservice;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Test for Image Rest Controller
  */
-public class ImageControllerTest {
+class ImageControllerTest {
+
   @Test
-  public void testGetImagePath() {
+  void testGetImagePath() {
     var imageController = new ImageController();
     var imagePath = imageController.getImagePath();
     assertEquals("/product-image.png", imagePath);

api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceController.java

@@ -23,27 +23,24 @@
 
 package com.iluwatar.price.microservice;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.slf4j.Logger;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 
 /**
  * Exposes the Price microservice's endpoints.
  */
+@Slf4j
 @RestController
 public class PriceController {
-  private static final Logger LOGGER = getLogger(PriceController.class);
 
   /**
    * An endpoint for a user to retrieve a product's price.
    *
    * @return A product's price
    */
-  @RequestMapping(value = "/price", method = RequestMethod.GET)
+  @GetMapping("/price")
   public String getPrice() {
     LOGGER.info("Successfully found price info");
     return "20";

api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceControllerTest.java

@@ -23,16 +23,17 @@
 
 package com.iluwatar.price.microservice;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Test for Price Rest Controller
  */
-public class PriceControllerTest {
+class PriceControllerTest {
+
   @Test
-  public void testgetPrice() {
+  void testgetPrice() {
     var priceController = new PriceController();
     var price = priceController.getPrice();
     assertEquals("20", price);

arrange-act-assert/README.md

@@ -81,10 +81,10 @@ Then we write our unit tests according to Arrange/Act/Assert pattern. Notice the
 separated steps for each unit test.
 
 ```java
-public class CashAAATest {
+class CashAAATest {
 
   @Test
-  public void testPlus() {
+  void testPlus() {
     //Arrange
     var cash = new Cash(3);
     //Act
@@ -94,7 +94,7 @@ public class CashAAATest {
   }
 
   @Test
-  public void testMinus() {
+  void testMinus() {
     //Arrange
     var cash = new Cash(8);
     //Act
@@ -105,7 +105,7 @@ public class CashAAATest {
   }
 
   @Test
-  public void testInsufficientMinus() {
+  void testInsufficientMinus() {
     //Arrange
     var cash = new Cash(1);
     //Act
@@ -116,7 +116,7 @@ public class CashAAATest {
   }
 
   @Test
-  public void testUpdate() {
+  void testUpdate() {
     //Arrange
     var cash = new Cash(5);
     //Act

arrange-act-assert/pom.xml

@@ -36,8 +36,8 @@
   <artifactId>arrange-act-assert</artifactId>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

arrange-act-assert/src/main/java/com/iluwatar/arrangeactassert/Cash.java

@@ -23,18 +23,17 @@
 
 package com.iluwatar.arrangeactassert;
 
+import lombok.AllArgsConstructor;
+
 /**
  * Arrange/Act/Assert (AAA) is a unit test pattern. In this simple example, we have a ({@link Cash})
  * object for plus, minus and counting amount.
  */
+@AllArgsConstructor
 public class Cash {
 
   private int amount;
 
-  Cash(int amount) {
-    this.amount = amount;
-  }
-
   //plus
   void plus(int addend) {
     amount += addend;

arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAAATest.java

@@ -23,11 +23,11 @@
 
 package com.iluwatar.arrangeactassert;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Arrange/Act/Assert (AAA) is a pattern for organizing unit tests. It is a way to structure your
@@ -51,10 +51,11 @@ import org.junit.Test;
  * change and one reason to fail. In a large and complicated code base, tests that honor the single
  * responsibility principle are much easier to troubleshoot.
  */
-public class CashAAATest {
+
+class CashAAATest {
 
   @Test
-  public void testPlus() {
+  void testPlus() {
     //Arrange
     var cash = new Cash(3);
     //Act
@@ -64,7 +65,7 @@ public class CashAAATest {
   }
 
   @Test
-  public void testMinus() {
+  void testMinus() {
     //Arrange
     var cash = new Cash(8);
     //Act
@@ -75,7 +76,7 @@ public class CashAAATest {
   }
 
   @Test
-  public void testInsufficientMinus() {
+  void testInsufficientMinus() {
     //Arrange
     var cash = new Cash(1);
     //Act
@@ -86,7 +87,7 @@ public class CashAAATest {
   }
 
   @Test
-  public void testUpdate() {
+  void testUpdate() {
     //Arrange
     var cash = new Cash(5);
     //Act

arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAntiAAATest.java

@@ -23,23 +23,24 @@
 
 package com.iluwatar.arrangeactassert;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * ({@link CashAAATest}) is an anti-example of AAA pattern. This test is functionally correct, but
- * with the addition of new feature, it needs refactoring. There are an awful lot of steps in that
+ * with the addition of a new feature, it needs refactoring. There are an awful lot of steps in that
  * test method, but it verifies the class' important behavior in just eleven lines. It violates the
  * single responsibility principle. If this test method failed after a small code change, it might
  * take some digging to discover why.
  */
-public class CashAntiAAATest {
+
+class CashAntiAAATest {
 
   @Test
-  public void testCash() {
+  void testCash() {
     //initialize
     var cash = new Cash(3);
     //test plus

async-method-invocation/pom.xml

@@ -45,11 +45,6 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/App.java

@@ -24,8 +24,7 @@
 package com.iluwatar.async.method.invocation;
 
 import java.util.concurrent.Callable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * This application demonstrates the async method invocation pattern. Key parts of the pattern are
@@ -55,10 +54,9 @@ import org.slf4j.LoggerFactory;
  * @see java.util.concurrent.CompletableFuture
  * @see java.util.concurrent.ExecutorService
  */
+@Slf4j
 public class App {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
-
   /**
    * Program entry point.
    */

balking/src/main/java/com/iluwatar/balking/App.java

@@ -23,11 +23,9 @@
 
 package com.iluwatar.balking;
 
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * In Balking Design Pattern if an object’s method is invoked when it is in an inappropriate state,
@@ -40,11 +38,9 @@ import org.slf4j.LoggerFactory;
  * been already washing and any other thread execute wash() it can't do that once again and returns
  * doing nothing.
  */
-
+@Slf4j
 public class App {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
-
   /**
    * Entry Point.
    *
@@ -61,6 +57,7 @@ public class App {
       executorService.awaitTermination(10, TimeUnit.SECONDS);
     } catch (InterruptedException ie) {
       LOGGER.error("ERROR: Waiting on executor service shutdown!");
+      Thread.currentThread().interrupt();
     }
   }
 

balking/src/main/java/com/iluwatar/balking/WashingMachine.java

@@ -24,15 +24,14 @@
 package com.iluwatar.balking;
 
 import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Washing machine class.
  */
+@Slf4j
 public class WashingMachine {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(WashingMachine.class);
   private final DelayProvider delayProvider;
   private WashingMachineState washingMachineState;
 
@@ -44,7 +43,8 @@ public class WashingMachine {
       try {
         Thread.sleep(timeUnit.toMillis(interval));
       } catch (InterruptedException ie) {
-        ie.printStackTrace();
+        LOGGER.error("", ie);
+        Thread.currentThread().interrupt();
       }
       task.run();
     });
@@ -71,7 +71,7 @@ public class WashingMachine {
       var machineState = getWashingMachineState();
       LOGGER.info("{}: Actual machine state: {}", Thread.currentThread().getName(), machineState);
       if (this.washingMachineState == WashingMachineState.WASHING) {
-        LOGGER.error("ERROR: Cannot wash if the machine has been already washing!");
+        LOGGER.error("Cannot wash if the machine has been already washing!");
         return;
       }
       this.washingMachineState = WashingMachineState.WASHING;

balking/src/main/java/com/iluwatar/balking/WashingMachineState.java

@@ -28,5 +28,6 @@ package com.iluwatar.balking;
  * as well as during washing.
  */
 public enum WashingMachineState {
-  ENABLED, WASHING
+  ENABLED,
+  WASHING
 }

bridge/src/main/java/com/iluwatar/bridge/App.java

@@ -23,8 +23,7 @@
 
 package com.iluwatar.bridge;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Composition over inheritance. The Bridge pattern can also be thought of as two layers of
@@ -39,10 +38,9 @@ import org.slf4j.LoggerFactory;
  * enchantments. We can easily combine any weapon with any enchantment using composition instead of
  * creating deep class hierarchy.
  */
+@Slf4j
 public class App {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
-
   /**
    * Program entry point.
    *

bridge/src/main/java/com/iluwatar/bridge/FlyingEnchantment.java

@@ -23,16 +23,14 @@
 
 package com.iluwatar.bridge;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * FlyingEnchantment.
  */
+@Slf4j
 public class FlyingEnchantment implements Enchantment {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(FlyingEnchantment.class);
-
   @Override
   public void onActivate() {
     LOGGER.info("The item begins to glow faintly.");

bridge/src/main/java/com/iluwatar/bridge/Hammer.java

@@ -23,22 +23,18 @@
 
 package com.iluwatar.bridge;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Hammer.
  */
+@Slf4j
+@AllArgsConstructor
 public class Hammer implements Weapon {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Hammer.class);
-
   private final Enchantment enchantment;
 
-  public Hammer(Enchantment enchantment) {
-    this.enchantment = enchantment;
-  }
-
   @Override
   public void wield() {
     LOGGER.info("The hammer is wielded.");

bridge/src/main/java/com/iluwatar/bridge/SoulEatingEnchantment.java

@@ -23,16 +23,14 @@
 
 package com.iluwatar.bridge;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * SoulEatingEnchantment.
  */
+@Slf4j
 public class SoulEatingEnchantment implements Enchantment {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(SoulEatingEnchantment.class);
-
   @Override
   public void onActivate() {
     LOGGER.info("The item spreads bloodlust.");

bridge/src/main/java/com/iluwatar/bridge/Sword.java

@@ -23,22 +23,18 @@
 
 package com.iluwatar.bridge;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Sword.
  */
+@Slf4j
+@AllArgsConstructor
 public class Sword implements Weapon {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Sword.class);
-
   private final Enchantment enchantment;
 
-  public Sword(Enchantment enchantment) {
-    this.enchantment = enchantment;
-  }
-
   @Override
   public void wield() {
     LOGGER.info("The sword is wielded.");

builder/src/main/java/com/iluwatar/builder/App.java

@@ -24,8 +24,7 @@
 package com.iluwatar.builder;
 
 import com.iluwatar.builder.Hero.Builder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * The intention of the Builder pattern is to find a solution to the telescoping constructor
@@ -48,10 +47,9 @@ import org.slf4j.LoggerFactory;
  * configuration for the {@link Hero} object can be done using the fluent {@link Builder} interface.
  * When configuration is ready the build method is called to receive the final {@link Hero} object.
  */
+@Slf4j
 public class App {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
-
   /**
    * Program entry point.
    *
@@ -76,6 +74,5 @@ public class App {
         .withWeapon(Weapon.BOW)
         .build();
     LOGGER.info(thief.toString());
-
   }
 }

builder/src/main/java/com/iluwatar/builder/Armor.java

@@ -23,19 +23,21 @@
 
 package com.iluwatar.builder;
 
+import lombok.AllArgsConstructor;
+
 /**
  * Armor enumeration.
  */
+@AllArgsConstructor
 public enum Armor {
 
-  CLOTHES("clothes"), LEATHER("leather"), CHAIN_MAIL("chain mail"), PLATE_MAIL("plate mail");
+  CLOTHES("clothes"),
+  LEATHER("leather"),
+  CHAIN_MAIL("chain mail"),
+  PLATE_MAIL("plate mail");
 
   private final String title;
 
-  Armor(String title) {
-    this.title = title;
-  }
-
   @Override
   public String toString() {
     return title;

builder/src/main/java/com/iluwatar/builder/HairColor.java

@@ -28,7 +28,11 @@ package com.iluwatar.builder;
  */
 public enum HairColor {
 
-  WHITE, BLOND, RED, BROWN, BLACK;
+  WHITE,
+  BLOND,
+  RED,
+  BROWN,
+  BLACK;
 
   @Override
   public String toString() {

builder/src/main/java/com/iluwatar/builder/HairType.java

@@ -23,20 +23,22 @@
 
 package com.iluwatar.builder;
 
+import lombok.AllArgsConstructor;
+
 /**
  * HairType enumeration.
  */
+@AllArgsConstructor
 public enum HairType {
 
-  BALD("bald"), SHORT("short"), CURLY("curly"), LONG_STRAIGHT("long straight"), LONG_CURLY(
-      "long curly");
+  BALD("bald"),
+  SHORT("short"),
+  CURLY("curly"),
+  LONG_STRAIGHT("long straight"),
+  LONG_CURLY("long curly");
 
   private final String title;
 
-  HairType(String title) {
-    this.title = title;
-  }
-
   @Override
   public String toString() {
     return title;

builder/src/test/java/com/iluwatar/builder/AppTest.java

@@ -41,7 +41,6 @@ class AppTest {
 
   @Test
   void shouldExecuteApplicationWithoutException() {
-
     assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessDelegate.java

@@ -29,7 +29,6 @@ package com.iluwatar.business.delegate;
 public class BusinessDelegate {
 
   private BusinessLookup lookupService;
-  private BusinessService businessService;
   private ServiceType serviceType;
 
   public void setLookupService(BusinessLookup businessLookup) {
@@ -41,7 +40,7 @@ public class BusinessDelegate {
   }
 
   public void doTask() {
-    businessService = lookupService.getBusinessService(serviceType);
+    BusinessService businessService = lookupService.getBusinessService(serviceType);
     businessService.doProcessing();
   }
 }

business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessLookup.java

@@ -23,9 +23,12 @@
 
 package com.iluwatar.business.delegate;
 
+import lombok.Setter;
+
 /**
  * Class for performing service lookups.
  */
+@Setter
 public class BusinessLookup {
 
   private EjbService ejbService;
@@ -45,12 +48,4 @@ public class BusinessLookup {
       return jmsService;
     }
   }
-
-  public void setJmsService(JmsService jmsService) {
-    this.jmsService = jmsService;
-  }
-
-  public void setEjbService(EjbService ejbService) {
-    this.ejbService = ejbService;
-  }
 }

business-delegate/src/main/java/com/iluwatar/business/delegate/EjbService.java

@@ -23,16 +23,14 @@
 
 package com.iluwatar.business.delegate;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Service EJB implementation.
  */
+@Slf4j
 public class EjbService implements BusinessService {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(EjbService.class);
-
   @Override
   public void doProcessing() {
     LOGGER.info("EjbService is now processing");

business-delegate/src/main/java/com/iluwatar/business/delegate/JmsService.java

@@ -23,16 +23,14 @@
 
 package com.iluwatar.business.delegate;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Service JMS implementation.
  */
+@Slf4j
 public class JmsService implements BusinessService {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(JmsService.class);
-
   @Override
   public void doProcessing() {
     LOGGER.info("JmsService is now processing");

business-delegate/src/main/java/com/iluwatar/business/delegate/ServiceType.java

@@ -28,5 +28,6 @@ package com.iluwatar.business.delegate;
  */
 public enum ServiceType {
 
-  EJB, JMS
+  EJB,
+  JMS
 }

business-delegate/src/test/java/com/iluwatar/business/delegate/BusinessDelegateTest.java

@@ -35,19 +35,17 @@ import static org.mockito.Mockito.verify;
  * tiers. By using the pattern we gain loose coupling between the tiers. The Business Delegate
  * encapsulates knowledge about how to locate, connect to, and interact with the business objects
  * that make up the application.
- * 
+ *
  * <p>Some of the services the Business Delegate uses are instantiated directly, and some can be
  * retrieved through service lookups. The Business Delegate itself may contain business logic too
  * potentially tying together multiple service calls, exception handling, retrying etc.
  */
-public class BusinessDelegateTest {
+class BusinessDelegateTest {
 
   private EjbService ejbService;
 
   private JmsService jmsService;
 
-  private BusinessLookup businessLookup;
-
   private BusinessDelegate businessDelegate;
 
   /**
@@ -59,7 +57,7 @@ public class BusinessDelegateTest {
     ejbService = spy(new EjbService());
     jmsService = spy(new JmsService());
 
-    businessLookup = spy(new BusinessLookup());
+    BusinessLookup businessLookup = spy(new BusinessLookup());
     businessLookup.setEjbService(ejbService);
     businessLookup.setJmsService(jmsService);
 
@@ -73,7 +71,7 @@ public class BusinessDelegateTest {
    * service and makes the service call.
    */
   @Test
-  public void testBusinessDelegate() {
+  void testBusinessDelegate() {
 
     // setup a client object
     var client = new Client(businessDelegate);

bytecode/src/main/java/com/iluwatar/bytecode/App.java

@@ -24,8 +24,7 @@
 package com.iluwatar.bytecode;
 
 import com.iluwatar.bytecode.util.InstructionConverterUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * The intention of Bytecode pattern is to give behavior the flexibility of data by encoding it as
@@ -40,8 +39,8 @@ import org.slf4j.LoggerFactory;
  * ensure the behavior being defined can’t break the game, you need to sandbox it from the rest of
  * the codebase.
  */
+@Slf4j
 public class App {
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
 
   /**
    * Main app method.

bytecode/src/main/java/com/iluwatar/bytecode/Instruction.java

@@ -23,9 +23,14 @@
 
 package com.iluwatar.bytecode;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * Representation of instructions understandable by virtual machine.
  */
+@AllArgsConstructor
+@Getter
 public enum Instruction {
 
   LITERAL(1),
@@ -40,15 +45,7 @@ public enum Instruction {
   ADD(10),
   DIVIDE(11);
 
-  private final int value;
-
-  Instruction(int value) {
-    this.value = value;
-  }
-
-  public int getIntValue() {
-    return value;
-  }
+  private final int intValue;
 
   /**
    * Converts integer value to Instruction.

bytecode/src/main/java/com/iluwatar/bytecode/VirtualMachine.java

@@ -24,10 +24,12 @@
 package com.iluwatar.bytecode;
 
 import java.util.Stack;
+import lombok.Getter;
 
 /**
  * Implementation of virtual machine.
  */
+@Getter
 public class VirtualMachine {
 
   private final Stack<Integer> stack = new Stack<>();
@@ -108,10 +110,6 @@ public class VirtualMachine {
     }
   }
 
-  public Stack<Integer> getStack() {
-    return stack;
-  }
-
   public void setHealth(int wizard, int amount) {
     wizards[wizard].setHealth(amount);
   }
@@ -135,8 +133,4 @@ public class VirtualMachine {
   public int getAgility(int wizard) {
     return wizards[wizard].getAgility();
   }
-
-  public Wizard[] getWizards() {
-    return wizards;
-  }
 }

bytecode/src/main/java/com/iluwatar/bytecode/Wizard.java

@@ -23,15 +23,18 @@
 
 package com.iluwatar.bytecode;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * This class represent game objects which properties can be changed by instructions interpreted by
  * virtual machine.
  */
+@Setter
+@Getter
+@Slf4j
 public class Wizard {
-  private static final Logger LOGGER = LoggerFactory.getLogger(Wizard.class);
 
   private int health;
 
@@ -41,30 +44,6 @@ public class Wizard {
   private int numberOfPlayedSounds;
   private int numberOfSpawnedParticles;
 
-  public int getHealth() {
-    return health;
-  }
-
-  public void setHealth(int health) {
-    this.health = health;
-  }
-
-  public int getAgility() {
-    return agility;
-  }
-
-  public void setAgility(int agility) {
-    this.agility = agility;
-  }
-
-  public int getWisdom() {
-    return wisdom;
-  }
-
-  public void setWisdom(int wisdom) {
-    this.wisdom = wisdom;
-  }
-
   public void playSound() {
     LOGGER.info("Playing sound");
     numberOfPlayedSounds++;
@@ -75,11 +54,4 @@ public class Wizard {
     numberOfSpawnedParticles++;
   }
 
-  public int getNumberOfPlayedSounds() {
-    return numberOfPlayedSounds;
-  }
-
-  public int getNumberOfSpawnedParticles() {
-    return numberOfSpawnedParticles;
-  }
 }

bytecode/src/test/java/com/iluwatar/bytecode/VirtualMachineTest.java

@@ -23,19 +23,19 @@
 
 package com.iluwatar.bytecode;
 
-import org.junit.jupiter.api.Test;
-
 import static com.iluwatar.bytecode.Instruction.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import org.junit.jupiter.api.Test;
+
 /**
- * Test for {@Link VirtualMachine}
+ * Test for {@link VirtualMachine}
  */
-public class VirtualMachineTest {
+class VirtualMachineTest {
 
   @Test
-  public void testLiteral() {
+  void testLiteral() {
     var bytecode = new int[2];
     bytecode[0] = LITERAL.getIntValue();
     bytecode[1] = 10;
@@ -48,7 +48,7 @@ public class VirtualMachineTest {
   }
 
   @Test
-  public void testSetHealth() {
+  void testSetHealth() {
     var wizardNumber = 0;
     var bytecode = new int[5];
     bytecode[0] = LITERAL.getIntValue();
@@ -64,7 +64,7 @@ public class VirtualMachineTest {
   }
 
   @Test
-  public void testSetAgility() {
+  void testSetAgility() {
     var wizardNumber = 0;
     var bytecode = new int[5];
     bytecode[0] = LITERAL.getIntValue();
@@ -80,7 +80,7 @@ public class VirtualMachineTest {
   }
 
   @Test
-  public void testSetWisdom() {
+  void testSetWisdom() {
     var wizardNumber = 0;
     var bytecode = new int[5];
     bytecode[0] = LITERAL.getIntValue();
@@ -96,7 +96,7 @@ public class VirtualMachineTest {
   }
 
   @Test
-  public void testGetHealth() {
+  void testGetHealth() {
     var wizardNumber = 0;
     var bytecode = new int[8];
     bytecode[0] = LITERAL.getIntValue();
@@ -115,7 +115,7 @@ public class VirtualMachineTest {
   }
 
   @Test
-  public void testPlaySound() {
+  void testPlaySound() {
     var wizardNumber = 0;
     var bytecode = new int[3];
     bytecode[0] = LITERAL.getIntValue();
@@ -130,7 +130,7 @@ public class VirtualMachineTest {
   }
 
   @Test
-  public void testSpawnParticles() {
+  void testSpawnParticles() {
     var wizardNumber = 0;
     var bytecode = new int[3];
     bytecode[0] = LITERAL.getIntValue();
@@ -145,7 +145,7 @@ public class VirtualMachineTest {
   }
 
   @Test
-  public void testInvalidInstruction() {
+  void testInvalidInstruction() {
     var bytecode = new int[1];
     bytecode[0] = 999;
     var vm = new VirtualMachine();

bytecode/src/test/java/com/iluwatar/bytecode/util/InstructionConverterUtilTest.java

@@ -24,16 +24,16 @@
 package com.iluwatar.bytecode.util;
 
 import com.iluwatar.bytecode.Instruction;
-import com.iluwatar.bytecode.util.InstructionConverterUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /**
- * Test for {@Link InstructionConverterUtil}
+ * Test for {@link InstructionConverterUtil}
  */
-public class InstructionConverterUtilTest {
+class InstructionConverterUtilTest {
+
   @Test
-  public void testEmptyInstruction() {
+  void testEmptyInstruction() {
     var instruction = "";
 
     var bytecode = InstructionConverterUtil.convertToByteCode(instruction);
@@ -42,7 +42,7 @@ public class InstructionConverterUtilTest {
   }
 
   @Test
-  public void testInstructions() {
+  void testInstructions() {
     var instructions = "LITERAL 35 SET_HEALTH SET_WISDOM SET_AGILITY PLAY_SOUND"
         + " SPAWN_PARTICLES GET_HEALTH ADD DIVIDE";
 

caching/src/main/java/com/iluwatar/caching/App.java

@@ -23,8 +23,7 @@
 
 package com.iluwatar.caching;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * The Caching pattern describes how to avoid expensive re-acquisition of resources by not releasing
@@ -60,11 +59,9 @@ import org.slf4j.LoggerFactory;
  * @see LruCache
  * @see CachingPolicy
  */
+@Slf4j
 public class App {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
-
-
   /**
    * Program entry point.
    *

caching/src/main/java/com/iluwatar/caching/CacheStore.java

@@ -26,16 +26,14 @@ package com.iluwatar.caching;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * The caching strategies are implemented in this class.
  */
+@Slf4j
 public class CacheStore {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CacheStore.class);
-
   private static LruCache cache;
 
   private CacheStore() {

caching/src/main/java/com/iluwatar/caching/CachingPolicy.java

@@ -23,19 +23,19 @@
 
 package com.iluwatar.caching;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * Enum class containing the four caching strategies implemented in the pattern.
  */
+@AllArgsConstructor
+@Getter
 public enum CachingPolicy {
-  THROUGH("through"), AROUND("around"), BEHIND("behind"), ASIDE("aside");
+  THROUGH("through"),
+  AROUND("around"),
+  BEHIND("behind"),
+  ASIDE("aside");
 
   private final String policy;
-
-  CachingPolicy(String policy) {
-    this.policy = policy;
-  }
-
-  public String getPolicy() {
-    return policy;
-  }
 }

caching/src/main/java/com/iluwatar/caching/LruCache.java

@@ -27,8 +27,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Data structure/implementation of the application's cache. The data structure consists of a hash
@@ -37,11 +36,10 @@ import org.slf4j.LoggerFactory;
  * the data is moved to the front of the list to depict itself as the most-recently-used data. The
  * LRU data is always at the end of the list.
  */
+@Slf4j
 public class LruCache {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(LruCache.class);
-
-  class Node {
+  static class Node {
     String userId;
     UserAccount userAccount;
     Node previous;

caching/src/main/java/com/iluwatar/caching/UserAccount.java

@@ -23,49 +23,20 @@
 
 package com.iluwatar.caching;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
 /**
  * Entity class (stored in cache and DB) used in the application.
  */
+@Setter
+@Getter
+@AllArgsConstructor
+@ToString
 public class UserAccount {
   private String userId;
   private String userName;
   private String additionalInfo;
-
-  /**
-   * Constructor.
-   */
-  public UserAccount(String userId, String userName, String additionalInfo) {
-    this.userId = userId;
-    this.userName = userName;
-    this.additionalInfo = additionalInfo;
-  }
-
-  public String getUserId() {
-    return userId;
-  }
-
-  public void setUserId(String userId) {
-    this.userId = userId;
-  }
-
-  public String getUserName() {
-    return userName;
-  }
-
-  public void setUserName(String userName) {
-    this.userName = userName;
-  }
-
-  public String getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(String additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  @Override
-  public String toString() {
-    return userId + ", " + userName + ", " + additionalInfo;
-  }
 }

callback/README.md

@@ -54,10 +54,9 @@ public abstract class Task {
   public abstract void execute();
 }
 
+@Slf4j
 public final class SimpleTask extends Task {
 
-  private static final Logger LOGGER = getLogger(SimpleTask.class);
-
   @Override
   public void execute() {
     LOGGER.info("Perform some important activity and after call the callback method.");

callback/src/main/java/com/iluwatar/callback/App.java

@@ -23,19 +23,16 @@
 
 package com.iluwatar.callback;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Callback pattern is more native for functional languages where functions are treated as
  * first-class citizens. Prior to Java 8 callbacks can be simulated using simple (alike command)
  * interfaces.
  */
+@Slf4j
 public final class App {
 
-  private static final Logger LOGGER = getLogger(App.class);
-
   private App() {
   }
 

callback/src/main/java/com/iluwatar/callback/SimpleTask.java

@@ -23,20 +23,16 @@
 
 package com.iluwatar.callback;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Implementation of task that need to be executed.
  */
+@Slf4j
 public final class SimpleTask extends Task {
 
-  private static final Logger LOGGER = getLogger(SimpleTask.class);
-
   @Override
   public void execute() {
-    LOGGER.info("Perform some important activity and after call the"
-        + " callback method.");
+    LOGGER.info("Perform some important activity and after call the callback method.");
   }
 }

callback/src/test/java/com/iluwatar/callback/CallbackTest.java

@@ -38,7 +38,7 @@ public class CallbackTest {
   private Integer callingCount = 0;
 
   @Test
-  public void test() {
+  void test() {
     Callback callback = () -> callingCount++;
 
     var task = new SimpleTask();

chain/README.md

@@ -68,8 +68,8 @@ public enum RequestType {
 Then the request handler hierarchy
 
 ```java
+@Slf4j
 public abstract class RequestHandler {
-  private static final Logger LOGGER = LoggerFactory.getLogger(RequestHandler.class);
   private final RequestHandler next;
 
   public RequestHandler(RequestHandler next) {

chain/src/main/java/com/iluwatar/chain/App.java

@@ -47,6 +47,5 @@ public class App {
     king.makeRequest(new Request(RequestType.DEFEND_CASTLE, "defend castle"));
     king.makeRequest(new Request(RequestType.TORTURE_PRISONER, "torture prisoner"));
     king.makeRequest(new Request(RequestType.COLLECT_TAX, "collect tax"));
-
   }
 }

chain/src/main/java/com/iluwatar/chain/RequestHandler.java

@@ -23,22 +23,18 @@
 
 package com.iluwatar.chain;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * RequestHandler.
  */
+@Slf4j
+@AllArgsConstructor
 public abstract class RequestHandler {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(RequestHandler.class);
-
   private final RequestHandler next;
 
-  public RequestHandler(RequestHandler next) {
-    this.next = next;
-  }
-
   /**
    * Request handler.
    */

chain/src/main/java/com/iluwatar/chain/RequestType.java

@@ -28,6 +28,8 @@ package com.iluwatar.chain;
  */
 public enum RequestType {
 
-  DEFEND_CASTLE, TORTURE_PRISONER, COLLECT_TAX
+  DEFEND_CASTLE,
+  TORTURE_PRISONER,
+  COLLECT_TAX
 
 }

chain/src/test/java/com/iluwatar/chain/OrcKingTest.java

@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class OrcKingTest {
+class OrcKingTest {
 
   /**
    * All possible requests
@@ -45,7 +45,7 @@ public class OrcKingTest {
   );
 
   @Test
-  public void testMakeRequest() {
+  void testMakeRequest() {
     final var king = new OrcKing();
 
     REQUESTS.forEach(request -> {

circuit-breaker/README.md

@@ -54,6 +54,7 @@ The service architecture is as follows:
 In terms of code, the end user application is:
 
 ```java
+@Slf4j
 public class App {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(App.class);

circuit-breaker/src/main/java/com/iluwatar/circuitbreaker/App.java

@@ -23,8 +23,7 @@
 
 package com.iluwatar.circuitbreaker;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * <p>
@@ -55,10 +54,9 @@ import org.slf4j.LoggerFactory;
  * recovers, it goes back to the closed state and the cycle continues.
  * </p>
  */
+@Slf4j
 public class App {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
-
   /**
    * Program entry point.
    *

circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DefaultCircuitBreakerTest.java

@@ -35,7 +35,7 @@ public class DefaultCircuitBreakerTest {
 
   //long timeout, int failureThreshold, long retryTimePeriod
   @Test
-  public void testEvaluateState() {
+  void testEvaluateState() {
     var circuitBreaker = new DefaultCircuitBreaker(null, 1, 1, 100);
     //Right now, failureCount<failureThreshold, so state should be closed
     assertEquals(circuitBreaker.getState(), "CLOSED");
@@ -57,7 +57,7 @@ public class DefaultCircuitBreakerTest {
   }
 
   @Test
-  public void testSetStateForBypass() {
+  void testSetStateForBypass() {
     var circuitBreaker = new DefaultCircuitBreaker(null, 1, 1, 2000 * 1000 * 1000);
     //Right now, failureCount<failureThreshold, so state should be closed
     //Bypass it and set it to open
@@ -66,7 +66,7 @@ public class DefaultCircuitBreakerTest {
   }
 
   @Test
-  public void testApiResponses() throws RemoteServiceException {
+  void testApiResponses() throws RemoteServiceException {
     RemoteService mockService = new RemoteService() {
       @Override
       public String call() throws RemoteServiceException {
@@ -79,6 +79,5 @@ public class DefaultCircuitBreakerTest {
     var serviceStartTime = System.nanoTime() - 60 * 1000 * 1000 * 1000;
     var response = circuitBreaker.attemptRequest();
     assertEquals(response, "Remote Success");
-
   }
 }

circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DelayedRemoteServiceTest.java

@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Monitoring Service test
  */
-public class DelayedRemoteServiceTest {
+class DelayedRemoteServiceTest {
 
   /**
    * Testing immediate response of the delayed service.
@@ -39,7 +39,7 @@ public class DelayedRemoteServiceTest {
    * @throws RemoteServiceException
    */
   @Test
-  public void testDefaultConstructor() throws RemoteServiceException {
+  void testDefaultConstructor() throws RemoteServiceException {
     Assertions.assertThrows(RemoteServiceException.class, () -> {
       var obj = new DelayedRemoteService();
       obj.call();

circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/MonitoringServiceTest.java

@@ -30,18 +30,18 @@ import org.junit.jupiter.api.Test;
 /**
  * Monitoring Service test
  */
-public class MonitoringServiceTest {
+class MonitoringServiceTest {
 
   //long timeout, int failureThreshold, long retryTimePeriod
   @Test
-  public void testLocalResponse() {
+  void testLocalResponse() {
     var monitoringService = new MonitoringService(null,null);
     var response = monitoringService.localResourceResponse();
     assertEquals(response, "Local Service is working");
   }
 
   @Test
-  public void testDelayedRemoteResponseSuccess() {
+  void testDelayedRemoteResponseSuccess() {
     var delayedService = new DelayedRemoteService(System.nanoTime()-2*1000*1000*1000, 2);
     var delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000,
         1,
@@ -54,7 +54,7 @@ public class MonitoringServiceTest {
   }
 
   @Test
-  public void testDelayedRemoteResponseFailure() {
+  void testDelayedRemoteResponseFailure() {
     var delayedService = new DelayedRemoteService(System.nanoTime(), 2);
     var delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000,
         1,
@@ -66,7 +66,7 @@ public class MonitoringServiceTest {
   }
 
   @Test
-  public void testQuickRemoteServiceResponse() {
+  void testQuickRemoteServiceResponse() {
     var delayedService = new QuickRemoteService();
     var delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000,
         1,