Merge branch 'master' into adapter-grammatical-fixes

Update adapter/README.md
Grammatical fixes
2021-08-01 21:17:37 +03:00 · 2021-06-05 12:59:03 +05:30 · 2021-06-05 10:00:36 +03:00
313 changed files with 1426 additions and 2872 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -1568,69 +1568,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "karthikbhat13",
-      "name": "karthikbhat13",
-      "avatar_url": "https://avatars.githubusercontent.com/u/22431014?v=4",
-      "profile": "https://github.com/karthikbhat13",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "mortezaadi",
-      "name": "Morteza Adigozalpour",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1329687?v=4",
-      "profile": "https://github.com/mortezaadi",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "tan31989",
-      "name": "Nagaraj Tantri",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3784194?v=4",
-      "profile": "https://stackoverflow.com/users/308565/nagaraj-tantri",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "frascu",
-      "name": "Francesco Scuccimarri",
-      "avatar_url": "https://avatars.githubusercontent.com/u/7107651?v=4",
-      "profile": "http://scuccimarri.it",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Conhan93",
-      "name": "Conny Hansson",
-      "avatar_url": "https://avatars.githubusercontent.com/u/71334757?v=4",
-      "profile": "https://github.com/Conhan93",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "muklasr",
-      "name": "Muklas Rahmanto",
-      "avatar_url": "https://avatars.githubusercontent.com/u/43443753?v=4",
-      "profile": "http://muklasr.medium.com",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "VxDxK",
-      "name": "Vadim",
-      "avatar_url": "https://avatars.githubusercontent.com/u/38704817?v=4",
-      "profile": "https://github.com/VxDxK",
-      "contributions": [
-        "translation"
-      ]
    }
  ],
  "contributorsPerLine": 4,
--- a/README.md
+++ b/README.md
@ -10,12 +10,12 @@
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=coverage)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns)
 [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-179-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-172-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 <br/>

-Read in different language : [**zh**](localization/zh/README.md), [**ko**](localization/ko/README.md), [**fr**](localization/fr/README.md), [**tr**](localization/tr/README.md), [**ar**](localization/ar/README.md), [**es**](localization/es/README.md), [**pt**](localization/pt/README.md), [**id**](localization/id/README.md), [**ru**](localization/ru/README.md) 
+Read in different language : [**zh**](/localization/zh/README.md), [**ko**](/localization/ko/README.md), [**fr**](/localization/fr/README.md), [**tr**](/localization/tr/README.md), [**ar**](/localization/ar/README.md), [**es**](/localization/es/README.md), [**pt**](/localization/pt/README.md)

 <br/>

@ -333,17 +333,6 @@ This project is licensed under the terms of the MIT license.
    <td align="center"><a href="https://github.com/marlo2222"><img src="https://avatars.githubusercontent.com/u/40809563?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marlo Henrique</b></sub></a><br /><a href="#translation-marlo2222" title="Translation">🌍</a></td>
    <td align="center"><a href="https://github.com/AndriyPyzh"><img src="https://avatars.githubusercontent.com/u/57706635?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AndriyPyzh</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=AndriyPyzh" title="Code">💻</a></td>
  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/karthikbhat13"><img src="https://avatars.githubusercontent.com/u/22431014?v=4?s=100" width="100px;" alt=""/><br /><sub><b>karthikbhat13</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=karthikbhat13" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/mortezaadi"><img src="https://avatars.githubusercontent.com/u/1329687?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Morteza Adigozalpour</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=mortezaadi" title="Code">💻</a></td>
-    <td align="center"><a href="https://stackoverflow.com/users/308565/nagaraj-tantri"><img src="https://avatars.githubusercontent.com/u/3784194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nagaraj Tantri</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=tan31989" title="Code">💻</a></td>
-    <td align="center"><a href="http://scuccimarri.it"><img src="https://avatars.githubusercontent.com/u/7107651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Francesco Scuccimarri</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=frascu" title="Code">💻</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/Conhan93"><img src="https://avatars.githubusercontent.com/u/71334757?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Conny Hansson</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Conhan93" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://muklasr.medium.com"><img src="https://avatars.githubusercontent.com/u/43443753?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Muklas Rahmanto</b></sub></a><br /><a href="#translation-muklasr" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/VxDxK"><img src="https://avatars.githubusercontent.com/u/38704817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vadim</b></sub></a><br /><a href="#translation-VxDxK" title="Translation">🌍</a></td>
-  </tr>
 </table>

 <!-- markdownlint-restore -->
--- a/abstract-document/README.md
+++ b/abstract-document/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Abstract Document
-category: Structural
+folder: abstract-document
+permalink: /patterns/abstract-document/
+categories: Structural
 language: en
 tags: 
 - Extensibility
--- a/abstract-factory/README.md
+++ b/abstract-factory/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Abstract Factory
-category: Creational
+folder: abstract-factory
+permalink: /patterns/abstract-factory/
+categories: Creational
 language: en
 tags:
 - Gang of Four
--- a/active-object/README.md
+++ b/active-object/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Active Object
-category: Concurrency
+folder: active-object
+permalink: /patterns/active-object/
+categories: Concurrency
 language: en
 tags:
 - Performance
@ -8,7 +11,7 @@ tags:


 ## Intent
-The active object design pattern decouples method execution from method invocation for objects that each reside in their thread of control. The goal is to introduce concurrency, by using asynchronous method invocation, and a scheduler for handling requests.
+The active object design pattern decouples method execution from method invocation for objects that each reside in their thread of control. The goal is to introduce concurrency, by using asynchronous method invocation and a scheduler for handling requests.

 ## Explanation

@ -67,7 +70,7 @@ public abstract class ActiveCreature{
    requests.put(new Runnable() {
        @Override
        public void run() { 
-          logger.info("{} has started to roam the wastelands.",name());
+          logger.info("{} has started to roam and the wastelands.",name());
        }
      }
    );
@ -79,7 +82,7 @@ public abstract class ActiveCreature{
 }
 ```

-We can see that any class that will extend the ActiveCreature class will have its own thread of control to invoke and execute methods.
+We can see that any class that will extend the ActiveCreature class will have its own thread of control to execute and invocate methods.

 For example, the Orc class:

@ -93,7 +96,7 @@ public class Orc extends ActiveCreature {
 }
 ```

-Now, we can create multiple creatures such as Orcs, tell them to eat and roam, and they will execute it on their own thread of control:
+Now, we can create multiple creatures such as Orcs, tell them to eat and roam and they will execute it on their own thread of control:

 ```java
  public static void main(String[] args) {  
@ -120,4 +123,4 @@ Now, we can create multiple creatures such as Orcs, tell them to eat and roam, a

 ## Class diagram

-![alt text](./etc/active-object.urm.png "Active Object class diagram")
+![alt text](./etc/active-object.urm.PNG "Active Object class diagram")
--- a/active-object/etc/active-object.urm.PNG
+++ b/active-object/etc/active-object.urm.PNG
--- a/active-object/src/main/java/com/iluwatar/activeobject/ActiveCreature.java
+++ b/active-object/src/main/java/com/iluwatar/activeobject/ActiveCreature.java
@ -82,7 +82,7 @@ public abstract class ActiveCreature {
  }

  /**
-   * Roam the wastelands.
+   * Roam in the wastelands.
   * @throws InterruptedException due to firing a new Runnable.
   */
  public void roam() throws InterruptedException {
--- a/acyclic-visitor/README.md
+++ b/acyclic-visitor/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Acyclic Visitor
-category: Behavioral
+folder: acyclic-visitor
+permalink: /patterns/acyclic-visitor/
+categories: Behavioral
 language: en
 tags:
 - Extensibility
--- a/adapter/README.md
+++ b/adapter/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Adapter
-category: Structural
+folder: adapter
+permalink: /patterns/adapter/
+categories: Structural
 language: en
 tags:
 - Gang of Four
@ -15,10 +18,10 @@ couldn't otherwise because of incompatible interfaces.

 ## Explanation

-Real world example
+Real-world example

-> Consider that you have some pictures in your memory card and you need to transfer them to your computer. In order to transfer them you need some kind of adapter that is compatible with your computer ports so that you can attach memory card to your computer. In this case card reader is an adapter.
-> Another example would be the famous power adapter; a three legged plug can't be connected to a two pronged outlet, it needs to use a power adapter that makes it compatible with the two pronged outlet.
+> Consider that you have some pictures on your memory card and you need to transfer them to your computer. To transfer them, you need some kind of adapter that is compatible with your computer ports so that you can attach a memory card to your computer. In this case card reader is an adapter.
+> Another example would be the famous power adapter; a three-legged plug can't be connected to a two-pronged outlet, it needs to use a power adapter that makes it compatible with the two-pronged outlets.
 > Yet another example would be a translator translating words spoken by one person to another

 In plain words
@ -33,7 +36,7 @@ Wikipedia says

 Consider a captain that can only use rowing boats and cannot sail at all.

-First we have interfaces `RowingBoat` and `FishingBoat`
+First, we have interfaces `RowingBoat` and `FishingBoat`

 ```java
 public interface RowingBoat {
@ -65,7 +68,7 @@ public class Captain {
 }
 ```

-Now let's say the pirates are coming and our captain needs to escape but there is only fishing boat available. We need to create an adapter that allows the captain to operate the fishing boat with his rowing boat skills.
+Now let's say the pirates are coming and our captain needs to escape but there is only a fishing boat available. We need to create an adapter that allows the captain to operate the fishing boat with his rowing boat skills.

 ```java
@Slf4j
@ -97,25 +100,25 @@ captain.row();
 ## Applicability
 Use the Adapter pattern when

-* you want to use an existing class, and its interface does not match the one you need
-* you want to create a reusable class that cooperates with unrelated or unforeseen classes, that is, classes that don't necessarily have compatible interfaces
-* you need to use several existing subclasses, but it's impractical to adapt their interface by subclassing every one. An object adapter can adapt the interface of its parent class.
-* most of the applications using third party libraries use adapters as a middle layer between the application and the 3rd party library to decouple the application from the library. If another library has to be used only an adapter for the new library is required without having to change the application code.
+* You want to use an existing class, and its interface does not match the one you need
+* You want to create a reusable class that cooperates with unrelated or unforeseen classes, that is, classes that don't necessarily have compatible interfaces
+* You need to use several existing subclasses, but it's impractical to adapt their interface by subclassing everyone. An object adapter can adapt the interface of its parent class.
+* Most of the applications using third-party libraries use adapters as a middle layer between the application and the 3rd party library to decouple the application from the library. If another library has to be used only an adapter for the new library is required without having to change the application code.

 ## Consequences
 Class and object adapters have different trade-offs. A class adapter

-*	adapts Adaptee to Target by committing to a concrete Adaptee class. As a consequence, a class adapter won’t work when we want to adapt a class and all its subclasses.
-*	let’s Adapter override some of Adaptee’s behavior, since Adapter is a subclass of Adaptee.
-*	introduces only one object, and no additional pointer indirection is needed to get to the adaptee.
+*	Adapts Adaptee to Target by committing to a concrete Adaptee class. As a consequence, a class adapter won’t work when we want to adapt a class and all its subclasses.
+*	Let’s Adapter override some of Adaptee’s behavior since Adapter is a subclass of Adaptee.
+*	Introduces only one object, and no additional pointer indirection is needed to get to the adaptee.

 An object adapter	

-*	let’s a single Adapter work with many Adaptees—that is, the Adaptee itself and all of its subclasses (if any). The Adapter can also add functionality to all Adaptees at once.
-*	makes it harder to override Adaptee behavior. It will require subclassing Adaptee and making Adapter refer to the subclass rather than the Adaptee itself.
+*	Lets a single Adapter work with many Adaptees—that is, the Adaptee itself and all of its subclasses (if any). The Adapter can also add functionality to all Adaptees at once.
+*	Makes it harder to override Adaptee behavior. It will require subclassing Adaptee and making the Adapter refer to the subclass rather than the Adaptee itself.


-## Known uses
+## Real-world examples

 * [java.util.Arrays#asList()](http://docs.oracle.com/javase/8/docs/api/java/util/Arrays.html#asList%28T...%29)
 * [java.util.Collections#list()](https://docs.oracle.com/javase/8/docs/api/java/util/Collections.html#list-java.util.Enumeration-)
--- a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
+++ b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
@ -33,7 +33,7 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;

 /**
- * Test class
+ * Tests for the adapter pattern.
 */
 class AdapterPatternTest {

--- a/adapter/src/test/java/com/iluwatar/adapter/AppTest.java
+++ b/adapter/src/test/java/com/iluwatar/adapter/AppTest.java
@ -33,9 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 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}
+   * Check whether the execution of the main method in {@link App}
   * throws an exception.
   */

--- a/aggregator-microservices/README.md
+++ b/aggregator-microservices/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Aggregator Microservices
-category: Architectural
+folder: aggregator-microservices
+permalink: /patterns/aggregator-microservices/
+categories: Architectural
 language: en
 tags:
 - Cloud distributed
--- a/aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java
+++ b/aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java
@ -48,7 +48,7 @@ class AggregatorTest {

  @BeforeEach
  public void setup() {
-    MockitoAnnotations.openMocks(this);
+    MockitoAnnotations.initMocks(this);
  }

  /**
--- a/ambassador/README.md
+++ b/ambassador/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Ambassador
-category: Structural
+folder: ambassador
+permalink: /patterns/ambassador/
+categories: Structural
 language: en
 tags:
  - Decoupling
--- a/api-gateway/README.md
+++ b/api-gateway/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: API Gateway
-category: Architectural
+folder: api-gateway
+permalink: /patterns/api-gateway/
+categories: Architectural
 language: en
 tags:
  - Cloud distributed
--- a/api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java
+++ b/api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java
@ -48,7 +48,7 @@ class ApiGatewayTest {

  @BeforeEach
  public void setup() {
-    MockitoAnnotations.openMocks(this);
+    MockitoAnnotations.initMocks(this);
  }

  /**
--- a/arrange-act-assert/README.md
+++ b/arrange-act-assert/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Arrange/Act/Assert
-category: Idiom
+folder: arrange-act-assert
+permalink: /patterns/arrange-act-assert/
+categories: Idiom
 language: en
 tags:
 - Testing
--- a/async-method-invocation/README.md
+++ b/async-method-invocation/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Async Method Invocation
-category: Concurrency
+folder: async-method-invocation
+permalink: /patterns/async-method-invocation/
+categories: Concurrency
 language: en
 tags:
 - Reactive
--- a/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java
+++ b/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java
@ -68,7 +68,7 @@ class ThreadAsyncExecutorTest {

  @BeforeEach
  void setUp() {
-    MockitoAnnotations.openMocks(this);
+    MockitoAnnotations.initMocks(this);
  }

  /**
--- a/balking/README.md
+++ b/balking/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Balking
-category: Concurrency
+folder: balking
+permalink: /patterns/balking/
+categories: Concurrency
 language: en
 tags:
 - Decoupling
--- a/bridge/README.md
+++ b/bridge/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Bridge
-category: Structural
+folder: bridge
+permalink: /patterns/bridge/
+categories: Structural
 language: en
 tags:
 - Gang of Four
--- a/builder/README.md
+++ b/builder/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Builder
-category: Creational
+folder: builder
+permalink: /patterns/builder/
+categories: Creational
 language: en
 tags:
 - Gang of Four
--- a/business-delegate/README.md
+++ b/business-delegate/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Business Delegate
-category: Structural
+folder: business-delegate
+permalink: /patterns/business-delegate/
+categories: Structural
 language: en
 tags:
 - Decoupling
--- a/bytecode/README.md
+++ b/bytecode/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Bytecode
-category: Behavioral
+folder: bytecode
+permalink: /patterns/bytecode/
+categories: Behavioral
 language: en
 tags:
 - Game programming
--- a/caching/README.md
+++ b/caching/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Caching
-category: Behavioral
+folder: caching
+permalink: /patterns/caching/
+categories: Behavioral
 language: en
 tags:
  - Performance
@ -40,29 +43,39 @@ Wikipedia says:
 **Programmatic Example**

 Let's first look at the data layer of our application. The interesting classes are `UserAccount`
-which is a simple Java object containing the user account details, and `DbManager` interface which handles
-reading and writing of these objects to/from database.
+which is a simple Java object containing the user account details, and `DbManager` which handles
+reading and writing of these objects to/from MongoDB database.

 ```java
-@Data
+@Setter
+@Getter
@AllArgsConstructor
@ToString
-@EqualsAndHashCode
 public class UserAccount {
  private String userId;
  private String userName;
  private String additionalInfo;
 }

-public interface DbManager {
+@Slf4j
+public final class DbManager {

-  void connect();
-  void disconnect();
-  
-  UserAccount readFromDb(String userId);
-  UserAccount writeToDb(UserAccount userAccount);
-  UserAccount updateDb(UserAccount userAccount);
-  UserAccount upsertDb(UserAccount userAccount);
+  private static MongoClient mongoClient;
+  private static MongoDatabase db;
+
+  private DbManager() { /*...*/ }
+
+  public static void createVirtualDb() { /*...*/ }
+
+  public static void connect() throws ParseException { /*...*/ }
+
+  public static UserAccount readFromDb(String userId) { /*...*/ }
+
+  public static void writeToDb(UserAccount userAccount) { /*...*/ }
+
+  public static void updateDb(UserAccount userAccount) { /*...*/ }
+
+  public static void upsertDb(UserAccount userAccount) { /*...*/ }
 }
 ```

@ -158,43 +171,30 @@ strategies.
@Slf4j
 public class CacheStore {

-  private static final int CAPACITY = 3;
  private static LruCache cache;
-  private final DbManager dbManager;

  /* ... details omitted ... */

-  public UserAccount readThrough(final String userId) {
+  public static UserAccount readThrough(String userId) {
    if (cache.contains(userId)) {
-      LOGGER.info("# Found in Cache!");
+      LOGGER.info("# Cache Hit!");
      return cache.get(userId);
    }
-    LOGGER.info("# Not found in cache! Go to DB!!");
-    UserAccount userAccount = dbManager.readFromDb(userId);
+    LOGGER.info("# Cache Miss!");
+    UserAccount userAccount = DbManager.readFromDb(userId);
    cache.set(userId, userAccount);
    return userAccount;
  }

-  public void writeThrough(final UserAccount userAccount) {
+  public static void writeThrough(UserAccount userAccount) {
    if (cache.contains(userAccount.getUserId())) {
-      dbManager.updateDb(userAccount);
+      DbManager.updateDb(userAccount);
    } else {
-      dbManager.writeToDb(userAccount);
+      DbManager.writeToDb(userAccount);
    }
    cache.set(userAccount.getUserId(), userAccount);
  }

-  public void writeAround(final UserAccount userAccount) {
-    if (cache.contains(userAccount.getUserId())) {
-      dbManager.updateDb(userAccount);
-      // Cache data has been updated -- remove older
-      cache.invalidate(userAccount.getUserId());
-      // version from cache.
-    } else {
-      dbManager.writeToDb(userAccount);
-    }
-  }
-
  public static void clearCache() {
    if (cache != null) {
      cache.clear();
@ -225,39 +225,34 @@ class.
 public final class AppManager {

  private static CachingPolicy cachingPolicy;
-  private final DbManager dbManager;
-  private final CacheStore cacheStore;

  private AppManager() {
  }

-  public void initDb() { /* ... */ }
+  public static void initDb(boolean useMongoDb) { /* ... */ }

  public static void initCachingPolicy(CachingPolicy policy) { /* ... */ }

  public static void initCacheCapacity(int capacity) { /* ... */ }

-  public UserAccount find(final String userId) {
-    LOGGER.info("Trying to find {} in cache", userId);
-    if (cachingPolicy == CachingPolicy.THROUGH
-            || cachingPolicy == CachingPolicy.AROUND) {
-      return cacheStore.readThrough(userId);
+  public static UserAccount find(String userId) {
+    if (cachingPolicy == CachingPolicy.THROUGH || cachingPolicy == CachingPolicy.AROUND) {
+      return CacheStore.readThrough(userId);
    } else if (cachingPolicy == CachingPolicy.BEHIND) {
-      return cacheStore.readThroughWithWriteBackPolicy(userId);
+      return CacheStore.readThroughWithWriteBackPolicy(userId);
    } else if (cachingPolicy == CachingPolicy.ASIDE) {
      return findAside(userId);
    }
    return null;
  }

-  public void save(final UserAccount userAccount) {
-    LOGGER.info("Save record!");
+  public static void save(UserAccount userAccount) {
    if (cachingPolicy == CachingPolicy.THROUGH) {
-      cacheStore.writeThrough(userAccount);
+      CacheStore.writeThrough(userAccount);
    } else if (cachingPolicy == CachingPolicy.AROUND) {
-      cacheStore.writeAround(userAccount);
+      CacheStore.writeAround(userAccount);
    } else if (cachingPolicy == CachingPolicy.BEHIND) {
-      cacheStore.writeBehind(userAccount);
+      CacheStore.writeBehind(userAccount);
    } else if (cachingPolicy == CachingPolicy.ASIDE) {
      saveAside(userAccount);
    }
@ -277,35 +272,24 @@ Here is what we do in the main class of the application.
@Slf4j
 public class App {

-  public static void main(final String[] args) {
-    boolean isDbMongo = isDbMongo(args);
-    if(isDbMongo){
-      LOGGER.info("Using the Mongo database engine to run the application.");
-    } else {
-      LOGGER.info("Using the 'in Memory' database to run the application.");
-    }
-    App app = new App(isDbMongo);
+  public static void main(String[] args) {
+    AppManager.initDb(false);
+    AppManager.initCacheCapacity(3);
+    var app = new App();
    app.useReadAndWriteThroughStrategy();
-    String splitLine = "==============================================";
-    LOGGER.info(splitLine);
    app.useReadThroughAndWriteAroundStrategy();
-    LOGGER.info(splitLine);
    app.useReadThroughAndWriteBehindStrategy();
-    LOGGER.info(splitLine);
    app.useCacheAsideStategy();
-    LOGGER.info(splitLine);
  }

  public void useReadAndWriteThroughStrategy() {
    LOGGER.info("# CachingPolicy.THROUGH");
-    appManager.initCachingPolicy(CachingPolicy.THROUGH);
-
+    AppManager.initCachingPolicy(CachingPolicy.THROUGH);
    var userAccount1 = new UserAccount("001", "John", "He is a boy.");
-
-    appManager.save(userAccount1);
-    LOGGER.info(appManager.printCacheContent());
-    appManager.find("001");
-    appManager.find("001");
+    AppManager.save(userAccount1);
+    LOGGER.info(AppManager.printCacheContent());
+    AppManager.find("001");
+    AppManager.find("001");
  }

  public void useReadThroughAndWriteAroundStrategy() { /* ... */ }
@ -316,6 +300,16 @@ public class App {
 }
 ```

+Finally, here is some of the console output from the program.
+
+```
+12:32:53.845 [main] INFO com.iluwatar.caching.App - # CachingPolicy.THROUGH
+12:32:53.900 [main] INFO com.iluwatar.caching.App - 
+--CACHE CONTENT--
+UserAccount(userId=001, userName=John, additionalInfo=He is a boy.)
+----
+```
+
 ## Class diagram

 ![alt text](./etc/caching.png "Caching")
--- a/caching/docker-compose.yml
+++ b/caching/docker-compose.yml
@ -1,11 +0,0 @@
-version: '3.7'
-services:
-  mongodb_container:
-    image: mongo:latest
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: rootpassword
-    ports:
-      - 27017:27017
-    volumes:
-      - ./mongo-data/:/data/db
--- a/caching/pom.xml
+++ b/caching/pom.xml
@ -39,21 +39,19 @@
      <scope>test</scope>
    </dependency>
    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <version>3.12.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
-      <scope>test</scope>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongodb-driver</artifactId>
+      <version>3.12.1</version>
    </dependency>
    <dependency>
      <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
-      <version>3.4.1</version>
+      <artifactId>mongodb-driver-core</artifactId>
+      <version>3.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>bson</artifactId>
+      <version>3.0.4</version>
    </dependency>
  </dependencies>
  <!--
--- a/caching/src/main/java/com/iluwatar/caching/App.java
+++ b/caching/src/main/java/com/iluwatar/caching/App.java
@ -1,62 +1,58 @@
+/*
+ * The MIT License
+ * Copyright © 2014-2021 Ilkka Seppälä
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package com.iluwatar.caching;

-import com.iluwatar.caching.database.DbManager;
-import com.iluwatar.caching.database.DbManagerFactory;
 import lombok.extern.slf4j.Slf4j;

 /**
- * The Caching pattern describes how to avoid expensive re-acquisition of
- * resources by not releasing the resources immediately after their use.
- * The resources retain their identity, are kept in some fast-access storage,
- * and are re-used to avoid having to acquire them again. There are four main
- * caching strategies/techniques in this pattern; each with their own pros and
- * cons. They are <code>write-through</code> which writes data to the cache and
- * DB in a single transaction, <code>write-around</code> which writes data
- * immediately into the DB instead of the cache, <code>write-behind</code>
- * which writes data into the cache initially whilst the data is only
- * written into the DB when the cache is full, and <code>cache-aside</code>
- * which pushes the responsibility of keeping the data synchronized in both
- * data sources to the application itself. The <code>read-through</code>
- * strategy is also included in the mentioned four strategies --
- * returns data from the cache to the caller <b>if</b> it exists <b>else</b>
- * queries from DB and stores it into the cache for future use. These strategies
- * determine when the data in the cache should be written back to the backing
- * store (i.e. Database) and help keep both data sources
- * synchronized/up-to-date. This pattern can improve performance and also helps
- * to maintainconsistency between data held in the cache and the data in
- * the underlying data store.
+ * The Caching pattern describes how to avoid expensive re-acquisition of resources by not releasing
+ * the resources immediately after their use. The resources retain their identity, are kept in some
+ * fast-access storage, and are re-used to avoid having to acquire them again. There are four main
+ * caching strategies/techniques in this pattern; each with their own pros and cons. They are;
+ * <code>write-through</code> which writes data to the cache and DB in a single transaction,
+ * <code>write-around</code> which writes data immediately into the DB instead of the cache,
+ * <code>write-behind</code> which writes data into the cache initially whilst the data is only
+ * written into the DB when the cache is full, and <code>cache-aside</code> which pushes the
+ * responsibility of keeping the data synchronized in both data sources to the application itself.
+ * The <code>read-through</code> strategy is also included in the mentioned four strategies --
+ * returns data from the cache to the caller <b>if</b> it exists <b>else</b> queries from DB and
+ * stores it into the cache for future use. These strategies determine when the data in the cache
+ * should be written back to the backing store (i.e. Database) and help keep both data sources
+ * synchronized/up-to-date. This pattern can improve performance and also helps to maintain
+ * consistency between data held in the cache and the data in the underlying data store.
 *
- * <p>In this example, the user account ({@link UserAccount}) entity is used
- * as the underlying application data. The cache itself is implemented as an
- * internal (Java) data structure. It adopts a Least-Recently-Used (LRU)
- * strategy for evicting data from itself when its full. The four
- * strategies are individually tested. The testing of the cache is restricted
- * towards saving and querying of user accounts from the
- * underlying data store( {@link DbManager}). The main class ( {@link App}
- * is not aware of the underlying mechanics of the application
- * (i.e. save and query) and whether the data is coming from the cache or the
- * DB (i.e. separation of concern). The AppManager ({@link AppManager}) handles
- * the transaction of data to-and-from the underlying data store (depending on
- * the preferred caching policy/strategy).
+ * <p>In this example, the user account ({@link UserAccount}) entity is used as the underlying
+ * application data. The cache itself is implemented as an internal (Java) data structure. It adopts
+ * a Least-Recently-Used (LRU) strategy for evicting data from itself when its full. The four
+ * strategies are individually tested. The testing of the cache is restricted towards saving and
+ * querying of user accounts from the underlying data store ( {@link DbManager}). The main class (
+ * {@link App} is not aware of the underlying mechanics of the application (i.e. save and query) and
+ * whether the data is coming from the cache or the DB (i.e. separation of concern). The AppManager
+ * ({@link AppManager}) handles the transaction of data to-and-from the underlying data store
+ * (depending on the preferred caching policy/strategy).
 * <p>
- * <i>{@literal App --> AppManager --> CacheStore/LRUCache/CachingPolicy -->
- * DBManager} </i>
- * </p>
- *
- * <p>
- * There are 2 ways to launch the application.
- *  - to use "in Memory" database.
- *  - to use the MongoDb as a database
- *
- * To run the application with "in Memory" database, just launch it without parameters
- * Example: 'java -jar app.jar'
- *
- * To run the application with MongoDb you need to be installed the MongoDb
- * in your system, or to launch it in the docker container.
- * You may launch docker container from the root of current module with command:
- * 'docker-compose up'
- * Then you can start the application with parameter --mongo
- * Example: 'java -jar app.jar --mongo'
+ * <i>{@literal App --> AppManager --> CacheStore/LRUCache/CachingPolicy --> DBManager} </i>
 * </p>
 *
 * @see CacheStore
@ -65,67 +61,23 @@ import lombok.extern.slf4j.Slf4j;
 */
@Slf4j
 public class App {
-  /**
-   * Constant parameter name to use mongoDB.
-   */
-  private static final String USE_MONGO_DB = "--mongo";
-  /**
-   * Application manager.
-   */
-  private final AppManager appManager;
-
-  /**
-   * Constructor of current App.
-   *
-   * @param isMongo boolean
-   */
-  public App(final boolean isMongo) {
-    DbManager dbManager = DbManagerFactory.initDb(isMongo);
-    appManager = new AppManager(dbManager);
-    appManager.initDb();
-  }

  /**
   * Program entry point.
   *
   * @param args command line args
   */
-  public static void main(final String[] args) {
-    // VirtualDB (instead of MongoDB) was used in running the JUnit tests
+  public static void main(String[] args) {
+    AppManager.initDb(false); // VirtualDB (instead of MongoDB) was used in running the JUnit tests
    // and the App class to avoid Maven compilation errors. Set flag to
    // true to run the tests with MongoDB (provided that MongoDB is
    // installed and socket connection is open).
-    boolean isDbMongo = isDbMongo(args);
-    if (isDbMongo) {
-      LOGGER.info("Using the Mongo database engine to run the application.");
-    } else {
-      LOGGER.info("Using the 'in Memory' database to run the application.");
-    }
-    App app = new App(isDbMongo);
+    AppManager.initCacheCapacity(3);
+    var app = new App();
    app.useReadAndWriteThroughStrategy();
-    String splitLine = "==============================================";
-    LOGGER.info(splitLine);
    app.useReadThroughAndWriteAroundStrategy();
-    LOGGER.info(splitLine);
    app.useReadThroughAndWriteBehindStrategy();
-    LOGGER.info(splitLine);
    app.useCacheAsideStategy();
-    LOGGER.info(splitLine);
-  }
-
-  /**
-   * Check the input parameters. if
-   *
-   * @param args input params
-   * @return true if there is "--mongo" parameter in arguments
-   */
-  private static boolean isDbMongo(final String[] args) {
-    for (String arg : args) {
-      if (arg.equals(USE_MONGO_DB)) {
-        return true;
-      }
-    }
-    return false;
  }

  /**
@ -133,14 +85,14 @@ public class App {
   */
  public void useReadAndWriteThroughStrategy() {
    LOGGER.info("# CachingPolicy.THROUGH");
-    appManager.initCachingPolicy(CachingPolicy.THROUGH);
+    AppManager.initCachingPolicy(CachingPolicy.THROUGH);

    var userAccount1 = new UserAccount("001", "John", "He is a boy.");

-    appManager.save(userAccount1);
-    LOGGER.info(appManager.printCacheContent());
-    appManager.find("001");
-    appManager.find("001");
+    AppManager.save(userAccount1);
+    LOGGER.info(AppManager.printCacheContent());
+    AppManager.find("001");
+    AppManager.find("001");
  }

  /**
@ -148,21 +100,21 @@ public class App {
   */
  public void useReadThroughAndWriteAroundStrategy() {
    LOGGER.info("# CachingPolicy.AROUND");
-    appManager.initCachingPolicy(CachingPolicy.AROUND);
+    AppManager.initCachingPolicy(CachingPolicy.AROUND);

    var userAccount2 = new UserAccount("002", "Jane", "She is a girl.");

-    appManager.save(userAccount2);
-    LOGGER.info(appManager.printCacheContent());
-    appManager.find("002");
-    LOGGER.info(appManager.printCacheContent());
-    userAccount2 = appManager.find("002");
+    AppManager.save(userAccount2);
+    LOGGER.info(AppManager.printCacheContent());
+    AppManager.find("002");
+    LOGGER.info(AppManager.printCacheContent());
+    userAccount2 = AppManager.find("002");
    userAccount2.setUserName("Jane G.");
-    appManager.save(userAccount2);
-    LOGGER.info(appManager.printCacheContent());
-    appManager.find("002");
-    LOGGER.info(appManager.printCacheContent());
-    appManager.find("002");
+    AppManager.save(userAccount2);
+    LOGGER.info(AppManager.printCacheContent());
+    AppManager.find("002");
+    LOGGER.info(AppManager.printCacheContent());
+    AppManager.find("002");
  }

  /**
@ -170,31 +122,23 @@ public class App {
   */
  public void useReadThroughAndWriteBehindStrategy() {
    LOGGER.info("# CachingPolicy.BEHIND");
-    appManager.initCachingPolicy(CachingPolicy.BEHIND);
+    AppManager.initCachingPolicy(CachingPolicy.BEHIND);

-    var userAccount3 = new UserAccount("003",
-            "Adam",
-            "He likes food.");
-    var userAccount4 = new UserAccount("004",
-            "Rita",
-            "She hates cats.");
-    var userAccount5 = new UserAccount("005",
-            "Isaac",
-            "He is allergic to mustard.");
+    var userAccount3 = new UserAccount("003", "Adam", "He likes food.");
+    var userAccount4 = new UserAccount("004", "Rita", "She hates cats.");
+    var userAccount5 = new UserAccount("005", "Isaac", "He is allergic to mustard.");

-    appManager.save(userAccount3);
-    appManager.save(userAccount4);
-    appManager.save(userAccount5);
-    LOGGER.info(appManager.printCacheContent());
-    appManager.find("003");
-    LOGGER.info(appManager.printCacheContent());
-    UserAccount userAccount6 = new UserAccount("006",
-            "Yasha",
-            "She is an only child.");
-    appManager.save(userAccount6);
-    LOGGER.info(appManager.printCacheContent());
-    appManager.find("004");
-    LOGGER.info(appManager.printCacheContent());
+    AppManager.save(userAccount3);
+    AppManager.save(userAccount4);
+    AppManager.save(userAccount5);
+    LOGGER.info(AppManager.printCacheContent());
+    AppManager.find("003");
+    LOGGER.info(AppManager.printCacheContent());
+    UserAccount userAccount6 = new UserAccount("006", "Yasha", "She is an only child.");
+    AppManager.save(userAccount6);
+    LOGGER.info(AppManager.printCacheContent());
+    AppManager.find("004");
+    LOGGER.info(AppManager.printCacheContent());
  }

  /**
@ -202,26 +146,20 @@ public class App {
   */
  public void useCacheAsideStategy() {
    LOGGER.info("# CachingPolicy.ASIDE");
-    appManager.initCachingPolicy(CachingPolicy.ASIDE);
-    LOGGER.info(appManager.printCacheContent());
+    AppManager.initCachingPolicy(CachingPolicy.ASIDE);
+    LOGGER.info(AppManager.printCacheContent());

-    var userAccount3 = new UserAccount("003",
-            "Adam",
-            "He likes food.");
-    var userAccount4 = new UserAccount("004",
-            "Rita",
-            "She hates cats.");
-    var userAccount5 = new UserAccount("005",
-            "Isaac",
-            "He is allergic to mustard.");
-    appManager.save(userAccount3);
-    appManager.save(userAccount4);
-    appManager.save(userAccount5);
+    var userAccount3 = new UserAccount("003", "Adam", "He likes food.");
+    var userAccount4 = new UserAccount("004", "Rita", "She hates cats.");
+    var userAccount5 = new UserAccount("005", "Isaac", "He is allergic to mustard.");
+    AppManager.save(userAccount3);
+    AppManager.save(userAccount4);
+    AppManager.save(userAccount5);

-    LOGGER.info(appManager.printCacheContent());
-    appManager.find("003");
-    LOGGER.info(appManager.printCacheContent());
-    appManager.find("004");
-    LOGGER.info(appManager.printCacheContent());
+    LOGGER.info(AppManager.printCacheContent());
+    AppManager.find("003");
+    LOGGER.info(AppManager.printCacheContent());
+    AppManager.find("004");
+    LOGGER.info(AppManager.printCacheContent());
  }
 }
--- a/caching/src/main/java/com/iluwatar/caching/AppManager.java
+++ b/caching/src/main/java/com/iluwatar/caching/AppManager.java
@ -23,80 +23,65 @@

 package com.iluwatar.caching;

-import com.iluwatar.caching.database.DbManager;
-
+import java.text.ParseException;
 import java.util.Optional;
-
 import lombok.extern.slf4j.Slf4j;

 /**
- * AppManager helps to bridge the gap in communication between the main class
- * and the application's back-end. DB connection is initialized through this
- * class. The chosen  caching strategy/policy is also initialized here.
- * Before the cache can be used, the size of the  cache has to be set.
- * Depending on the chosen caching policy, AppManager will call the
- * appropriate function in the CacheStore class.
+ * AppManager helps to bridge the gap in communication between the main class and the application's
+ * back-end. DB connection is initialized through this class. The chosen caching strategy/policy is
+ * also initialized here. Before the cache can be used, the size of the cache has to be set.
+ * Depending on the chosen caching policy, AppManager will call the appropriate function in the
+ * CacheStore class.
 */
@Slf4j
-public class AppManager {
-  /**
-   * Caching Policy.
-   */
-  private CachingPolicy cachingPolicy;
-  /**
-   * Database Manager.
-   */
-  private final DbManager dbManager;
-  /**
-   * Cache Store.
-   */
-  private final CacheStore cacheStore;
+public final class AppManager {

-  /**
-   * Constructor.
-   *
-   * @param newDbManager database manager
-   */
-  public AppManager(final DbManager newDbManager) {
-    this.dbManager = newDbManager;
-    this.cacheStore = new CacheStore(newDbManager);
+  private static CachingPolicy cachingPolicy;
+
+  private AppManager() {
  }

  /**
-   * Developer/Tester is able to choose whether the application should use
-   * MongoDB as its underlying data storage or a simple Java data structure
-   * to (temporarily) store the data/objects during runtime.
+   * Developer/Tester is able to choose whether the application should use MongoDB as its underlying
+   * data storage or a simple Java data structure to (temporarily) store the data/objects during
+   * runtime.
   */
-  public void initDb() {
-    dbManager.connect();
+  public static void initDb(boolean useMongoDb) {
+    if (useMongoDb) {
+      try {
+        DbManager.connect();
+      } catch (ParseException e) {
+        LOGGER.error("Error connecting to MongoDB", e);
+      }
+    } else {
+      DbManager.createVirtualDb();
+    }
  }

  /**
   * Initialize caching policy.
-   *
-   * @param policy is a {@link CachingPolicy}
   */
-  public void initCachingPolicy(final CachingPolicy policy) {
+  public static void initCachingPolicy(CachingPolicy policy) {
    cachingPolicy = policy;
    if (cachingPolicy == CachingPolicy.BEHIND) {
-      Runtime.getRuntime().addShutdownHook(new Thread(cacheStore::flushCache));
+      Runtime.getRuntime().addShutdownHook(new Thread(CacheStore::flushCache));
    }
-    cacheStore.clearCache();
+    CacheStore.clearCache();
+  }
+
+  public static void initCacheCapacity(int capacity) {
+    CacheStore.initCapacity(capacity);
  }

  /**
   * Find user account.
-   *
-   * @param userId String
-   * @return {@link UserAccount}
   */
-  public UserAccount find(final String userId) {
-    LOGGER.info("Trying to find {} in cache", userId);
-    if (cachingPolicy == CachingPolicy.THROUGH
-            || cachingPolicy == CachingPolicy.AROUND) {
-      return cacheStore.readThrough(userId);
+  public static UserAccount find(String userId) {
+    if (cachingPolicy == CachingPolicy.THROUGH || cachingPolicy == CachingPolicy.AROUND) {
+      return CacheStore.readThrough(userId);
    } else if (cachingPolicy == CachingPolicy.BEHIND) {
-      return cacheStore.readThroughWithWriteBackPolicy(userId);
+      return CacheStore.readThroughWithWriteBackPolicy(userId);
    } else if (cachingPolicy == CachingPolicy.ASIDE) {
      return findAside(userId);
    }
@ -105,55 +90,41 @@ public class AppManager {

  /**
   * Save user account.
-   *
-   * @param userAccount {@link UserAccount}
   */
-  public void save(final UserAccount userAccount) {
-    LOGGER.info("Save record!");
+  public static void save(UserAccount userAccount) {
    if (cachingPolicy == CachingPolicy.THROUGH) {
-      cacheStore.writeThrough(userAccount);
+      CacheStore.writeThrough(userAccount);
    } else if (cachingPolicy == CachingPolicy.AROUND) {
-      cacheStore.writeAround(userAccount);
+      CacheStore.writeAround(userAccount);
    } else if (cachingPolicy == CachingPolicy.BEHIND) {
-      cacheStore.writeBehind(userAccount);
+      CacheStore.writeBehind(userAccount);
    } else if (cachingPolicy == CachingPolicy.ASIDE) {
      saveAside(userAccount);
    }
  }

-  /**
-   * Returns String.
-   *
-   * @return String
-   */
-  public String printCacheContent() {
-    return cacheStore.print();
+  public static String printCacheContent() {
+    return CacheStore.print();
  }

  /**
   * Cache-Aside save user account helper.
-   *
-   * @param userAccount {@link UserAccount}
   */
-  private void saveAside(final UserAccount userAccount) {
-    dbManager.updateDb(userAccount);
-    cacheStore.invalidate(userAccount.getUserId());
+  private static void saveAside(UserAccount userAccount) {
+    DbManager.updateDb(userAccount);
+    CacheStore.invalidate(userAccount.getUserId());
  }

  /**
   * Cache-Aside find user account helper.
-   *
-   * @param userId String
-   * @return {@link UserAccount}
   */
-  private UserAccount findAside(final String userId) {
-    return Optional.ofNullable(cacheStore.get(userId))
-            .or(() -> {
-              Optional<UserAccount> userAccount =
-                      Optional.ofNullable(dbManager.readFromDb(userId));
-              userAccount.ifPresent(account -> cacheStore.set(userId, account));
-              return userAccount;
-            })
-            .orElse(null);
+  private static UserAccount findAside(String userId) {
+    return Optional.ofNullable(CacheStore.get(userId))
+        .or(() -> {
+          Optional<UserAccount> userAccount = Optional.ofNullable(DbManager.readFromDb(userId));
+          userAccount.ifPresent(account -> CacheStore.set(userId, account));
+          return userAccount;
+        })
+        .orElse(null);
  }
 }
--- a/caching/src/main/java/com/iluwatar/caching/CacheStore.java
+++ b/caching/src/main/java/com/iluwatar/caching/CacheStore.java
@ -23,11 +23,9 @@

 package com.iluwatar.caching;

-import com.iluwatar.caching.database.DbManager;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import lombok.extern.slf4j.Slf4j;

 /**
@ -35,34 +33,16 @@ import lombok.extern.slf4j.Slf4j;
 */
@Slf4j
 public class CacheStore {
-  /**
-   * Cache capacity.
-   */
-  private static final int CAPACITY = 3;

-  /**
-   * Lru cache see {@link LruCache}.
-   */
-  private LruCache cache;
-  /**
-   * DbManager.
-   */
-  private final DbManager dbManager;
+  private static LruCache cache;

-  /**
-   * Cache Store.
-   * @param dataBaseManager {@link DbManager}
-   */
-  public CacheStore(final DbManager dataBaseManager) {
-    this.dbManager = dataBaseManager;
-    initCapacity(CAPACITY);
+  private CacheStore() {
  }

  /**
   * Init cache capacity.
-   * @param capacity int
   */
-  public void initCapacity(final int capacity) {
+  public static void initCapacity(int capacity) {
    if (cache == null) {
      cache = new LruCache(capacity);
    } else {
@ -72,64 +52,57 @@ public class CacheStore {

  /**
   * Get user account using read-through cache.
-   * @param userId {@link String}
-   * @return {@link UserAccount}
   */
-  public UserAccount readThrough(final String userId) {
+  public static UserAccount readThrough(String userId) {
    if (cache.contains(userId)) {
-      LOGGER.info("# Found in Cache!");
+      LOGGER.info("# Cache Hit!");
      return cache.get(userId);
    }
-    LOGGER.info("# Not found in cache! Go to DB!!");
-    UserAccount userAccount = dbManager.readFromDb(userId);
+    LOGGER.info("# Cache Miss!");
+    UserAccount userAccount = DbManager.readFromDb(userId);
    cache.set(userId, userAccount);
    return userAccount;
  }

  /**
   * Get user account using write-through cache.
-   * @param userAccount {@link UserAccount}
   */
-  public void writeThrough(final UserAccount userAccount) {
+  public static void writeThrough(UserAccount userAccount) {
    if (cache.contains(userAccount.getUserId())) {
-      dbManager.updateDb(userAccount);
+      DbManager.updateDb(userAccount);
    } else {
-      dbManager.writeToDb(userAccount);
+      DbManager.writeToDb(userAccount);
    }
    cache.set(userAccount.getUserId(), userAccount);
  }

  /**
   * Get user account using write-around cache.
-   * @param userAccount {@link UserAccount}
   */
-  public void writeAround(final UserAccount userAccount) {
+  public static void writeAround(UserAccount userAccount) {
    if (cache.contains(userAccount.getUserId())) {
-      dbManager.updateDb(userAccount);
-      // Cache data has been updated -- remove older
-      cache.invalidate(userAccount.getUserId());
+      DbManager.updateDb(userAccount);
+      cache.invalidate(userAccount.getUserId()); // Cache data has been updated -- remove older
      // version from cache.
    } else {
-      dbManager.writeToDb(userAccount);
+      DbManager.writeToDb(userAccount);
    }
  }

  /**
   * Get user account using read-through cache with write-back policy.
-   * @param userId {@link String}
-   * @return {@link UserAccount}
   */
-  public UserAccount readThroughWithWriteBackPolicy(final String userId) {
+  public static UserAccount readThroughWithWriteBackPolicy(String userId) {
    if (cache.contains(userId)) {
-      LOGGER.info("# Found in cache!");
+      LOGGER.info("# Cache Hit!");
      return cache.get(userId);
    }
-    LOGGER.info("# Not found in Cache!");
-    UserAccount userAccount = dbManager.readFromDb(userId);
+    LOGGER.info("# Cache Miss!");
+    UserAccount userAccount = DbManager.readFromDb(userId);
    if (cache.isFull()) {
      LOGGER.info("# Cache is FULL! Writing LRU data to DB...");
      UserAccount toBeWrittenToDb = cache.getLruData();
-      dbManager.upsertDb(toBeWrittenToDb);
+      DbManager.upsertDb(toBeWrittenToDb);
    }
    cache.set(userId, userAccount);
    return userAccount;
@ -137,13 +110,12 @@ public class CacheStore {

  /**
   * Set user account.
-   * @param userAccount {@link UserAccount}
   */
-  public void writeBehind(final UserAccount userAccount) {
+  public static void writeBehind(UserAccount userAccount) {
    if (cache.isFull() && !cache.contains(userAccount.getUserId())) {
      LOGGER.info("# Cache is FULL! Writing LRU data to DB...");
      UserAccount toBeWrittenToDb = cache.getLruData();
-      dbManager.upsertDb(toBeWrittenToDb);
+      DbManager.upsertDb(toBeWrittenToDb);
    }
    cache.set(userAccount.getUserId(), userAccount);
  }
@ -151,7 +123,7 @@ public class CacheStore {
  /**
   * Clears cache.
   */
-  public void clearCache() {
+  public static void clearCache() {
    if (cache != null) {
      cache.clear();
    }
@ -160,51 +132,44 @@ public class CacheStore {
  /**
   * Writes remaining content in the cache into the DB.
   */
-  public void flushCache() {
+  public static void flushCache() {
    LOGGER.info("# flushCache...");
    Optional.ofNullable(cache)
        .map(LruCache::getCacheDataInListForm)
        .orElse(List.of())
-        .forEach(dbManager::updateDb);
-    dbManager.disconnect();
+        .forEach(DbManager::updateDb);
  }

  /**
   * Print user accounts.
-   * @return {@link String}
   */
-  public String print() {
+  public static String print() {
    return Optional.ofNullable(cache)
        .map(LruCache::getCacheDataInListForm)
        .orElse(List.of())
        .stream()
        .map(userAccount -> userAccount.toString() + "\n")
-        .collect(Collectors.joining("", "\n--CACHE CONTENT--\n", "----"));
+        .collect(Collectors.joining("", "\n--CACHE CONTENT--\n", "----\n"));
  }

  /**
   * Delegate to backing cache store.
-   * @param userId {@link String}
-   * @return {@link UserAccount}
   */
-  public UserAccount get(final String userId) {
+  public static UserAccount get(String userId) {
    return cache.get(userId);
  }

  /**
   * Delegate to backing cache store.
-   * @param userId {@link String}
-   * @param userAccount {@link UserAccount}
   */
-  public void set(final String userId, final UserAccount userAccount) {
+  public static void set(String userId, UserAccount userAccount) {
    cache.set(userId, userAccount);
  }

  /**
   * Delegate to backing cache store.
-   * @param userId {@link String}
   */
-  public void invalidate(final String userId) {
+  public static void invalidate(String userId) {
    cache.invalidate(userId);
  }
 }
--- a/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java
+++ b/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java
@ -32,25 +32,10 @@ import lombok.Getter;
@AllArgsConstructor
@Getter
 public enum CachingPolicy {
-  /**
-   * Through.
-   */
  THROUGH("through"),
-  /**
-   * AROUND.
-   */
  AROUND("around"),
-  /**
-   * BEHIND.
-   */
  BEHIND("behind"),
-  /**
-   * ASIDE.
-   */
  ASIDE("aside");

-  /**
-   * Policy value.
-   */
  private final String policy;
 }
--- a/caching/src/main/java/com/iluwatar/caching/DbManager.java
+++ b/caching/src/main/java/com/iluwatar/caching/DbManager.java
@ -0,0 +1,171 @@
+/*
+ * The MIT License
+ * Copyright © 2014-2021 Ilkka Seppälä
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.iluwatar.caching;
+
+import com.iluwatar.caching.constants.CachingConstants;
+import com.mongodb.MongoClient;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.UpdateOptions;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.bson.Document;
+
+/**
+ * <p>DBManager handles the communication with the underlying data store i.e. Database. It contains
+ * the implemented methods for querying, inserting, and updating data. MongoDB was used as the
+ * database for the application.</p>
+ *
+ * <p>Developer/Tester is able to choose whether the application should use MongoDB as its
+ * underlying data storage (connect()) or a simple Java data structure to (temporarily) store the
+ * data/objects during runtime (createVirtualDB()).</p>
+ */
+@Slf4j
+public final class DbManager {
+
+  private static MongoClient mongoClient;
+  private static MongoDatabase db;
+  private static boolean useMongoDB;
+
+  private static Map<String, UserAccount> virtualDB;
+
+  private DbManager() {
+  }
+
+  /**
+   * Create DB.
+   */
+  public static void createVirtualDb() {
+    useMongoDB = false;
+    virtualDB = new HashMap<>();
+  }
+
+  /**
+   * Connect to DB.
+   */
+  public static void connect() throws ParseException {
+    useMongoDB = true;
+    mongoClient = new MongoClient();
+    db = mongoClient.getDatabase("test");
+  }
+
+  /**
+   * Read user account from DB.
+   */
+  public static UserAccount readFromDb(String userId) {
+    if (!useMongoDB) {
+      if (virtualDB.containsKey(userId)) {
+        return virtualDB.get(userId);
+      }
+      return null;
+    }
+    if (db == null) {
+      try {
+        connect();
+      } catch (ParseException e) {
+        LOGGER.error("Error connecting to MongoDB", e);
+      }
+    }
+    var iterable = db
+        .getCollection(CachingConstants.USER_ACCOUNT)
+        .find(new Document(CachingConstants.USER_ID, userId));
+    if (iterable == null) {
+      return null;
+    }
+    Document doc = iterable.first();
+    String userName = doc.getString(CachingConstants.USER_NAME);
+    String appInfo = doc.getString(CachingConstants.ADD_INFO);
+    return new UserAccount(userId, userName, appInfo);
+  }
+
+  /**
+   * Write user account to DB.
+   */
+  public static void writeToDb(UserAccount userAccount) {
+    if (!useMongoDB) {
+      virtualDB.put(userAccount.getUserId(), userAccount);
+      return;
+    }
+    if (db == null) {
+      try {
+        connect();
+      } catch (ParseException e) {
+        LOGGER.error("Error connecting to MongoDB", e);
+      }
+    }
+    db.getCollection(CachingConstants.USER_ACCOUNT).insertOne(
+        new Document(CachingConstants.USER_ID, userAccount.getUserId())
+            .append(CachingConstants.USER_NAME, userAccount.getUserName())
+            .append(CachingConstants.ADD_INFO, userAccount.getAdditionalInfo())
+    );
+  }
+
+  /**
+   * Update DB.
+   */
+  public static void updateDb(UserAccount userAccount) {
+    if (!useMongoDB) {
+      virtualDB.put(userAccount.getUserId(), userAccount);
+      return;
+    }
+    if (db == null) {
+      try {
+        connect();
+      } catch (ParseException e) {
+        LOGGER.error("Error connecting to MongoDB", e);
+      }
+    }
+    db.getCollection(CachingConstants.USER_ACCOUNT).updateOne(
+        new Document(CachingConstants.USER_ID, userAccount.getUserId()),
+        new Document("$set", new Document(CachingConstants.USER_NAME, userAccount.getUserName())
+            .append(CachingConstants.ADD_INFO, userAccount.getAdditionalInfo())));
+  }
+
+  /**
+   * Insert data into DB if it does not exist. Else, update it.
+   */
+  public static void upsertDb(UserAccount userAccount) {
+    if (!useMongoDB) {
+      virtualDB.put(userAccount.getUserId(), userAccount);
+      return;
+    }
+    if (db == null) {
+      try {
+        connect();
+      } catch (ParseException e) {
+        LOGGER.error("Error connecting to MongoDB", e);
+      }
+    }
+    db.getCollection(CachingConstants.USER_ACCOUNT).updateOne(
+        new Document(CachingConstants.USER_ID, userAccount.getUserId()),
+        new Document("$set",
+            new Document(CachingConstants.USER_ID, userAccount.getUserId())
+                .append(CachingConstants.USER_NAME, userAccount.getUserName())
+                .append(CachingConstants.ADD_INFO, userAccount.getAdditionalInfo())
+        ),
+        new UpdateOptions().upsert(true)
+    );
+  }
+}
--- a/caching/src/main/java/com/iluwatar/caching/LruCache.java
+++ b/caching/src/main/java/com/iluwatar/caching/LruCache.java
@ -29,83 +29,41 @@ import java.util.List;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;

-
 /**
- * Data structure/implementation of the application's cache. The data structure
- * consists of a hash table attached with a doubly linked-list. The linked-list
- * helps in capturing and maintaining the LRU data in the cache. When a data is
- * queried (from the cache), added (to the cache), or updated, the data is
- * moved to the front of the list to depict itself as the most-recently-used
- * data. The LRU data is always at the end of the list.
+ * Data structure/implementation of the application's cache. The data structure consists of a hash
+ * table attached with a doubly linked-list. The linked-list helps in capturing and maintaining the
+ * LRU data in the cache. When a data is queried (from the cache), added (to the cache), or updated,
+ * the data is moved to the front of the list to depict itself as the most-recently-used data. The
+ * LRU data is always at the end of the list.
 */
@Slf4j
 public class LruCache {
-  /**
-   * Static class Node.
-   */
-  static class Node {
-    /**
-     * user id.
-     */
-    private final String userId;
-    /**
-     * User Account.
-     */
-    private UserAccount userAccount;
-    /**
-     * previous.
-     */
-    private Node previous;
-    /**
-     * next.
-     */
-    private Node next;

-    /**
-     * Node definition.
-     *
-     * @param id      String
-     * @param account {@link UserAccount}
-     */
-    Node(final String id, final UserAccount account) {
-      this.userId = id;
-      this.userAccount = account;
+  static class Node {
+    String userId;
+    UserAccount userAccount;
+    Node previous;
+    Node next;
+
+    public Node(String userId, UserAccount userAccount) {
+      this.userId = userId;
+      this.userAccount = userAccount;
    }
  }

-  /**
-   * Capacity of Cache.
-   */
-  private int capacity;
-  /**
-   * Cache {@link HashMap}.
-   */
-  private Map<String, Node> cache = new HashMap<>();
-  /**
-   * Head.
-   */
-  private Node head;
-  /**
-   * End.
-   */
-  private Node end;
+  int capacity;
+  Map<String, Node> cache = new HashMap<>();
+  Node head;
+  Node end;

-  /**
-   * Constructor.
-   *
-   * @param cap Integer.
-   */
-  public LruCache(final int cap) {
-    this.capacity = cap;
+  public LruCache(int capacity) {
+    this.capacity = capacity;
  }

  /**
   * Get user account.
-   *
-   * @param userId String
-   * @return {@link UserAccount}
   */
-  public UserAccount get(final String userId) {
+  public UserAccount get(String userId) {
    if (cache.containsKey(userId)) {
      var node = cache.get(userId);
      remove(node);
@ -117,10 +75,8 @@ public class LruCache {

  /**
   * Remove node from linked list.
-   *
-   * @param node {@link Node}
   */
-  public void remove(final Node node) {
+  public void remove(Node node) {
    if (node.previous != null) {
      node.previous.next = node.next;
    } else {
@ -135,10 +91,8 @@ public class LruCache {

  /**
   * Move node to the front of the list.
-   *
-   * @param node {@link Node}
   */
-  public void setHead(final Node node) {
+  public void setHead(Node node) {
    node.next = head;
    node.previous = null;
    if (head != null) {
@ -152,11 +106,8 @@ public class LruCache {

  /**
   * Set user account.
-   *
-   * @param userAccount {@link UserAccount}
-   * @param userId      {@link String}
   */
-  public void set(final String userId, final UserAccount userAccount) {
+  public void set(String userId, UserAccount userAccount) {
    if (cache.containsKey(userId)) {
      var old = cache.get(userId);
      old.userAccount = userAccount;
@ -176,43 +127,25 @@ public class LruCache {
    }
  }

-  /**
-   * Check if Cache contains the userId.
-   *
-   * @param userId {@link String}
-   * @return boolean
-   */
-  public boolean contains(final String userId) {
+  public boolean contains(String userId) {
    return cache.containsKey(userId);
  }

  /**
   * Invalidate cache for user.
-   *
-   * @param userId {@link String}
   */
-  public void invalidate(final String userId) {
+  public void invalidate(String userId) {
    var toBeRemoved = cache.remove(userId);
    if (toBeRemoved != null) {
-      LOGGER.info("# {} has been updated! "
-              + "Removing older version from cache...", userId);
+      LOGGER.info("# {} has been updated! Removing older version from cache...", userId);
      remove(toBeRemoved);
    }
  }

-  /**
-   * Check if the cache is full.
-   * @return boolean
-   */
  public boolean isFull() {
    return cache.size() >= capacity;
  }

-  /**
-   * Get LRU data.
-   *
-   * @return {@link UserAccount}
-   */
  public UserAccount getLruData() {
    return end.userAccount;
  }
@ -228,8 +161,6 @@ public class LruCache {

  /**
   * Returns cache data in list form.
-   *
-   * @return {@link List}
   */
  public List<UserAccount> getCacheDataInListForm() {
    var listOfCacheData = new ArrayList<UserAccount>();
@ -243,14 +174,10 @@ public class LruCache {

  /**
   * Set cache capacity.
-   *
-   * @param newCapacity int
   */
-  public void setCapacity(final int newCapacity) {
+  public void setCapacity(int newCapacity) {
    if (capacity > newCapacity) {
-      // Behavior can be modified to accommodate
-      // for decrease in cache size. For now, we'll
-      clear();
+      clear(); // Behavior can be modified to accommodate for decrease in cache size. For now, we'll
      // just clear the cache.
    } else {
      this.capacity = newCapacity;
--- a/caching/src/main/java/com/iluwatar/caching/UserAccount.java
+++ b/caching/src/main/java/com/iluwatar/caching/UserAccount.java
@ -24,28 +24,19 @@
 package com.iluwatar.caching;

 import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.ToString;

 /**
 * Entity class (stored in cache and DB) used in the application.
 */
-@Data
+@Setter
+@Getter
@AllArgsConstructor
@ToString
-@EqualsAndHashCode
 public class UserAccount {
-  /**
-   * User Id.
-   */
  private String userId;
-  /**
-   * User Name.
-   */
  private String userName;
-  /**
-   * Additional Info.
-   */
  private String additionalInfo;
 }
--- a/caching/src/main/java/com/iluwatar/caching/constants/CachingConstants.java
+++ b/caching/src/main/java/com/iluwatar/caching/constants/CachingConstants.java
@ -26,27 +26,11 @@ package com.iluwatar.caching.constants;
 /**
 * Constant class for defining constants.
 */
-public final class CachingConstants {
-  /**
-   * User Account.
-   */
+public class CachingConstants {
+
  public static final String USER_ACCOUNT = "user_accounts";
-  /**
-   * User ID.
-   */
  public static final String USER_ID = "userID";
-  /**
-   * User Name.
-   */
  public static final String USER_NAME = "userName";
-  /**
-   * Additional Info.
-   */
  public static final String ADD_INFO = "additionalInfo";

-  /**
-   * Constructor.
-   */
-  private CachingConstants() {
-  }
 }
--- a/caching/src/main/java/com/iluwatar/caching/constants/package-info.java
+++ b/caching/src/main/java/com/iluwatar/caching/constants/package-info.java
@ -1,4 +0,0 @@
-/**
- * Constants.
- */
-package com.iluwatar.caching.constants;
--- a/caching/src/main/java/com/iluwatar/caching/database/DbManager.java
+++ b/caching/src/main/java/com/iluwatar/caching/database/DbManager.java
@ -1,52 +0,0 @@
-package com.iluwatar.caching.database;
-
-import com.iluwatar.caching.UserAccount;
-
-/**
- * <p>DBManager handles the communication with the underlying data store i.e.
- * Database. It contains the implemented methods for querying, inserting,
- * and updating data. MongoDB was used as the database for the application.</p>
- */
-public interface DbManager {
-  /**
-   * Connect to DB.
-   */
-  void connect();
-
-  /**
-   * Disconnect from DB.
-   */
-  void disconnect();
-
-  /**
-   * Read from DB.
-   *
-   * @param userId {@link String}
-   * @return {@link UserAccount}
-   */
-  UserAccount readFromDb(String userId);
-
-  /**
-   * Write to DB.
-   *
-   * @param userAccount {@link UserAccount}
-   * @return {@link UserAccount}
-   */
-  UserAccount writeToDb(UserAccount userAccount);
-
-  /**
-   * Update record.
-   *
-   * @param userAccount {@link UserAccount}
-   * @return {@link UserAccount}
-   */
-  UserAccount updateDb(UserAccount userAccount);
-
-  /**
-   * Update record or Insert if not exists.
-   *
-   * @param userAccount {@link UserAccount}
-   * @return {@link UserAccount}
-   */
-  UserAccount upsertDb(UserAccount userAccount);
-}
--- a/caching/src/main/java/com/iluwatar/caching/database/DbManagerFactory.java
+++ b/caching/src/main/java/com/iluwatar/caching/database/DbManagerFactory.java
@ -1,25 +0,0 @@
-package com.iluwatar.caching.database;
-
-/**
- * Creates the database connection accroding the input parameter.
- */
-public final class DbManagerFactory {
-  /**
-   * Private constructor.
-   */
-  private DbManagerFactory() {
-  }
-
-  /**
-   * Init database.
-   *
-   * @param isMongo boolean
-   * @return {@link DbManager}
-   */
-  public static DbManager initDb(final boolean isMongo) {
-    if (isMongo) {
-      return new MongoDb();
-    }
-    return new VirtualDb();
-  }
-}
--- a/caching/src/main/java/com/iluwatar/caching/database/MongoDb.java
+++ b/caching/src/main/java/com/iluwatar/caching/database/MongoDb.java
@ -1,128 +0,0 @@
-package com.iluwatar.caching.database;
-
-import static com.iluwatar.caching.constants.CachingConstants.ADD_INFO;
-import static com.iluwatar.caching.constants.CachingConstants.USER_ACCOUNT;
-import static com.iluwatar.caching.constants.CachingConstants.USER_ID;
-import static com.iluwatar.caching.constants.CachingConstants.USER_NAME;
-
-import com.iluwatar.caching.UserAccount;
-import com.iluwatar.caching.constants.CachingConstants;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.model.UpdateOptions;
-import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import org.bson.Document;
-
-/**
- * Implementation of DatabaseManager.
- * implements base methods to work with MongoDb.
- */
-@Slf4j
-public class MongoDb implements DbManager {
-  private static final String DATABASE_NAME = "admin";
-  private static final String MONGO_USER = "root";
-  private static final String MONGO_PASSWORD = "rootpassword";
-  private MongoClient client;
-  private MongoDatabase db;
-
-  /**
-   * Connect to Db. Check th connection
-   */
-  @Override
-  public void connect() {
-    MongoCredential mongoCredential = MongoCredential.createCredential(MONGO_USER,
-                    DATABASE_NAME,
-                    MONGO_PASSWORD.toCharArray());
-    MongoClientOptions options = MongoClientOptions.builder().build();
-    client = new MongoClient(new ServerAddress(), List.of(mongoCredential), options);
-    db = client.getDatabase(DATABASE_NAME);
-  }
-
-  @Override
-  public void disconnect() {
-    client.close();
-  }
-
-  /**
-   * Read data from DB.
-   *
-   * @param userId {@link String}
-   * @return {@link UserAccount}
-   */
-  @Override
-  public UserAccount readFromDb(final String userId) {
-    var iterable = db
-            .getCollection(CachingConstants.USER_ACCOUNT)
-            .find(new Document(USER_ID, userId));
-    if (iterable.first() == null) {
-      return null;
-    }
-    Document doc = iterable.first();
-    if (doc != null) {
-      String userName = doc.getString(USER_NAME);
-      String appInfo = doc.getString(ADD_INFO);
-      return new UserAccount(userId, userName, appInfo);
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * Write data to DB.
-   *
-   * @param userAccount {@link UserAccount}
-   * @return {@link UserAccount}
-   */
-  @Override
-  public UserAccount writeToDb(final UserAccount userAccount) {
-    db.getCollection(USER_ACCOUNT).insertOne(
-            new Document(USER_ID, userAccount.getUserId())
-                    .append(USER_NAME, userAccount.getUserName())
-                    .append(ADD_INFO, userAccount.getAdditionalInfo())
-    );
-    return userAccount;
-  }
-
-  /**
-   * Update DB.
-   *
-   * @param userAccount {@link UserAccount}
-   * @return {@link UserAccount}
-   */
-  @Override
-  public UserAccount updateDb(final UserAccount userAccount) {
-    Document id = new Document(USER_ID, userAccount.getUserId());
-    Document dataSet = new Document(USER_NAME, userAccount.getUserName())
-            .append(ADD_INFO, userAccount.getAdditionalInfo());
-    db.getCollection(CachingConstants.USER_ACCOUNT)
-            .updateOne(id, new Document("$set", dataSet));
-    return userAccount;
-  }
-
-  /**
-   * Update data if exists.
-   *
-   * @param userAccount {@link UserAccount}
-   * @return {@link UserAccount}
-   */
-  @Override
-  public UserAccount upsertDb(final UserAccount userAccount) {
-    String userId = userAccount.getUserId();
-    String userName = userAccount.getUserName();
-    String additionalInfo = userAccount.getAdditionalInfo();
-    db.getCollection(CachingConstants.USER_ACCOUNT).updateOne(
-            new Document(USER_ID, userId),
-            new Document("$set",
-                    new Document(USER_ID, userId)
-                            .append(USER_NAME, userName)
-                            .append(ADD_INFO, additionalInfo)
-            ),
-            new UpdateOptions().upsert(true)
-    );
-    return userAccount;
-  }
-}
--- a/caching/src/main/java/com/iluwatar/caching/database/VirtualDb.java
+++ b/caching/src/main/java/com/iluwatar/caching/database/VirtualDb.java
@ -1,78 +0,0 @@
-package com.iluwatar.caching.database;
-
-import com.iluwatar.caching.UserAccount;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Implementation of DatabaseManager.
- * implements base methods to work with hashMap as database.
- */
-public class VirtualDb implements DbManager {
-  /**
-   * Virtual DataBase.
-   */
-  private Map<String, UserAccount> db;
-
-  /**
-   * Creates new HashMap.
-   */
-  @Override
-  public void connect() {
-    db = new HashMap<>();
-  }
-
-  @Override
-  public void disconnect() {
-    db = null;
-  }
-
-  /**
-   * Read from Db.
-   *
-   * @param userId {@link String}
-   * @return {@link UserAccount}
-   */
-  @Override
-  public UserAccount readFromDb(final String userId) {
-    if (db.containsKey(userId)) {
-      return db.get(userId);
-    }
-    return null;
-  }
-
-  /**
-   * Write to DB.
-   *
-   * @param userAccount {@link UserAccount}
-   * @return {@link UserAccount}
-   */
-  @Override
-  public UserAccount writeToDb(final UserAccount userAccount) {
-    db.put(userAccount.getUserId(), userAccount);
-    return userAccount;
-  }
-
-  /**
-   * Update reecord in DB.
-   *
-   * @param userAccount {@link UserAccount}
-   * @return {@link UserAccount}
-   */
-  @Override
-  public UserAccount updateDb(final UserAccount userAccount) {
-    return writeToDb(userAccount);
-  }
-
-  /**
-   * Update.
-   *
-   * @param userAccount {@link UserAccount}
-   * @return {@link UserAccount}
-   */
-  @Override
-  public UserAccount upsertDb(final UserAccount userAccount) {
-    return updateDb(userAccount);
-  }
-}
--- a/caching/src/main/java/com/iluwatar/caching/database/package-info.java
+++ b/caching/src/main/java/com/iluwatar/caching/database/package-info.java
@ -1,4 +0,0 @@
-/**
- * Database classes.
- */
-package com.iluwatar.caching.database;
--- a/caching/src/main/java/com/iluwatar/caching/package-info.java
+++ b/caching/src/main/java/com/iluwatar/caching/package-info.java
@ -1,20 +0,0 @@
-/**
- * The MIT License
- * Copyright © 2014-2021 Ilkka Seppälä
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package com.iluwatar.caching;
--- a/caching/src/test/java/com/iluwatar/caching/AppTest.java
+++ b/caching/src/test/java/com/iluwatar/caching/AppTest.java
@ -25,21 +25,25 @@ package com.iluwatar.caching;

 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.
 */
 class AppTest {
+
  /**
   * Issue: Add at least one assertion to this test case.
-   * <p>
+   *
   * Solution: Inserted assertion to check whether the execution of the main method in {@link App}
   * throws an exception.
   */

  @Test
  void shouldExecuteApplicationWithoutException() {
+
    assertDoesNotThrow(() -> App.main(new String[]{}));
  }
 }
--- a/caching/src/test/java/com/iluwatar/caching/CachingTest.java
+++ b/caching/src/test/java/com/iluwatar/caching/CachingTest.java
@ -23,11 +23,11 @@

 package com.iluwatar.caching;

+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 /**
 * Application test
 */
@ -43,30 +43,32 @@ class CachingTest {
    // to avoid Maven compilation errors. Set flag to true to run the
    // tests with MongoDB (provided that MongoDB is installed and socket
    // connection is open).
-    app = new App(false);
+    AppManager.initDb(false);
+    AppManager.initCacheCapacity(3);
+    app = new App();
  }

  @Test
  void testReadAndWriteThroughStrategy() {
-    assertNotNull(app);
+	assertNotNull(app);
    app.useReadAndWriteThroughStrategy();
  }

  @Test
  void testReadThroughAndWriteAroundStrategy() {
-    assertNotNull(app);
+	assertNotNull(app);
    app.useReadThroughAndWriteAroundStrategy();
  }

  @Test
  void testReadThroughAndWriteBehindStrategy() {
-    assertNotNull(app);
+	assertNotNull(app);
    app.useReadThroughAndWriteBehindStrategy();
  }

  @Test
  void testCacheAsideStrategy() {
-    assertNotNull(app);
+	assertNotNull(app);
    app.useCacheAsideStategy();
  }
 }
--- a/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java
+++ b/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java
@ -1,84 +0,0 @@
-package com.iluwatar.caching.database;
-
-import com.iluwatar.caching.UserAccount;
-import com.iluwatar.caching.constants.CachingConstants;
-import com.mongodb.client.FindIterable;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-import org.bson.Document;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.internal.util.reflection.Whitebox;
-
-import static com.iluwatar.caching.constants.CachingConstants.ADD_INFO;
-import static com.iluwatar.caching.constants.CachingConstants.USER_ID;
-import static com.iluwatar.caching.constants.CachingConstants.USER_NAME;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-class MongoDbTest {
-  private static final String ID = "123";
-  private static final String NAME = "Some user";
-  private static final String ADDITIONAL_INFO = "Some app Info";
-
-  @Mock
-  MongoDatabase db;
-  private MongoDb mongoDb = new MongoDb();
-
-  private UserAccount userAccount;
-
-  @BeforeEach
-  void init() {
-    db = mock(MongoDatabase.class);
-    Whitebox.setInternalState(mongoDb, "db", db);
-    userAccount = new UserAccount(ID, NAME, ADDITIONAL_INFO);
-
-
-  }
-
-  @Test
-  void connect() {
-    assertDoesNotThrow(() -> mongoDb.connect());
-  }
-
-  @Test
-  void readFromDb() {
-    Document document = new Document(USER_ID, ID)
-            .append(USER_NAME, NAME)
-            .append(ADD_INFO, ADDITIONAL_INFO);
-    MongoCollection<Document> mongoCollection = mock(MongoCollection.class);
-    when(db.getCollection(CachingConstants.USER_ACCOUNT)).thenReturn(mongoCollection);
-
-    FindIterable<Document> findIterable = mock(FindIterable.class);
-    when(mongoCollection.find(any(Document.class))).thenReturn(findIterable);
-
-    when(findIterable.first()).thenReturn(document);
-
-    assertEquals(mongoDb.readFromDb(ID),userAccount);
-  }
-
-  @Test
-  void writeToDb() {
-    MongoCollection<Document> mongoCollection = mock(MongoCollection.class);
-    when(db.getCollection(CachingConstants.USER_ACCOUNT)).thenReturn(mongoCollection);
-    doNothing().when(mongoCollection).insertOne(any(Document.class));
-    assertDoesNotThrow(()-> {mongoDb.writeToDb(userAccount);});
-  }
-
-  @Test
-  void updateDb() {
-    MongoCollection<Document> mongoCollection = mock(MongoCollection.class);
-    when(db.getCollection(CachingConstants.USER_ACCOUNT)).thenReturn(mongoCollection);
-    assertDoesNotThrow(()-> {mongoDb.updateDb(userAccount);});
-  }
-
-  @Test
-  void upsertDb() {
-    MongoCollection<Document> mongoCollection = mock(MongoCollection.class);
-    when(db.getCollection(CachingConstants.USER_ACCOUNT)).thenReturn(mongoCollection);
-    assertDoesNotThrow(()-> {mongoDb.upsertDb(userAccount);});
-  }
-}
--- a/callback/README.md
+++ b/callback/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Callback
-category: Idiom
+folder: callback
+permalink: /patterns/callback/
+categories: Idiom
 language: en
 tags:
 - Reactive
--- a/chain-of-responsibility/README.md
+++ b/chain-of-responsibility/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Chain of responsibility
-category: Behavioral
+folder: chain-of-responsibility
+permalink: /patterns/chain-of-responsibility/
+categories: Behavioral
 language: en
 tags:
 - Gang of Four
--- a/circuit-breaker/README.md
+++ b/circuit-breaker/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Circuit Breaker
-category: Behavioral
+folder: circuit-breaker
+permalink: /patterns/circuit-breaker/
+categories: Behavioral
 language: en
 tags:
  - Performance
--- a/cloud-static-content-hosting/README.md
+++ b/cloud-static-content-hosting/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Static Content Hosting
-category: Cloud
+folder: cloud-static-content-hosting
+permalink: /patterns/cloud-static-content-hosting/
+categories: Cloud
 language: en
 tags:
 - Cloud distributed
--- a/collection-pipeline/README.md
+++ b/collection-pipeline/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Collection Pipeline
-category: Functional
+folder: collection-pipeline
+permalink: /patterns/collection-pipeline/
+categories: Functional
 language: en
 tags:
 - Reactive
--- a/combinator/README.md
+++ b/combinator/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Combinator
-category: Idiom
+folder: combinator
+permalink: /patterns/combinator/
+categories: Idiom
 language: en
 tags:
 - Reactive
--- a/command/README.md
+++ b/command/README.md
@ -1,6 +1,9 @@
---
+ ---
+layout: pattern
 title: Command
-category: Behavioral
+folder: command
+permalink: /patterns/command/
+categories: Behavioral
 language: en
 tags:
 - Gang of Four
--- a/commander/README.md
+++ b/commander/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Commander
-category: Concurrency
+folder: commander
+permalink: /patterns/commander/
+categories: Concurrency
 language: en
 tags:
 - Cloud distributed
@ -22,4 +25,4 @@ We need a mechanism in place which can handle these kinds of situations. We have

 ## Credits

-* [Distributed Transactions: The Icebergs of Microservices](https://www.grahamlea.com/2016/08/distributed-transactions-microservices-icebergs/)
+* [https://www.grahamlea.com/2016/08/distributed-transactions-microservices-icebergs/]
--- a/composite-entity/README.md
+++ b/composite-entity/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Composite Entity
-category: Structural
+folder: composite-entity
+permalink: /patterns/composite-entity/
+categories: Structural
 language: en
 tags:
 - Enterprise Integration Pattern
--- a/composite/README.md
+++ b/composite/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Composite
-category: Structural
+folder: composite
+permalink: /patterns/composite/
+categories: Structural
 language: en
 tags:
 - Gang of Four
--- a/converter/README.md
+++ b/converter/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Converter
-category: Creational
+folder: converter
+permalink: /patterns/converter/
+categories: Creational
 language: en
 tags:
 - Decoupling
--- a/cqrs/README.md
+++ b/cqrs/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: CQRS
-category: Architectural
+folder: cqrs
+permalink: /patterns/cqrs/
+categories: Architectural
 language: en
 tags:
  - Performance
--- a/dao/README.md
+++ b/dao/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Data Access Object
-category: Architectural
+folder: dao
+permalink: /patterns/dao/
+categories: Architectural
 language: en
 tags:
 - Data access
--- a/data-bus/README.md
+++ b/data-bus/README.md
@ -1,6 +1,10 @@
 ---
+layout: pattern
 title: Data Bus
-category: Architectural
+folder: data-bus
+permalink: /patterns/data-bus/
+
+categories: Architectural
 language: en
 tags:
 - Decoupling
--- a/data-bus/src/test/java/com/iluwatar/databus/DataBusTest.java
+++ b/data-bus/src/test/java/com/iluwatar/databus/DataBusTest.java
@ -46,7 +46,7 @@ class DataBusTest {

  @BeforeEach
  void setUp() {
-    MockitoAnnotations.openMocks(this);
+    MockitoAnnotations.initMocks(this);
  }

  @Test
--- a/data-locality/README.md
+++ b/data-locality/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Data Locality
-category: Behavioral
+folder: data-locality
+permalink: /patterns/data-locality/
+categories: Behavioral
 language: en
 tags:
 - Game programming
--- a/data-mapper/README.md
+++ b/data-mapper/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Data Mapper
-category: Architectural
+folder: data-mapper
+permalink: /patterns/data-mapper/
+categories: Architectural
 language: en
 tags:
 - Decoupling
--- a/data-transfer-object/README.md
+++ b/data-transfer-object/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Data Transfer Object
-category: Architectural
+folder: data-transfer-object
+permalink: /patterns/data-transfer-object/
+categories: Architectural
 language: en
 tags:
 - Performance
--- a/decorator/README.md
+++ b/decorator/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Decorator
-category: Structural
+folder: decorator
+permalink: /patterns/decorator/
+categories: Structural
 language: en
 tags:
 - Gang of Four
--- a/delegation/README.md
+++ b/delegation/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Delegation
-category: Structural
+folder: delegation
+permalink: /patterns/delegation/
+categories: Structural
 language: en
 tags:
 - Decoupling
--- a/dependency-injection/README.md
+++ b/dependency-injection/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Dependency Injection
-category: Creational
+folder: dependency-injection
+permalink: /patterns/dependency-injection/
+categories: Creational
 language: en
 tags:
 - Decoupling
@ -100,4 +103,4 @@ Use the Dependency Injection pattern when:
 * [Dependency Injection Principles, Practices, and Patterns](https://www.amazon.com/gp/product/161729473X/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=161729473X&linkId=57079257a5c7d33755493802f3b884bd)
 * [Clean Code: A Handbook of Agile Software Craftsmanship](https://www.amazon.com/gp/product/0132350882/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0132350882&linkCode=as2&tag=javadesignpat-20&linkId=2c390d89cc9e61c01b9e7005c7842871)
 * [Java 9 Dependency Injection: Write loosely coupled code with Spring 5 and Guice](https://www.amazon.com/gp/product/1788296257/ref=as_li_tl?ie=UTF8&tag=javadesignpat-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=1788296257&linkId=4e9137a3bf722a8b5b156cce1eec0fc1)
-* [Google Guice: Agile Lightweight Dependency Injection Framework](https://www.amazon.com/gp/product/1590599977/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1590599977&linkId=3b10c90b7ba480a1b7777ff38000f956)
+* [Google Guice Tutorial: Open source Java based dependency injection framework](https://www.amazon.com/gp/product/B083P7DZ8M/ref=as_li_tl?ie=UTF8&tag=javadesignpat-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=B083P7DZ8M&linkId=04f0f902c877921e45215b624a124bfe)
--- a/dirty-flag/README.md
+++ b/dirty-flag/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Dirty Flag
-category: Behavioral
+folder: dirty-flag
+permalink: /patterns/dirty-flag/
+categories: Behavioral
 language: en
 tags:
 - Game programming
--- a/domain-model/README.md
+++ b/domain-model/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Domain Model
-category: Architectural
+folder: domain-model
+permalink: /patterns/domain-model/
+categories: Architectural
 language: en
 tags:
 - Domain
--- a/double-buffer/README.md
+++ b/double-buffer/README.md
@ -1,6 +1,9 @@
 ---  
+layout: pattern  
 title: Double Buffer 
-category: Behavioral
+folder:  double-buffer  
+permalink: /patterns/double-buffer/  
+categories: Behavioral
 language: en
 tags:  
 - Performance
--- a/double-checked-locking/README.md
+++ b/double-checked-locking/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Double Checked Locking
-category: Idiom
+folder: double-checked-locking
+permalink: /patterns/double-checked-locking/
+categories: Idiom
 language: en
 tags:
 - Performance
--- a/double-dispatch/README.md
+++ b/double-dispatch/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Double Dispatch
-category: Idiom
+folder: double-dispatch
+permalink: /patterns/double-dispatch/
+categories: Idiom
 language: en
 tags:
 - Extensibility
--- a/eip-aggregator/README.md
+++ b/eip-aggregator/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: EIP Aggregator
-category: Integration
+folder: eip-aggregator
+permalink: /patterns/eip-aggregator/
+categories: Integration
 language: en
 tags:
 - Enterprise Integration Pattern
--- a/eip-message-channel/README.md
+++ b/eip-message-channel/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: EIP Message Channel
-category: Integration
+folder: eip-message-channel
+permalink: /patterns/eip-message-channel/
+categories: Integration
 language: en
 tags:
 - Enterprise Integration Pattern
--- a/eip-publish-subscribe/README.md
+++ b/eip-publish-subscribe/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: EIP Publish Subscribe
-category: Integration
+folder: eip-publish-subscribe
+permalink: /patterns/eip-publish-subscribe/
+categories: Integration
 language: en
 tags:
 - Enterprise Integration Pattern
--- a/eip-splitter/README.md
+++ b/eip-splitter/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: EIP Splitter
-category: Integration
+folder: eip-splitter
+permalink: /patterns/eip-splitter/
+categories: Integration
 language: en
 tags:
 - Enterprise Integration Pattern
--- a/eip-wire-tap/README.md
+++ b/eip-wire-tap/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: EIP Wire Tap
-category: Integration
+folder: eip-wire-tap
+permalink: /patterns/eip-wire-tap/
+categories: Integration
 language: en
 tags:
 - Enterprise Integration Pattern
--- a/event-aggregator/README.md
+++ b/event-aggregator/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Event Aggregator
-category: Structural
+folder: event-aggregator
+permalink: /patterns/event-aggregator/
+categories: Structural
 language: en
 tags:
 - Reactive
--- a/event-asynchronous/README.md
+++ b/event-asynchronous/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Event-based Asynchronous
-category: Concurrency
+folder: event-asynchronous
+permalink: /patterns/event-asynchronous/
+categories: Concurrency
 language: en
 tags:
 - Reactive
--- a/event-driven-architecture/README.md
+++ b/event-driven-architecture/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Event Driven Architecture
-category: Architectural
+folder: event-driven-architecture
+permalink: /patterns/event-driven-architecture/
+categories: Architectural
 language: en
 tags:
 - Reactive
@ -21,6 +24,7 @@ Use an Event-driven architecture when

 ## Real world examples

+* SendGrid, an email API, sends events whenever an email is processed, delivered, opened etc... (https://sendgrid.com/docs/API_Reference/Webhooks/event.html)
 * Chargify, a billing API, exposes payment activity through various events (https://docs.chargify.com/api-events)
 * Amazon's AWS Lambda, lets you execute code in response to events such as changes to Amazon S3 buckets, updates to an Amazon DynamoDB table, or custom events generated by your applications or devices. (https://aws.amazon.com/lambda)
 * MySQL runs triggers based on events such as inserts and update events happening on database tables.
@ -28,6 +32,6 @@ Use an Event-driven architecture when
 ## Credits

 * [Event-driven architecture - Wikipedia](https://en.wikipedia.org/wiki/Event-driven_architecture)
-* [What is an Event-Driven Architecture](https://aws.amazon.com/event-driven-architecture/)
+* [Fundamental Components of an Event-Driven Architecture](http://giocc.com/fundamental-components-of-an-event-driven-architecture.html)
 * [Real World Applications/Event Driven Applications](https://wiki.haskell.org/Real_World_Applications/Event_Driven_Applications)
 * [Event-driven architecture definition](http://searchsoa.techtarget.com/definition/event-driven-architecture)
--- a/event-queue/README.md
+++ b/event-queue/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Event Queue
-category: Concurrency
+folder: event-queue
+permalink: /patterns/event-queue/
+categories: Concurrency
 language: en
 tags:
 - Game programming
--- a/event-sourcing/README.md
+++ b/event-sourcing/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Event Sourcing
-category: Architectural
+folder: event-sourcing
+permalink: /patterns/event-sourcing/
+categories: Architectural
 language: en
 tags:
  - Performance
--- a/execute-around/README.md
+++ b/execute-around/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Execute Around
-category: Idiom
+folder: execute-around
+permalink: /patterns/execute-around/
+categories: Idiom
 language: en
 tags:
 - Extensibility
--- a/extension-objects/README.md
+++ b/extension-objects/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Extension objects
-category: Behavioral
+folder: extension-objects
+permalink: /patterns/extension-objects/
+categories: Behavioral
 language: en
 tags:
 - Extensibility
--- a/facade/README.md
+++ b/facade/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Facade
-category: Structural
+folder: facade
+permalink: /patterns/facade/
+categories: Structural
 language: en
 tags:
 - Gang Of Four
--- a/factory-kit/README.md
+++ b/factory-kit/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Factory Kit
-category: Creational
+folder: factory-kit
+permalink: /patterns/factory-kit/
+categories: Creational
 language: en
 tags:
 - Extensibility
--- a/factory-method/README.md
+++ b/factory-method/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Factory Method
-category: Creational
+folder: factory-method
+permalink: /patterns/factory-method/
+categories: Creational
 language: en
 tags:
 - Extensibility
--- a/factory/README.md
+++ b/factory/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Factory
-category: Creational
+folder: factory
+permalink: /patterns/factory/
+categories: Creational
 language: en
 tags:
 - Gang of Four
--- a/fanout-fanin/README.md
+++ b/fanout-fanin/README.md
@ -1,117 +0,0 @@
---
-title: Fan-Out/Fan-In
-category: Integration
-language: en
-tags:
- Microservices
---
-
-## Intent
-The pattern is used when a source system needs to run one or more long-running processes that will fetch some data. 
-The source will not block itself waiting for the reply. <br> The pattern will run the same function in multiple 
-services or machines to fetch the data. This is equivalent to invoking the function multiple times on different chunks of data.  
-
-## Explanation
-The FanOut/FanIn service will take in a list of requests and a consumer. Each request might complete at a different time.
-FanOut/FanIn service will accept the input params and returns the initial system an ID to acknowledge that the pattern
-service has received the requests. Now the caller will not wait or expect the result in the same connection. 
-
-Meanwhile, the pattern service will invoke the requests that have come. The requests might complete at different time. 
-These requests will be processed in different instances of the same function in different machines or services. As the 
-requests get completed, a callback service everytime is called that transforms the result into a common single object format
-that gets pushed to a consumer. The caller will be at the other end of the consumer receiving the result.
-
-**Programmatic Example**
-
-The implementation provided has a list of numbers and end goal is to square the numbers and add them to a single result.
-`FanOutFanIn` class receives the list of numbers in the form of list of `SquareNumberRequest` and a `Consumer` instance 
-that collects the results as the requests get over. `SquareNumberRequest` will square the number with a random delay
-to give the impression of a long-running process that can complete at any time. `Consumer` instance will add the results from
-different `SquareNumberRequest` that will come random time instances. 
-
-Let's look at `FanOutFanIn` class that fans out the requests in async processes. 
-
-```java
-public class FanOutFanIn {
-  public static Long fanOutFanIn(
-      final List<SquareNumberRequest> requests, final Consumer consumer) {
-
-    ExecutorService service = Executors.newFixedThreadPool(requests.size());
-
-    // fanning out
-    List<CompletableFuture<Void>> futures =
-        requests.stream()
-            .map(
-                request ->
-                    CompletableFuture.runAsync(() -> request.delayedSquaring(consumer), service))
-            .collect(Collectors.toList());
-
-    CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-
-    return consumer.getSumOfSquaredNumbers().get();
-  }
-}
-```
-
-`Consumer` is used a callback class that will be called when a request is completed. This will aggregate
-the result from all requests.
-
-```java
-public class Consumer {
-
-  private final AtomicLong sumOfSquaredNumbers;
-
-  Consumer(Long init) {
-    sumOfSquaredNumbers = new AtomicLong(init);
-  }
-
-  public Long add(final Long num) {
-    return sumOfSquaredNumbers.addAndGet(num);
-  }
-}
-```
-
-Request is represented as a `SquareNumberRequest` that squares the number with random delay and calls the 
-`Consumer` once it is squared.
-
-```java
-public class SquareNumberRequest {
-
-  private final Long number;
-  public void delayedSquaring(final Consumer consumer) {
-
-    var minTimeOut = 5000L;
-
-    SecureRandom secureRandom = new SecureRandom();
-    var randomTimeOut = secureRandom.nextInt(2000);
-
-    try {
-      // this will make the thread sleep from 5-7s.
-      Thread.sleep(minTimeOut + randomTimeOut);
-    } catch (InterruptedException e) {
-      LOGGER.error("Exception while sleep ", e);
-      Thread.currentThread().interrupt();
-    } finally {
-      consumer.add(number * number);
-    }
-  }
-}
-```
-
-## Class diagram
-![alt-text](./etc/fanout-fanin.png)
-
-## Applicability
-
-Use this pattern when you can divide the workload into multiple chunks that can be dealt with separately.
-
-## Related patterns
-
-* [Aggregator Microservices](https://java-design-patterns.com/patterns/aggregator-microservices/)
-* [API Gateway](https://java-design-patterns.com/patterns/api-gateway/)
-
-## Credits
-
-* [Understanding Azure Durable Functions - Part 8: The Fan Out/Fan In Pattern](http://dontcodetired.com/blog/post/Understanding-Azure-Durable-Functions-Part-8-The-Fan-OutFan-In-Pattern)
-* [Fan-out/fan-in scenario in Durable Functions - Cloud backup example](https://docs.microsoft.com/en-us/azure/azure-functions/durable/durable-functions-cloud-backup)
-* [Understanding the Fan-Out/Fan-In API Integration Pattern](https://dzone.com/articles/understanding-the-fan-out-fan-in-api-integration-p)
--- a/fanout-fanin/etc/fanout-fanin.png
+++ b/fanout-fanin/etc/fanout-fanin.png
--- a/fanout-fanin/etc/fanout-fanin.urm.puml
+++ b/fanout-fanin/etc/fanout-fanin.urm.puml
@ -1,39 +0,0 @@
-@startuml
-package com.iluwatar.fanout.fanin {
-  class App {
-    - LOGGER : Logger {static}
-    + App()
-    + main(args : String[]) {static}
-  }
-  class Consumer {
-    - sumOfSquaredNumbers : AtomicLong
-    ~ Consumer(init : Long)
-    + add(num : Long) : Long
-    + getSumOfSquaredNumbers() : AtomicLong
-  }
-  class FanOutFanIn {
-    + FanOutFanIn()
-    + fanOutFanIn(requests : List<SquareNumberRequest>, consumer : Consumer) : Long {static}
-  }
-  class SquareNumberRequest {
-    - LOGGER : Logger {static}
-    - number : Long
-    + SquareNumberRequest(number : Long)
-    + delayedSquaring(consumer : Consumer)
-  }
-
-  object SquareNumberRequest1
-  object SquareNumberRequest2
-  object SquareNumberRequest3
-  diamond dia
-}
-
-App --> FanOutFanIn
-FanOutFanIn --> "fan out - running in parallel" SquareNumberRequest1
-FanOutFanIn --> "fan out" SquareNumberRequest2
-FanOutFanIn --> "fan out" SquareNumberRequest3
-SquareNumberRequest1 --> "fan in - aggregate using callback" dia
-SquareNumberRequest2 --> "fan in" dia
-SquareNumberRequest3 --> "fan in" dia
-dia --> Consumer
-@enduml
--- a/fanout-fanin/pom.xml
+++ b/fanout-fanin/pom.xml
@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The MIT License (MIT)
-
-    Copyright © 2014-2021 Ilkka Seppälä
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-
-    Module Model-view-viewmodel is using ZK framework
-    ZK framework is licensed under LGPL and the license can be found at lgpl-3.0.txt
-
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>java-design-patterns</artifactId>
-        <groupId>com.iluwatar</groupId>
-        <version>1.25.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>fanout-fanin</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <mainClass>com.iluwatar.fanout.fanin.App</mainClass>
-                                </manifest>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
--- a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/App.java
+++ b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/App.java
@ -1,74 +0,0 @@
-/*
- * The MIT License
- * Copyright © 2014-2021 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package com.iluwatar.fanout.fanin;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import lombok.extern.slf4j.Slf4j;
-
-
-
-/**
- * FanOut/FanIn pattern is a concurrency pattern that refers to executing multiple instances of the
- * activity function concurrently. The "fan out" part is essentially splitting the data into
- * multiple chunks and then calling the activity function multiple times, passing the chunks.
- *
- * <p>When each chunk has been processed, the "fan in" takes place that aggregates results from each
- * instance of function and forms a single final result.
- *
- * <p>This pattern is only really useful if you can “chunk” the workload in a meaningful way for
- * splitting up to be processed in parallel.
- */
-@Slf4j
-public class App {
-
-  /**
-   * Entry point.
-   *
-   * <p>Implementation provided has a list of numbers that has to be squared and added. The list can
-   * be chunked in any way and the "activity function" {@link
-   * SquareNumberRequest#delayedSquaring(Consumer)} i.e. squaring the number ca be done
-   * concurrently. The "fan in" part is handled by the {@link Consumer} that takes in the result
-   * from each instance of activity and aggregates it whenever that particular activity function
-   * gets over.
-   */
-  public static void main(String[] args) {
-    final List<Long> numbers = Arrays.asList(1L, 3L, 4L, 7L, 8L);
-
-    LOGGER.info("Numbers to be squared and get sum --> {}", numbers);
-
-    final List<SquareNumberRequest> requests =
-        numbers.stream().map(SquareNumberRequest::new).collect(Collectors.toList());
-
-    var consumer = new Consumer(0L);
-
-    // Pass the request and the consumer to fanOutFanIn or sometimes referred as Orchestrator
-    // function
-    final Long sumOfSquaredNumbers = FanOutFanIn.fanOutFanIn(requests, consumer);
-
-    LOGGER.info("Sum of all squared numbers --> {}", sumOfSquaredNumbers);
-  }
-}
--- a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/Consumer.java
+++ b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/Consumer.java
@ -1,48 +0,0 @@
-/*
- * The MIT License
- * Copyright © 2014-2021 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package com.iluwatar.fanout.fanin;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-import lombok.Getter;
-
-
-
-/**
- * Consumer or callback class that will be called everytime a request is complete This will
- * aggregate individual result to form a final result.
- */
-@Getter
-public class Consumer {
-
-  private final AtomicLong sumOfSquaredNumbers;
-
-  Consumer(Long init) {
-    sumOfSquaredNumbers = new AtomicLong(init);
-  }
-
-  public Long add(final Long num) {
-    return sumOfSquaredNumbers.addAndGet(num);
-  }
-}
--- a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/FanOutFanIn.java
+++ b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/FanOutFanIn.java
@ -1,62 +0,0 @@
-/*
- * The MIT License
- * Copyright © 2014-2021 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package com.iluwatar.fanout.fanin;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-
-/**
- * FanOutFanIn class processes long running requests, when any of the processes gets over, result is
- * passed over to the consumer or the callback function. Consumer will aggregate the results as they
- * keep on completing.
- */
-public class FanOutFanIn {
-
-  /**
-   * the main fanOutFanIn function or orchestrator function.
-   * @param requests List of numbers that need to be squared and summed up
-   * @param consumer Takes in the squared number from {@link SquareNumberRequest} and sums it up
-   * @return Aggregated sum of all squared numbers.
-   */
-  public static Long fanOutFanIn(
-      final List<SquareNumberRequest> requests, final Consumer consumer) {
-
-    ExecutorService service = Executors.newFixedThreadPool(requests.size());
-
-    // fanning out
-    List<CompletableFuture<Void>> futures =
-        requests.stream()
-            .map(
-                request ->
-                    CompletableFuture.runAsync(() -> request.delayedSquaring(consumer), service))
-            .collect(Collectors.toList());
-
-    CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-
-    return consumer.getSumOfSquaredNumbers().get();
-  }
-}
--- a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/SquareNumberRequest.java
+++ b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/SquareNumberRequest.java
@ -1,63 +0,0 @@
-/*
- * The MIT License
- * Copyright © 2014-2021 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package com.iluwatar.fanout.fanin;
-
-import java.security.SecureRandom;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Squares the number with a little timeout to give impression of long running process that return
- * at different times.
- */
-@Slf4j
-@AllArgsConstructor
-public class SquareNumberRequest {
-
-  private final Long number;
-
-  /**
-   * Squares the number with a little timeout to give impression of long running process that return
-   * at different times.
-   * @param consumer callback class that takes the result after the delay.
-   * */
-  public void delayedSquaring(final Consumer consumer) {
-
-    var minTimeOut = 5000L;
-
-    SecureRandom secureRandom = new SecureRandom();
-    var randomTimeOut = secureRandom.nextInt(2000);
-
-    try {
-      // this will make the thread sleep from 5-7s.
-      Thread.sleep(minTimeOut + randomTimeOut);
-    } catch (InterruptedException e) {
-      LOGGER.error("Exception while sleep ", e);
-      Thread.currentThread().interrupt();
-    } finally {
-      consumer.add(number * number);
-    }
-  }
-}
--- a/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/AppTest.java
+++ b/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/AppTest.java
@ -1,36 +0,0 @@
-/*
- * The MIT License
- * Copyright © 2014-2021 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package com.iluwatar.fanout.fanin;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
-class AppTest {
-
-    @Test
-    void shouldLaunchApp() {
-        assertDoesNotThrow(() -> App.main(new String[]{}));
-    }
-}
--- a/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/FanOutFanInTest.java
+++ b/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/FanOutFanInTest.java
@ -1,47 +0,0 @@
-/*
- * The MIT License
- * Copyright © 2014-2021 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package com.iluwatar.fanout.fanin;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-class FanOutFanInTest {
-
-  @Test
-  void fanOutFanInTest() {
-    final List<Long> numbers = Arrays.asList(1L, 3L, 4L, 7L, 8L);
-
-    final List<SquareNumberRequest> requests =
-        numbers.stream().map(SquareNumberRequest::new).collect(Collectors.toList());
-
-    final Consumer consumer = new Consumer(0L);
-
-    final Long sumOfSquaredNumbers = FanOutFanIn.fanOutFanIn(requests, consumer);
-
-    Assertions.assertEquals(139, sumOfSquaredNumbers);
-  }
-}
--- a/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/SquareNumberRequestTest.java
+++ b/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/SquareNumberRequestTest.java
@ -1,41 +0,0 @@
-/*
- * The MIT License
- * Copyright © 2014-2021 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package com.iluwatar.fanout.fanin;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class SquareNumberRequestTest {
-
-  @Test
-  void delayedSquaringTest() {
-    Consumer consumer = new Consumer(10L);
-
-    SquareNumberRequest squareNumberRequest = new SquareNumberRequest(5L);
-
-    squareNumberRequest.delayedSquaring(consumer);
-
-    Assertions.assertEquals(35, consumer.getSumOfSquaredNumbers().get());
-  }
-}
--- a/feature-toggle/README.md
+++ b/feature-toggle/README.md
@ -1,6 +1,9 @@
 ---
+layout: pattern
 title: Feature Toggle
-category: Behavioral
+folder: feature-toggle
+permalink: /patterns/feature-toggle/
+categories: Behavioral
 language: en
 tags:
 - Extensibility
--- a/filterer/README.md
+++ b/filterer/README.md
@ -1,8 +1,12 @@
 ---
+layout: pattern
 title: Filterer
+folder: filterer
+permalink: /patterns/filterer/
 description: Design pattern that helps container-like objects to return filtered version of themselves.# short meta description that shows in Google search results
 language: en
-category: Functional
+categories:
+ - Functional
 tags:
 - Extensibility
 ---
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ilkka Seppälä	d76715be82	Merge branch 'master' into adapter-grammatical-fixes	2021-08-01 21:17:37 +03:00
Subhrodip Mohanta	647afad34e	Update adapter/README.md	2021-06-05 12:59:03 +05:30
Ilkka Seppälä	ceca83cafa	Grammatical fixes	2021-06-05 10:00:36 +03:00