Merge branch 'master' into feature/3230

Author: iluwatar

.all-contributorsrc

@@ -3466,6 +3466,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "sanurah",
+      "name": "Sanura Hettiarachchi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16178588?v=4",
+      "profile": "https://github.com/sanurah",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "2897robo",
+      "name": "Kim Gi Uk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31699375?v=4",
+      "profile": "https://github.com/2897robo",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 6,

README.md

@@ -6,7 +6,7 @@
 [![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-380-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-382-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <br/>
@@ -567,6 +567,8 @@ This project is licensed under the terms of the MIT license.
     <tr>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/DenizAltunkapan"><img src="https://avatars.githubusercontent.com/u/93663085?v=4?s=100" width="100px;" alt="Deniz Altunkapan"/><br /><sub><b>Deniz Altunkapan</b></sub></a><br /><a href="#translation-DenizAltunkapan" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/johnklint81"><img src="https://avatars.githubusercontent.com/u/70539458?v=4?s=100" width="100px;" alt="John Klint"/><br /><sub><b>John Klint</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=johnklint81" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/sanurah"><img src="https://avatars.githubusercontent.com/u/16178588?v=4?s=100" width="100px;" alt="Sanura Hettiarachchi"/><br /><sub><b>Sanura Hettiarachchi</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=sanurah" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/2897robo"><img src="https://avatars.githubusercontent.com/u/31699375?v=4?s=100" width="100px;" alt="Kim Gi Uk"/><br /><sub><b>Kim Gi Uk</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=2897robo" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

abstract-document/pom.xml

@@ -34,6 +34,14 @@
   </parent>
   <artifactId>abstract-document</artifactId>
   <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>

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

@@ -31,9 +31,7 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-/**
- * Abstract implementation of Document interface.
- */
+/** Abstract implementation of Document interface. */
 public abstract class AbstractDocument implements Document {
 
   private final Map<String, Object> documentProperties;
@@ -57,12 +55,12 @@ public Object get(String key) {
   @Override
   public <T> Stream<T> children(String key, Function<Map<String, Object>, T> childConstructor) {
     return Stream.ofNullable(get(key))
-            .filter(Objects::nonNull)
-            .map(el -> (List<Map<String, Object>>) el)
-            .findAny()
-            .stream()
-            .flatMap(Collection::stream)
-            .map(childConstructor);
+        .filter(Objects::nonNull)
+        .map(el -> (List<Map<String, Object>>) el)
+        .findAny()
+        .stream()
+        .flatMap(Collection::stream)
+        .map(childConstructor);
   }
 
   @Override
@@ -100,5 +98,4 @@ private String buildStringRepresentation() {
     builder.append("]");
     return builder.toString();
   }
-
 }

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

@@ -49,31 +49,40 @@ public class App {
   public static void main(String[] args) {
     LOGGER.info("Constructing parts and car");
 
-    var wheelProperties = Map.of(
-        Property.TYPE.toString(), "wheel",
-        Property.MODEL.toString(), "15C",
-        Property.PRICE.toString(), 100L);
+    var wheelProperties =
+        Map.of(
+            Property.TYPE.toString(), "wheel",
+            Property.MODEL.toString(), "15C",
+            Property.PRICE.toString(), 100L);
 
-    var doorProperties = Map.of(
-        Property.TYPE.toString(), "door",
-        Property.MODEL.toString(), "Lambo",
-        Property.PRICE.toString(), 300L);
+    var doorProperties =
+        Map.of(
+            Property.TYPE.toString(), "door",
+            Property.MODEL.toString(), "Lambo",
+            Property.PRICE.toString(), 300L);
 
-    var carProperties = Map.of(
-        Property.MODEL.toString(), "300SL",
-        Property.PRICE.toString(), 10000L,
-        Property.PARTS.toString(), List.of(wheelProperties, doorProperties));
+    var carProperties =
+        Map.of(
+            Property.MODEL.toString(),
+            "300SL",
+            Property.PRICE.toString(),
+            10000L,
+            Property.PARTS.toString(),
+            List.of(wheelProperties, doorProperties));
 
     var car = new Car(carProperties);
 
     LOGGER.info("Here is our car:");
     LOGGER.info("-> model: {}", car.getModel().orElseThrow());
     LOGGER.info("-> price: {}", car.getPrice().orElseThrow());
     LOGGER.info("-> parts: ");
-    car.getParts().forEach(p -> LOGGER.info("\t{}/{}/{}",
-        p.getType().orElse(null),
-        p.getModel().orElse(null),
-        p.getPrice().orElse(null))
-    );
+    car.getParts()
+        .forEach(
+            p ->
+                LOGGER.info(
+                    "\t{}/{}/{}",
+                    p.getType().orElse(null),
+                    p.getModel().orElse(null),
+                    p.getPrice().orElse(null)));
   }
 }

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

@@ -28,15 +28,13 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-/**
- * Document interface.
- */
+/** Document interface. */
 public interface Document {
 
   /**
    * Puts the value related to the key.
    *
-   * @param key   element key
+   * @param key element key
    * @param value element value
    * @return Void
    */
@@ -53,7 +51,7 @@ public interface Document {
   /**
    * Gets the stream of child documents.
    *
-   * @param key         element key
+   * @param key element key
    * @param constructor constructor of child class
    * @return child documents
    */

abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Car.java

@@ -27,13 +27,10 @@
 import com.iluwatar.abstractdocument.AbstractDocument;
 import java.util.Map;
 
-/**
- * Car entity.
- */
+/** Car entity. */
 public class Car extends AbstractDocument implements HasModel, HasPrice, HasParts {
 
   public Car(Map<String, Object> properties) {
     super(properties);
   }
-
 }

abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasModel.java

@@ -28,13 +28,10 @@
 import com.iluwatar.abstractdocument.domain.enums.Property;
 import java.util.Optional;
 
-/**
- * HasModel trait for static access to 'model' property.
- */
+/** HasModel trait for static access to 'model' property. */
 public interface HasModel extends Document {
 
   default Optional<String> getModel() {
     return Optional.ofNullable((String) get(Property.MODEL.toString()));
   }
-
 }

abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasParts.java

@@ -28,13 +28,10 @@
 import com.iluwatar.abstractdocument.domain.enums.Property;
 import java.util.stream.Stream;
 
-/**
- * HasParts trait for static access to 'parts' property.
- */
+/** HasParts trait for static access to 'parts' property. */
 public interface HasParts extends Document {
 
   default Stream<Part> getParts() {
     return children(Property.PARTS.toString(), Part::new);
   }
-
 }

abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasPrice.java

@@ -28,13 +28,10 @@
 import com.iluwatar.abstractdocument.domain.enums.Property;
 import java.util.Optional;
 
-/**
- * HasPrice trait for static access to 'price' property.
- */
+/** HasPrice trait for static access to 'price' property. */
 public interface HasPrice extends Document {
 
   default Optional<Number> getPrice() {
     return Optional.ofNullable((Number) get(Property.PRICE.toString()));
   }
-
 }