Merge pull request #3 from iluwatar/master

Sync from master

Author: hbothra15

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [iluwatar]

.travis.yml

@@ -6,8 +6,7 @@ sudo: required
 
 env:
   global:
-  - GH_REF: github.com/iluwatar/java-design-patterns.git
-  - secure: LxTDuNS/rBWIvKkaEqr79ImZAe48mCdoYCF41coxNXgNoippo4GIBArknqtv+XvdkiuRZ1yGyj6pn8GU33c/yn+krddTUkVCwTbVatbalW5jhQjDbHYym/JcxaK9ZS/3JTeGcWrBgiPqHEEDhCf26vPZsXoMSeVCEORVKTp1BSg=
+  - secure: "DCpazS3nkLnter3sguXEAS2fC/1ZWNfM+XLyif9MfNFxlZdpni2vCD/jA0Rdpga8puQWHNVLyAec+RPFH/2qSmJ1c1UTV5MaLv8tPqwUX0VFA+1I6XoSv6oX4ldHTBWHEWqQHkRFOLoil0h0edc0tTOWQwXF8U+DLAB+HkRb4gw="
 
 services:
 - xvfb
@@ -24,7 +23,7 @@ script:
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mvn clean verify sonar:sonar -Dsonar.projectKey=iluwatar_java-design-patterns -Dsonar.host.url=https://sonarcloud.io; fi'
 
 after_success:
-- bash update-ghpages.sh
+- bash update-website.sh
 
 notifications:
   email:

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

@@ -23,14 +23,13 @@
 
 package com.iluwatar.abstractdocument;
 
-import java.util.Arrays;
-import java.util.HashMap;
-
+import com.iluwatar.abstractdocument.domain.Car;
+import com.iluwatar.abstractdocument.domain.enums.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.iluwatar.abstractdocument.domain.Car;
-import com.iluwatar.abstractdocument.domain.enums.Property;
+import java.util.List;
+import java.util.Map;
 
 /**
  * The Abstract Document pattern enables handling additional, non-static
@@ -52,21 +51,20 @@ public class App {
   public App() {
     LOGGER.info("Constructing parts and car");
 
-    var carProperties = new HashMap<String, Object>();
-    carProperties.put(Property.MODEL.toString(), "300SL");
-    carProperties.put(Property.PRICE.toString(), 10000L);
-
-    var wheelProperties = new HashMap<String, Object>();
-    wheelProperties.put(Property.TYPE.toString(), "wheel");
-    wheelProperties.put(Property.MODEL.toString(), "15C");
-    wheelProperties.put(Property.PRICE.toString(), 100L);
+    var wheelProperties = Map.of(
+            Property.TYPE.toString(), "wheel",
+            Property.MODEL.toString(), "15C",
+            Property.PRICE.toString(), 100L);
 
-    var doorProperties = new HashMap<String, Object>();
-    doorProperties.put(Property.TYPE.toString(), "door");
-    doorProperties.put(Property.MODEL.toString(), "Lambo");
-    doorProperties.put(Property.PRICE.toString(), 300L);
+    var doorProperties = Map.of(
+            Property.TYPE.toString(), "door",
+            Property.MODEL.toString(), "Lambo",
+            Property.PRICE.toString(), 300L);
 
-    carProperties.put(Property.PARTS.toString(), Arrays.asList(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);
 

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

@@ -25,15 +25,12 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * AbstractDocument test class
@@ -60,9 +57,7 @@ public void shouldPutAndGetValue() {
 
   @Test
   public void shouldRetrieveChildren() {
-    Map<String, Object> child1 = new HashMap<>();
-    Map<String, Object> child2 = new HashMap<>();
-    List<Map<String, Object>> children = Arrays.asList(child1, child2);
+    var children = List.of(Map.of(), Map.of());
 
     document.put(KEY, children);
 
@@ -80,8 +75,7 @@ public void shouldRetrieveEmptyStreamForNonExistingChildren() {
 
   @Test
   public void shouldIncludePropsInToString() {
-    Map<String, Object> props = new HashMap<>();
-    props.put(KEY, VALUE);
+    Map<String, Object> props = Map.of(KEY, VALUE);
     DocumentImplementation document = new DocumentImplementation(props);
     assertTrue(document.toString().contains(KEY));
     assertTrue(document.toString().contains(VALUE));

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

@@ -23,17 +23,15 @@
 
 package com.iluwatar.abstractdocument;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
 import com.iluwatar.abstractdocument.domain.Car;
 import com.iluwatar.abstractdocument.domain.Part;
 import com.iluwatar.abstractdocument.domain.enums.Property;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test for Part and Car
@@ -49,10 +47,10 @@ public class DomainTest {
 
   @Test
   public void shouldConstructPart() {
-    Map<String, Object> partProperties = new HashMap<>();
-    partProperties.put(Property.TYPE.toString(), TEST_PART_TYPE);
-    partProperties.put(Property.MODEL.toString(), TEST_PART_MODEL);
-    partProperties.put(Property.PRICE.toString(), TEST_PART_PRICE);
+    Map<String, Object> partProperties = Map.of(
+            Property.TYPE.toString(), TEST_PART_TYPE,
+            Property.MODEL.toString(), TEST_PART_MODEL,
+            Property.PRICE.toString(), TEST_PART_PRICE);
     Part part = new Part(partProperties);
 
     assertEquals(TEST_PART_TYPE, part.getType().get());
@@ -62,10 +60,10 @@ public void shouldConstructPart() {
 
   @Test
   public void shouldConstructCar() {
-    Map<String, Object> carProperties = new HashMap<>();
-    carProperties.put(Property.MODEL.toString(), TEST_CAR_MODEL);
-    carProperties.put(Property.PRICE.toString(), TEST_CAR_PRICE);
-    carProperties.put(Property.PARTS.toString(), Arrays.asList(new HashMap<>(), new HashMap<>()));
+    Map<String, Object> carProperties = Map.of(
+            Property.MODEL.toString(), TEST_CAR_MODEL,
+            Property.PRICE.toString(), TEST_CAR_PRICE,
+            Property.PARTS.toString(), List.of(Map.of(), Map.of()));
     Car car = new Car(carProperties);
 
     assertEquals(TEST_CAR_MODEL, car.getModel().get());

abstract-factory/README.md

@@ -188,10 +188,6 @@ Use the Abstract Factory pattern when
 ## Tutorial
 * [Abstract Factory Pattern Tutorial](https://www.journaldev.com/1418/abstract-factory-design-pattern-in-java) 
 
-## Presentations
-
-* [Abstract Factory Pattern](etc/presentation.html) 
-
 
 ## Real world examples