docs: update .all-contributorsrc [skip ci]

docs: add manannikov as a contributor

.all-contributorsrc

@@ -1082,7 +1082,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/10645273?v=4",
       "profile": "https://github.com/ravening",
       "contributions": [
-        "code"
+        "code",
+        "review"
       ]
     },
     {
@@ -1128,7 +1129,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/13291222?v=4",
       "profile": "http://subho.xyz",
       "contributions": [
-        "code"
+        "code",
+        "review"
       ]
     },
     {
@@ -1139,6 +1141,132 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "ToxicDreamz",
+      "name": "Toxic Dreamz",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/45225562?v=4",
+      "profile": "https://github.com/ToxicDreamz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "edycutjong",
+      "name": "Edy Cu Tjong",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1098102?v=4",
+      "profile": "http://www.edycutjong.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "mkrzywanski",
+      "name": "Michał Krzywański",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/15279585?v=4",
+      "profile": "https://github.com/mkrzywanski",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "stefanbirkner",
+      "name": "Stefan Birkner",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/711349?v=4",
+      "profile": "https://www.stefan-birkner.de",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fedorskvorcov",
+      "name": "Fedor Skvorcov",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/43882212?v=4",
+      "profile": "https://github.com/fedorskvorcov",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "samilAyoub",
+      "name": "samilAyoub",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/61546990?v=4",
+      "profile": "https://github.com/samilAyoub",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vdlald",
+      "name": "Vladislav Golubinov",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/29997701?v=4",
+      "profile": "https://github.com/vdlald",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "swarajsaaj",
+      "name": "Swaraj",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/6285049?v=4",
+      "profile": "https://github.com/swarajsaaj",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ChFlick",
+      "name": "Christoph Flick",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/4465376?v=4",
+      "profile": "http://christophflick.de",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Ascenio",
+      "name": "Ascênio",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/7662016?v=4",
+      "profile": "https://github.com/Ascenio",
+      "contributions": [
+        "review"
+      ]
+    },
+    {
+      "login": "dsibilio",
+      "name": "Domenico Sibilio",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/24280982?v=4",
+      "profile": "https://www.linkedin.com/in/domenico-sibilio/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "akashchandwani",
+      "name": "Akash Chandwani",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/3483277?v=4",
+      "profile": "https://github.com/akashchandwani",
+      "contributions": [
+        "review"
+      ]
+    },
+    {
+      "login": "manannikov",
+      "name": "Pavlo Manannikov",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/7019769?v=4",
+      "profile": "http://www.linkedin.com/in/manannikov",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "eimanip",
+      "name": "Eiman",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/20307301?v=4",
+      "profile": "https://github.com/eimanip",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 4,

.github/workflows/maven-ci.yml

@@ -30,35 +30,49 @@ on:
   push:
     branches: [ master ]
 
+
 jobs:
+
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
+
     - uses: actions/checkout@v2
+      with:
+        # Disabling shallow clone for improving relevancy of SonarQube reporting
+        fetch-depth: 0
+
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
         java-version: 11
+
+    - name: Cache SonarCloud packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.sonar/cache
+        key: ${{ runner.os }}-sonar
+        restore-keys: ${{ runner.os }}-sonar
+
     - uses: actions/cache@v2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
+
     # Some tests need screen access
     - name: Install xvfb
-      run: sudo apt-get install xvfb
-    # SonarQube scan does not work for forked repositories
+      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
-      if: github.ref != 'refs/heads/master'
-      run: xvfb-run mvn clean verify
     - name: Build with Maven and run SonarQube analysis
-      if: github.ref == 'refs/heads/master'
       run: xvfb-run mvn clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
       env:
         # These two env variables are needed for sonar analysis
-        GITHUB_TOKEN: ${{ secrets.REPOSITORY_ACCESS_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

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

@@ -33,7 +33,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
@@ -49,9 +49,9 @@ jobs:
           ${{ runner.os }}-maven-
     # Some tests need screen access
     - name: Install xvfb
-      run: sudo apt-get install xvfb
-    # SonarQube scan does not work for forked repositories
+      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
-      if: github.ref != 'refs/heads/master'
       run: xvfb-run mvn clean verify

README.md

@@ -6,10 +6,11 @@
 
 ![Java CI with Maven](https://github.com/iluwatar/java-design-patterns/workflows/Java%20CI%20with%20Maven/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)
-[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-125-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-139-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 # Introduction
@@ -30,7 +31,7 @@ This site showcases Java Design Patterns. The solutions have been developed by
 experienced programmers and architects from the open source community. The 
 patterns can be browsed by their high level descriptions or by looking at their
 source code. The source code examples are well commented and can be thought as
-programming tutorials how to implement a specific pattern. We use the most
+programming tutorials on how to implement a specific pattern. We use the most
 popular battle-proven open source Java technologies.
 
 Before you dive into the material, you should be familiar with various
@@ -245,17 +246,37 @@ This project is licensed under the terms of the MIT license.
   <tr>
     <td align="center"><a href="https://github.com/nishant"><img src="https://avatars2.githubusercontent.com/u/15331971?v=4" width="100px;" alt=""/><br /><sub><b>Nishant Arora</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=nishant" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/raja-peeyush-kumar-singh"><img src="https://avatars0.githubusercontent.com/u/5496024?v=4" width="100px;" alt=""/><br /><sub><b>Peeyush</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=raja-peeyush-kumar-singh" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/ravening"><img src="https://avatars1.githubusercontent.com/u/10645273?v=4" width="100px;" alt=""/><br /><sub><b>Rakesh</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=ravening" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ravening"><img src="https://avatars1.githubusercontent.com/u/10645273?v=4" width="100px;" alt=""/><br /><sub><b>Rakesh</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=ravening" title="Code">💻</a> <a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3Aravening" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/vINCENT8888801"><img src="https://avatars0.githubusercontent.com/u/8037883?v=4" width="100px;" alt=""/><br /><sub><b>Wei Seng</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=vINCENT8888801" title="Code">💻</a></td>
   </tr>
   <tr>
     <td align="center"><a href="https://www.linkedin.com/in/ashish-trivedi-218379135/"><img src="https://avatars3.githubusercontent.com/u/23194128?v=4" width="100px;" alt=""/><br /><sub><b>Ashish Trivedi</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=ashishtrivedi16" title="Code">💻</a></td>
     <td align="center"><a href="https://rayyounghong.com"><img src="https://avatars1.githubusercontent.com/u/41055099?v=4" width="100px;" alt=""/><br /><sub><b>洪月阳</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=RayYH" title="Code">💻</a></td>
     <td align="center"><a href="https://xdvrx1.github.io/"><img src="https://avatars0.githubusercontent.com/u/47092464?v=4" width="100px;" alt=""/><br /><sub><b>xdvrx1</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3Axdvrx1" title="Reviewed Pull Requests">👀</a> <a href="#ideas-xdvrx1" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="http://subho.xyz"><img src="https://avatars0.githubusercontent.com/u/13291222?v=4" width="100px;" alt=""/><br /><sub><b>Subhrodip Mohanta</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=ohbus" title="Code">💻</a></td>
+    <td align="center"><a href="http://subho.xyz"><img src="https://avatars0.githubusercontent.com/u/13291222?v=4" width="100px;" alt=""/><br /><sub><b>Subhrodip Mohanta</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=ohbus" title="Code">💻</a> <a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3Aohbus" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/nahteb"><img src="https://avatars3.githubusercontent.com/u/13121570?v=4" width="100px;" alt=""/><br /><sub><b>Bethan Palmer</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=nahteb" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ToxicDreamz"><img src="https://avatars0.githubusercontent.com/u/45225562?v=4" width="100px;" alt=""/><br /><sub><b>Toxic Dreamz</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=ToxicDreamz" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.edycutjong.com"><img src="https://avatars1.githubusercontent.com/u/1098102?v=4" width="100px;" alt=""/><br /><sub><b>Edy Cu Tjong</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=edycutjong" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/mkrzywanski"><img src="https://avatars0.githubusercontent.com/u/15279585?v=4" width="100px;" alt=""/><br /><sub><b>Michał Krzywański</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=mkrzywanski" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://www.stefan-birkner.de"><img src="https://avatars1.githubusercontent.com/u/711349?v=4" width="100px;" alt=""/><br /><sub><b>Stefan Birkner</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=stefanbirkner" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/fedorskvorcov"><img src="https://avatars3.githubusercontent.com/u/43882212?v=4" width="100px;" alt=""/><br /><sub><b>Fedor Skvorcov</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=fedorskvorcov" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/samilAyoub"><img src="https://avatars0.githubusercontent.com/u/61546990?v=4" width="100px;" alt=""/><br /><sub><b>samilAyoub</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=samilAyoub" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/vdlald"><img src="https://avatars0.githubusercontent.com/u/29997701?v=4" width="100px;" alt=""/><br /><sub><b>Vladislav Golubinov</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=vdlald" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/swarajsaaj"><img src="https://avatars2.githubusercontent.com/u/6285049?v=4" width="100px;" alt=""/><br /><sub><b>Swaraj</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=swarajsaaj" title="Code">💻</a></td>
+    <td align="center"><a href="http://christophflick.de"><img src="https://avatars0.githubusercontent.com/u/4465376?v=4" width="100px;" alt=""/><br /><sub><b>Christoph Flick</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=ChFlick" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Ascenio"><img src="https://avatars1.githubusercontent.com/u/7662016?v=4" width="100px;" alt=""/><br /><sub><b>Ascênio</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3AAscenio" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://www.linkedin.com/in/domenico-sibilio/"><img src="https://avatars2.githubusercontent.com/u/24280982?v=4" width="100px;" alt=""/><br /><sub><b>Domenico Sibilio</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=dsibilio" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/akashchandwani"><img src="https://avatars2.githubusercontent.com/u/3483277?v=4" width="100px;" alt=""/><br /><sub><b>Akash Chandwani</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3Aakashchandwani" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="http://www.linkedin.com/in/manannikov"><img src="https://avatars2.githubusercontent.com/u/7019769?v=4" width="100px;" alt=""/><br /><sub><b>Pavlo Manannikov</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=manannikov" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/eimanip"><img src="https://avatars0.githubusercontent.com/u/20307301?v=4" width="100px;" alt=""/><br /><sub><b>Eiman</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=eimanip" title="Code">💻</a></td>
   </tr>
 </table>
 

abstract-document/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>java-design-patterns</artifactId>
 		<groupId>com.iluwatar</groupId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>abstract-document</artifactId>
 	<dependencies>

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

@@ -25,14 +25,23 @@ package com.iluwatar.abstractdocument;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Simple App test
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
 
   @Test
-  public void shouldExecuteAppWithoutException() {
-    App.main(null);
+  void shouldExecuteAppWithoutException() {
+    assertDoesNotThrow(() -> App.main(null));
   }
 
 }

abstract-factory/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.iluwatar</groupId>
 		<artifactId>java-design-patterns</artifactId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>abstract-factory</artifactId>
 	<dependencies>

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

@@ -23,7 +23,6 @@
 
 package com.iluwatar.abstractfactory;
 
-import com.iluwatar.abstractfactory.App.FactoryMaker.KingdomType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,84 +40,14 @@ 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.
  */
-public class App {
+public class App implements Runnable {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+  private static Logger log = LoggerFactory.getLogger(App.class);
 
-  private King king;
-  private Castle castle;
-  private Army army;
+  private final Kingdom kingdom = new Kingdom();
 
-  /**
-   * Creates kingdom.
-   */
-  public void createKingdom(final KingdomFactory factory) {
-    setKing(factory.createKing());
-    setCastle(factory.createCastle());
-    setArmy(factory.createArmy());
-  }
-
-  King getKing(final KingdomFactory factory) {
-    return factory.createKing();
-  }
-
-  public King getKing() {
-    return king;
-  }
-
-  private void setKing(final King king) {
-    this.king = king;
-  }
-
-  Castle getCastle(final KingdomFactory factory) {
-    return factory.createCastle();
-  }
-
-  public Castle getCastle() {
-    return castle;
-  }
-
-  private void setCastle(final Castle castle) {
-    this.castle = castle;
-  }
-
-  Army getArmy(final KingdomFactory factory) {
-    return factory.createArmy();
-  }
-
-  public Army getArmy() {
-    return army;
-  }
-
-  private void setArmy(final Army army) {
-    this.army = army;
-  }
-
-  /**
-   * The factory of kingdom factories.
-   */
-  public static class FactoryMaker {
-
-    /**
-     * Enumeration for the different types of Kingdoms.
-     */
-    public enum KingdomType {
-      ELF, ORC
-    }
-
-    /**
-     * The factory method to create KingdomFactory concrete objects.
-     */
-    public static KingdomFactory makeFactory(KingdomType type) {
-      switch (type) {
-        case ELF:
-          return new ElfKingdomFactory();
-        case ORC:
-          return new OrcKingdomFactory();
-        default:
-          throw new IllegalArgumentException("KingdomType not supported.");
-      }
-    }
+  public Kingdom getKingdom() {
+    return kingdom;
   }
 
   /**
@@ -127,19 +56,33 @@ public class App {
    * @param args command line args
    */
   public static void main(String[] args) {
-
     var app = new App();
+    app.run();
+  }
 
-    LOGGER.info("Elf Kingdom");
-    app.createKingdom(FactoryMaker.makeFactory(KingdomType.ELF));
-    LOGGER.info(app.getArmy().getDescription());
-    LOGGER.info(app.getCastle().getDescription());
-    LOGGER.info(app.getKing().getDescription());
+  @Override
+  public void run() {
+    log.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("Orc Kingdom");
-    app.createKingdom(FactoryMaker.makeFactory(KingdomType.ORC));
-    LOGGER.info(app.getArmy().getDescription());
-    LOGGER.info(app.getCastle().getDescription());
-    LOGGER.info(app.getKing().getDescription());
+    log.info("Orc Kingdom");
+    createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
+    log.info(kingdom.getArmy().getDescription());
+    log.info(kingdom.getCastle().getDescription());
+    log.info(kingdom.getKing().getDescription());
+  }
+
+  /**
+   * Creates kingdom.
+   * @param kingdomType type of Kingdom
+   */
+  public void createKingdom(final Kingdom.FactoryMaker.KingdomType kingdomType) {
+    final KingdomFactory kingdomFactory = Kingdom.FactoryMaker.makeFactory(kingdomType);
+    kingdom.setKing(kingdomFactory.createKing());
+    kingdom.setCastle(kingdomFactory.createCastle());
+    kingdom.setArmy(kingdomFactory.createArmy());
   }
 }

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

@@ -0,0 +1,82 @@
+/*
+ * The MIT License
+ * Copyright © 2014-2019 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.
+ */
+
+package com.iluwatar.abstractfactory;
+
+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.
+   */
+  public static class FactoryMaker {
+
+    /**
+     * Enumeration for the different types of Kingdoms.
+     */
+    public enum KingdomType {
+      ELF, ORC
+    }
+
+    /**
+     * The factory method to create KingdomFactory concrete objects.
+     */
+    public static KingdomFactory makeFactory(KingdomType type) {
+      switch (type) {
+        case ELF:
+          return new ElfKingdomFactory();
+        case ORC:
+          return new OrcKingdomFactory();
+        default:
+          throw new IllegalArgumentException("KingdomType not supported.");
+      }
+    }
+  }
+}

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

@@ -23,65 +23,71 @@
 
 package com.iluwatar.abstractfactory;
 
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.iluwatar.abstractfactory.App.FactoryMaker;
-import com.iluwatar.abstractfactory.App.FactoryMaker.KingdomType;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
 /**
  * Test for abstract factory.
  */
 public class AbstractFactoryTest {
 
   private final App app = new App();
-  private KingdomFactory elfFactory;
-  private KingdomFactory orcFactory;
-
-  @BeforeEach
-  public void setUp() {
-    elfFactory = FactoryMaker.makeFactory(KingdomType.ELF);
-    orcFactory = FactoryMaker.makeFactory(KingdomType.ORC);
-  }
 
   @Test
   public void king() {
-    final var elfKing = app.getKing(elfFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
+    final var kingdom = app.getKingdom();
+
+    final var elfKing = kingdom.getKing();
     assertTrue(elfKing instanceof ElfKing);
     assertEquals(ElfKing.DESCRIPTION, elfKing.getDescription());
-    final var orcKing = app.getKing(orcFactory);
+
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
+    final var orcKing = kingdom.getKing();
     assertTrue(orcKing instanceof OrcKing);
     assertEquals(OrcKing.DESCRIPTION, orcKing.getDescription());
   }
 
   @Test
   public void castle() {
-    final var elfCastle = app.getCastle(elfFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
+    final var kingdom = app.getKingdom();
+
+    final var elfCastle = kingdom.getCastle();
     assertTrue(elfCastle instanceof ElfCastle);
     assertEquals(ElfCastle.DESCRIPTION, elfCastle.getDescription());
-    final var orcCastle = app.getCastle(orcFactory);
+
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
+    final var orcCastle = kingdom.getCastle();
     assertTrue(orcCastle instanceof OrcCastle);
     assertEquals(OrcCastle.DESCRIPTION, orcCastle.getDescription());
   }
 
   @Test
   public void army() {
-    final var elfArmy = app.getArmy(elfFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
+    final var kingdom = app.getKingdom();
+
+    final var elfArmy = kingdom.getArmy();
     assertTrue(elfArmy instanceof ElfArmy);
     assertEquals(ElfArmy.DESCRIPTION, elfArmy.getDescription());
-    final var orcArmy = app.getArmy(orcFactory);
+
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
+    final var orcArmy = kingdom.getArmy();
     assertTrue(orcArmy instanceof OrcArmy);
     assertEquals(OrcArmy.DESCRIPTION, orcArmy.getDescription());
   }
 
   @Test
   public void createElfKingdom() {
-    app.createKingdom(elfFactory);
-    final var king = app.getKing();
-    final var castle = app.getCastle();
-    final var army = app.getArmy();
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
+    final var kingdom = app.getKingdom();
+
+    final var king = kingdom.getKing();
+    final var castle = kingdom.getCastle();
+    final var army = kingdom.getArmy();
     assertTrue(king instanceof ElfKing);
     assertEquals(ElfKing.DESCRIPTION, king.getDescription());
     assertTrue(castle instanceof ElfCastle);
@@ -92,10 +98,12 @@ public class AbstractFactoryTest {
 
   @Test
   public void createOrcKingdom() {
-    app.createKingdom(orcFactory);
-    final var king = app.getKing();
-    final var castle = app.getCastle();
-    final var army = app.getArmy();
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
+    final var kingdom = app.getKingdom();
+
+    final var king = kingdom.getKing();
+    final var castle = kingdom.getCastle();
+    final var army = kingdom.getArmy();
     assertTrue(king instanceof OrcKing);
     assertEquals(OrcKing.DESCRIPTION, king.getDescription());
     assertTrue(castle instanceof OrcCastle);

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

@@ -25,12 +25,23 @@ package com.iluwatar.abstractfactory;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Tests that Abstract Factory example runs without errors.
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  public void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

acyclic-visitor/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.iluwatar</groupId>
 		<artifactId>java-design-patterns</artifactId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>acyclic-visitor</artifactId>

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

@@ -25,13 +25,23 @@ package com.iluwatar.acyclicvisitor;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Tests that the Acyclic Visitor example runs without errors.
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
 
   @Test
-  public void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

adapter/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.iluwatar</groupId>
 		<artifactId>java-design-patterns</artifactId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>adapter</artifactId>
 	<dependencies>

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

@@ -25,12 +25,23 @@ package com.iluwatar.adapter;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Tests that Adapter example runs without errors.
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  public void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

aggregator-microservices/aggregator-service/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<artifactId>aggregator-microservices</artifactId>
 		<groupId>com.iluwatar</groupId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>aggregator-service</artifactId>

aggregator-microservices/information-microservice/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<artifactId>aggregator-microservices</artifactId>
 		<groupId>com.iluwatar</groupId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

aggregator-microservices/inventory-microservice/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<artifactId>aggregator-microservices</artifactId>
 		<groupId>com.iluwatar</groupId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>inventory-microservice</artifactId>

aggregator-microservices/pom.xml

@@ -29,7 +29,7 @@
     <parent>
         <artifactId>java-design-patterns</artifactId>
         <groupId>com.iluwatar</groupId>
-        <version>1.23.0-SNAPSHOT</version>
+        <version>1.24.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>aggregator-microservices</artifactId>

ambassador/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<artifactId>java-design-patterns</artifactId>
 		<groupId>com.iluwatar</groupId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>ambassador</artifactId>

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

@@ -62,7 +62,7 @@ public class RemoteService implements RemoteServiceInterface {
    *
    * @param value integer value to be multiplied.
    * @return if waitTime is less than {@link RemoteService#THRESHOLD}, it returns value * 10,
-   *     otherwise {@link RemoteServiceInterface#FAILURE}.
+   *     otherwise {@link RemoteServiceStatus#FAILURE}.
    */
   @Override
   public long doRemoteFunction(int value) {
@@ -74,6 +74,7 @@ public class RemoteService implements RemoteServiceInterface {
     } catch (InterruptedException e) {
       LOGGER.error("Thread sleep state interrupted", e);
     }
-    return waitTime <= THRESHOLD ? value * 10 : FAILURE;
+    return waitTime <= THRESHOLD ? value * 10
+            : RemoteServiceStatus.FAILURE.getRemoteServiceStatusValue();
   }
 }

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

@@ -27,7 +27,6 @@ package com.iluwatar.ambassador;
  * Interface shared by ({@link RemoteService}) and ({@link ServiceAmbassador}).
  */
 interface RemoteServiceInterface {
-  int FAILURE = -1;
 
   long doRemoteFunction(int value);
 }

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

@@ -21,39 +21,28 @@
  * THE SOFTWARE.
  */
 
-package com.iluwatar.command;
+package com.iluwatar.ambassador;
 
 /**
- * ShrinkSpell is a concrete command.
+ * Holds information regarding the status of the Remote Service.
+ *
+ * <p> This Enum replaces the integer value previously
+ * stored in {@link RemoteServiceInterface} as SonarCloud was identifying
+ * it as an issue. All test cases have been checked after changes,
+ * without failures. </p>
  */
-public class ShrinkSpell implements Command {
 
-  private Size oldSize;
-  private Target target;
+public enum RemoteServiceStatus {
+  FAILURE(-1)
+  ;
 
-  @Override
-  public void execute(Target target) {
-    oldSize = target.getSize();
-    target.setSize(Size.SMALL);
-    this.target = target;
+  private final long remoteServiceStatusValue;
+
+  RemoteServiceStatus(long remoteServiceStatusValue) {
+    this.remoteServiceStatusValue = remoteServiceStatusValue;
   }
 
-  @Override
-  public void undo() {
-    if (oldSize != null && target != null) {
-      var temp = target.getSize();
-      target.setSize(oldSize);
-      oldSize = temp;
-    }
-  }
-
-  @Override
-  public void redo() {
-    undo();
-  }
-
-  @Override
-  public String toString() {
-    return "Shrink spell";
+  public long getRemoteServiceStatusValue() {
+    return remoteServiceStatusValue;
   }
 }

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

@@ -23,6 +23,7 @@
 
 package com.iluwatar.ambassador;
 
+import static com.iluwatar.ambassador.RemoteServiceStatus.FAILURE;
 import static java.lang.Thread.sleep;
 
 import org.slf4j.Logger;
@@ -58,14 +59,14 @@ public class ServiceAmbassador implements RemoteServiceInterface {
 
   private long safeCall(int value) {
     var retries = 0;
-    var result = (long) FAILURE;
+    var result = FAILURE.getRemoteServiceStatusValue();
 
     for (int i = 0; i < RETRIES; i++) {
       if (retries >= RETRIES) {
-        return FAILURE;
+        return FAILURE.getRemoteServiceStatusValue();
       }
 
-      if ((result = checkLatency(value)) == FAILURE) {
+      if ((result = checkLatency(value)) == FAILURE.getRemoteServiceStatusValue()) {
         LOGGER.info("Failed to reach remote: (" + (i + 1) + ")");
         retries++;
         try {

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

@@ -25,13 +25,23 @@ package com.iluwatar.ambassador;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Application test
  */
 class AppTest {
 
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

ambassador/src/test/java/com/iluwatar/ambassador/ClientTest.java

@@ -37,6 +37,6 @@ class ClientTest {
     Client client = new Client();
     var result = client.useService(10);
 
-    assertTrue(result == 100 || result == RemoteService.FAILURE);
+    assertTrue(result == 100 || result == RemoteServiceStatus.FAILURE.getRemoteServiceStatusValue());
   }
 }

ambassador/src/test/java/com/iluwatar/ambassador/RemoteServiceTest.java

@@ -37,7 +37,7 @@ class RemoteServiceTest {
   void testFailedCall() {
     var remoteService = new RemoteService(new StaticRandomProvider(0.21));
     var result = remoteService.doRemoteFunction(10);
-    assertEquals(RemoteServiceInterface.FAILURE, result);
+    assertEquals(RemoteServiceStatus.FAILURE.getRemoteServiceStatusValue(), result);
   }
 
   @Test

ambassador/src/test/java/com/iluwatar/ambassador/ServiceAmbassadorTest.java

@@ -35,6 +35,6 @@ class ServiceAmbassadorTest {
   @Test
   void test() {
     long result = new ServiceAmbassador().doRemoteFunction(10);
-    assertTrue(result == 100 || result == RemoteServiceInterface.FAILURE);
+    assertTrue(result == 100 || result == RemoteServiceStatus.FAILURE.getRemoteServiceStatusValue());
   }
 }

api-gateway/api-gateway-service/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <artifactId>api-gateway</artifactId>
     <groupId>com.iluwatar</groupId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-gateway-service</artifactId>

api-gateway/image-microservice/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <artifactId>api-gateway</artifactId>
     <groupId>com.iluwatar</groupId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>image-microservice</artifactId>

api-gateway/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <artifactId>java-design-patterns</artifactId>
     <groupId>com.iluwatar</groupId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-gateway</artifactId>

api-gateway/price-microservice/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <artifactId>api-gateway</artifactId>
     <groupId>com.iluwatar</groupId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

arrange-act-assert/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <artifactId>java-design-patterns</artifactId>
     <groupId>com.iluwatar</groupId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

async-method-invocation/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.iluwatar</groupId>
 		<artifactId>java-design-patterns</artifactId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>async-method-invocation</artifactId>
 	<dependencies>

async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/AppTest.java

@@ -25,12 +25,24 @@ package com.iluwatar.async.method.invocation;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Application test
  */
 class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  void test() throws Exception {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
+
   }
 }

balking/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<artifactId>java-design-patterns</artifactId>
 		<groupId>com.iluwatar</groupId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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

@@ -24,15 +24,26 @@
 package com.iluwatar.balking;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.function.Executable;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 
 /**
  * Application test
  */
 class AppTest {
 
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  void main() {
-    App.main();
+  void shouldExecuteApplicationWithoutException() {
+    assertDoesNotThrow((Executable) App::main);
   }
 
 }

bridge/README.md

@@ -9,20 +9,26 @@ tags:
 ---
 
 ## Also known as
+
 Handle/Body
 
 ## Intent
+
 Decouple an abstraction from its implementation so that the two can vary independently.
 
 ## Explanation
 
 Real world example
 
-> Consider you have a weapon with different enchantments and you are supposed to allow mixing different weapons with different enchantments. What would you do? Create multiple copies of each of the weapons for each of the enchantments or would you just create separate enchantment and set it for the weapon as needed? Bridge pattern allows you to do the second.
+> Consider you have a weapon with different enchantments, and you are supposed to allow mixing 
+> different weapons with different enchantments. What would you do? Create multiple copies of each 
+> of the weapons for each of the enchantments or would you just create separate enchantment and set 
+> it for the weapon as needed? Bridge pattern allows you to do the second.
 
 In Plain Words
 
-> Bridge pattern is about preferring composition over inheritance. Implementation details are pushed from a hierarchy to another object with a separate hierarchy.
+> Bridge pattern is about preferring composition over inheritance. Implementation details are pushed 
+> from a hierarchy to another object with a separate hierarchy.
 
 Wikipedia says
 
@@ -30,7 +36,7 @@ Wikipedia says
 
 **Programmatic Example**
 
-Translating our weapon example from above. Here we have the `Weapon` hierarchy
+Translating our weapon example from above. Here we have the `Weapon` hierarchy:
 
 ```java
 public interface Weapon {
@@ -105,7 +111,7 @@ public class Hammer implements Weapon {
 }
 ```
 
-And the separate enchantment hierarchy
+Here's the separate enchantment hierarchy:
 
 ```java
 public interface Enchantment {
@@ -151,7 +157,7 @@ public class SoulEatingEnchantment implements Enchantment {
 }
 ```
 
-And both the hierarchies in action
+Here are both hierarchies in action:
 
 ```java
 var enchantedSword = new Sword(new SoulEatingEnchantment());
@@ -178,18 +184,21 @@ hammer.unwield();
 ```
 
 ## Class diagram
+
 ![alt text](./etc/bridge.urm.png "Bridge class diagram")
 
 ## Applicability
+
 Use the Bridge pattern when
 
-* you want to avoid a permanent binding between an abstraction and its implementation. This might be the case, for example, when the implementation must be selected or switched at run-time.
-* both the abstractions and their implementations should be extensible by subclassing. In this case, the Bridge pattern lets you combine the different abstractions and implementations and extend them independently
-* changes in the implementation of an abstraction should have no impact on clients; that is, their code should not have to be recompiled.
-* you have a proliferation of classes. Such a class hierarchy indicates the need for splitting an object into two parts. Rumbaugh uses the term "nested generalizations" to refer to such class hierarchies
-* you want to share an implementation among multiple objects (perhaps using reference counting), and this fact should be hidden from the client. A simple example is Coplien's String class, in which multiple objects can share the same string representation.
+* You want to avoid a permanent binding between an abstraction and its implementation. This might be the case, for example, when the implementation must be selected or switched at run-time.
+* Both the abstractions and their implementations should be extensible by subclassing. In this case, the Bridge pattern lets you combine the different abstractions and implementations and extend them independently.
+* Changes in the implementation of an abstraction should have no impact on clients; that is, their code should not have to be recompiled.
+* You have a proliferation of classes. Such a class hierarchy indicates the need for splitting an object into two parts. Rumbaugh uses the term "nested generalizations" to refer to such class hierarchies.
+* You want to share an implementation among multiple objects (perhaps using reference counting), and this fact should be hidden from the client. A simple example is Coplien's String class, in which multiple objects can share the same string representation.
 
 ## Tutorial
+
 * [Bridge Pattern Tutorial](https://www.journaldev.com/1491/bridge-design-pattern-java)
 
 ## Credits

bridge/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.iluwatar</groupId>
 		<artifactId>java-design-patterns</artifactId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>bridge</artifactId>
 	<dependencies>

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

@@ -25,12 +25,22 @@ package com.iluwatar.bridge;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Application test
  */
 class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

builder/README.md

@@ -9,36 +9,47 @@ tags:
 ---
 
 ## Intent
-Separate the construction of a complex object from its
-representation so that the same construction process can create different
-representations.
+
+Separate the construction of a complex object from its representation so that the same construction 
+process can create different representations.
 
 ## Explanation
 
 Real world example
 
-> Imagine a character generator for a role playing game. The easiest option is to let computer create the character for you. But if you want to select the character details like profession, gender, hair color etc. the character generation becomes a step-by-step process that completes when all the selections are ready.
+> Imagine a character generator for a role-playing game. The easiest option is to let the computer 
+> create the character for you. If you want to manually select the character details like 
+> profession, gender, hair color etc. the character generation becomes a step-by-step process that 
+> completes when all the selections are ready.
 
 In plain words
 
-> Allows you to create different flavors of an object while avoiding constructor pollution. Useful when there could be several flavors of an object. Or when there are a lot of steps involved in creation of an object.
+> Allows you to create different flavors of an object while avoiding constructor pollution. Useful 
+> when there could be several flavors of an object. Or when there are a lot of steps involved in 
+> creation of an object.
 
 Wikipedia says
 
-> The builder pattern is an object creation software design pattern with the intentions of finding a solution to the telescoping constructor anti-pattern.
+> The builder pattern is an object creation software design pattern with the intentions of finding 
+> a solution to the telescoping constructor anti-pattern.
 
-Having said that let me add a bit about what telescoping constructor anti-pattern is. At one point or the other we have all seen a constructor like below:
+Having said that let me add a bit about what telescoping constructor anti-pattern is. At one point 
+or the other, we have all seen a constructor like below:
 
 ```java
 public Hero(Profession profession, String name, HairType hairType, HairColor hairColor, Armor armor, Weapon weapon) {
 }
 ```
 
-As you can see the number of constructor parameters can quickly get out of hand and it might become difficult to understand the arrangement of parameters. Plus this parameter list could keep on growing if you would want to add more options in future. This is called telescoping constructor anti-pattern.
+As you can see the number of constructor parameters can quickly get out of hand, and it may become 
+difficult to understand the arrangement of parameters. Plus this parameter list could keep on 
+growing if you would want to add more options in the future. This is called telescoping constructor 
+anti-pattern.
 
 **Programmatic Example**
 
-The sane alternative is to use the Builder pattern. First of all we have our hero that we want to create
+The sane alternative is to use the Builder pattern. First of all we have our hero that we want to 
+create:
 
 ```java
 public final class Hero {
@@ -60,7 +71,7 @@ public final class Hero {
 }
 ```
 
-And then we have the builder
+Then we have the builder:
 
 ```java
   public static class Builder {
@@ -105,20 +116,22 @@ And then we have the builder
   }
 ```
 
-And then it can be used as:
+Then it can be used as:
 
 ```java
 var mage = new Hero.Builder(Profession.MAGE, "Riobard").withHairColor(HairColor.BLACK).withWeapon(Weapon.DAGGER).build();
 ```
 
 ## Class diagram
+
 ![alt text](./etc/builder.urm.png "Builder class diagram")
 
 ## Applicability
+
 Use the Builder pattern when
 
-* the algorithm for creating a complex object should be independent of the parts that make up the object and how they're assembled
-* the construction process must allow different representations for the object that's constructed
+* The algorithm for creating a complex object should be independent of the parts that make up the object and how they're assembled
+* The construction process must allow different representations for the object that's constructed
 
 ## Real world examples
 

builder/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.iluwatar</groupId>
 		<artifactId>java-design-patterns</artifactId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>builder</artifactId>
 	<dependencies>

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

@@ -25,12 +25,23 @@ package com.iluwatar.builder;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Application test
  */
 class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

business-delegate/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.iluwatar</groupId>
 		<artifactId>java-design-patterns</artifactId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>business-delegate</artifactId>
 	<dependencies>

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

@@ -27,13 +27,23 @@ import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Tests that Business Delegate example runs without errors.
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  public void test() throws IOException {
-    String[] args = {};
-    App.main(args);
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

bytecode/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<artifactId>java-design-patterns</artifactId>
 		<groupId>com.iluwatar</groupId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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

@@ -58,12 +58,14 @@ public class App {
     var vm = new VirtualMachine();
     vm.getWizards()[0] = wizard;
 
-    interpretInstruction("LITERAL 0", vm);
-    interpretInstruction("LITERAL 0", vm);
+    String literal = "LITERAL 0";
+
+    interpretInstruction(literal, vm);
+    interpretInstruction(literal, vm);
     interpretInstruction("GET_HEALTH", vm);
-    interpretInstruction("LITERAL 0", vm);
+    interpretInstruction(literal, vm);
     interpretInstruction("GET_AGILITY", vm);
-    interpretInstruction("LITERAL 0", vm);
+    interpretInstruction(literal, vm);
     interpretInstruction("GET_WISDOM ", vm);
     interpretInstruction("ADD", vm);
     interpretInstruction("LITERAL 2", vm);

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

@@ -25,13 +25,22 @@ package com.iluwatar.bytecode;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Application test
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
 
   @Test
-  public void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

caching/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>caching</artifactId>
   <dependencies>

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

@@ -27,12 +27,23 @@ import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Tests that Caching example runs without errors.
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  public void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

callback/README.md

@@ -9,14 +9,16 @@ tags:
 ---
 
 ## Intent
-Callback is a piece of executable code that is passed as an argument to other code, which is expected to call back 
-(execute) the argument at some convenient time.
+
+Callback is a piece of executable code that is passed as an argument to other code, which is 
+expected to call back (execute) the argument at some convenient time.
 
 ## Explanation
 
 Real world example
 
-> We need to be notified after executing task has finished. We pass a callback method for the executor and wait for it to call back on us.     
+> We need to be notified after executing task has finished. We pass a callback method for 
+> the executor and wait for it to call back on us.     
 
 In plain words
 
@@ -24,7 +26,9 @@ In plain words
 
 Wikipedia says
 
-> In computer programming, a callback, also known as a "call-after" function, is any executable code that is passed as an argument to other code; that other code is expected to call back (execute) the argument at a given time.
+> In computer programming, a callback, also known as a "call-after" function, is any executable 
+> code that is passed as an argument to other code; that other code is expected to call 
+> back (execute) the argument at a given time.
 
 **Programmatic Example**
 
@@ -61,7 +65,7 @@ public final class SimpleTask extends Task {
 }
 ```
 
-Finally here's how we execute a task and receive a callback when it's finished.
+Finally, here's how we execute a task and receive a callback when it's finished.
 
 ```java
     var task = new SimpleTask();
@@ -69,13 +73,15 @@ Finally here's how we execute a task and receive a callback when it's finished.
 ```
 
 ## Class diagram
+
 ![alt text](./etc/callback.png "Callback")
 
 ## Applicability
+
 Use the Callback pattern when
 
 * when some arbitrary synchronous or asynchronous action must be performed after execution of some defined activity.
 
 ## Real world examples
 
-* [CyclicBarrier](http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/CyclicBarrier.html#CyclicBarrier%28int,%20java.lang.Runnable%29) constructor can accept callback that will be triggered every time when barrier is tripped.
+* [CyclicBarrier](http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/CyclicBarrier.html#CyclicBarrier%28int,%20java.lang.Runnable%29) constructor can accept a callback that will be triggered every time a barrier is tripped.

callback/etc/callback.urm.puml

@@ -8,11 +8,6 @@ package com.iluwatar.callback {
   interface Callback {
     + call() {abstract}
   }
-  class LambdasApp {
-    - LOGGER : Logger {static}
-    - LambdasApp()
-    + main(args : String[]) {static}
-  }
   class SimpleTask {
     - LOGGER : Logger {static}
     + SimpleTask()

callback/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>callback</artifactId>
   <dependencies>

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

@@ -25,12 +25,23 @@ package com.iluwatar.callback;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Tests that Callback example runs without errors.
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
+
   @Test
-  public void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

chain/README.md

@@ -9,27 +9,32 @@ tags:
 ---
 
 ## Intent
-Avoid coupling the sender of a request to its receiver by giving
-more than one object a chance to handle the request. Chain the receiving
-objects and pass the request along the chain until an object handles it.
+Avoid coupling the sender of a request to its receiver by giving more than one object a chance to 
+handle the request. Chain the receiving objects and pass the request along the chain until an object 
+handles it.
 
 ## Explanation
 
 Real world example
 
-> The Orc King gives loud orders to his army. The closest one to react is the commander, then officer and then soldier. The commander, officer and soldier here form a chain of responsibility.
+> The Orc King gives loud orders to his army. The closest one to react is the commander, then 
+> officer and then soldier. The commander, officer and soldier here form a chain of responsibility.
 
 In plain words
 
-> It helps building a chain of objects. Request enters from one end and keeps going from object to object till it finds the suitable handler.
+> It helps to build a chain of objects. A request enters from one end and keeps going from an object 
+> to another until it finds a suitable handler.
 
 Wikipedia says
 
-> In object-oriented design, the chain-of-responsibility pattern is a design pattern consisting of a source of command objects and a series of processing objects. Each processing object contains logic that defines the types of command objects that it can handle; the rest are passed to the next processing object in the chain.
+> In object-oriented design, the chain-of-responsibility pattern is a design pattern consisting of 
+> a source of command objects and a series of processing objects. Each processing object contains 
+> logic that defines the types of command objects that it can handle; the rest are passed to the 
+> next processing object in the chain.
 
 **Programmatic Example**
 
-Translating our example with orcs from above. First we have the request class
+Translating our example with the orcs from above. First we have the `Request` class:
 
 ```java
 public class Request {
@@ -140,14 +145,16 @@ king.makeRequest(new Request(RequestType.COLLECT_TAX, "collect tax")); // Orc so
 ```
 
 ## Class diagram
+
 ![alt text](./etc/chain.urm.png "Chain of Responsibility class diagram")
 
 ## Applicability
+
 Use Chain of Responsibility when
 
-* more than one object may handle a request, and the handler isn't known a priori. The handler should be ascertained automatically
-* you want to issue a request to one of several objects without specifying the receiver explicitly
-* the set of objects that can handle a request should be specified dynamically
+* More than one object may handle a request, and the handler isn't known a priori. The handler should be ascertained automatically.
+* You want to issue a request to one of several objects without specifying the receiver explicitly.
+* The set of objects that can handle a request should be specified dynamically.
 
 ## Real world examples
 

chain/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>chain</artifactId>
   <dependencies>

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

@@ -25,13 +25,23 @@ package com.iluwatar.chain;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Application test
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
+   * throws an exception.
+   */
 
   @Test
-  public void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

circuit-breaker/README.md

@@ -12,167 +12,304 @@ tags:
 
 ## Intent
 
-Handle costly remote *procedure/service* calls in such a way that the failure of a **single** service/component cannot bring the whole application down, and we can reconnect to the service as soon as possible.
+Handle costly remote service calls in such a way that the failure of a single service/component 
+cannot bring the whole application down, and we can reconnect to the service as soon as possible.
 
 ## Explanation
 
 Real world example
 
-> Imagine a Web App that has both local (example: files and images) and remote (example: database entries) to serve. The database might not be responding due to a variety of reasons, so if the application keeps trying to read from the database using multiple threads/processes, soon all of them will hang and our entire web application will crash. We should be able to detect this situation and show the user an appropriate message so that he/she can explore other parts of the app unaffected by the database failure without any problem. 
+> Imagine a web application that has both local files/images and remote services that are used for 
+> fetching data. These remote services may be either healthy and responsive at times, or may become 
+> slow and unresponsive at some point of time due to variety of reasons. So if one of the remote 
+> services is slow or not responding successfully, our application will try to fetch response from 
+> the remote service using multiple threads/processes, soon all of them will hang (also called 
+> [thread starvation](https://en.wikipedia.org/wiki/Starvation_(computer_science))) causing our entire web application to crash. We should be able to detect 
+> this situation and show the user an appropriate message so that he/she can explore other parts of 
+> the app unaffected by the remote service failure. Meanwhile, the other services that are working 
+> normally, should keep functioning unaffected by this failure.
 
 In plain words
 
-> Allows us to save resources when we know a remote service failed. Useful when all parts of our application are highly decoupled from each other, and failure of one component doesn't mean the other parts will stop working.
+> Circuit Breaker allows graceful handling of failed remote services. It's especially useful when 
+> all parts of our application are highly decoupled from each other, and failure of one component 
+> doesn't mean the other parts will stop working.
 
 Wikipedia says
 
-> **Circuit breaker** is a design pattern used in modern software development. It is used to detect failures and encapsulates the logic of preventing a failure from constantly recurring, during maintenance, temporary external system failure or unexpected system difficulties.
-
-So, how does this all come together?
+> Circuit breaker is a design pattern used in modern software development. It is used to detect 
+> failures and encapsulates the logic of preventing a failure from constantly recurring, during 
+> maintenance, temporary external system failure or unexpected system difficulties.
 
 ## Programmatic Example
-With the above example in mind we will imitate the functionality in a simple manner. We have two services: A *monitoring service* which will mimic the web app and will make both **local** and **remote** calls.
+
+So, how does this all come together? With the above example in mind we will imitate the 
+functionality in a simple example. A monitoring service mimics the web app and makes both local and 
+remote calls.
 
 The service architecture is as follows:
 
 ![alt text](./etc/ServiceDiagram.PNG "Service Diagram")
 
-In terms of code, the End user application is:
+In terms of code, the end user application is:
 
 ```java
 public class App {
-   
+
   private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
-    
+
+  /**
+   * Program entry point.
+   *
+   * @param args command line args
+   */
   public static void main(String[] args) {
-    var obj = new MonitoringService();
-    var circuitBreaker = new CircuitBreaker(3000, 1, 2000 * 1000 * 1000); 
+
     var serverStartTime = System.nanoTime();
-    while (true) {
-      LOGGER.info(obj.localResourceResponse());
-      LOGGER.info(obj.remoteResourceResponse(circuitBreaker, serverStartTime));
-      LOGGER.info(circuitBreaker.getState());
-      try {
-        Thread.sleep(5 * 1000); 
-      } catch (InterruptedException e) {
-        LOGGER.error(e.getMessage());
-      }
+
+    var delayedService = new DelayedRemoteService(serverStartTime, 5);
+    var delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000, 2,
+        2000 * 1000 * 1000);
+
+    var quickService = new QuickRemoteService();
+    var quickServiceCircuitBreaker = new DefaultCircuitBreaker(quickService, 3000, 2,
+        2000 * 1000 * 1000);
+
+    //Create an object of monitoring service which makes both local and remote calls
+    var monitoringService = new MonitoringService(delayedServiceCircuitBreaker,
+        quickServiceCircuitBreaker);
+
+    //Fetch response from local resource
+    LOGGER.info(monitoringService.localResourceResponse());
+
+    //Fetch response from delayed service 2 times, to meet the failure threshold
+    LOGGER.info(monitoringService.delayedServiceResponse());
+    LOGGER.info(monitoringService.delayedServiceResponse());
+
+    //Fetch current state of delayed service circuit breaker after crossing failure threshold limit
+    //which is OPEN now
+    LOGGER.info(delayedServiceCircuitBreaker.getState());
+
+    //Meanwhile, the delayed service is down, fetch response from the healthy quick service
+    LOGGER.info(monitoringService.quickServiceResponse());
+    LOGGER.info(quickServiceCircuitBreaker.getState());
+
+    //Wait for the delayed service to become responsive
+    try {
+      LOGGER.info("Waiting for delayed service to become responsive");
+      Thread.sleep(5000);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
     }
+    //Check the state of delayed circuit breaker, should be HALF_OPEN
+    LOGGER.info(delayedServiceCircuitBreaker.getState());
+
+    //Fetch response from delayed service, which should be healthy by now
+    LOGGER.info(monitoringService.delayedServiceResponse());
+    //As successful response is fetched, it should be CLOSED again.
+    LOGGER.info(delayedServiceCircuitBreaker.getState());
   }
 }
 ```
 
-The monitoring service is: 
+The monitoring service: 
 
-``` java
+```java
 public class MonitoringService {
 
+  private final CircuitBreaker delayedService;
+
+  private final CircuitBreaker quickService;
+
+  public MonitoringService(CircuitBreaker delayedService, CircuitBreaker quickService) {
+    this.delayedService = delayedService;
+    this.quickService = quickService;
+  }
+
+  //Assumption: Local service won't fail, no need to wrap it in a circuit breaker logic
   public String localResourceResponse() {
     return "Local Service is working";
   }
 
-  public String remoteResourceResponse(CircuitBreaker circuitBreaker, long serverStartTime) {
+  /**
+   * Fetch response from the delayed service (with some simulated startup time).
+   *
+   * @return response string
+   */
+  public String delayedServiceResponse() {
     try {
-      return circuitBreaker.call("delayedService", serverStartTime);
-    } catch (Exception e) {
+      return this.delayedService.attemptRequest();
+    } catch (RemoteServiceException e) {
+      return e.getMessage();
+    }
+  }
+
+  /**
+   * Fetches response from a healthy service without any failure.
+   *
+   * @return response string
+   */
+  public String quickServiceResponse() {
+    try {
+      return this.quickService.attemptRequest();
+    } catch (RemoteServiceException e) {
       return e.getMessage();
     }
   }
 }
 ```
-As it can be seen, it does the call to get local resources directly, but it wraps the call to remote (costly) service in a circuit breaker object, which prevents faults as follows:
+As it can be seen, it does the call to get local resources directly, but it wraps the call to 
+remote (costly) service in a circuit breaker object, which prevents faults as follows:
 
 ```java
-public class CircuitBreaker {
+public class DefaultCircuitBreaker implements CircuitBreaker {
+
   private final long timeout;
   private final long retryTimePeriod;
+  private final RemoteService service;
   long lastFailureTime;
+  private String lastFailureResponse;
   int failureCount;
   private final int failureThreshold;
   private State state;
   private final long futureTime = 1000 * 1000 * 1000 * 1000;
 
-  CircuitBreaker(long timeout, int failureThreshold, long retryTimePeriod) {
+  /**
+   * Constructor to create an instance of Circuit Breaker.
+   *
+   * @param timeout          Timeout for the API request. Not necessary for this simple example
+   * @param failureThreshold Number of failures we receive from the depended service before changing
+   *                         state to 'OPEN'
+   * @param retryTimePeriod  Time period after which a new request is made to remote service for
+   *                         status check.
+   */
+  DefaultCircuitBreaker(RemoteService serviceToCall, long timeout, int failureThreshold,
+      long retryTimePeriod) {
+    this.service = serviceToCall;
+    // We start in a closed state hoping that everything is fine
     this.state = State.CLOSED;
     this.failureThreshold = failureThreshold;
+    // Timeout for the API request.
+    // Used to break the calls made to remote resource if it exceeds the limit
     this.timeout = timeout;
     this.retryTimePeriod = retryTimePeriod;
+    //An absurd amount of time in future which basically indicates the last failure never happened
     this.lastFailureTime = System.nanoTime() + futureTime;
     this.failureCount = 0;
   }
-    
-  private void reset() {
+
+  // Reset everything to defaults
+  @Override
+  public void recordSuccess() {
     this.failureCount = 0;
-    this.lastFailureTime = System.nanoTime() + futureTime; 
+    this.lastFailureTime = System.nanoTime() + futureTime;
     this.state = State.CLOSED;
   }
 
-  private void recordFailure() {
+  @Override
+  public void recordFailure(String response) {
     failureCount = failureCount + 1;
     this.lastFailureTime = System.nanoTime();
+    // Cache the failure response for returning on open state
+    this.lastFailureResponse = response;
   }
-    
-  protected void setState() {
-    if (failureCount > failureThreshold) { 
+
+  // Evaluate the current state based on failureThreshold, failureCount and lastFailureTime.
+  protected void evaluateState() {
+    if (failureCount >= failureThreshold) { //Then something is wrong with remote service
       if ((System.nanoTime() - lastFailureTime) > retryTimePeriod) {
+        //We have waited long enough and should try checking if service is up
         state = State.HALF_OPEN;
       } else {
+        //Service would still probably be down
         state = State.OPEN;
       }
     } else {
+      //Everything is working fine
       state = State.CLOSED;
     }
   }
-    
+
+  @Override
   public String getState() {
+    evaluateState();
     return state.name();
   }
-  
-  public void setStateForBypass(State state) {
+
+  /**
+   * Break the circuit beforehand if it is known service is down Or connect the circuit manually if
+   * service comes online before expected.
+   *
+   * @param state State at which circuit is in
+   */
+  @Override
+  public void setState(State state) {
     this.state = state;
+    switch (state) {
+      case OPEN:
+        this.failureCount = failureThreshold;
+        this.lastFailureTime = System.nanoTime();
+        break;
+      case HALF_OPEN:
+        this.failureCount = failureThreshold;
+        this.lastFailureTime = System.nanoTime() - retryTimePeriod;
+        break;
+      default:
+        this.failureCount = 0;
+    }
   }
-   
-  public String call(String serviceToCall, long serverStartTime) throws Exception {
-    setState();
+
+  /**
+   * Executes service call.
+   *
+   * @return Value from the remote resource, stale response or a custom exception
+   */
+  @Override
+  public String attemptRequest() throws RemoteServiceException {
+    evaluateState();
     if (state == State.OPEN) {
-      return "This is stale response from API";
+      // return cached response if the circuit is in OPEN state
+      return this.lastFailureResponse;
     } else {
-      if (serviceToCall.equals("delayedService")) {
-        var delayedService = new DelayedService(20);
-        var response = delayedService.response(serverStartTime);
-        if (response.split(" ")[3].equals("working")) {
-          reset();
-          return response;
-        } else {
-          recordFailure();
-          throw new Exception("Remote service not responding");
-        }
-      } else {
-        throw new Exception("Unknown Service Name");
+      // Make the API request if the circuit is not OPEN
+      try {
+        //In a real application, this would be run in a thread and the timeout
+        //parameter of the circuit breaker would be utilized to know if service
+        //is working. Here, we simulate that based on server response itself
+        var response = service.call();
+        // Yay!! the API responded fine. Let's reset everything.
+        recordSuccess();
+        return response;
+      } catch (RemoteServiceException ex) {
+        recordFailure(ex.getMessage());
+        throw ex;
       }
     }
   }
 }
 ```
 
-How does the above pattern prevent failures? Let's understand via this finite state machine implemented by it.
+How does the above pattern prevent failures? Let's understand via this finite state machine 
+implemented by it.
 
 ![alt text](./etc/StateDiagram.PNG "State Diagram")
 
-- We initialize the Circuit Breaker object with certain parameters: **timeout**, **failureThreshold** and **retryTimePeriod** which help determine how resilient the API is.
-- Initially, we are in the **closed** state and the remote call to API happens.
+- We initialize the Circuit Breaker object with certain parameters: `timeout`, `failureThreshold` and `retryTimePeriod` which help determine how resilient the API is.
+- Initially, we are in the `closed` state and nos remote calls to the API have occurred.
 - Every time the call succeeds, we reset the state to as it was in the beginning.
-- If the number of failures cross a certain threshold, we move to the **open** state, which acts just like an open circuit and prevents remote service calls from being made, thus saving resources. (Here, we return the response called ```stale response from API```)
-- Once we exceed the retry timeout period, we move to the **half-open** state and make another call to the remote service again to check if the service is working so that we can serve fresh content. A *failure* sets it back to **open** state and another attempt is made after retry timeout period, while a *success* sets it to **closed** state so that everything starts working normally again. 
+- If the number of failures cross a certain threshold, we move to the `open` state, which acts just like an open circuit and prevents remote service calls from being made, thus saving resources. (Here, we return the response called ```stale response from API```)
+- Once we exceed the retry timeout period, we move to the `half-open` state and make another call to the remote service again to check if the service is working so that we can serve fresh content. A failure sets it back to `open` state and another attempt is made after retry timeout period, while a success sets it to `closed` state so that everything starts working normally again. 
 
 ## Class diagram
+
 ![alt text](./etc/circuit-breaker.urm.png "Circuit Breaker class diagram")
 
 ## Applicability
+
 Use the Circuit Breaker pattern when
 
 - Building a fault-tolerant application where failure of some services shouldn't bring the entire application down.
-- Building an continuously incremental/continuous delivery application, as some of it's components can be upgraded without shutting it down entirely.
+- Building a continuously running (always-on) application, so that its components can be upgraded without shutting it down entirely.
 
 ## Related Patterns
 

circuit-breaker/etc/circuit-breaker.urm.puml

@@ -5,32 +5,52 @@ package com.iluwatar.circuitbreaker {
     + App()
     + main(args : String[]) {static}
   }
-  class CircuitBreaker {
+  interface CircuitBreaker {
+    + attemptRequest() : String {abstract}
+    + getState() : String {abstract}
+    + recordFailure(String) {abstract}
+    + recordSuccess() {abstract}
+    + setState(State) {abstract}
+  }
+  class DefaultCircuitBreaker {
     ~ failureCount : int
     - failureThreshold : int
     - futureTime : long
+    - lastFailureResponse : String
     ~ lastFailureTime : long
     - retryTimePeriod : long
+    - service : RemoteService
     - state : State
     - timeout : long
-    ~ CircuitBreaker(timeout : long, failureThreshold : int, retryTimePeriod : long)
-    + call(serviceToCall : String, serverStartTime : long) : String
+    ~ DefaultCircuitBreaker(serviceToCall : RemoteService, timeout : long, failureThreshold : int, retryTimePeriod : long)
+    + attemptRequest() : String
+    # evaluateState()
     + getState() : String
-    - recordFailure()
-    - reset()
-    # setState()
-    + setStateForBypass(state : State)
+    + recordFailure(response : String)
+    + recordSuccess()
+    + setState(state : State)
   }
-  class DelayedService {
+  class DelayedRemoteService {
     - delay : int
-    + DelayedService()
-    + DelayedService(delay : int)
-    + response(serverStartTime : long) : String
+    - serverStartTime : long
+    + DelayedRemoteService()
+    + DelayedRemoteService(serverStartTime : long, delay : int)
+    + call() : String
   }
   class MonitoringService {
-    + MonitoringService()
+    - delayedService : CircuitBreaker
+    - quickService : CircuitBreaker
+    + MonitoringService(delayedService : CircuitBreaker, quickService : CircuitBreaker)
+    + delayedServiceResponse() : String
     + localResourceResponse() : String
-    + remoteResourceResponse(circuitBreaker : CircuitBreaker, serverStartTime : long) : String
+    + quickServiceResponse() : String
+  }
+  class QuickRemoteService {
+    + QuickRemoteService()
+    + call() : String
+  }
+  interface RemoteService {
+    + call() : String {abstract}
   }
   enum State {
     + CLOSED {static}
@@ -40,5 +60,10 @@ package com.iluwatar.circuitbreaker {
     + values() : State[] {static}
   }
 }
-CircuitBreaker -->  "-state" State
+DefaultCircuitBreaker -->  "-state" State
+MonitoringService -->  "-delayedService" CircuitBreaker
+DefaultCircuitBreaker -->  "-service" RemoteService
+DefaultCircuitBreaker ..|> CircuitBreaker 
+DelayedRemoteService ..|> RemoteService 
+QuickRemoteService ..|> RemoteService 
 @enduml

circuit-breaker/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>com.iluwatar</groupId>
         <artifactId>java-design-patterns</artifactId>
-        <version>1.23.0-SNAPSHOT</version>
+        <version>1.24.0-SNAPSHOT</version>
     </parent>
     <artifactId>circuit-breaker</artifactId>
     <dependencies>

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

@@ -36,17 +36,18 @@ import org.slf4j.LoggerFactory;
  * operational again, so that we can use it
  * </p>
  * <p>
- * In this example, the circuit breaker pattern is demonstrated by using two services: {@link
- * MonitoringService} and {@link DelayedService}. The monitoring service is responsible for calling
- * two services: a local service and a remote service {@link DelayedService} , and by using the
- * circuit breaker construction we ensure that if the call to remote service is going to fail, we
- * are going to save our resources and not make the function call at all, by wrapping our call to
- * the remote service in the circuit breaker object.
+ * In this example, the circuit breaker pattern is demonstrated by using three services: {@link
+ * DelayedRemoteService}, {@link QuickRemoteService} and {@link MonitoringService}. The monitoring
+ * service is responsible for calling three services: a local service, a quick remove service
+ * {@link QuickRemoteService} and a delayed remote service {@link DelayedRemoteService} , and by
+ * using the circuit breaker construction we ensure that if the call to remote service is going to
+ * fail, we are going to save our resources and not make the function call at all, by wrapping our
+ * call to the remote services in the {@link DefaultCircuitBreaker} implementation object.
  * </p>
  * <p>
- * This works as follows: The {@link CircuitBreaker} object can be in one of three states:
- * <b>Open</b>, <b>Closed</b> and <b>Half-Open</b>, which represents the real world circuits. If the
- * state is closed (initial), we assume everything is alright and perform the function call.
+ * This works as follows: The {@link DefaultCircuitBreaker} object can be in one of three states:
+ * <b>Open</b>, <b>Closed</b> and <b>Half-Open</b>, which represents the real world circuits. If
+ * the state is closed (initial), we assume everything is alright and perform the function call.
  * However, every time the call fails, we note it and once it crosses a threshold, we set the state
  * to Open, preventing any further calls to the remote server. Then, after a certain retry period
  * (during which we expect thee service to recover), we make another call to the remote server and
@@ -63,22 +64,50 @@ public class App {
    *
    * @param args command line args
    */
-  @SuppressWarnings("squid:S2189")
   public static void main(String[] args) {
-    //Create an object of monitoring service which makes both local and remote calls
-    var obj = new MonitoringService();
-    //Set the circuit Breaker parameters
-    var circuitBreaker = new CircuitBreaker(3000, 1, 2000 * 1000 * 1000);
+
     var serverStartTime = System.nanoTime();
-    while (true) {
-      LOGGER.info(obj.localResourceResponse());
-      LOGGER.info(obj.remoteResourceResponse(circuitBreaker, serverStartTime));
-      LOGGER.info(circuitBreaker.getState());
-      try {
-        Thread.sleep(5 * 1000);
-      } catch (InterruptedException e) {
-        LOGGER.error(e.getMessage());
-      }
+
+    var delayedService = new DelayedRemoteService(serverStartTime, 5);
+    var delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000, 2,
+        2000 * 1000 * 1000);
+
+    var quickService = new QuickRemoteService();
+    var quickServiceCircuitBreaker = new DefaultCircuitBreaker(quickService, 3000, 2,
+        2000 * 1000 * 1000);
+
+    //Create an object of monitoring service which makes both local and remote calls
+    var monitoringService = new MonitoringService(delayedServiceCircuitBreaker,
+        quickServiceCircuitBreaker);
+
+    //Fetch response from local resource
+    LOGGER.info(monitoringService.localResourceResponse());
+
+    //Fetch response from delayed service 2 times, to meet the failure threshold
+    LOGGER.info(monitoringService.delayedServiceResponse());
+    LOGGER.info(monitoringService.delayedServiceResponse());
+
+    //Fetch current state of delayed service circuit breaker after crossing failure threshold limit
+    //which is OPEN now
+    LOGGER.info(delayedServiceCircuitBreaker.getState());
+
+    //Meanwhile, the delayed service is down, fetch response from the healthy quick service
+    LOGGER.info(monitoringService.quickServiceResponse());
+    LOGGER.info(quickServiceCircuitBreaker.getState());
+
+    //Wait for the delayed service to become responsive
+    try {
+      LOGGER.info("Waiting for delayed service to become responsive");
+      Thread.sleep(5000);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
     }
+    //Check the state of delayed circuit breaker, should be HALF_OPEN
+    LOGGER.info(delayedServiceCircuitBreaker.getState());
+
+    //Fetch response from delayed service, which should be healthy by now
+    LOGGER.info(monitoringService.delayedServiceResponse());
+    //As successful response is fetched, it should be CLOSED again.
+    LOGGER.info(delayedServiceCircuitBreaker.getState());
   }
 }

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

@@ -24,114 +24,22 @@
 package com.iluwatar.circuitbreaker;
 
 /**
- * The circuit breaker class with all configurations.
+ * The Circuit breaker interface.
  */
-public class CircuitBreaker {
-  private final long timeout;
-  private final long retryTimePeriod;
-  long lastFailureTime;
-  int failureCount;
-  private final int failureThreshold;
-  private State state;
-  private final long futureTime = 1000 * 1000 * 1000 * 1000;
+public interface CircuitBreaker {
 
-  /**
-   * Constructor to create an instance of Circuit Breaker.
-   *
-   * @param timeout          Timeout for the API request. Not necessary for this simple example
-   * @param failureThreshold Number of failures we receive from the depended service before changing
-   *                         state to 'OPEN'
-   * @param retryTimePeriod  Time period after which a new request is made to remote service for
-   *                         status check.
-   */
-  CircuitBreaker(long timeout, int failureThreshold, long retryTimePeriod) {
-    // We start in a closed state hoping that everything is fine
-    this.state = State.CLOSED;
-    this.failureThreshold = failureThreshold;
-    // Timeout for the API request.
-    // Used to break the calls made to remote resource if it exceeds the limit
-    this.timeout = timeout;
-    this.retryTimePeriod = retryTimePeriod;
-    //An absurd amount of time in future which basically indicates the last failure never happened
-    this.lastFailureTime = System.nanoTime() + futureTime;
-    this.failureCount = 0;
-  }
+  // Success response. Reset everything to defaults
+  void recordSuccess();
 
-  //Reset everything to defaults
-  private void reset() {
-    this.failureCount = 0;
-    this.lastFailureTime = System.nanoTime() + futureTime;
-    this.state = State.CLOSED;
-  }
+  // Failure response. Handle accordingly with response and change state if required.
+  void recordFailure(String response);
 
-  private void recordFailure() {
-    failureCount = failureCount + 1;
-    this.lastFailureTime = System.nanoTime();
-  }
+  // Get the current state of circuit breaker
+  String getState();
 
-  protected void setState() {
-    if (failureCount > failureThreshold) { //Then something is wrong with remote service
-      if ((System.nanoTime() - lastFailureTime) > retryTimePeriod) {
-        //We have waited long enough and should try checking if service is up
-        state = State.HALF_OPEN;
-      } else {
-        //Service would still probably be down
-        state = State.OPEN;
-      }
-    } else {
-      //Everything is working fine
-      state = State.CLOSED;
-    }
-  }
+  // Set the specific state manually.
+  void setState(State state);
 
-  public String getState() {
-    return state.name();
-  }
-
-  /**
-   * Break the circuit beforehand if it is known service is down Or connect the circuit manually if
-   * service comes online before expected.
-   *
-   * @param state State at which circuit is in
-   */
-  public void setStateForBypass(State state) {
-    this.state = state;
-  }
-
-  /**
-   * Executes service call.
-   *
-   * @param serviceToCall   The name of the service in String. Can be changed to data URLs in case
-   *                        of web applications
-   * @param serverStartTime Time at which actual server was started which makes calls to this
-   *                        service
-   * @return Value from the remote resource, stale response or a custom exception
-   */
-  public String call(String serviceToCall, long serverStartTime) throws Exception {
-    setState();
-    if (state == State.OPEN) {
-      // return  cached response if no the circuit is in OPEN state
-      return "This is stale response from API";
-    } else {
-      // Make the API request if the circuit is not OPEN
-      if (serviceToCall.equals("delayedService")) {
-        var delayedService = new DelayedService(20);
-        var response = delayedService.response(serverStartTime);
-        //In a real application, this would be run in a thread and the timeout
-        //parameter of the circuit breaker would be utilized to know if service
-        //is working. Here, we simulate that based on server response itself
-        if (response.split(" ")[3].equals("working")) {
-          // Yay!! the API responded fine. Let's reset everything.
-          reset();
-          return response;
-        } else {
-          // Uh-oh!! the call still failed. Let's update that in our records.
-          recordFailure();
-          throw new Exception("Remote service not responding");
-        }
-      } else {
-        throw new Exception("Unknown Service Name");
-      }
-    }
-  }
-}
+  // Attempt to fetch response from the remote service.
+  String attemptRequest() throws RemoteServiceException;
+}

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

@@ -0,0 +1,155 @@
+/*
+ * The MIT License
+ * Copyright © 2014-2019 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.
+ */
+
+package com.iluwatar.circuitbreaker;
+
+/**
+ * The delay based Circuit breaker implementation that works in a
+ * CLOSED->OPEN-(retry_time_period)->HALF_OPEN->CLOSED flow with some retry time period for failed
+ * services and a failure threshold for service to open circuit.
+ */
+public class DefaultCircuitBreaker implements CircuitBreaker {
+
+  private final long timeout;
+  private final long retryTimePeriod;
+  private final RemoteService service;
+  long lastFailureTime;
+  private String lastFailureResponse;
+  int failureCount;
+  private final int failureThreshold;
+  private State state;
+  private final long futureTime = 1000 * 1000 * 1000 * 1000;
+
+  /**
+   * Constructor to create an instance of Circuit Breaker.
+   *
+   * @param timeout          Timeout for the API request. Not necessary for this simple example
+   * @param failureThreshold Number of failures we receive from the depended service before changing
+   *                         state to 'OPEN'
+   * @param retryTimePeriod  Time period after which a new request is made to remote service for
+   *                         status check.
+   */
+  DefaultCircuitBreaker(RemoteService serviceToCall, long timeout, int failureThreshold,
+      long retryTimePeriod) {
+    this.service = serviceToCall;
+    // We start in a closed state hoping that everything is fine
+    this.state = State.CLOSED;
+    this.failureThreshold = failureThreshold;
+    // Timeout for the API request.
+    // Used to break the calls made to remote resource if it exceeds the limit
+    this.timeout = timeout;
+    this.retryTimePeriod = retryTimePeriod;
+    //An absurd amount of time in future which basically indicates the last failure never happened
+    this.lastFailureTime = System.nanoTime() + futureTime;
+    this.failureCount = 0;
+  }
+
+  // Reset everything to defaults
+  @Override
+  public void recordSuccess() {
+    this.failureCount = 0;
+    this.lastFailureTime = System.nanoTime() + futureTime;
+    this.state = State.CLOSED;
+  }
+
+  @Override
+  public void recordFailure(String response) {
+    failureCount = failureCount + 1;
+    this.lastFailureTime = System.nanoTime();
+    // Cache the failure response for returning on open state
+    this.lastFailureResponse = response;
+  }
+
+  // Evaluate the current state based on failureThreshold, failureCount and lastFailureTime.
+  protected void evaluateState() {
+    if (failureCount >= failureThreshold) { //Then something is wrong with remote service
+      if ((System.nanoTime() - lastFailureTime) > retryTimePeriod) {
+        //We have waited long enough and should try checking if service is up
+        state = State.HALF_OPEN;
+      } else {
+        //Service would still probably be down
+        state = State.OPEN;
+      }
+    } else {
+      //Everything is working fine
+      state = State.CLOSED;
+    }
+  }
+
+  @Override
+  public String getState() {
+    evaluateState();
+    return state.name();
+  }
+
+  /**
+   * Break the circuit beforehand if it is known service is down Or connect the circuit manually if
+   * service comes online before expected.
+   *
+   * @param state State at which circuit is in
+   */
+  @Override
+  public void setState(State state) {
+    this.state = state;
+    switch (state) {
+      case OPEN:
+        this.failureCount = failureThreshold;
+        this.lastFailureTime = System.nanoTime();
+        break;
+      case HALF_OPEN:
+        this.failureCount = failureThreshold;
+        this.lastFailureTime = System.nanoTime() - retryTimePeriod;
+        break;
+      default:
+        this.failureCount = 0;
+    }
+  }
+
+  /**
+   * Executes service call.
+   *
+   * @return Value from the remote resource, stale response or a custom exception
+   */
+  @Override
+  public String attemptRequest() throws RemoteServiceException {
+    evaluateState();
+    if (state == State.OPEN) {
+      // return cached response if the circuit is in OPEN state
+      return this.lastFailureResponse;
+    } else {
+      // Make the API request if the circuit is not OPEN
+      try {
+        //In a real application, this would be run in a thread and the timeout
+        //parameter of the circuit breaker would be utilized to know if service
+        //is working. Here, we simulate that based on server response itself
+        var response = service.call();
+        // Yay!! the API responded fine. Let's reset everything.
+        recordSuccess();
+        return response;
+      } catch (RemoteServiceException ex) {
+        recordFailure(ex.getMessage());
+        throw ex;
+      }
+    }
+  }
+}

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

@@ -27,7 +27,9 @@ package com.iluwatar.circuitbreaker;
  * This simulates the remote service It responds only after a certain timeout period (default set to
  * 20 seconds).
  */
-public class DelayedService {
+public class DelayedRemoteService implements RemoteService {
+
+  private final long serverStartTime;
   private final int delay;
 
   /**
@@ -35,22 +37,23 @@ public class DelayedService {
    *
    * @param delay the delay after which service would behave properly, in seconds
    */
-  public DelayedService(int delay) {
+  public DelayedRemoteService(long serverStartTime, int delay) {
+    this.serverStartTime = serverStartTime;
     this.delay = delay;
   }
 
-  public DelayedService() {
-    this.delay = 60;
+  public DelayedRemoteService() {
+    this.serverStartTime = System.nanoTime();
+    this.delay = 20;
   }
 
   /**
    * Responds based on delay, current time and server start time if the service is down / working.
    *
-   * @param serverStartTime Time at which actual server was started which makes calls to this
-   *                        service
    * @return The state of the service
    */
-  public String response(long serverStartTime) {
+  @Override
+  public String call() throws RemoteServiceException {
     var currentTime = System.nanoTime();
     //Since currentTime and serverStartTime are both in nanoseconds, we convert it to
     //seconds by diving by 10e9 and ensure floating point division by multiplying it
@@ -58,9 +61,8 @@ public class DelayedService {
     //send the reply
     if ((currentTime - serverStartTime) * 1.0 / (1000 * 1000 * 1000) < delay) {
       //Can use Thread.sleep() here to block and simulate a hung server
-      return "Delayed service is down";
-    } else {
-      return "Delayed service is working";
+      throw new RemoteServiceException("Delayed service is down");
     }
+    return "Delayed service is working";
   }
 }

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

@@ -24,28 +24,47 @@
 package com.iluwatar.circuitbreaker;
 
 /**
- * The service class which makes local and remote calls Uses {@link CircuitBreaker} object to ensure
- * remote calls don't use up resources.
+ * The service class which makes local and remote calls Uses {@link DefaultCircuitBreaker} object to
+ * ensure remote calls don't use up resources.
  */
 public class MonitoringService {
 
+  private final CircuitBreaker delayedService;
+
+  private final CircuitBreaker quickService;
+
+  public MonitoringService(CircuitBreaker delayedService, CircuitBreaker quickService) {
+    this.delayedService = delayedService;
+    this.quickService = quickService;
+  }
+
   //Assumption: Local service won't fail, no need to wrap it in a circuit breaker logic
   public String localResourceResponse() {
     return "Local Service is working";
   }
 
   /**
-   * Try to get result from remote server.
+   * Fetch response from the delayed service (with some simulated startup time).
    *
-   * @param circuitBreaker  The circuitBreaker object with all parameters
-   * @param serverStartTime Time at which actual server was started which makes calls to this
-   *                        service
-   * @return result from the remote response or exception raised by it.
+   * @return response string
    */
-  public String remoteResourceResponse(CircuitBreaker circuitBreaker, long serverStartTime) {
+  public String delayedServiceResponse() {
     try {
-      return circuitBreaker.call("delayedService", serverStartTime);
-    } catch (Exception e) {
+      return this.delayedService.attemptRequest();
+    } catch (RemoteServiceException e) {
+      return e.getMessage();
+    }
+  }
+
+  /**
+   * Fetches response from a healthy service without any failure.
+   *
+   * @return response string
+   */
+  public String quickServiceResponse() {
+    try {
+      return this.quickService.attemptRequest();
+    } catch (RemoteServiceException e) {
       return e.getMessage();
     }
   }

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

@@ -0,0 +1,35 @@
+/*
+ * The MIT License
+ * Copyright © 2014-2019 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.
+ */
+
+package com.iluwatar.circuitbreaker;
+
+/**
+ * A quick response remote service, that responds healthy without any delay or failure.
+ */
+public class QuickRemoteService implements RemoteService {
+
+  @Override
+  public String call() throws RemoteServiceException {
+    return "Quick Service is working";
+  }
+}

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

@@ -0,0 +1,34 @@
+/*
+ * The MIT License
+ * Copyright © 2014-2019 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.
+ */
+
+package com.iluwatar.circuitbreaker;
+
+/**
+ * The Remote service interface, used by {@link CircuitBreaker} for fetching response from remote
+ * services.
+ */
+public interface RemoteService {
+
+  //Fetch response from remote service.
+  String call() throws RemoteServiceException;
+}

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

@@ -0,0 +1,34 @@
+/*
+ * The MIT License
+ * Copyright © 2014-2019 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.
+ */
+
+package com.iluwatar.circuitbreaker;
+
+/**
+ * Exception thrown when {@link RemoteService} does not respond successfully.
+ */
+public class RemoteServiceException extends Exception {
+
+  public RemoteServiceException(String message) {
+    super(message);
+  }
+}

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

@@ -0,0 +1,135 @@
+/*
+ * The MIT License
+ * Copyright © 2014-2019 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.
+ */
+
+package com.iluwatar.circuitbreaker;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * App Test showing usage of circuit breaker.
+ */
+public class AppTest {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(AppTest.class);
+
+  //Startup delay for delayed service (in seconds)
+  private static final int STARTUP_DELAY = 4;
+
+  //Number of failed requests for circuit breaker to open
+  private static final int FAILURE_THRESHOLD = 1;
+
+  //Time period in seconds for circuit breaker to retry service
+  private static final int RETRY_PERIOD = 2;
+
+  private MonitoringService monitoringService;
+
+  private CircuitBreaker delayedServiceCircuitBreaker;
+
+  private CircuitBreaker quickServiceCircuitBreaker;
+
+  /**
+   * Setup the circuit breakers and services, where {@link DelayedRemoteService} will be start with
+   * a delay of 4 seconds and a {@link QuickRemoteService} responding healthy. Both services are
+   * wrapped in a {@link DefaultCircuitBreaker} implementation with failure threshold of 1 failure
+   * and retry time period of 2 seconds.
+   */
+  @BeforeEach
+  public void setupCircuitBreakers() {
+    var delayedService = new DelayedRemoteService(System.nanoTime(), STARTUP_DELAY);
+    //Set the circuit Breaker parameters
+    delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000,
+        FAILURE_THRESHOLD,
+        RETRY_PERIOD * 1000 * 1000 * 1000);
+
+    var quickService = new QuickRemoteService();
+    //Set the circuit Breaker parameters
+    quickServiceCircuitBreaker = new DefaultCircuitBreaker(quickService, 3000, FAILURE_THRESHOLD,
+        RETRY_PERIOD * 1000 * 1000 * 1000);
+
+    monitoringService = new MonitoringService(delayedServiceCircuitBreaker,
+        quickServiceCircuitBreaker);
+
+  }
+
+  @Test
+  public void testFailure_OpenStateTransition() {
+    //Calling delayed service, which will be unhealthy till 4 seconds
+    assertEquals("Delayed service is down", monitoringService.delayedServiceResponse());
+    //As failure threshold is "1", the circuit breaker is changed to OPEN
+    assertEquals("OPEN", delayedServiceCircuitBreaker.getState());
+    //As circuit state is OPEN, we expect a quick fallback response from circuit breaker.
+    assertEquals("Delayed service is down", monitoringService.delayedServiceResponse());
+
+    //Meanwhile, the quick service is responding and the circuit state is CLOSED
+    assertEquals("Quick Service is working", monitoringService.quickServiceResponse());
+    assertEquals("CLOSED", quickServiceCircuitBreaker.getState());
+
+  }
+
+  @Test
+  public void testFailure_HalfOpenStateTransition() {
+    //Calling delayed service, which will be unhealthy till 4 seconds
+    assertEquals("Delayed service is down", monitoringService.delayedServiceResponse());
+    //As failure threshold is "1", the circuit breaker is changed to OPEN
+    assertEquals("OPEN", delayedServiceCircuitBreaker.getState());
+
+    //Waiting for recovery period of 2 seconds for circuit breaker to retry service.
+    try {
+      LOGGER.info("Waiting 2s for delayed service to become responsive");
+      Thread.sleep(2000);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+    //After 2 seconds, the circuit breaker should move to "HALF_OPEN" state and retry fetching response from service again
+    assertEquals("HALF_OPEN", delayedServiceCircuitBreaker.getState());
+
+  }
+
+  @Test
+  public void testRecovery_ClosedStateTransition() {
+    //Calling delayed service, which will be unhealthy till 4 seconds
+    assertEquals("Delayed service is down", monitoringService.delayedServiceResponse());
+    //As failure threshold is "1", the circuit breaker is changed to OPEN
+    assertEquals("OPEN", delayedServiceCircuitBreaker.getState());
+
+    //Waiting for 4 seconds, which is enough for DelayedService to become healthy and respond successfully.
+    try {
+      LOGGER.info("Waiting 4s for delayed service to become responsive");
+      Thread.sleep(4000);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+    //As retry period is 2 seconds (<4 seconds of wait), hence the circuit breaker should be back in HALF_OPEN state.
+    assertEquals("HALF_OPEN", delayedServiceCircuitBreaker.getState());
+    //Check the success response from delayed service.
+    assertEquals("Delayed service is working", monitoringService.delayedServiceResponse());
+    //As the response is success, the state should be CLOSED
+    assertEquals("CLOSED", delayedServiceCircuitBreaker.getState());
+  }
+
+}

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

@@ -25,56 +25,60 @@ package com.iluwatar.circuitbreaker;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.rmi.Remote;
 import org.junit.jupiter.api.Test;
 
 /**
  * Circuit Breaker test
  */
-public class CircuitBreakerTest {
+public class DefaultCircuitBreakerTest {
 
   //long timeout, int failureThreshold, long retryTimePeriod
   @Test
-  public void testSetState() {
-    var circuitBreaker = new CircuitBreaker(1, 1, 100);
+  public void testEvaluateState() {
+    var circuitBreaker = new DefaultCircuitBreaker(null, 1, 1, 100);
     //Right now, failureCount<failureThreshold, so state should be closed
     assertEquals(circuitBreaker.getState(), "CLOSED");
     circuitBreaker.failureCount = 4;
     circuitBreaker.lastFailureTime = System.nanoTime();
-    circuitBreaker.setState();
+    circuitBreaker.evaluateState();
     //Since failureCount>failureThreshold, and lastFailureTime is nearly equal to current time,
     //state should be half-open
     assertEquals(circuitBreaker.getState(), "HALF_OPEN");
     //Since failureCount>failureThreshold, and lastFailureTime is much lesser current time,
     //state should be open
     circuitBreaker.lastFailureTime = System.nanoTime() - 1000 * 1000 * 1000 * 1000;
-    circuitBreaker.setState();
+    circuitBreaker.evaluateState();
     assertEquals(circuitBreaker.getState(), "OPEN");
     //Now set it back again to closed to test idempotency
     circuitBreaker.failureCount = 0;
-    circuitBreaker.setState();
+    circuitBreaker.evaluateState();
     assertEquals(circuitBreaker.getState(), "CLOSED");
   }
 
   @Test
   public void testSetStateForBypass() {
-    var circuitBreaker = new CircuitBreaker(1, 1, 100);
+    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
-    circuitBreaker.setStateForBypass(State.OPEN);
+    circuitBreaker.setState(State.OPEN);
     assertEquals(circuitBreaker.getState(), "OPEN");
   }
 
   @Test
-  public void testApiResponses() {
-    var circuitBreaker = new CircuitBreaker(1, 1, 100);
-    try {
-      //Call with the paramater start_time set to huge amount of time in past so that service 
-      //replies with "Ok". Also, state is CLOSED in start
-      var serviceStartTime = System.nanoTime() - 60 * 1000 * 1000 * 1000;
-      var response = circuitBreaker.call("delayedService", serviceStartTime);
-      assertEquals(response, "Delayed service is working");
-    } catch (Exception e) {
-      System.out.println(e.getMessage());
-    }
+  public void testApiResponses() throws RemoteServiceException {
+    RemoteService mockService = new RemoteService() {
+      @Override
+      public String call() throws RemoteServiceException {
+        return "Remote Success";
+      }
+    };
+    var circuitBreaker = new DefaultCircuitBreaker(mockService, 1, 1, 100);
+    //Call with the paramater start_time set to huge amount of time in past so that service
+    //replies with "Ok". Also, state is CLOSED in start
+    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

@@ -0,0 +1,59 @@
+/*
+ * The MIT License
+ * Copyright © 2014-2019 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.
+ */
+
+package com.iluwatar.circuitbreaker;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Monitoring Service test
+ */
+public class DelayedRemoteServiceTest {
+
+  /**
+   * Testing immediate response of the delayed service.
+   *
+   * @throws RemoteServiceException
+   */
+  @Test
+  public void testDefaultConstructor() throws RemoteServiceException {
+    Assertions.assertThrows(RemoteServiceException.class, () -> {
+      var obj = new DelayedRemoteService();
+      obj.call();
+    });
+  }
+
+  /**
+   * Testing server started in past (2 seconds ago) and with a simulated delay of 1 second.
+   *
+   * @throws RemoteServiceException
+   */
+  @Test
+  public void testParameterizedConstructor() throws RemoteServiceException {
+      var obj = new DelayedRemoteService(System.nanoTime()-2000*1000*1000,1);
+      assertEquals("Delayed service is working",obj.call());
+  }
+}

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

@@ -35,28 +35,45 @@ public class MonitoringServiceTest {
   //long timeout, int failureThreshold, long retryTimePeriod
   @Test
   public void testLocalResponse() {
-    var monitoringService = new MonitoringService();
+    var monitoringService = new MonitoringService(null,null);
     var response = monitoringService.localResourceResponse();
     assertEquals(response, "Local Service is working");
   }
 
   @Test
-  public void testRemoteResponse() {
-    var monitoringService = new MonitoringService();
-    var circuitBreaker = new CircuitBreaker(1, 1, 100);
+  public void testDelayedRemoteResponseSuccess() {
+    var delayedService = new DelayedRemoteService(System.nanoTime()-2*1000*1000*1000, 2);
+    var delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000,
+        1,
+        2 * 1000 * 1000 * 1000);
+
+    var monitoringService = new MonitoringService(delayedServiceCircuitBreaker,null);
     //Set time in past to make the server work
-    var serverStartTime = System.nanoTime() / 10;
-    var response = monitoringService.remoteResourceResponse(circuitBreaker, serverStartTime);
+    var response = monitoringService.delayedServiceResponse();
     assertEquals(response, "Delayed service is working");
   }
 
   @Test
-  public void testRemoteResponse2() {
-    var monitoringService = new MonitoringService();
-    var circuitBreaker = new CircuitBreaker(1, 1, 100);
+  public void testDelayedRemoteResponseFailure() {
+    var delayedService = new DelayedRemoteService(System.nanoTime(), 2);
+    var delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000,
+        1,
+        2 * 1000 * 1000 * 1000);
+    var monitoringService = new MonitoringService(delayedServiceCircuitBreaker,null);
     //Set time as current time as initially server fails
-    var serverStartTime = System.nanoTime();
-    var response = monitoringService.remoteResourceResponse(circuitBreaker, serverStartTime);
-    assertEquals(response, "Remote service not responding");
+    var response = monitoringService.delayedServiceResponse();
+    assertEquals(response, "Delayed service is down");
+  }
+
+  @Test
+  public void testQuickRemoteServiceResponse() {
+    var delayedService = new QuickRemoteService();
+    var delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000,
+        1,
+        2 * 1000 * 1000 * 1000);
+    var monitoringService = new MonitoringService(delayedServiceCircuitBreaker,null);
+    //Set time as current time as initially server fails
+    var response = monitoringService.delayedServiceResponse();
+    assertEquals(response, "Quick Service is working");
   }
 }

collection-pipeline/pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>collection-pipeline</artifactId>
   <dependencies>

combinator/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>combinator</artifactId>
@@ -39,6 +39,12 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

combinator/src/test/java/com/iluwatar/combinator/CombinatorAppTest.java

@@ -25,12 +25,19 @@ package com.iluwatar.combinator;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 public class CombinatorAppTest {
 
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link CombinatorApp#main(String[])}
+   * throws an exception.
+   */
+
   @Test
-  public void main() {
-    CombinatorApp.main(new String[]{});
+  public void shouldExecuteApplicationWithoutException() {
+    assertDoesNotThrow(() -> CombinatorApp.main(new String[]{}));
   }
 }

command/README.md

@@ -9,15 +9,20 @@ tags:
 ---
 
 ## Also known as
+
 Action, Transaction
 
 ## Intent
-Encapsulate a request as an object, thereby letting you parameterize clients with different requests, queue or log requests, and support undoable operations.
+
+Encapsulate a request as an object, thereby letting you parameterize clients with different
+requests, queue or log requests, and support undoable operations.
 
 ## Explanation
 Real world example
 
-> There is a wizard casting spells on a goblin. The spells are executed on the goblin one by one. The first spell shrinks the goblin and the second makes him invisible. Then the wizard reverses the spells one by one. Each spell here is a command object that can be undone.
+> There is a wizard casting spells on a goblin. The spells are executed on the goblin one by one.
+> The first spell shrinks the goblin and the second makes him invisible. Then the wizard reverses
+> the spells one by one. Each spell here is a command object that can be undone.
 
 In plain words
 
@@ -25,34 +30,32 @@ In plain words
 
 Wikipedia says
 
-> In object-oriented programming, the command pattern is a behavioral design pattern in which an object is used to encapsulate all information needed to perform an action or trigger an event at a later time.
+> In object-oriented programming, the command pattern is a behavioral design pattern in which an
+> object is used to encapsulate all information needed to perform an action or trigger an event at
+> a later time.
 
 **Programmatic Example**
 
-Here's the sample code with wizard and goblin. Let's start from the wizard class.
+Here's the sample code with wizard and goblin. Let's start from the `Wizard` class.
 
 ```java
 public class Wizard {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Wizard.class);
-
   private final Deque<Command> undoStack = new LinkedList<>();
   private final Deque<Command> redoStack = new LinkedList<>();
 
   public Wizard() {}
 
-  public void castSpell(Command command, Target target) {
-    LOGGER.info("{} casts {} at {}", this, command, target);
-    command.execute(target);
-    undoStack.offerLast(command);
+  public void castSpell(Runnable runnable) {
+    runnable.run();
+    undoStack.offerLast(runnable);
   }
 
   public void undoLastSpell() {
     if (!undoStack.isEmpty()) {
       var previousSpell = undoStack.pollLast();
       redoStack.offerLast(previousSpell);
-      LOGGER.info("{} undoes {}", this, previousSpell);
-      previousSpell.undo();
+      previousSpell.run();
     }
   }
 
@@ -60,8 +63,7 @@ public class Wizard {
     if (!redoStack.isEmpty()) {
       var previousSpell = redoStack.pollLast();
       undoStack.offerLast(previousSpell);
-      LOGGER.info("{} redoes {}", this, previousSpell);
-      previousSpell.redo();
+      previousSpell.run();
     }
   }
 
@@ -72,84 +74,7 @@ public class Wizard {
 }
 ```
 
-Next we present the spell hierarchy.
-
-```java
-public interface Command {
-
-  void execute(Target target);
-
-  void undo();
-
-  void redo();
-
-  String toString();
-}
-
-public class InvisibilitySpell implements Command {
-
-  private Target target;
-
-  @Override
-  public void execute(Target target) {
-    target.setVisibility(Visibility.INVISIBLE);
-    this.target = target;
-  }
-
-  @Override
-  public void undo() {
-    if (target != null) {
-      target.setVisibility(Visibility.VISIBLE);
-    }
-  }
-
-  @Override
-  public void redo() {
-    if (target != null) {
-      target.setVisibility(Visibility.INVISIBLE);
-    }
-  }
-
-  @Override
-  public String toString() {
-    return "Invisibility spell";
-  }
-}
-
-public class ShrinkSpell implements Command {
-
-  private Size oldSize;
-  private Target target;
-
-  @Override
-  public void execute(Target target) {
-    oldSize = target.getSize();
-    target.setSize(Size.SMALL);
-    this.target = target;
-  }
-
-  @Override
-  public void undo() {
-    if (oldSize != null && target != null) {
-      var temp = target.getSize();
-      target.setSize(oldSize);
-      oldSize = temp;
-    }
-  }
-
-  @Override
-  public void redo() {
-    undo();
-  }
-
-  @Override
-  public String toString() {
-    return "Shrink spell";
-  }
-}
-```
-
-And last we have the goblin who's the target of the spells.
+Next, we have the goblin who's the target of the spells.
 
 ```java
 public abstract class Target {
@@ -196,47 +121,110 @@ public class Goblin extends Target {
     return "Goblin";
   }
 
+  public void changeSize() {
+    var oldSize = getSize() == Size.NORMAL ? Size.SMALL : Size.NORMAL;
+    setSize(oldSize);
+  }
+
+  public void changeVisibility() {
+    var visible = getVisibility() == Visibility.INVISIBLE
+          ? Visibility.VISIBLE : Visibility.INVISIBLE;
+    setVisibility(visible);
+  }
 }
 ```
 
-Finally here's the whole example in action.
+Finally we have the wizard in main function who casts spell
+
+```java
+public static void main(String[] args) {
+  var wizard = new Wizard();
+  var goblin = new Goblin();
+
+  // casts shrink/unshrink spell
+  wizard.castSpell(goblin::changeSize);
+
+  // casts visible/invisible spell
+  wizard.castSpell(goblin::changeVisibility);
+
+  // undo and redo casts
+   wizard.undoLastSpell();
+   wizard.redoLastSpell();
+```
+
+Here's the whole example in action.
 
 ```java
 var wizard = new Wizard();
 var goblin = new Goblin();
+
 goblin.printStatus();
-// Goblin, [size=normal] [visibility=visible]
-wizard.castSpell(new ShrinkSpell(), goblin);
-// Wizard casts Shrink spell at Goblin
+wizard.castSpell(goblin::changeSize);
 goblin.printStatus();
-// Goblin, [size=small] [visibility=visible]
-wizard.castSpell(new InvisibilitySpell(), goblin);
-// Wizard casts Invisibility spell at Goblin
+
+wizard.castSpell(goblin::changeVisibility);
 goblin.printStatus();
-// Goblin, [size=small] [visibility=invisible]
+
 wizard.undoLastSpell();
-// Wizard undoes Invisibility spell
 goblin.printStatus();
-// Goblin, [size=small] [visibility=visible]
+
+wizard.undoLastSpell();
+goblin.printStatus();
+
+wizard.redoLastSpell();
+goblin.printStatus();
+
+wizard.redoLastSpell();
+goblin.printStatus();
+```
+
+Here's the program output:
+
+```java
+Goblin, [size=normal] [visibility=visible]
+Goblin, [size=small] [visibility=visible]
+Goblin, [size=small] [visibility=invisible]
+Goblin, [size=small] [visibility=visible]
+Goblin, [size=normal] [visibility=visible]
+Goblin, [size=small] [visibility=visible]
+Goblin, [size=small] [visibility=invisible]
 ```
 
 ## Class diagram
+
 ![alt text](./etc/command.png "Command")
 
 ## Applicability
-Use the Command pattern when you want to
 
-* parameterize objects by an action to perform. You can express such parameterization in a procedural language with a callback function, that is, a function that's registered somewhere to be called at a later point. Commands are an object-oriented replacement for callbacks.
-* specify, queue, and execute requests at different times. A Command object can have a lifetime independent of the original request. If the receiver of a request can be represented in an address space-independent way, then you can transfer a command object for the request to a different process and fulfill the request there
-* support undo. The Command's execute operation can store state for reversing its effects in the command itself. The Command interface must have an added Unexecute operation that reverses the effects of a previous call to execute. Executed commands are stored in a history list. Unlimited-level undo and redo is achieved by traversing this list backwards and forwards calling unexecute and execute, respectively
-* support logging changes so that they can be reapplied in case of a system crash. By augmenting the Command interface with load and store operations, you can keep a persistent log of changes. Recovering from a crash involves reloading logged commands from disk and re-executing them with the execute operation
-* structure a system around high-level operations build on primitive operations. Such a structure is common in information systems that support transactions. A transaction encapsulates a set of changes to data. The Command pattern offers a way to model transactions. Commands have a common interface, letting you invoke all transactions the same way. The pattern also makes it easy to extend the system with new transactions
+Use the Command pattern when you want to:
+
+* Parameterize objects by an action to perform. You can express such parameterization in a
+procedural language with a callback function, that is, a function that's registered somewhere to be
+called at a later point. Commands are an object-oriented replacement for callbacks.
+* Specify, queue, and execute requests at different times. A Command object can have a lifetime
+independent of the original request. If the receiver of a request can be represented in an address
+space-independent way, then you can transfer a command object for the request to a different process
+and fulfill the request there.
+* Support undo. The Command's execute operation can store state for reversing its effects in the
+command itself. The Command interface must have an added un-execute operation that reverses the
+effects of a previous call to execute. The executed commands are stored in a history list.
+Unlimited-level undo and redo is achieved by traversing this list backwards and forwards calling
+un-execute and execute, respectively.
+* Support logging changes so that they can be reapplied in case of a system crash. By augmenting the
+Command interface with load and store operations, you can keep a persistent log of changes.
+Recovering from a crash involves reloading logged commands from disk and re-executing them with
+the execute operation.
+* Structure a system around high-level operations build on primitive operations. Such a structure is
+common in information systems that support transactions. A transaction encapsulates a set of changes
+to data. The Command pattern offers a way to model transactions. Commands have a common interface,
+letting you invoke all transactions the same way. The pattern also makes it easy to extend the
+system with new transactions.
 
 ## Typical Use Case
 
-* to keep a history of requests
-* implement callback functionality
-* implement the undo functionality
+* To keep a history of requests
+* Implement callback functionality
+* Implement the undo functionality
 
 ## Real world examples
 

command/etc/command.ucls

@@ -1,116 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
-  realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
-  <class id="1" language="java" name="com.iluwatar.command.ShrinkSpell" project="command" 
-    file="/command/src/main/java/com/iluwatar/command/ShrinkSpell.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="178" width="141" x="-30" y="681"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="2" language="java" name="com.iluwatar.command.Goblin" project="command" 
-    file="/command/src/main/java/com/iluwatar/command/Goblin.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="129" y="1223"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="3" language="java" name="com.iluwatar.command.Wizard" project="command" 
-    file="/command/src/main/java/com/iluwatar/command/Wizard.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="129" y="362"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="4" language="java" name="com.iluwatar.command.Command" project="command" 
-    file="/command/src/main/java/com/iluwatar/command/Command.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="129" y="561"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="5" language="java" name="com.iluwatar.command.InvisibilitySpell" project="command" 
-    file="/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="160" width="141" x="151" y="681"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="6" language="java" name="com.iluwatar.command.Target" project="command" 
-    file="/command/src/main/java/com/iluwatar/command/Target.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="129" y="1014"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <association id="7">    
-    <end type="SOURCE" refId="3" navigable="false">      
-      <attribute id="8" name="redoStack">        
-        <position height="20" width="67" x="140" y="451"/>      
-      </attribute>      
-      <multiplicity id="9" minimum="0" maximum="2147483647">        
-        <position height="18" width="25" x="221" y="452"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="4" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <generalization id="10">    
-    <end type="SOURCE" refId="2"/>    
-    <end type="TARGET" refId="6"/>  
-  </generalization>  
-  <association id="11">    
-    <end type="SOURCE" refId="1" navigable="false">      
-      <attribute id="12" name="target"/>      
-      <multiplicity id="13" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="6" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <generalization id="14">    
-    <end type="SOURCE" refId="1"/>    
-    <end type="TARGET" refId="4"/>  
-  </generalization>  
-  <association id="15">    
-    <end type="SOURCE" refId="3" navigable="false">      
-      <attribute id="16" name="undoStack">        
-        <position height="20" width="70" x="-17" y="451"/>      
-      </attribute>      
-      <multiplicity id="17" minimum="0" maximum="2147483647">        
-        <position height="18" width="25" x="60" y="452"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="4" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <generalization id="18">    
-    <end type="SOURCE" refId="5"/>    
-    <end type="TARGET" refId="4"/>  
-  </generalization>  
-  <association id="19">    
-    <end type="SOURCE" refId="5" navigable="false">      
-      <attribute id="20" name="target"/>      
-      <multiplicity id="21" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="6" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-    sort-features="false" accessors="true" visibility="true">    
-    <attributes public="true" package="true" protected="true" private="true" static="true"/>    
-    <operations public="true" package="true" protected="true" private="true" static="true"/>  
-  </classifier-display>  
+<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
+  realizations="true" associations="true" dependencies="false" nesting-relationships="true">
+  <class id="2" language="java" name="com.iluwatar.command.Goblin" project="command"
+    file="/command/src/main/java/com/iluwatar/command/Goblin.java" binary="false" corner="BOTTOM_RIGHT">
+    <position height="-1" width="-1" x="129" y="1223"/>
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+      sort-features="false" accessors="true" visibility="true">
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>
+      <operations public="true" package="true" protected="true" private="true" static="true"/>
+    </display>
+  </class>
+  <class id="3" language="java" name="com.iluwatar.command.Wizard" project="command"
+    file="/command/src/main/java/com/iluwatar/command/Wizard.java" binary="false" corner="BOTTOM_RIGHT">
+    <position height="-1" width="-1" x="129" y="362"/>
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+      sort-features="false" accessors="true" visibility="true">
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>
+      <operations public="true" package="true" protected="true" private="true" static="true"/>
+    </display>
+  </class>
+  <class id="6" language="java" name="com.iluwatar.command.Target" project="command"
+    file="/command/src/main/java/com/iluwatar/command/Target.java" binary="false" corner="BOTTOM_RIGHT">
+    <position height="-1" width="-1" x="129" y="1014"/>
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+      sort-features="false" accessors="true" visibility="true">
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>
+      <operations public="true" package="true" protected="true" private="true" static="true"/>
+    </display>
+  </class>
+  <association id="7">
+    <end type="SOURCE" refId="3" navigable="false">
+      <attribute id="8" name="redoStack">
+        <position height="20" width="67" x="140" y="451"/>
+      </attribute>
+      <multiplicity id="9" minimum="0" maximum="2147483647">
+        <position height="18" width="25" x="221" y="452"/>
+      </multiplicity>
+    </end>
+    <end type="TARGET" refId="4" navigable="true"/>
+    <display labels="true" multiplicity="true"/>
+  </association>
+  <generalization id="10">
+    <end type="SOURCE" refId="2"/>
+    <end type="TARGET" refId="6"/>
+  </generalization>
+  <association id="11">
+    <end type="SOURCE" refId="1" navigable="false">
+      <attribute id="12" name="target"/>
+      <multiplicity id="13" minimum="0" maximum="1"/>
+    </end>
+    <end type="TARGET" refId="6" navigable="true"/>
+    <display labels="true" multiplicity="true"/>
+  </association>
+  <generalization id="14">
+    <end type="SOURCE" refId="1"/>
+    <end type="TARGET" refId="4"/>
+  </generalization>
+  <association id="15">
+    <end type="SOURCE" refId="3" navigable="false">
+      <attribute id="16" name="undoStack">
+        <position height="20" width="70" x="-17" y="451"/>
+      </attribute>
+      <multiplicity id="17" minimum="0" maximum="2147483647">
+        <position height="18" width="25" x="60" y="452"/>
+      </multiplicity>
+    </end>
+    <end type="TARGET" refId="4" navigable="true"/>
+    <display labels="true" multiplicity="true"/>
+  </association>
+  <generalization id="18">
+    <end type="SOURCE" refId="5"/>
+    <end type="TARGET" refId="4"/>
+  </generalization>
+  <association id="19">
+    <end type="SOURCE" refId="5" navigable="false">
+      <attribute id="20" name="target"/>
+      <multiplicity id="21" minimum="0" maximum="1"/>
+    </end>
+    <end type="TARGET" refId="6" navigable="true"/>
+    <display labels="true" multiplicity="true"/>
+  </association>
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+    sort-features="false" accessors="true" visibility="true">
+    <attributes public="true" package="true" protected="true" private="true" static="true"/>
+    <operations public="true" package="true" protected="true" private="true" static="true"/>
+  </classifier-display>
   <association-display labels="true" multiplicity="true"/>
-</class-diagram>
+</class-diagram>

command/etc/command.urm.puml

@@ -4,33 +4,11 @@ package com.iluwatar.command {
     + App()
     + main(args : String[]) {static}
   }
-  interface Command {
-    + Command()
-    + execute(Target) {abstract}
-    + redo() {abstract}
-    + toString() : String {abstract}
-    + undo() {abstract}
-  }
   class Goblin {
     + Goblin()
     + toString() : String
-  }
-  class InvisibilitySpell {
-    - target : Target
-    + InvisibilitySpell()
-    + execute(target : Target)
-    + redo()
-    + toString() : String
-    + undo()
-  }
-  class ShrinkSpell {
-    - oldSize : Size
-    - target : Target
-    + ShrinkSpell()
-    + execute(target : Target)
-    + redo()
-    + toString() : String
-    + undo()
+    + changeSize()
+    + changeVisibility()
   }
   enum Size {
     + NORMAL {static}
@@ -62,22 +40,19 @@ package com.iluwatar.command {
   }
   class Wizard {
     - LOGGER : Logger {static}
-    - redoStack : Deque<Command>
-    - undoStack : Deque<Command>
+    - redoStack : Deque<Runnable>
+    - undoStack : Deque<Runnable>
     + Wizard()
-    + castSpell(command : Command, target : Target)
+    + castSpell(Runnable : runnable)
     + redoLastSpell()
     + toString() : String
     + undoLastSpell()
   }
 }
 Target -->  "-size" Size
-Wizard -->  "-undoStack" Command
-ShrinkSpell -->  "-oldSize" Size
-InvisibilitySpell -->  "-target" Target
-ShrinkSpell -->  "-target" Target
+Wizard -->  "-changeSize" Goblin
+Wizard -->  "-changeVisibility" Goblin
 Target -->  "-visibility" Visibility
 Goblin --|> Target
-InvisibilitySpell ..|> Command
-ShrinkSpell ..|> Command
+App --> "castSpell" Wizard
 @enduml

command/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>command</artifactId>
   <dependencies>

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

@@ -30,12 +30,10 @@ package com.iluwatar.command;
  *
  * <p>Four terms always associated with the command pattern are command, receiver, invoker and
  * client. A command object (spell) knows about the receiver (target) and invokes a method of the
- * receiver. Values for parameters of the receiver method are stored in the command. The receiver
- * then does the work. An invoker object (wizard) knows how to execute a command, and optionally
- * does bookkeeping about the command execution. The invoker does not know anything about a concrete
- * command, it knows only about command interface. Both an invoker object and several command
- * objects are held by a client object (app). The client decides which commands to execute at which
- * points. To execute a command, it passes the command object to the invoker object.
+ * receiver. An invoker object (wizard) receives a reference to the command to be executed and
+ * optionally does bookkeeping about the command execution. The invoker does not know anything
+ * about how the command is executed. The client decides which commands to execute at which
+ * points. To execute a command, it passes a reference of the function to the invoker object.
  *
  * <p>In other words, in this example the wizard casts spells on the goblin. The wizard keeps track
  * of the previous spells cast, so it is easy to undo them. In addition, the wizard keeps track of
@@ -54,10 +52,10 @@ public class App {
 
     goblin.printStatus();
 
-    wizard.castSpell(new ShrinkSpell(), goblin);
+    wizard.castSpell(goblin::changeSize);
     goblin.printStatus();
 
-    wizard.castSpell(new InvisibilitySpell(), goblin);
+    wizard.castSpell(goblin::changeVisibility);
     goblin.printStatus();
 
     wizard.undoLastSpell();

command/src/main/java/com/iluwatar/command/Goblin.java

@@ -37,5 +37,4 @@ public class Goblin extends Target {
   public String toString() {
     return "Goblin";
   }
-
 }

command/src/main/java/com/iluwatar/command/Target.java

@@ -62,4 +62,21 @@ public abstract class Target {
   public void printStatus() {
     LOGGER.info("{}, [size={}] [visibility={}]", this, getSize(), getVisibility());
   }
+
+  /**
+   * Changes the size of the target.
+   */
+  public void changeSize() {
+    var oldSize = getSize() == Size.NORMAL ? Size.SMALL : Size.NORMAL;
+    setSize(oldSize);
+  }
+
+  /**
+   * Changes the visibility of the target.
+   */
+  public void changeVisibility() {
+    var visible = getVisibility() == Visibility.INVISIBLE
+            ? Visibility.VISIBLE : Visibility.INVISIBLE;
+    setVisibility(visible);
+  }
 }

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

@@ -25,30 +25,24 @@ package com.iluwatar.command;
 
 import java.util.Deque;
 import java.util.LinkedList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Wizard is the invoker of the commands.
  */
 public class Wizard {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Wizard.class);
-
-  private final Deque<Command> undoStack = new LinkedList<>();
-  private final Deque<Command> redoStack = new LinkedList<>();
+  private final Deque<Runnable> undoStack = new LinkedList<>();
+  private final Deque<Runnable> redoStack = new LinkedList<>();
 
   public Wizard() {
-    // comment to ignore sonar issue: LEVEL critical
   }
 
   /**
    * Cast spell.
    */
-  public void castSpell(Command command, Target target) {
-    LOGGER.info("{} casts {} at {}", this, command, target);
-    command.execute(target);
-    undoStack.offerLast(command);
+  public void castSpell(Runnable runnable) {
+    runnable.run();
+    undoStack.offerLast(runnable);
   }
 
   /**
@@ -58,8 +52,7 @@ public class Wizard {
     if (!undoStack.isEmpty()) {
       var previousSpell = undoStack.pollLast();
       redoStack.offerLast(previousSpell);
-      LOGGER.info("{} undoes {}", this, previousSpell);
-      previousSpell.undo();
+      previousSpell.run();
     }
   }
 
@@ -70,8 +63,7 @@ public class Wizard {
     if (!redoStack.isEmpty()) {
       var previousSpell = redoStack.pollLast();
       undoStack.offerLast(previousSpell);
-      LOGGER.info("{} redoes {}", this, previousSpell);
-      previousSpell.redo();
+      previousSpell.run();
     }
   }
 

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

@@ -25,12 +25,21 @@ package com.iluwatar.command;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * Tests that Command example runs without errors.
  */
-public class AppTest {
+class AppTest {
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App#main(String[])}
+   * throws an exception.
+   */
   @Test
-  public void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

command/src/test/java/com/iluwatar/command/CommandTest.java

@@ -56,10 +56,10 @@ public class CommandTest {
     var wizard = new Wizard();
     var goblin = new Goblin();
 
-    wizard.castSpell(new ShrinkSpell(), goblin);
+    wizard.castSpell(goblin::changeSize);
     verifyGoblin(goblin, GOBLIN, Size.SMALL, Visibility.VISIBLE);
 
-    wizard.castSpell(new InvisibilitySpell(), goblin);
+    wizard.castSpell(goblin::changeVisibility);
     verifyGoblin(goblin, GOBLIN, Size.SMALL, Visibility.INVISIBLE);
 
     wizard.undoLastSpell();

commander/pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>commander</artifactId>
   <dependencies>

commander/src/main/java/com/iluwatar/commander/Commander.java

@@ -36,9 +36,11 @@ import com.iluwatar.commander.queue.QueueDatabase;
 import com.iluwatar.commander.queue.QueueTask;
 import com.iluwatar.commander.queue.QueueTask.TaskType;
 import com.iluwatar.commander.shippingservice.ShippingService;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * <p>Commander pattern is used to handle all issues that can come up while making a
  * distributed transaction. The idea is to have a commander, which coordinates the execution of all
@@ -159,8 +161,8 @@ public class Commander {
 
   private void sendPaymentRequest(Order order) {
     if (System.currentTimeMillis() - order.createdTime >= this.paymentTime) {
-      if (order.paid.equals(PaymentStatus.Trying)) {
-        order.paid = PaymentStatus.NotDone;
+      if (order.paid.equals(PaymentStatus.TRYING)) {
+        order.paid = PaymentStatus.NOT_DONE;
         sendPaymentFailureMessage(order);
         LOG.error("Order " + order.id + ": Payment time for order over, failed and returning..");
       } //if succeeded or failed, would have been dequeued, no attempt to make payment     
@@ -172,15 +174,15 @@ public class Commander {
         if (!l.isEmpty()) {
           if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
             LOG.debug("Order " + order.id + ": Error in connecting to payment service,"
-                + " trying again..");
+                    + " trying again..");
           } else {
             LOG.debug("Order " + order.id + ": Error in creating payment request..");
           }
           throw l.remove(0);
         }
-        if (order.paid.equals(PaymentStatus.Trying)) {
+        if (order.paid.equals(PaymentStatus.TRYING)) {
           var transactionId = paymentService.receiveRequest(order.price);
-          order.paid = PaymentStatus.Done;
+          order.paid = PaymentStatus.DONE;
           LOG.info("Order " + order.id + ": Payment successful, transaction Id: " + transactionId);
           if (!finalSiteMsgShown) {
             LOG.info("Payment made successfully, thank you for shopping with us!!");
@@ -193,26 +195,26 @@ public class Commander {
         if (PaymentDetailsErrorException.class.isAssignableFrom(err.getClass())) {
           if (!finalSiteMsgShown) {
             LOG.info("There was an error in payment. Your account/card details "
-                + "may have been incorrect. "
-                + "Meanwhile, your order has been converted to COD and will be shipped.");
+                    + "may have been incorrect. "
+                    + "Meanwhile, your order has been converted to COD and will be shipped.");
             finalSiteMsgShown = true;
           }
           LOG.error("Order " + order.id + ": Payment details incorrect, failed..");
-          o.paid = PaymentStatus.NotDone;
+          o.paid = PaymentStatus.NOT_DONE;
           sendPaymentFailureMessage(o);
         } else {
-          if (o.messageSent.equals(MessageSent.NoneSent)) {
+          if (o.messageSent.equals(MessageSent.NONE_SENT)) {
             if (!finalSiteMsgShown) {
               LOG.info("There was an error in payment. We are on it, and will get back to you "
-                  + "asap. Don't worry, your order has been placed and will be shipped.");
+                      + "asap. Don't worry, your order has been placed and will be shipped.");
               finalSiteMsgShown = true;
             }
             LOG.warn("Order " + order.id + ": Payment error, going to queue..");
             sendPaymentPossibleErrorMsg(o);
           }
-          if (o.paid.equals(PaymentStatus.Trying) && System
-              .currentTimeMillis() - o.createdTime < paymentTime) {
-            var qt = new QueueTask(o, TaskType.Payment, -1);
+          if (o.paid.equals(PaymentStatus.TRYING) && System
+                  .currentTimeMillis() - o.createdTime < paymentTime) {
+            var qt = new QueueTask(o, TaskType.PAYMENT, -1);
             updateQueue(qt);
           }
         }
@@ -234,12 +236,12 @@ public class Commander {
       // additional check not needed
       LOG.trace("Order " + qt.order.id + ": Queue time for order over, failed..");
       return;
-    } else if (qt.taskType.equals(TaskType.Payment) && !qt.order.paid.equals(PaymentStatus.Trying)
-        || qt.taskType.equals(TaskType.Messaging) && (qt.messageType == 1
-        && !qt.order.messageSent.equals(MessageSent.NoneSent)
-        || qt.order.messageSent.equals(MessageSent.PaymentFail)
-        || qt.order.messageSent.equals(MessageSent.PaymentSuccessful))
-        || qt.taskType.equals(TaskType.EmployeeDb) && qt.order.addedToEmployeeHandle) {
+    } else if (qt.taskType.equals(TaskType.PAYMENT) && !qt.order.paid.equals(PaymentStatus.TRYING)
+        || qt.taskType.equals(TaskType.MESSAGING) && (qt.messageType == 1
+        && !qt.order.messageSent.equals(MessageSent.NONE_SENT)
+        || qt.order.messageSent.equals(MessageSent.PAYMENT_FAIL)
+        || qt.order.messageSent.equals(MessageSent.PAYMENT_SUCCESSFUL))
+        || qt.taskType.equals(TaskType.EMPLOYEE_DB) && qt.order.addedToEmployeeHandle) {
       LOG.trace("Order " + qt.order.id + ": Not queueing task since task already done..");
       return;
     }
@@ -256,8 +258,8 @@ public class Commander {
         tryDoingTasksInQueue();
       };
       Retry.HandleErrorIssue<QueueTask> handleError = (qt1, err) -> {
-        if (qt1.taskType.equals(TaskType.Payment)) {
-          qt1.order.paid = PaymentStatus.NotDone;
+        if (qt1.taskType.equals(TaskType.PAYMENT)) {
+          qt1.order.paid = PaymentStatus.NOT_DONE;
           sendPaymentFailureMessage(qt1.order);
           LOG.error("Order " + qt1.order.id + ": Unable to enqueue payment task,"
               + " payment failed..");
@@ -331,35 +333,9 @@ public class Commander {
     }
     var list = messagingService.exceptionsList;
     Thread t = new Thread(() -> {
-      Retry.Operation op = (l) -> {
-        if (!l.isEmpty()) {
-          if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
-            LOG.debug("Order " + order.id + ": Error in connecting to messaging service "
-                + "(Payment Success msg), trying again..");
-          } else {
-            LOG.debug("Order " + order.id + ": Error in creating Payment Success"
-                + " messaging request..");
-          }
-          throw l.remove(0);
-        }
-        if (!order.messageSent.equals(MessageSent.PaymentFail)
-            && !order.messageSent.equals(MessageSent.PaymentSuccessful)) {
-          var requestId = messagingService.receiveRequest(2);
-          order.messageSent = MessageSent.PaymentSuccessful;
-          LOG.info("Order " + order.id + ": Payment Success message sent,"
-              + " request Id: " + requestId);
-        }
-      };
+      Retry.Operation op = handleSuccessMessageRetryOperation(order);
       Retry.HandleErrorIssue<Order> handleError = (o, err) -> {
-        if ((o.messageSent.equals(MessageSent.NoneSent) || o.messageSent
-            .equals(MessageSent.PaymentTrying))
-            && System.currentTimeMillis() - o.createdTime < messageTime) {
-          var qt = new QueueTask(order, TaskType.Messaging, 2);
-          updateQueue(qt);
-          LOG.info("Order " + order.id + ": Error in sending Payment Success message, trying to"
-              + " queue task and add to employee handle..");
-          employeeHandleIssue(order);
-        }
+        handleSuccessMessageErrorIssue(order, o);
       };
       var r = new Retry<>(op, handleError, numOfRetries, retryDuration,
           e -> DatabaseUnavailableException.class.isAssignableFrom(e.getClass()));
@@ -372,6 +348,40 @@ public class Commander {
     t.start();
   }
 
+  private void handleSuccessMessageErrorIssue(Order order, Order o) {
+    if ((o.messageSent.equals(MessageSent.NONE_SENT) || o.messageSent
+        .equals(MessageSent.PAYMENT_TRYING))
+        && System.currentTimeMillis() - o.createdTime < messageTime) {
+      var qt = new QueueTask(order, TaskType.MESSAGING, 2);
+      updateQueue(qt);
+      LOG.info("Order " + order.id + ": Error in sending Payment Success message, trying to"
+          + " queue task and add to employee handle..");
+      employeeHandleIssue(order);
+    }
+  }
+
+  private Retry.Operation handleSuccessMessageRetryOperation(Order order) {
+    return (l) -> {
+      if (!l.isEmpty()) {
+        if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
+          LOG.debug("Order " + order.id + ": Error in connecting to messaging service "
+              + "(Payment Success msg), trying again..");
+        } else {
+          LOG.debug("Order " + order.id + ": Error in creating Payment Success"
+              + " messaging request..");
+        }
+        throw l.remove(0);
+      }
+      if (!order.messageSent.equals(MessageSent.PAYMENT_FAIL)
+          && !order.messageSent.equals(MessageSent.PAYMENT_SUCCESSFUL)) {
+        var requestId = messagingService.receiveRequest(2);
+        order.messageSent = MessageSent.PAYMENT_SUCCESSFUL;
+        LOG.info("Order " + order.id + ": Payment Success message sent,"
+            + " request Id: " + requestId);
+      }
+    };
+  }
+
   private void sendPaymentFailureMessage(Order order) {
     if (System.currentTimeMillis() - order.createdTime >= this.messageTime) {
       LOG.trace("Order " + order.id + ": Message time for order over, returning..");
@@ -380,34 +390,10 @@ public class Commander {
     var list = messagingService.exceptionsList;
     var t = new Thread(() -> {
       Retry.Operation op = (l) -> {
-        if (!l.isEmpty()) {
-          if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
-            LOG.debug("Order " + order.id + ": Error in connecting to messaging service "
-                + "(Payment Failure msg), trying again..");
-          } else {
-            LOG.debug("Order " + order.id + ": Error in creating Payment Failure"
-                + " message request..");
-          }
-          throw l.remove(0);
-        }
-        if (!order.messageSent.equals(MessageSent.PaymentFail)
-            && !order.messageSent.equals(MessageSent.PaymentSuccessful)) {
-          var requestId = messagingService.receiveRequest(0);
-          order.messageSent = MessageSent.PaymentFail;
-          LOG.info("Order " + order.id + ": Payment Failure message sent successfully,"
-              + " request Id: " + requestId);
-        }
+        handlePaymentFailureRetryOperation(order, l);
       };
       Retry.HandleErrorIssue<Order> handleError = (o, err) -> {
-        if ((o.messageSent.equals(MessageSent.NoneSent) || o.messageSent
-            .equals(MessageSent.PaymentTrying))
-            && System.currentTimeMillis() - o.createdTime < messageTime) {
-          var qt = new QueueTask(order, TaskType.Messaging, 0);
-          updateQueue(qt);
-          LOG.warn("Order " + order.id + ": Error in sending Payment Failure message, "
-              + "trying to queue task and add to employee handle..");
-          employeeHandleIssue(o);
-        }
+        handlePaymentErrorIssue(order, o);
       };
       var r = new Retry<>(op, handleError, numOfRetries, retryDuration,
           e -> DatabaseUnavailableException.class.isAssignableFrom(e.getClass()));
@@ -420,6 +406,38 @@ public class Commander {
     t.start();
   }
 
+  private void handlePaymentErrorIssue(Order order, Order o) {
+    if ((o.messageSent.equals(MessageSent.NONE_SENT) || o.messageSent
+        .equals(MessageSent.PAYMENT_TRYING))
+        && System.currentTimeMillis() - o.createdTime < messageTime) {
+      var qt = new QueueTask(order, TaskType.MESSAGING, 0);
+      updateQueue(qt);
+      LOG.warn("Order " + order.id + ": Error in sending Payment Failure message, "
+          + "trying to queue task and add to employee handle..");
+      employeeHandleIssue(o);
+    }
+  }
+
+  private void handlePaymentFailureRetryOperation(Order order, List<Exception> l) throws Exception {
+    if (!l.isEmpty()) {
+      if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
+        LOG.debug("Order " + order.id + ": Error in connecting to messaging service "
+            + "(Payment Failure msg), trying again..");
+      } else {
+        LOG.debug("Order " + order.id + ": Error in creating Payment Failure"
+            + " message request..");
+      }
+      throw l.remove(0);
+    }
+    if (!order.messageSent.equals(MessageSent.PAYMENT_FAIL)
+        && !order.messageSent.equals(MessageSent.PAYMENT_SUCCESSFUL)) {
+      var requestId = messagingService.receiveRequest(0);
+      order.messageSent = MessageSent.PAYMENT_FAIL;
+      LOG.info("Order " + order.id + ": Payment Failure message sent successfully,"
+          + " request Id: " + requestId);
+    }
+  }
+
   private void sendPaymentPossibleErrorMsg(Order order) {
     if (System.currentTimeMillis() - order.createdTime >= this.messageTime) {
       LOG.trace("Message time for order over, returning..");
@@ -428,34 +446,10 @@ public class Commander {
     var list = messagingService.exceptionsList;
     var t = new Thread(() -> {
       Retry.Operation op = (l) -> {
-        if (!l.isEmpty()) {
-          if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
-            LOG.debug("Order " + order.id + ": Error in connecting to messaging service "
-                + "(Payment Error msg), trying again..");
-          } else {
-            LOG.debug("Order " + order.id + ": Error in creating Payment Error"
-                + " messaging request..");
-          }
-          throw l.remove(0);
-        }
-        if (order.paid.equals(PaymentStatus.Trying) && order.messageSent
-            .equals(MessageSent.NoneSent)) {
-          var requestId = messagingService.receiveRequest(1);
-          order.messageSent = MessageSent.PaymentTrying;
-          LOG.info("Order " + order.id + ": Payment Error message sent successfully,"
-              + " request Id: " + requestId);
-        }
+        handlePaymentPossibleErrorMsgRetryOperation(order, l);
       };
       Retry.HandleErrorIssue<Order> handleError = (o, err) -> {
-        if (o.messageSent.equals(MessageSent.NoneSent) && order.paid
-            .equals(PaymentStatus.Trying)
-            && System.currentTimeMillis() - o.createdTime < messageTime) {
-          var qt = new QueueTask(order, TaskType.Messaging, 1);
-          updateQueue(qt);
-          LOG.warn("Order " + order.id + ": Error in sending Payment Error message, "
-              + "trying to queue task and add to employee handle..");
-          employeeHandleIssue(o);
-        }
+        handlePaymentPossibleErrorMsgErrorIssue(order, o);
       };
       var r = new Retry<>(op, handleError, numOfRetries, retryDuration,
           e -> DatabaseUnavailableException.class.isAssignableFrom(e.getClass()));
@@ -468,6 +462,39 @@ public class Commander {
     t.start();
   }
 
+  private void handlePaymentPossibleErrorMsgErrorIssue(Order order, Order o) {
+    if (o.messageSent.equals(MessageSent.NONE_SENT) && order.paid
+        .equals(PaymentStatus.TRYING)
+        && System.currentTimeMillis() - o.createdTime < messageTime) {
+      var qt = new QueueTask(order, TaskType.MESSAGING, 1);
+      updateQueue(qt);
+      LOG.warn("Order " + order.id + ": Error in sending Payment Error message, "
+          + "trying to queue task and add to employee handle..");
+      employeeHandleIssue(o);
+    }
+  }
+
+  private void handlePaymentPossibleErrorMsgRetryOperation(Order order, List<Exception> l)
+          throws Exception {
+    if (!l.isEmpty()) {
+      if (DatabaseUnavailableException.class.isAssignableFrom(l.get(0).getClass())) {
+        LOG.debug("Order " + order.id + ": Error in connecting to messaging service "
+            + "(Payment Error msg), trying again..");
+      } else {
+        LOG.debug("Order " + order.id + ": Error in creating Payment Error"
+            + " messaging request..");
+      }
+      throw l.remove(0);
+    }
+    if (order.paid.equals(PaymentStatus.TRYING) && order.messageSent
+        .equals(MessageSent.NONE_SENT)) {
+      var requestId = messagingService.receiveRequest(1);
+      order.messageSent = MessageSent.PAYMENT_TRYING;
+      LOG.info("Order " + order.id + ": Payment Error message sent successfully,"
+          + " request Id: " + requestId);
+    }
+  }
+
   private void employeeHandleIssue(Order order) {
     if (System.currentTimeMillis() - order.createdTime >= this.employeeTime) {
       LOG.trace("Order " + order.id + ": Employee handle time for order over, returning..");
@@ -490,7 +517,7 @@ public class Commander {
       Retry.HandleErrorIssue<Order> handleError = (o, err) -> {
         if (!o.addedToEmployeeHandle && System
             .currentTimeMillis() - order.createdTime < employeeTime) {
-          var qt = new QueueTask(order, TaskType.EmployeeDb, -1);
+          var qt = new QueueTask(order, TaskType.EMPLOYEE_DB, -1);
           updateQueue(qt);
           LOG.warn("Order " + order.id + ": Error in adding to employee db,"
               + " trying to queue task..");
@@ -520,21 +547,21 @@ public class Commander {
         LOG.trace("Order " + qt.order.id + ": This queue task of type " + qt.getType()
             + " does not need to be done anymore (timeout), dequeue..");
       } else {
-        if (qt.taskType.equals(TaskType.Payment)) {
-          if (!qt.order.paid.equals(PaymentStatus.Trying)) {
+        if (qt.taskType.equals(TaskType.PAYMENT)) {
+          if (!qt.order.paid.equals(PaymentStatus.TRYING)) {
             tryDequeue();
             LOG.trace("Order " + qt.order.id + ": This payment task already done, dequeueing..");
           } else {
             sendPaymentRequest(qt.order);
             LOG.debug("Order " + qt.order.id + ": Trying to connect to payment service..");
           }
-        } else if (qt.taskType.equals(TaskType.Messaging)) {
-          if (qt.order.messageSent.equals(MessageSent.PaymentFail)
-              || qt.order.messageSent.equals(MessageSent.PaymentSuccessful)) {
+        } else if (qt.taskType.equals(TaskType.MESSAGING)) {
+          if (qt.order.messageSent.equals(MessageSent.PAYMENT_FAIL)
+              || qt.order.messageSent.equals(MessageSent.PAYMENT_SUCCESSFUL)) {
             tryDequeue();
             LOG.trace("Order " + qt.order.id + ": This messaging task already done, dequeue..");
-          } else if (qt.messageType == 1 && (!qt.order.messageSent.equals(MessageSent.NoneSent)
-              || !qt.order.paid.equals(PaymentStatus.Trying))) {
+          } else if (qt.messageType == 1 && (!qt.order.messageSent.equals(MessageSent.NONE_SENT)
+              || !qt.order.paid.equals(PaymentStatus.TRYING))) {
             tryDequeue();
             LOG.trace("Order " + qt.order.id + ": This messaging task does not need to be done,"
                 + " dequeue..");
@@ -548,7 +575,7 @@ public class Commander {
             sendSuccessMessage(qt.order);
             LOG.debug("Order " + qt.order.id + ": Trying to connect to messaging service..");
           }
-        } else if (qt.taskType.equals(TaskType.EmployeeDb)) {
+        } else if (qt.taskType.equals(TaskType.EMPLOYEE_DB)) {
           if (qt.order.addedToEmployeeHandle) {
             tryDequeue();
             LOG.trace("Order " + qt.order.id + ": This employee handle task already done,"

commander/src/main/java/com/iluwatar/commander/Order.java

@@ -33,11 +33,11 @@ import java.util.Random;
 public class Order { //can store all transactions ids also
 
   enum PaymentStatus {
-    NotDone, Trying, Done
+    NOT_DONE, TRYING, DONE
   }
 
   enum MessageSent {
-    NoneSent, PaymentFail, PaymentTrying, PaymentSuccessful
+    NONE_SENT, PAYMENT_FAIL, PAYMENT_TRYING, PAYMENT_SUCCESSFUL
   }
 
   final User user;
@@ -65,8 +65,8 @@ public class Order { //can store all transactions ids also
     }
     this.id = id;
     USED_IDS.put(this.id, true);
-    this.paid = PaymentStatus.Trying;
-    this.messageSent = MessageSent.NoneSent;
+    this.paid = PaymentStatus.TRYING;
+    this.messageSent = MessageSent.NONE_SENT;
     this.addedToEmployeeHandle = false;
   }
 

commander/src/main/java/com/iluwatar/commander/messagingservice/MessagingService.java

@@ -38,7 +38,7 @@ public class MessagingService extends Service {
   private static final Logger LOGGER = LoggerFactory.getLogger(MessagingService.class);
 
   enum MessageToSend {
-    PaymentFail, PaymentTrying, PaymentSuccessful
+    PAYMENT_FAIL, PAYMENT_TRYING, PAYMENT_SUCCESSFUL
   }
 
   class MessageRequest {
@@ -63,11 +63,11 @@ public class MessagingService extends Service {
     var id = generateId();
     MessageToSend msg;
     if (messageToSend == 0) {
-      msg = MessageToSend.PaymentFail;
+      msg = MessageToSend.PAYMENT_FAIL;
     } else if (messageToSend == 1) {
-      msg = MessageToSend.PaymentTrying;
+      msg = MessageToSend.PAYMENT_TRYING;
     } else { //messageToSend == 2
-      msg = MessageToSend.PaymentSuccessful;
+      msg = MessageToSend.PAYMENT_SUCCESSFUL;
     }
     var req = new MessageRequest(id, msg);
     return updateDb(req);
@@ -84,10 +84,10 @@ public class MessagingService extends Service {
   }
 
   String sendMessage(MessageToSend m) {
-    if (m.equals(MessageToSend.PaymentSuccessful)) {
+    if (m.equals(MessageToSend.PAYMENT_SUCCESSFUL)) {
       return "Msg: Your order has been placed and paid for successfully!"
           + " Thank you for shopping with us!";
-    } else if (m.equals(MessageToSend.PaymentTrying)) {
+    } else if (m.equals(MessageToSend.PAYMENT_TRYING)) {
       return "Msg: There was an error in your payment process,"
           + " we are working on it and will return back to you shortly."
           + " Meanwhile, your order has been placed and will be shipped.";

commander/src/main/java/com/iluwatar/commander/queue/QueueTask.java

@@ -36,7 +36,7 @@ public class QueueTask {
    */
 
   public enum TaskType {
-    Messaging, Payment, EmployeeDb
+    MESSAGING, PAYMENT, EMPLOYEE_DB
   }
 
   public Order order;
@@ -68,7 +68,7 @@ public class QueueTask {
    * @return String representing type of task
    */
   public String getType() {
-    if (!this.taskType.equals(TaskType.Messaging)) {
+    if (!this.taskType.equals(TaskType.MESSAGING)) {
       return this.taskType.toString();
     } else {
       if (this.messageType == 0) {

composite/README.md

@@ -9,15 +9,17 @@ tags:
 ---
 
 ## Intent
-Compose objects into tree structures to represent part-whole
-hierarchies. Composite lets clients treat individual objects and compositions
-of objects uniformly.
+
+Compose objects into tree structures to represent part-whole hierarchies. Composite lets clients 
+treat individual objects and compositions of objects uniformly.
 
 ## Explanation
 
 Real world example
 
-> Every sentence is composed of words which are in turn composed of characters. Each of these objects is printable and they can have something printed before or after them like sentence always ends with full stop and word always has space before it
+> Every sentence is composed of words which are in turn composed of characters. Each of these 
+> objects is printable and they can have something printed before or after them like sentence always 
+> ends with full stop and word always has space before it.
 
 In plain words
 
@@ -25,11 +27,16 @@ In plain words
 
 Wikipedia says
 
-> In software engineering, the composite pattern is a partitioning design pattern. The composite pattern describes that a group of objects is to be treated in the same way as a single instance of an object. The intent of a composite is to "compose" objects into tree structures to represent part-whole hierarchies. Implementing the composite pattern lets clients treat individual objects and compositions uniformly.
+> In software engineering, the composite pattern is a partitioning design pattern. The composite 
+> pattern describes that a group of objects is to be treated in the same way as a single instance of 
+> an object. The intent of a composite is to "compose" objects into tree structures to represent 
+> part-whole hierarchies. Implementing the composite pattern lets clients treat individual objects 
+> and compositions uniformly.
 
 **Programmatic Example**
 
-Taking our sentence example from above. Here we have the base class and different printable types
+Taking our sentence example from above. Here we have the base class `LetterComposite` and the 
+different printable types `Letter`, `Word` and `Sentence`. 
 
 ```java
 public abstract class LetterComposite {
@@ -102,7 +109,7 @@ public class Sentence extends LetterComposite {
 }
 ```
 
-Then we have a messenger to carry messages
+Then we have a messenger to carry messages:
 
 ```java
 public class Messenger {
@@ -143,7 +150,7 @@ public class Messenger {
 }
 ```
 
-And then it can be used as
+And then it can be used as:
 
 ```java
 var orcMessage = new Messenger().messageFromOrcs();
@@ -153,13 +160,16 @@ elfMessage.print(); // Much wind pours from your mouth.
 ```
 
 ## Class diagram
+
 ![alt text](./etc/composite.urm.png "Composite class diagram")
 
 ## Applicability
+
 Use the Composite pattern when
 
-* you want to represent part-whole hierarchies of objects
-* you want clients to be able to ignore the difference between compositions of objects and individual objects. Clients will treat all objects in the composite structure uniformly
+* You want to represent part-whole hierarchies of objects.
+* You want clients to be able to ignore the difference between compositions of objects and 
+individual objects. Clients will treat all objects in the composite structure uniformly.
 
 ## Real world examples
 

composite/pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.23.0-SNAPSHOT</version>
+    <version>1.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>composite</artifactId>
   <dependencies>

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

@@ -23,15 +23,23 @@
 
 package com.iluwatar.composite;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /**
  * Application test
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App#main(String[])}
+   * throws an exception.
+   */
 
   @Test
-  public void test() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+    Assertions.assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 }

converter/README.md

@@ -9,16 +9,19 @@ tags:
 ---
 
 ## Intent
-The purpose of the Converter Pattern is to provide a generic, common way of bidirectional
+
+The purpose of the Converter pattern is to provide a generic, common way of bidirectional
 conversion between corresponding types, allowing a clean implementation in which the types do not
-need to be aware of each other. Moreover, the Converter Pattern introduces bidirectional collection
+need to be aware of each other. Moreover, the Converter pattern introduces bidirectional collection
 mapping, reducing a boilerplate code to minimum.
 
 ## Explanation
 
 Real world example
 
-> In real world applications it is often the case that database layer consists of entities that need to be mapped into DTOs for use on the business logic layer. Similar mapping is done for potentially huge amount of classes and we need a generic way to achieve this.
+> In real world applications it is often the case that database layer consists of entities that need 
+> to be mapped into DTOs for use on the business logic layer. Similar mapping is done for 
+> potentially huge amount of classes and we need a generic way to achieve this.
 
 In plain words
 
@@ -26,7 +29,8 @@ In plain words
 
 **Programmatic Example**
 
-We need a generic solution for the mapping problem. To achieve this, let's introduce a generic converter.
+We need a generic solution for the mapping problem. To achieve this, let's introduce a generic 
+converter.
 
 ```java
 public class Converter<T, U> {
@@ -77,7 +81,7 @@ public class UserConverter extends Converter<UserDto, User> {
 }
 ```
 
-Now mapping between User and UserDto becomes trivial.
+Now mapping between `User` and `UserDto` becomes trivial.
 
 ```java
 var userConverter = new UserConverter();
@@ -86,14 +90,18 @@ var user = userConverter.convertFromDto(dtoUser);
 ```
 
 ## Class diagram
+
 ![alt text](./etc/converter.png "Converter Pattern")
 
 ## Applicability
+
 Use the Converter Pattern in the following situations:
 
-* When you have types that logically correspond which other and you need to convert entities between them
-* When you want to provide different ways of types conversions depending on a context
-* Whenever you introduce a DTO (Data transfer object), you will probably need to convert it into the domain equivalence
+* When you have types that logically correspond with each other and you need to convert entities 
+between them.
+* When you want to provide different ways of types conversions depending on the context.
+* Whenever you introduce a DTO (Data transfer object), you will probably need to convert it into the 
+domain equivalence.
 
 ## Credits
 

converter/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<artifactId>java-design-patterns</artifactId>
 		<groupId>com.iluwatar</groupId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>converter</artifactId>
 	<modelVersion>4.0.0</modelVersion>

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

@@ -25,14 +25,24 @@ package com.iluwatar.converter;
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 /**
  * App running test
  */
-public class AppTest {
+class AppTest {
+
+  /**
+   * Issue: Add at least one assertion to this test case.
+   *
+   * Solution: Inserted assertion to check whether the execution of the main method in {@link App#main(String[])}
+   * throws an exception.
+   */
 
   @Test
-  public void testMain() {
-    App.main(new String[]{});
+  void shouldExecuteApplicationWithoutException() {
+
+    assertDoesNotThrow(() -> App.main(new String[]{}));
   }
 
 }