Merge pull request #5 from iluwatar/master

Resync to remove conflicts

Author: hbothra15

abstract-document/pom.xml

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

abstract-factory/pom.xml

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

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

@@ -32,7 +32,7 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * Test for abstract factory
+ * Test for abstract factory.
  */
 public class AbstractFactoryTest {
 

acyclic-visitor/pom.xml

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

adapter/pom.xml

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

aggregator-microservices/aggregator-service/pom.xml

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

aggregator-microservices/information-microservice/pom.xml

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

aggregator-microservices/inventory-microservice/pom.xml

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

aggregator-microservices/pom.xml

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

ambassador/pom.xml

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

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

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

api-gateway/image-microservice/pom.xml

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

api-gateway/pom.xml

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

api-gateway/price-microservice/pom.xml

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

async-method-invocation/pom.xml

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

balking/pom.xml

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

bridge/pom.xml

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

builder/pom.xml

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

business-delegate/pom.xml

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

bytecode/pom.xml

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

caching/pom.xml

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

callback/pom.xml

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

chain/pom.xml

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

circuit-breaker/README.md

@@ -1,6 +1,6 @@
 ---
 layout: pattern
-title: CircuitBreaker
+title: Circuit Breaker
 folder: circuit-breaker
 permalink: /patterns/circuit-breaker/
 categories: Other

circuit-breaker/pom.xml

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

collection-pipeline/README.md

@@ -3,7 +3,7 @@ layout: pattern
 title: Collection Pipeline
 folder: collection-pipeline
 permalink: /patterns/collection-pipeline/
-categories: Functional
+categories: Other
 tags:
  - Java
  - Difficulty-Beginner

collection-pipeline/pom.xml

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

command/pom.xml

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

commander/README.md

@@ -3,7 +3,7 @@ layout: pattern
 title: Commander
 folder: commander
 permalink: /patterns/commander/
-categories: 
+categories: Other
 tags:
  - Java
  - Difficulty-Intermediate

commander/pom.xml

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

composite/pom.xml

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

composite/src/main/java/com/iluwatar/composite/Word.java

@@ -37,6 +37,10 @@ public Word(List<Letter> letters) {
     letters.forEach(this::add);
   }
 
+  /**
+   * Constructor.
+   * @param letters to include
+   */
   public Word(char... letters) {
     for (char letter : letters) {
       this.add(new Letter(letter));

converter/README.md

@@ -17,6 +17,71 @@ mapping, reducing a boilerplate code to minimum.
 
 ![alt text](./etc/converter.png "Converter Pattern")
 
+## Explanation
+
+Real world example
+
+> In real world applications it is often the case that database layer consists of entities that need to be mapped into DTOs for use on the business logic layer. Similar mapping is done for potentially huge amount of classes and we need a generic way to achieve this.
+
+In plain words
+
+> Converter pattern makes it easy to map instances of one class into instances of another class.
+
+**Programmatic Example**
+
+We need a generic solution for the mapping problem. To achieve this, let's introduce a generic converter.
+
+```java
+public class Converter<T, U> {
+
+  private final Function<T, U> fromDto;
+  private final Function<U, T> fromEntity;
+
+  public Converter(final Function<T, U> fromDto, final Function<U, T> fromEntity) {
+    this.fromDto = fromDto;
+    this.fromEntity = fromEntity;
+  }
+
+  public final U convertFromDto(final T dto) {
+    return fromDto.apply(dto);
+  }
+
+  public final T convertFromEntity(final U entity) {
+    return fromEntity.apply(entity);
+  }
+
+  public final List<U> createFromDtos(final Collection<T> dtos) {
+    return dtos.stream().map(this::convertFromDto).collect(Collectors.toList());
+  }
+
+  public final List<T> createFromEntities(final Collection<U> entities) {
+    return entities.stream().map(this::convertFromEntity).collect(Collectors.toList());
+  }
+}
+```
+
+The specialized converters inherit from this base class as follows.
+
+```java
+public class UserConverter extends Converter<UserDto, User> {
+
+  public UserConverter() {
+    super(userDto -> new User(userDto.getFirstName(), userDto.getLastName(), userDto.isActive(),
+            userDto.getEmail()),
+        user -> new UserDto(user.getFirstName(), user.getLastName(), user.isActive(),
+            user.getUserId()));
+  }
+}
+```
+
+Now mapping between User and UserDto becomes trivial.
+
+```java
+Converter<UserDto, User> userConverter = new UserConverter();
+UserDto dtoUser = new UserDto("John", "Doe", true, "whatever[at]wherever.com");
+User user = userConverter.convertFromDto(dtoUser);
+```
+
 ## Applicability
 Use the Converter Pattern in the following situations:
 

converter/pom.xml

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

cqrs/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>com.iluwatar</groupId>
 		<artifactId>java-design-patterns</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cqrs</artifactId>
 	<dependencies>

dao/pom.xml

@@ -30,7 +30,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.22.0-SNAPSHOT</version>
+    <version>1.23.0-SNAPSHOT</version>
   </parent>
   <artifactId>dao</artifactId>
 

data-bus/pom.xml

@@ -33,7 +33,7 @@
     <parent>
         <groupId>com.iluwatar</groupId>
         <artifactId>java-design-patterns</artifactId>
-        <version>1.22.0-SNAPSHOT</version>
+        <version>1.23.0-SNAPSHOT</version>
     </parent>
     <artifactId>data-bus</artifactId>
     <dependencies>