Achieved milestone 1.14.0

Sonar quality bugfix and minor refactor

.gitignore

@@ -15,5 +15,5 @@ datanucleus.log
 /bin/
 /bin/
 /bin/
-
+*.log
 data-mapper/src/main/resources/log4j.xml

.travis.yml

@@ -6,6 +6,7 @@ env:
   global:
   - GH_REF: github.com/iluwatar/java-design-patterns.git
   - secure: LxTDuNS/rBWIvKkaEqr79ImZAe48mCdoYCF41coxNXgNoippo4GIBArknqtv+XvdkiuRZ1yGyj6pn8GU33c/yn+krddTUkVCwTbVatbalW5jhQjDbHYym/JcxaK9ZS/3JTeGcWrBgiPqHEEDhCf26vPZsXoMSeVCEORVKTp1BSg=
+  - secure: "eoWlW9GyTJY04P8K3pxayXwU9/hmptQg/LfirispQkV9YvmziCfSzXnatnBhNfud98sCzY8BScXnb+OWLTnjLKpId4rtEqb0aJ40Jc32cUKzgzFAUn7cNcDAbUIfyPAGVqyQqfj/11wYSADwWMMOPlW97ExUtoyiH2WenXuRHso="
   
 before_install:
 - export DISPLAY=:99.0
@@ -16,7 +17,7 @@ install:
 - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -e
 
 after_success:
-- mvn clean test jacoco:report coveralls:report
+- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_TOKEN
 - bash update-ghpages.sh
 
 # use latest java version available instead of travis default

README.md

@@ -5,9 +5,9 @@
 # Design patterns implemented in Java
 
 [![Build status](https://travis-ci.org/iluwatar/java-design-patterns.svg?branch=master)](https://travis-ci.org/iluwatar/java-design-patterns)
-[![Coverage Status](https://coveralls.io/repos/iluwatar/java-design-patterns/badge.svg?branch=master)](https://coveralls.io/r/iluwatar/java-design-patterns?branch=master)
 [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/iluwatar/java-design-patterns/master/LICENSE.md)
 [![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)
+[![Quality Gate](https://sonarqube.com/api/badges/gate?key=com.iluwatar%3Ajava-design-patterns)](https://sonarqube.com/dashboard/index/com.iluwatar%3Ajava-design-patterns)
 
 # Introduction
 

_scripts/postPumlsToServer.py

@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright (c) 2014 Ilkka Seppälä
+# Copyright (c) 2014-2016 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

abstract-document/etc/abstract-document.urm.puml

@@ -1,33 +1,29 @@
 @startuml
 package com.iluwatar.abstractdocument.domain {
-  class Part {
-    + Part(properties : Map<String, Object>)
-  }
-  interface HasPrice {
-    + PROPERTY : String {static}
-    + getPrice() : Optional<Number>
-  }
-  interface HasParts {
-    + PROPERTY : String {static}
-    + getParts() : Stream<Part>
-  }
   class Car {
     + Car(properties : Map<String, Object>)
   }
-  interface HasType {
-    + PROPERTY : String {static}
-    + getType() : Optional<String>
-  }
   interface HasModel {
     + PROPERTY : String {static}
     + getModel() : Optional<String>
   }
+  interface HasParts {
+    + PROPERTY : String {static}
+    + getParts() : Stream<Part>
+  }
+  interface HasPrice {
+    + PROPERTY : String {static}
+    + getPrice() : Optional<Number>
+  }
+  interface HasType {
+    + PROPERTY : String {static}
+    + getType() : Optional<String>
+  }
+  class Part {
+    + Part(properties : Map<String, Object>)
+  }
 }
 package com.iluwatar.abstractdocument {
-  class App {
-    + App()
-    + main(args : String[]) {static}
-  }
   abstract class AbstractDocument {
     - properties : Map<String, Object>
     # AbstractDocument(properties : Map<String, Object>)
@@ -36,24 +32,28 @@ package com.iluwatar.abstractdocument {
     + put(key : String, value : Object)
     + toString() : String
   }
+  class App {
+    - LOGGER : Logger {static}
+    + App()
+    + main(args : String[]) {static}
+  }
   interface Document {
     + children(String, Function<Map<String, Object>, T>) : Stream<T> {abstract}
     + get(String) : Object {abstract}
     + put(String, Object) {abstract}
   }
 }
-AbstractDocument --+ Map
-Part ..|> HasType 
-Part ..|> HasModel 
-Part ..|> HasPrice 
-Part --|> AbstractDocument 
 AbstractDocument ..|> Document 
-HasPrice --|> Document 
-HasParts --|> Document 
 Car ..|> HasModel 
 Car ..|> HasPrice 
 Car ..|> HasParts 
 Car --|> AbstractDocument 
-HasType --|> Document 
 HasModel --|> Document 
+HasParts --|> Document 
+HasPrice --|> Document 
+HasType --|> Document 
+Part ..|> HasType 
+Part ..|> HasModel 
+Part ..|> HasPrice 
+Part --|> AbstractDocument 
 @enduml

abstract-document/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>java-design-patterns</artifactId>
         <groupId>com.iluwatar</groupId>
-        <version>1.13.0</version>
+        <version>1.14.0</version>
     </parent>
     <artifactId>abstract-document</artifactId>
     <dependencies>

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,8 @@ import com.iluwatar.abstractdocument.domain.HasModel;
 import com.iluwatar.abstractdocument.domain.HasParts;
 import com.iluwatar.abstractdocument.domain.HasPrice;
 import com.iluwatar.abstractdocument.domain.HasType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -44,11 +46,13 @@ import java.util.Map;
  */
 public class App {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
   /**
    * Executes the App
    */
   public App() {
-    System.out.println("Constructing parts and car");
+    LOGGER.info("Constructing parts and car");
 
     Map<String, Object> carProperties = new HashMap<>();
     carProperties.put(HasModel.PROPERTY, "300SL");
@@ -68,12 +72,11 @@ public class App {
 
     Car car = new Car(carProperties);
 
-    System.out.println("Here is our car:");
+    LOGGER.info("Here is our car:");
-    System.out.println("-> model: " + car.getModel().get());
+    LOGGER.info("-> model: {}", car.getModel().get());
-    System.out.println("-> price: " + car.getPrice().get());
+    LOGGER.info("-> price: {}", car.getPrice().get());
-    System.out.println("-> parts: ");
+    LOGGER.info("-> parts: ");
-    car.getParts().forEach(p -> System.out
+    car.getParts().forEach(p -> LOGGER.info("\t{}/{}/{}", p.getType().get(), p.getModel().get(), p.getPrice().get()));
-        .println("\t" + p.getType().get() + "/" + p.getModel().get() + "/" + p.getPrice().get()));
   }
 
   /**

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

abstract-factory/etc/abstract-factory.urm.puml

@@ -1,6 +1,7 @@
 @startuml
 package com.iluwatar.abstractfactory {
   class App {
+    - LOGGER : Logger {static}
     - army : Army
     - castle : Castle
     - king : King
@@ -17,58 +18,58 @@ package com.iluwatar.abstractfactory {
     - setCastle(castle : Castle)
     - setKing(king : King)
   }
-  class OrcKingdomFactory {
+  interface Army {
-    + OrcKingdomFactory()
+    + getDescription() : String {abstract}
-    + createArmy() : Army
+  }
-    + createCastle() : Castle
+  interface Castle {
-    + createKing() : King
+    + getDescription() : String {abstract}
+  }
+  class ElfArmy {
+    ~ DESCRIPTION : String {static}
+    + ElfArmy()
+    + getDescription() : String
   }
   class ElfCastle {
     ~ DESCRIPTION : String {static}
     + ElfCastle()
     + getDescription() : String
   }
+  class ElfKing {
+    ~ DESCRIPTION : String {static}
+    + ElfKing()
+    + getDescription() : String
+  }
+  class ElfKingdomFactory {
+    + ElfKingdomFactory()
+    + createArmy() : Army
+    + createCastle() : Castle
+    + createKing() : King
+  }
+  interface King {
+    + getDescription() : String {abstract}
+  }
+  interface KingdomFactory {
+    + createArmy() : Army {abstract}
+    + createCastle() : Castle {abstract}
+    + createKing() : King {abstract}
+  }
+  class OrcArmy {
+    ~ DESCRIPTION : String {static}
+    + OrcArmy()
+    + getDescription() : String
+  }
   class OrcCastle {
     ~ DESCRIPTION : String {static}
     + OrcCastle()
     + getDescription() : String
   }
-  interface KingdomFactory {
-    + createArmy() : Army {abstract}
-    + createCastle() : Castle {abstract}
-    + createKing() : King {abstract}
-  }
-  class ElfKing {
-    ~ DESCRIPTION : String {static}
-    + ElfKing()
-    + getDescription() : String
-  }
-  class ElfArmy {
-    ~ DESCRIPTION : String {static}
-    + ElfArmy()
-    + getDescription() : String
-  }
-  interface Castle {
-    + getDescription() : String {abstract}
-  }
-  interface Army {
-    + getDescription() : String {abstract}
-  }
   class OrcKing {
     ~ DESCRIPTION : String {static}
     + OrcKing()
     + getDescription() : String
   }
-  class OrcArmy {
+  class OrcKingdomFactory {
-    ~ DESCRIPTION : String {static}
+    + OrcKingdomFactory()
-    + OrcArmy()
-    + getDescription() : String
-  }
-  interface King {
-    + getDescription() : String {abstract}
-  }
-  class ElfKingdomFactory {
-    + ElfKingdomFactory()
     + createArmy() : Army
     + createCastle() : Castle
     + createKing() : King
@@ -77,12 +78,12 @@ package com.iluwatar.abstractfactory {
 App -->  "-castle" Castle
 App -->  "-king" King
 App -->  "-army" Army
-OrcKingdomFactory ..|> KingdomFactory 
-ElfCastle ..|> Castle 
-OrcCastle ..|> Castle 
-ElfKing ..|> King 
 ElfArmy ..|> Army 
-OrcKing ..|> King 
+ElfCastle ..|> Castle 
-OrcArmy ..|> Army 
+ElfKing ..|> King 
 ElfKingdomFactory ..|> KingdomFactory 
+OrcArmy ..|> Army 
+OrcCastle ..|> Castle 
+OrcKing ..|> King 
+OrcKingdomFactory ..|> KingdomFactory 
 @enduml

abstract-factory/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.13.0</version>
+    <version>1.14.0</version>
   </parent>
   <artifactId>abstract-factory</artifactId>
   <dependencies>

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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
@@ -22,6 +22,9 @@
  */
 package com.iluwatar.abstractfactory;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * 
  * The Abstract Factory pattern provides a way to encapsulate a group of individual factories that have a common theme
@@ -39,6 +42,8 @@ package com.iluwatar.abstractfactory;
  */
 public class App {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
   private King king;
   private Castle castle;
   private Army army;
@@ -98,17 +103,17 @@ public class App {
 
     App app = new App();
 
-    System.out.println("Elf Kingdom");
+    LOGGER.info("Elf Kingdom");
     app.createKingdom(new ElfKingdomFactory());
-    System.out.println(app.getArmy().getDescription());
+    LOGGER.info(app.getArmy().getDescription());
-    System.out.println(app.getCastle().getDescription());
+    LOGGER.info(app.getCastle().getDescription());
-    System.out.println(app.getKing().getDescription());
+    LOGGER.info(app.getKing().getDescription());
 
-    System.out.println("\nOrc Kingdom");
+    LOGGER.info("Orc Kingdom");
     app.createKingdom(new OrcKingdomFactory());
-    System.out.println(app.getArmy().getDescription());
+    LOGGER.info(app.getArmy().getDescription());
-    System.out.println(app.getCastle().getDescription());
+    LOGGER.info(app.getCastle().getDescription());
-    System.out.println(app.getKing().getDescription());
+    LOGGER.info(app.getKing().getDescription());
 
   }
 

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

adapter/etc/adapter.urm.puml

@@ -1,18 +1,19 @@
 @startuml
 package com.iluwatar.adapter {
-  interface BattleShip {
+  class App {
-    + fire() {abstract}
+    + App()
-    + move() {abstract}
+    + main(args : String[]) {static}
   }
   class BattleFishingBoat {
+    - LOGGER : Logger {static}
     - boat : FishingBoat
     + BattleFishingBoat()
     + fire()
     + move()
   }
-  class App {
+  interface BattleShip {
-    + App()
+    + fire() {abstract}
-    + main(args : String[]) {static}
+    + move() {abstract}
   }
   class Captain {
     - battleship : BattleShip
@@ -23,6 +24,7 @@ package com.iluwatar.adapter {
     + setBattleship(battleship : BattleShip)
   }
   class FishingBoat {
+    - LOGGER : Logger {static}
     + FishingBoat()
     + fish()
     + sail()

adapter/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.13.0</version>
+    <version>1.14.0</version>
   </parent>
   <artifactId>adapter</artifactId>
   <dependencies>

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

adapter/src/main/java/com/iluwatar/adapter/BattleFishingBoat.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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
@@ -22,6 +22,9 @@
  */
 package com.iluwatar.adapter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  *
  * Adapter class. Adapts the interface of the device ({@link FishingBoat}) into {@link BattleShip}
@@ -33,6 +36,8 @@ package com.iluwatar.adapter;
  */
 public class BattleFishingBoat implements BattleShip {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(BattleFishingBoat.class);
+
   private FishingBoat boat;
 
   public BattleFishingBoat() {
@@ -41,7 +46,7 @@ public class BattleFishingBoat implements BattleShip {
 
   @Override
   public void fire() {
-    System.out.println("fire!");
+    LOGGER.info("fire!");
   }
 
   @Override

adapter/src/main/java/com/iluwatar/adapter/BattleShip.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

adapter/src/main/java/com/iluwatar/adapter/Captain.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

adapter/src/main/java/com/iluwatar/adapter/FishingBoat.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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
@@ -22,6 +22,9 @@
  */
 package com.iluwatar.adapter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  *
  * Device class (adaptee in the pattern). We want to reuse this class
@@ -29,12 +32,14 @@ package com.iluwatar.adapter;
  */
 public class FishingBoat {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(FishingBoat.class);
+
   public void sail() {
-    System.out.println("The Boat is moving to that place");
+    LOGGER.info("The Boat is moving to that place");
   }
 
   public void fish() {
-    System.out.println("fishing ...");
+    LOGGER.info("fishing ...");
   }
 
 }

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

aggregator-microservices/aggregator-service/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>aggregator-microservices</artifactId>
         <groupId>com.iluwatar</groupId>
-        <version>1.13.0</version>
+        <version>1.14.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/App.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Product.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClient.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,8 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -37,6 +39,8 @@ import java.io.IOException;
 @Component
 public class ProductInformationClientImpl implements ProductInformationClient {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(ProductInformationClientImpl.class);
+
   @Override
   public String getProductTitle() {
     String response = null;
@@ -46,7 +50,7 @@ public class ProductInformationClientImpl implements ProductInformationClient {
         response = EntityUtils.toString(httpResponse.getEntity());
       }
     } catch (IOException e) {
-      e.printStackTrace();
+      LOGGER.error("Exception caught.", e);
     }
     return response;
   }

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClient.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,8 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -37,6 +39,8 @@ import java.io.IOException;
 @Component
 public class ProductInventoryClientImpl implements ProductInventoryClient {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(ProductInventoryClientImpl.class);
+
   @Override
   public int getProductInventories() {
     String response = "0";
@@ -46,7 +50,7 @@ public class ProductInventoryClientImpl implements ProductInventoryClient {
         response = EntityUtils.toString(httpResponse.getEntity());
       }
     } catch (IOException e) {
-      e.printStackTrace();
+      LOGGER.error("Exception caught.", e);
     }
     return Integer.parseInt(response);
   }

aggregator-microservices/aggregator-service/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright (c) 2014 Ilkka Seppälä
+# Copyright (c) 2014-2016 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

aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/etc/aggregator-service.urm.puml

@@ -1,16 +1,15 @@
 @startuml
 package com.iluwatar.aggregator.microservices {
-  class ProductInventoryClientImpl {
+  class Aggregator {
-    + ProductInventoryClientImpl()
+    - informationClient : ProductInformationClient
-    + getProductInventories() : int
+    - inventoryClient : ProductInventoryClient
+    + Aggregator()
+    + getProduct() : Product
   }
   class App {
     + App()
     + main(args : String[]) {static}
   }
-  interface ProductInventoryClient {
-    + getProductInventories() : int {abstract}
-  }
   class Product {
     - productInventories : int
     - title : String
@@ -20,22 +19,25 @@ package com.iluwatar.aggregator.microservices {
     + setProductInventories(productInventories : int)
     + setTitle(title : String)
   }
-  class Aggregator {
-    - informationClient : ProductInformationClient
-    - inventoryClient : ProductInventoryClient
-    + Aggregator()
-    + getProduct() : Product
-  }
-  class ProductInformationClientImpl {
-    + ProductInformationClientImpl()
-    + getProductTitle() : String
-  }
   interface ProductInformationClient {
     + getProductTitle() : String {abstract}
   }
+  class ProductInformationClientImpl {
+    - LOGGER : Logger {static}
+    + ProductInformationClientImpl()
+    + getProductTitle() : String
+  }
+  interface ProductInventoryClient {
+    + getProductInventories() : int {abstract}
+  }
+  class ProductInventoryClientImpl {
+    - LOGGER : Logger {static}
+    + ProductInventoryClientImpl()
+    + getProductInventories() : int
+  }
 }
-Aggregator -->  "-inventoryClient" ProductInventoryClient
 Aggregator -->  "-informationClient" ProductInformationClient
-ProductInventoryClientImpl ..|> ProductInventoryClient 
+Aggregator -->  "-inventoryClient" ProductInventoryClient
 ProductInformationClientImpl ..|> ProductInformationClient 
+ProductInventoryClientImpl ..|> ProductInventoryClient 
 @enduml

aggregator-microservices/etc/inventory-microservice.urm.puml

@@ -1,12 +1,12 @@
 @startuml
 package com.iluwatar.inventory.microservice {
-  class InventoryController {
-    + InventoryController()
-    + getProductInventories() : int
-  }
   class InventoryApplication {
     + InventoryApplication()
     + main(args : String[]) {static}
   }
+  class InventoryController {
+    + InventoryController()
+    + getProductInventories() : int
+  }
 }
 @enduml

aggregator-microservices/information-microservice/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>aggregator-microservices</artifactId>
         <groupId>com.iluwatar</groupId>
-        <version>1.13.0</version>
+        <version>1.14.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationApplication.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/information-microservice/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright (c) 2014 Ilkka Seppälä
+# Copyright (c) 2014-2016 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

aggregator-microservices/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/inventory-microservice/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>aggregator-microservices</artifactId>
         <groupId>com.iluwatar</groupId>
-        <version>1.13.0</version>
+        <version>1.14.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryApplication.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/inventory-microservice/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright (c) 2014 Ilkka Seppälä
+# Copyright (c) 2014-2016 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

aggregator-microservices/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 Ilkka Seppälä
  * <p/>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

aggregator-microservices/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>java-design-patterns</artifactId>
         <groupId>com.iluwatar</groupId>
-        <version>1.13.0</version>
+        <version>1.14.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>aggregator-microservices</artifactId>

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

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
   <parent>
     <artifactId>api-gateway</artifactId>
     <groupId>com.iluwatar</groupId>
-    <version>1.13.0</version>
+    <version>1.14.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-gateway-service</artifactId>

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/App.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/DesktopProduct.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClient.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClientImpl.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/MobileProduct.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClient.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClientImpl.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/api-gateway-service/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright (c) 2014 Ilkka Seppälä
+# Copyright (c) 2014-2016 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

api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/etc/api-gateway-service.urm.puml

@@ -1,12 +1,27 @@
 @startuml
 package com.iluwatar.api.gateway {
+  class ApiGateway {
+    - imageClient : ImageClient
+    - priceClient : PriceClient
+    + ApiGateway()
+    + getProductDesktop() : DesktopProduct
+    + getProductMobile() : MobileProduct
+  }
   class App {
     + App()
     + main(args : String[]) {static}
   }
-  class PriceClientImpl {
+  class DesktopProduct {
-    + PriceClientImpl()
+    - imagePath : String
+    - price : String
+    + DesktopProduct()
+    + getImagePath() : String
     + getPrice() : String
+    + setImagePath(imagePath : String)
+    + setPrice(price : String)
+  }
+  interface ImageClient {
+    + getImagePath() : String {abstract}
   }
   class ImageClientImpl {
     + ImageClientImpl()
@@ -18,31 +33,16 @@ package com.iluwatar.api.gateway {
     + getPrice() : String
     + setPrice(price : String)
   }
-  interface ImageClient {
-    + getImagePath() : String {abstract}
-  }
-  class ApiGateway {
-    - imageClient : ImageClient
-    - priceClient : PriceClient
-    + ApiGateway()
-    + getProductDesktop() : DesktopProduct
-    + getProductMobile() : MobileProduct
-  }
-  class DesktopProduct {
-    - imagePath : String
-    - price : String
-    + DesktopProduct()
-    + getImagePath() : String
-    + getPrice() : String
-    + setImagePath(imagePath : String)
-    + setPrice(price : String)
-  }
   interface PriceClient {
     + getPrice() : String {abstract}
   }
+  class PriceClientImpl {
+    + PriceClientImpl()
+    + getPrice() : String
+  }
 }
 ApiGateway -->  "-imageClient" ImageClient
 ApiGateway -->  "-priceClient" PriceClient
-PriceClientImpl ..|> PriceClient 
 ImageClientImpl ..|> ImageClient 
+PriceClientImpl ..|> PriceClient 
 @enduml

api-gateway/image-microservice/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
   <parent>
     <artifactId>api-gateway</artifactId>
     <groupId>com.iluwatar</groupId>
-    <version>1.13.0</version>
+    <version>1.14.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageApplication.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/image-microservice/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright (c) 2014 Ilkka Seppälä
+# Copyright (c) 2014-2016 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

api-gateway/image-microservice/src/test/java/com/iluwatar/image/microservice/ImageControllerTest.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
   <parent>
     <artifactId>java-design-patterns</artifactId>
     <groupId>com.iluwatar</groupId>
-    <version>1.13.0</version>
+    <version>1.14.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-gateway</artifactId>

api-gateway/price-microservice/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
   <parent>
     <artifactId>api-gateway</artifactId>
     <groupId>com.iluwatar</groupId>
-    <version>1.13.0</version>
+    <version>1.14.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceApplication.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

api-gateway/price-microservice/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright (c) 2014 Ilkka Seppälä
+# Copyright (c) 2014-2016 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

api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceControllerTest.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

async-method-invocation/etc/async-method-invocation.urm.puml

@@ -1,22 +1,26 @@
 @startuml
 package com.iluwatar.async.method.invocation {
   class App {
+    - LOGGER : Logger {static}
     + App()
     - callback(name : String) : AsyncCallback<T> {static}
     - lazyval(value : T, delayMillis : long) : Callable<T> {static}
     - log(msg : String) {static}
     + main(args : String[]) {static}
   }
-  interface AsyncResult<T> {
+  interface AsyncCallback<T> {
-    + await() {abstract}
+    + onComplete(T, Optional<Exception>) {abstract}
-    + getValue() : T {abstract}
-    + isCompleted() : boolean {abstract}
   }
   interface AsyncExecutor {
     + endProcess(AsyncResult<T>) : T {abstract}
     + startProcess(Callable<T>) : AsyncResult<T> {abstract}
     + startProcess(Callable<T>, AsyncCallback<T>) : AsyncResult<T> {abstract}
   }
+  interface AsyncResult<T> {
+    + await() {abstract}
+    + getValue() : T {abstract}
+    + isCompleted() : boolean {abstract}
+  }
   class ThreadAsyncExecutor {
     - idx : AtomicInteger
     + ThreadAsyncExecutor()
@@ -24,9 +28,6 @@ package com.iluwatar.async.method.invocation {
     + startProcess(task : Callable<T>) : AsyncResult<T>
     + startProcess(task : Callable<T>, callback : AsyncCallback<T>) : AsyncResult<T>
   }
-  interface AsyncCallback<T> {
-    + onComplete(T, Optional<Exception>) {abstract}
-  }
   -class CompletableResult<T> {
     ~ COMPLETED : int {static}
     ~ FAILED : int {static}

async-method-invocation/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
+    Copyright (c) 2014-2016 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
@@ -29,7 +29,7 @@
   <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.13.0</version>
+    <version>1.14.0</version>
   </parent>
   <artifactId>async-method-invocation</artifactId>
   <dependencies>

async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/App.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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
@@ -22,6 +22,9 @@
  */
 package com.iluwatar.async.method.invocation;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.concurrent.Callable;
 
 /**
@@ -54,6 +57,8 @@ import java.util.concurrent.Callable;
  */
 public class App {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
   /**
    * Program entry point
    */
@@ -120,6 +125,6 @@ public class App {
   }
 
   private static void log(String msg) {
-    System.out.println(String.format("[%1$-10s] - %2$s", Thread.currentThread().getName(), msg));
+    LOGGER.info(msg);
   }
 }

async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncCallback.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncExecutor.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncResult.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutor.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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
@@ -57,12 +57,10 @@ public class ThreadAsyncExecutor implements AsyncExecutor {
 
   @Override
   public <T> T endProcess(AsyncResult<T> asyncResult) throws ExecutionException, InterruptedException {
-    if (asyncResult.isCompleted()) {
+    if (!asyncResult.isCompleted()) {
-      return asyncResult.getValue();
-    } else {
       asyncResult.await();
-      return asyncResult.getValue();
     }
+    return asyncResult.getValue();
   }
 
   /**

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright (c) 2014 Ilkka Seppälä
+ * Copyright (c) 2014-2016 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
@@ -31,7 +31,6 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 import static org.mockito.internal.verification.VerificationModeFactory.times;
 

bridge/etc/bridge.urm.puml

@@ -1,72 +1,9 @@
 @startuml
 package com.iluwatar.bridge {
-  class FlyingMagicWeapon {
-    + FlyingMagicWeapon(imp : FlyingMagicWeaponImpl)
-    + fly()
-    + getImp() : FlyingMagicWeaponImpl
-    + swing()
-    + unwield()
-    + wield()
-  }
-  class Stormbringer {
-    + Stormbringer()
-    + eatSoulImp()
-    + swingImp()
-    + unwieldImp()
-    + wieldImp()
-  }
-  abstract class FlyingMagicWeaponImpl {
-    + FlyingMagicWeaponImpl()
-    + flyImp() {abstract}
-  }
-  class SoulEatingMagicWeapon {
-    + SoulEatingMagicWeapon(imp : SoulEatingMagicWeaponImpl)
-    + eatSoul()
-    + getImp() : SoulEatingMagicWeaponImpl
-    + swing()
-    + unwield()
-    + wield()
-  }
-  abstract class MagicWeaponImpl {
-    + MagicWeaponImpl()
-    + swingImp() {abstract}
-    + unwieldImp() {abstract}
-    + wieldImp() {abstract}
-  }
-  abstract class SoulEatingMagicWeaponImpl {
-    + SoulEatingMagicWeaponImpl()
-    + eatSoulImp() {abstract}
-  }
-  class Excalibur {
-    + Excalibur()
-    + blindImp()
-    + swingImp()
-    + unwieldImp()
-    + wieldImp()
-  }
-  class Mjollnir {
-    + Mjollnir()
-    + flyImp()
-    + swingImp()
-    + unwieldImp()
-    + wieldImp()
-  }
   class App {
     + App()
     + main(args : String[]) {static}
   }
-  abstract class MagicWeapon {
-    # imp : MagicWeaponImpl
-    + MagicWeapon(imp : MagicWeaponImpl)
-    + getImp() : MagicWeaponImpl
-    + swing() {abstract}
-    + unwield() {abstract}
-    + wield() {abstract}
-  }
-  abstract class BlindingMagicWeaponImpl {
-    + BlindingMagicWeaponImpl()
-    + blindImp() {abstract}
-  }
   class BlindingMagicWeapon {
     + BlindingMagicWeapon(imp : BlindingMagicWeaponImpl)
     + blind()
@@ -75,15 +12,81 @@ package com.iluwatar.bridge {
     + unwield()
     + wield()
   }
+  abstract class BlindingMagicWeaponImpl {
+    + BlindingMagicWeaponImpl()
+    + blindImp() {abstract}
+  }
+  class Excalibur {
+    - LOGGER : Logger {static}
+    + Excalibur()
+    + blindImp()
+    + swingImp()
+    + unwieldImp()
+    + wieldImp()
+  }
+  class FlyingMagicWeapon {
+    + FlyingMagicWeapon(imp : FlyingMagicWeaponImpl)
+    + fly()
+    + getImp() : FlyingMagicWeaponImpl
+    + swing()
+    + unwield()
+    + wield()
+  }
+  abstract class FlyingMagicWeaponImpl {
+    + FlyingMagicWeaponImpl()
+    + flyImp() {abstract}
+  }
+  abstract class MagicWeapon {
+    # imp : MagicWeaponImpl
+    + MagicWeapon(imp : MagicWeaponImpl)
+    + getImp() : MagicWeaponImpl
+    + swing() {abstract}
+    + unwield() {abstract}
+    + wield() {abstract}
+  }
+  abstract class MagicWeaponImpl {
+    + MagicWeaponImpl()
+    + swingImp() {abstract}
+    + unwieldImp() {abstract}
+    + wieldImp() {abstract}
+  }
+  class Mjollnir {
+    - LOGGER : Logger {static}
+    + Mjollnir()
+    + flyImp()
+    + swingImp()
+    + unwieldImp()
+    + wieldImp()
+  }
+  class SoulEatingMagicWeapon {
+    + SoulEatingMagicWeapon(imp : SoulEatingMagicWeaponImpl)
+    + eatSoul()
+    + getImp() : SoulEatingMagicWeaponImpl
+    + swing()
+    + unwield()
+    + wield()
+  }
+  abstract class SoulEatingMagicWeaponImpl {
+    + SoulEatingMagicWeaponImpl()
+    + eatSoulImp() {abstract}
+  }
+  class Stormbringer {
+    - LOGGER : Logger {static}
+    + Stormbringer()
+    + eatSoulImp()
+    + swingImp()
+    + unwieldImp()
+    + wieldImp()
+  }
 }
 MagicWeapon -->  "-imp" MagicWeaponImpl
+BlindingMagicWeapon --|> MagicWeapon 
+BlindingMagicWeaponImpl --|> MagicWeaponImpl 
+Excalibur --|> BlindingMagicWeaponImpl 
 FlyingMagicWeapon --|> MagicWeapon 
-Stormbringer --|> SoulEatingMagicWeaponImpl 
 FlyingMagicWeaponImpl --|> MagicWeaponImpl 
+Mjollnir --|> FlyingMagicWeaponImpl 
 SoulEatingMagicWeapon --|> MagicWeapon 
 SoulEatingMagicWeaponImpl --|> MagicWeaponImpl 
-Excalibur --|> BlindingMagicWeaponImpl 
+Stormbringer --|> SoulEatingMagicWeaponImpl 
-Mjollnir --|> FlyingMagicWeaponImpl 
-BlindingMagicWeaponImpl --|> MagicWeaponImpl 
-BlindingMagicWeapon --|> MagicWeapon 
 @enduml