diff --git a/.gitignore b/.gitignore
index 589d3fb13..64f833e2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,19 @@
-target
-.metadata
-.settings
-.classpath
-.project
-*.class
-# Package Files #
-*.jar
-*.war
-*.ear
-.idea
-*.iml
-*.swp
+target
+.metadata
+.settings
+.classpath
+.project
+*.class
+# Package Files #
+*.jar
+*.war
+*.ear
+.idea
+*.iml
+*.swp
datanucleus.log
/bin/
/bin/
/bin/
-
-data-mapper/src/main/resources/log4j.xml
\ No newline at end of file
+*.log
+data-mapper/src/main/resources/log4j.xml
diff --git a/_scripts/postPumlsToServer.py b/_scripts/postPumlsToServer.py
index 3929b3c86..107ea1988 100644
--- a/_scripts/postPumlsToServer.py
+++ b/_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
diff --git a/abstract-document/etc/abstract-document.urm.puml b/abstract-document/etc/abstract-document.urm.puml
index fa15eb3c7..0c6ffc5ec 100644
--- a/abstract-document/etc/abstract-document.urm.puml
+++ b/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
\ No newline at end of file
diff --git a/abstract-document/pom.xml b/abstract-document/pom.xml
index 1ab6d5a2b..0d7a31340 100644
--- a/abstract-document/pom.xml
+++ b/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
diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java
index 4bf8f0d14..36a946cc9 100644
--- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java
+++ b/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
diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java
index d7758b6f7..83f6ab3d5 100644
--- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java
+++ b/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:");
- System.out.println("-> model: " + car.getModel().get());
- System.out.println("-> price: " + car.getPrice().get());
- System.out.println("-> parts: ");
- car.getParts().forEach(p -> System.out
- .println("\t" + p.getType().get() + "/" + p.getModel().get() + "/" + p.getPrice().get()));
+ LOGGER.info("Here is our car:");
+ LOGGER.info("-> model: {}", car.getModel().get());
+ LOGGER.info("-> price: {}", car.getPrice().get());
+ LOGGER.info("-> parts: ");
+ car.getParts().forEach(p -> LOGGER.info("\t{}/{}/{}", p.getType().get(), p.getModel().get(), p.getPrice().get()));
}
/**
diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/Document.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/Document.java
index 7705f37eb..137823514 100644
--- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/Document.java
+++ b/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
diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Car.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Car.java
index e29ee63da..44f640b41 100644
--- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Car.java
+++ b/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
diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasModel.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasModel.java
index fbd8c0d7f..252a4644f 100644
--- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasModel.java
+++ b/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
diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasParts.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasParts.java
index 581702cc9..9df836376 100644
--- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasParts.java
+++ b/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
diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasPrice.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasPrice.java
index 3d1d0e3e7..39e4d159c 100644
--- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasPrice.java
+++ b/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
diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasType.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasType.java
index b0f292bb6..4a80bff20 100644
--- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/HasType.java
+++ b/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
diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Part.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Part.java
index e42f099d9..649ccf413 100644
--- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/domain/Part.java
+++ b/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
diff --git a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java b/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java
index b6467e232..f6686ff8f 100644
--- a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java
+++ b/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
diff --git a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AppTest.java b/abstract-document/src/test/java/com/iluwatar/abstractdocument/AppTest.java
index 787ae3aa6..b91f57b27 100644
--- a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AppTest.java
+++ b/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
diff --git a/abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java b/abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java
index 437244a3d..03d75d5e5 100644
--- a/abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java
+++ b/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
diff --git a/abstract-factory/etc/abstract-factory.urm.puml b/abstract-factory/etc/abstract-factory.urm.puml
index 9648a6a96..7b5e1b701 100644
--- a/abstract-factory/etc/abstract-factory.urm.puml
+++ b/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 {
- + OrcKingdomFactory()
- + createArmy() : Army
- + createCastle() : Castle
- + createKing() : King
+ interface Army {
+ + getDescription() : String {abstract}
+ }
+ interface Castle {
+ + 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 {
- ~ DESCRIPTION : String {static}
- + OrcArmy()
- + getDescription() : String
- }
- interface King {
- + getDescription() : String {abstract}
- }
- class ElfKingdomFactory {
- + ElfKingdomFactory()
+ class OrcKingdomFactory {
+ + OrcKingdomFactory()
+ 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
-OrcArmy ..|> Army
+ElfCastle ..|> Castle
+ElfKing ..|> King
ElfKingdomFactory ..|> KingdomFactory
+OrcArmy ..|> Army
+OrcCastle ..|> Castle
+OrcKing ..|> King
+OrcKingdomFactory ..|> KingdomFactory
@enduml
\ No newline at end of file
diff --git a/abstract-factory/pom.xml b/abstract-factory/pom.xml
index 5c3d4d16a..25e00e377 100644
--- a/abstract-factory/pom.xml
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
index aae396f1d..d7cb296c0 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
+++ b/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());
- System.out.println(app.getCastle().getDescription());
- System.out.println(app.getKing().getDescription());
+ LOGGER.info(app.getArmy().getDescription());
+ LOGGER.info(app.getCastle().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());
- System.out.println(app.getCastle().getDescription());
- System.out.println(app.getKing().getDescription());
+ LOGGER.info(app.getArmy().getDescription());
+ LOGGER.info(app.getCastle().getDescription());
+ LOGGER.info(app.getKing().getDescription());
}
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Army.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Army.java
index d9e7f9989..3d107dd34 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Army.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Castle.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Castle.java
index adea2327e..837952d0d 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Castle.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfArmy.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfArmy.java
index 2969a8615..f9687073d 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfArmy.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfCastle.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfCastle.java
index 5321bfeba..108bdc8d3 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfCastle.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKing.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKing.java
index 1eb892e6f..f6e400bc0 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKing.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKingdomFactory.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKingdomFactory.java
index 9d48ab25f..31cfddb70 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKingdomFactory.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/King.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/King.java
index ec1cff4d1..bffc994d2 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/King.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/KingdomFactory.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/KingdomFactory.java
index d8258fd8b..fb3434fae 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/KingdomFactory.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcArmy.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcArmy.java
index 261ad37c9..31552f430 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcArmy.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcCastle.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcCastle.java
index cb2a92652..e72da4a77 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcCastle.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKing.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKing.java
index ba7576492..f48115f89 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKing.java
+++ b/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
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKingdomFactory.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKingdomFactory.java
index 2d740cf0d..5b2ba3a30 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKingdomFactory.java
+++ b/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
diff --git a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
index 216f0443a..82fd8acff 100644
--- a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
+++ b/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
diff --git a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AppTest.java b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AppTest.java
index a965284f7..b9d5f7d90 100644
--- a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AppTest.java
+++ b/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
diff --git a/adapter/etc/adapter.urm.puml b/adapter/etc/adapter.urm.puml
index a7c962a3b..847427a44 100644
--- a/adapter/etc/adapter.urm.puml
+++ b/adapter/etc/adapter.urm.puml
@@ -1,18 +1,19 @@
@startuml
package com.iluwatar.adapter {
- interface BattleShip {
- + fire() {abstract}
- + move() {abstract}
+ class App {
+ + App()
+ + main(args : String[]) {static}
}
class BattleFishingBoat {
+ - LOGGER : Logger {static}
- boat : FishingBoat
+ BattleFishingBoat()
+ fire()
+ move()
}
- class App {
- + App()
- + main(args : String[]) {static}
+ interface BattleShip {
+ + fire() {abstract}
+ + 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()
diff --git a/adapter/pom.xml b/adapter/pom.xml
index 83a930653..0dac4ea8f 100644
--- a/adapter/pom.xml
+++ b/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
diff --git a/adapter/src/main/java/com/iluwatar/adapter/App.java b/adapter/src/main/java/com/iluwatar/adapter/App.java
index 29c313b59..239424da9 100644
--- a/adapter/src/main/java/com/iluwatar/adapter/App.java
+++ b/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
diff --git a/adapter/src/main/java/com/iluwatar/adapter/BattleFishingBoat.java b/adapter/src/main/java/com/iluwatar/adapter/BattleFishingBoat.java
index a591818fe..5e4da91f8 100644
--- a/adapter/src/main/java/com/iluwatar/adapter/BattleFishingBoat.java
+++ b/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
diff --git a/adapter/src/main/java/com/iluwatar/adapter/BattleShip.java b/adapter/src/main/java/com/iluwatar/adapter/BattleShip.java
index 6a29a5034..62ee366e7 100644
--- a/adapter/src/main/java/com/iluwatar/adapter/BattleShip.java
+++ b/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
diff --git a/adapter/src/main/java/com/iluwatar/adapter/Captain.java b/adapter/src/main/java/com/iluwatar/adapter/Captain.java
index 34f783cd4..6d88b1975 100644
--- a/adapter/src/main/java/com/iluwatar/adapter/Captain.java
+++ b/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
diff --git a/adapter/src/main/java/com/iluwatar/adapter/FishingBoat.java b/adapter/src/main/java/com/iluwatar/adapter/FishingBoat.java
index 307437038..2124d9d9f 100644
--- a/adapter/src/main/java/com/iluwatar/adapter/FishingBoat.java
+++ b/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 ...");
}
}
diff --git a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
index 263c9ab02..89c9bc5d5 100644
--- a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
+++ b/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
diff --git a/adapter/src/test/java/com/iluwatar/adapter/AppTest.java b/adapter/src/test/java/com/iluwatar/adapter/AppTest.java
index 4f5fcd91d..213035627 100644
--- a/adapter/src/test/java/com/iluwatar/adapter/AppTest.java
+++ b/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
diff --git a/aggregator-microservices/aggregator-service/pom.xml b/aggregator-microservices/aggregator-service/pom.xml
index 520aefaa8..64fa86c23 100644
--- a/aggregator-microservices/aggregator-service/pom.xml
+++ b/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
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java
index 639349db9..9f1e4f4da 100644
--- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java
+++ b/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
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/App.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/App.java
index 25bb9ee6f..2c14774d5 100644
--- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/App.java
+++ b/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
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Product.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Product.java
index edf0c121d..1ded980f9 100644
--- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Product.java
+++ b/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
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClient.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClient.java
index 863db4759..81cfdc87b 100644
--- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClient.java
+++ b/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
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java
index 1c5c1527c..16849d529 100644
--- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java
+++ b/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;
}
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClient.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClient.java
index 22be900b3..c5953dc30 100644
--- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClient.java
+++ b/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
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java
index 14d0a32c4..89f1a25e0 100644
--- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java
+++ b/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);
}
diff --git a/aggregator-microservices/aggregator-service/src/main/resources/application.properties b/aggregator-microservices/aggregator-service/src/main/resources/application.properties
index 69f581712..ae91c5eb5 100644
--- a/aggregator-microservices/aggregator-service/src/main/resources/application.properties
+++ b/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
diff --git 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
index 95d36fe25..f44aa2044 100644
--- 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
@@ -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
diff --git a/aggregator-microservices/etc/aggregator-service.urm.puml b/aggregator-microservices/etc/aggregator-service.urm.puml
index 2a6600531..ebb782f20 100644
--- a/aggregator-microservices/etc/aggregator-service.urm.puml
+++ b/aggregator-microservices/etc/aggregator-service.urm.puml
@@ -1,16 +1,15 @@
@startuml
package com.iluwatar.aggregator.microservices {
- class ProductInventoryClientImpl {
- + ProductInventoryClientImpl()
- + getProductInventories() : int
+ class Aggregator {
+ - informationClient : ProductInformationClient
+ - 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
\ No newline at end of file
diff --git a/aggregator-microservices/etc/inventory-microservice.urm.puml b/aggregator-microservices/etc/inventory-microservice.urm.puml
index a07a36306..90f327e07 100644
--- a/aggregator-microservices/etc/inventory-microservice.urm.puml
+++ b/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
\ No newline at end of file
diff --git a/aggregator-microservices/information-microservice/pom.xml b/aggregator-microservices/information-microservice/pom.xml
index 4cd1916c6..a77e9f65f 100644
--- a/aggregator-microservices/information-microservice/pom.xml
+++ b/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
diff --git a/aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationApplication.java b/aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationApplication.java
index c93219c17..67d568e17 100644
--- a/aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationApplication.java
+++ b/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
diff --git a/aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java b/aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java
index 37ec45c1b..ff020585c 100644
--- a/aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java
+++ b/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
diff --git a/aggregator-microservices/information-microservice/src/main/resources/application.properties b/aggregator-microservices/information-microservice/src/main/resources/application.properties
index 3c8452f1f..a921ea0fd 100644
--- a/aggregator-microservices/information-microservice/src/main/resources/application.properties
+++ b/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
diff --git a/aggregator-microservices/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java b/aggregator-microservices/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java
index 9c3a6b98d..12d59aee6 100644
--- a/aggregator-microservices/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java
+++ b/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
diff --git a/aggregator-microservices/inventory-microservice/pom.xml b/aggregator-microservices/inventory-microservice/pom.xml
index 1bf655b45..0a6173420 100644
--- a/aggregator-microservices/inventory-microservice/pom.xml
+++ b/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
diff --git a/aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryApplication.java b/aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryApplication.java
index 3e2cf9e60..73b4c0b18 100644
--- a/aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryApplication.java
+++ b/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
diff --git a/aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryController.java b/aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryController.java
index 483e28bf3..987ab0b3d 100644
--- a/aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryController.java
+++ b/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
diff --git a/aggregator-microservices/inventory-microservice/src/main/resources/application.properties b/aggregator-microservices/inventory-microservice/src/main/resources/application.properties
index 36f7589fc..46b49a8a1 100644
--- a/aggregator-microservices/inventory-microservice/src/main/resources/application.properties
+++ b/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
diff --git a/aggregator-microservices/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java b/aggregator-microservices/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java
index 787ec0e61..b461461d3 100644
--- a/aggregator-microservices/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java
+++ b/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
diff --git a/aggregator-microservices/pom.xml b/aggregator-microservices/pom.xml
index cedc35eec..f13000f92 100644
--- a/aggregator-microservices/pom.xml
+++ b/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
diff --git a/api-gateway/api-gateway-service/pom.xml b/api-gateway/api-gateway-service/pom.xml
index e2ab9e6d9..24fb9bab9 100644
--- a/api-gateway/api-gateway-service/pom.xml
+++ b/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
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java
index 60f0b6d54..aab124796 100644
--- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java
+++ b/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
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/App.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/App.java
index 9a644a0f7..3b529aa5f 100644
--- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/App.java
+++ b/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
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/DesktopProduct.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/DesktopProduct.java
index 0a04db402..e72b98e73 100644
--- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/DesktopProduct.java
+++ b/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
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClient.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClient.java
index 935dab778..dca012a41 100644
--- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClient.java
+++ b/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
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClientImpl.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClientImpl.java
index 64fde1e66..10f8625c5 100644
--- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClientImpl.java
+++ b/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
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/MobileProduct.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/MobileProduct.java
index db358b781..c057379fc 100644
--- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/MobileProduct.java
+++ b/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
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClient.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClient.java
index 44497b997..4f4d2bbfc 100644
--- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClient.java
+++ b/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
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClientImpl.java b/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClientImpl.java
index bdc7cb00b..aa2686845 100644
--- a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClientImpl.java
+++ b/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
diff --git a/api-gateway/api-gateway-service/src/main/resources/application.properties b/api-gateway/api-gateway-service/src/main/resources/application.properties
index 69f581712..ae91c5eb5 100644
--- a/api-gateway/api-gateway-service/src/main/resources/application.properties
+++ b/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
diff --git 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
index d1a210f05..fe8e76db4 100644
--- 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
@@ -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
diff --git a/api-gateway/etc/api-gateway-service.urm.puml b/api-gateway/etc/api-gateway-service.urm.puml
index 409e7ee91..5fabc6a0f 100644
--- a/api-gateway/etc/api-gateway-service.urm.puml
+++ b/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 {
- + PriceClientImpl()
+ class DesktopProduct {
+ - 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
\ No newline at end of file
diff --git a/api-gateway/image-microservice/pom.xml b/api-gateway/image-microservice/pom.xml
index db25b947b..1e9905f1f 100644
--- a/api-gateway/image-microservice/pom.xml
+++ b/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
diff --git a/api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageApplication.java b/api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageApplication.java
index b4cb3d250..c4c75c0f0 100644
--- a/api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageApplication.java
+++ b/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
diff --git a/api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageController.java b/api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageController.java
index 16faf5b70..18d0d4008 100644
--- a/api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageController.java
+++ b/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
diff --git a/api-gateway/image-microservice/src/main/resources/application.properties b/api-gateway/image-microservice/src/main/resources/application.properties
index aeda0c24c..5830a3c95 100644
--- a/api-gateway/image-microservice/src/main/resources/application.properties
+++ b/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
diff --git a/api-gateway/image-microservice/src/test/java/com/iluwatar/image/microservice/ImageControllerTest.java b/api-gateway/image-microservice/src/test/java/com/iluwatar/image/microservice/ImageControllerTest.java
index cf0c099c1..3f4154b58 100644
--- a/api-gateway/image-microservice/src/test/java/com/iluwatar/image/microservice/ImageControllerTest.java
+++ b/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
diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml
index 94f91cabb..aa8fc29ca 100644
--- a/api-gateway/pom.xml
+++ b/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
diff --git a/api-gateway/price-microservice/pom.xml b/api-gateway/price-microservice/pom.xml
index ce47e9db0..3a33969b9 100644
--- a/api-gateway/price-microservice/pom.xml
+++ b/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
diff --git a/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceApplication.java b/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceApplication.java
index e777c7c2b..b12082328 100644
--- a/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceApplication.java
+++ b/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
diff --git a/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceController.java b/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceController.java
index ec43618fa..906b55c88 100644
--- a/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceController.java
+++ b/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
diff --git a/api-gateway/price-microservice/src/main/resources/application.properties b/api-gateway/price-microservice/src/main/resources/application.properties
index f0b479dfd..d7b443b26 100644
--- a/api-gateway/price-microservice/src/main/resources/application.properties
+++ b/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
diff --git a/api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceControllerTest.java b/api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceControllerTest.java
index c289549f2..634a60b04 100644
--- a/api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceControllerTest.java
+++ b/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
diff --git a/async-method-invocation/etc/async-method-invocation.urm.puml b/async-method-invocation/etc/async-method-invocation.urm.puml
index b96e843d3..6f5d0b27f 100644
--- a/async-method-invocation/etc/async-method-invocation.urm.puml
+++ b/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> {
- + await() {abstract}
- + getValue() : T {abstract}
- + isCompleted() : boolean {abstract}
+ interface AsyncCallback<T> {
+ + onComplete(T, Optional<Exception>) {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}
diff --git a/async-method-invocation/pom.xml b/async-method-invocation/pom.xml
index e374b4753..1c2f037e0 100644
--- a/async-method-invocation/pom.xml
+++ b/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
diff --git a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/App.java b/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/App.java
index 0a56dc166..0a387d582 100644
--- a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/App.java
+++ b/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);
}
}
diff --git a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncCallback.java b/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncCallback.java
index 2fddba683..5a291f996 100644
--- a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncCallback.java
+++ b/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
diff --git a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncExecutor.java b/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncExecutor.java
index eb1afa4f3..800bc2728 100644
--- a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncExecutor.java
+++ b/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
diff --git a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncResult.java b/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncResult.java
index bcd97adbc..3fa99cc27 100644
--- a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/AsyncResult.java
+++ b/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
diff --git a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutor.java b/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutor.java
index 5a10232f0..f92792c39 100644
--- a/async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutor.java
+++ b/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
diff --git a/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/AppTest.java b/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/AppTest.java
index 117a75f2a..ef2649f8a 100644
--- a/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/AppTest.java
+++ b/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
diff --git 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
index 09126e99f..d0e730344 100644
--- 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
@@ -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
diff --git a/bridge/etc/bridge.urm.puml b/bridge/etc/bridge.urm.puml
index 84e250a06..82e3b14af 100644
--- a/bridge/etc/bridge.urm.puml
+++ b/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
-Mjollnir --|> FlyingMagicWeaponImpl
-BlindingMagicWeaponImpl --|> MagicWeaponImpl
-BlindingMagicWeapon --|> MagicWeapon
+Stormbringer --|> SoulEatingMagicWeaponImpl
@enduml
\ No newline at end of file
diff --git a/bridge/pom.xml b/bridge/pom.xml
index 4960dbd08..7b98867a0 100644
--- a/bridge/pom.xml
+++ b/bridge/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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/App.java b/bridge/src/main/java/com/iluwatar/bridge/App.java
index 27b37b6b3..4fc336042 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/App.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.java
index 045039ef0..e70cbb96e 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImpl.java b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImpl.java
index 83f31e709..0bd7d7b52 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImpl.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImpl.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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/Excalibur.java b/bridge/src/main/java/com/iluwatar/bridge/Excalibur.java
index 2523b3557..ddd2ac540 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/Excalibur.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/Excalibur.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.bridge;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Excalibur
@@ -29,23 +32,25 @@ package com.iluwatar.bridge;
*/
public class Excalibur extends BlindingMagicWeaponImpl {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Excalibur.class);
+
@Override
public void wieldImp() {
- System.out.println("wielding Excalibur");
+ LOGGER.info("wielding Excalibur");
}
@Override
public void swingImp() {
- System.out.println("swinging Excalibur");
+ LOGGER.info("swinging Excalibur");
}
@Override
public void unwieldImp() {
- System.out.println("unwielding Excalibur");
+ LOGGER.info("unwielding Excalibur");
}
@Override
public void blindImp() {
- System.out.println("bright light streams from Excalibur blinding the enemy");
+ LOGGER.info("bright light streams from Excalibur blinding the enemy");
}
}
diff --git a/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.java
index 0988c179c..85532d410 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImpl.java b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImpl.java
index 4bdb8801b..c7b47e780 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImpl.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImpl.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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.java
index 038da7c4f..049133d91 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImpl.java b/bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImpl.java
index 01f91825b..b0d3070c1 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImpl.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImpl.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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/Mjollnir.java b/bridge/src/main/java/com/iluwatar/bridge/Mjollnir.java
index 0cc31b471..7cec530eb 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/Mjollnir.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/Mjollnir.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.bridge;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Mjollnir
@@ -29,23 +32,25 @@ package com.iluwatar.bridge;
*/
public class Mjollnir extends FlyingMagicWeaponImpl {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Mjollnir.class);
+
@Override
public void wieldImp() {
- System.out.println("wielding Mjollnir");
+ LOGGER.info("wielding Mjollnir");
}
@Override
public void swingImp() {
- System.out.println("swinging Mjollnir");
+ LOGGER.info("swinging Mjollnir");
}
@Override
public void unwieldImp() {
- System.out.println("unwielding Mjollnir");
+ LOGGER.info("unwielding Mjollnir");
}
@Override
public void flyImp() {
- System.out.println("Mjollnir hits the enemy in the air and returns back to the owner's hand");
+ LOGGER.info("Mjollnir hits the enemy in the air and returns back to the owner's hand");
}
}
diff --git a/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.java
index d62f7644b..927ac2d66 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImpl.java b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImpl.java
index ad8bec48f..2ed27242a 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImpl.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImpl.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
diff --git a/bridge/src/main/java/com/iluwatar/bridge/Stormbringer.java b/bridge/src/main/java/com/iluwatar/bridge/Stormbringer.java
index 91cad9cc2..0c7a6ce6b 100644
--- a/bridge/src/main/java/com/iluwatar/bridge/Stormbringer.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/Stormbringer.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.bridge;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Stormbringer
@@ -29,23 +32,25 @@ package com.iluwatar.bridge;
*/
public class Stormbringer extends SoulEatingMagicWeaponImpl {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Stormbringer.class);
+
@Override
public void wieldImp() {
- System.out.println("wielding Stormbringer");
+ LOGGER.info("wielding Stormbringer");
}
@Override
public void swingImp() {
- System.out.println("swinging Stormbringer");
+ LOGGER.info("swinging Stormbringer");
}
@Override
public void unwieldImp() {
- System.out.println("unwielding Stormbringer");
+ LOGGER.info("unwielding Stormbringer");
}
@Override
public void eatSoulImp() {
- System.out.println("Stormbringer devours the enemy's soul");
+ LOGGER.info("Stormbringer devours the enemy's soul");
}
}
diff --git a/bridge/src/test/java/com/iluwatar/bridge/AppTest.java b/bridge/src/test/java/com/iluwatar/bridge/AppTest.java
index 1b9b63d7f..fcf7e44ce 100644
--- a/bridge/src/test/java/com/iluwatar/bridge/AppTest.java
+++ b/bridge/src/test/java/com/iluwatar/bridge/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
diff --git a/bridge/src/test/java/com/iluwatar/bridge/BlindingMagicWeaponTest.java b/bridge/src/test/java/com/iluwatar/bridge/BlindingMagicWeaponTest.java
index 54435555e..97298a161 100644
--- a/bridge/src/test/java/com/iluwatar/bridge/BlindingMagicWeaponTest.java
+++ b/bridge/src/test/java/com/iluwatar/bridge/BlindingMagicWeaponTest.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
diff --git a/bridge/src/test/java/com/iluwatar/bridge/FlyingMagicWeaponTest.java b/bridge/src/test/java/com/iluwatar/bridge/FlyingMagicWeaponTest.java
index 9053a7bb0..fca3ea9ab 100644
--- a/bridge/src/test/java/com/iluwatar/bridge/FlyingMagicWeaponTest.java
+++ b/bridge/src/test/java/com/iluwatar/bridge/FlyingMagicWeaponTest.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
diff --git a/bridge/src/test/java/com/iluwatar/bridge/MagicWeaponTest.java b/bridge/src/test/java/com/iluwatar/bridge/MagicWeaponTest.java
index 6408fd256..e883f03d3 100644
--- a/bridge/src/test/java/com/iluwatar/bridge/MagicWeaponTest.java
+++ b/bridge/src/test/java/com/iluwatar/bridge/MagicWeaponTest.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
diff --git a/bridge/src/test/java/com/iluwatar/bridge/SoulEatingMagicWeaponTest.java b/bridge/src/test/java/com/iluwatar/bridge/SoulEatingMagicWeaponTest.java
index 0bd0a6b8d..b71fe2228 100644
--- a/bridge/src/test/java/com/iluwatar/bridge/SoulEatingMagicWeaponTest.java
+++ b/bridge/src/test/java/com/iluwatar/bridge/SoulEatingMagicWeaponTest.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
diff --git a/builder/etc/builder.urm.puml b/builder/etc/builder.urm.puml
index 0c98f3b4b..631c62cc4 100644
--- a/builder/etc/builder.urm.puml
+++ b/builder/etc/builder.urm.puml
@@ -1,23 +1,41 @@
@startuml
package com.iluwatar.builder {
- class Builder {
- - armor : Armor
- - hairColor : HairColor
- - hairType : HairType
- - name : String
- - profession : Profession
- - weapon : Weapon
- + Builder(profession : Profession, name : String)
- + build() : Hero
- + withArmor(armor : Armor) : Builder
- + withHairColor(hairColor : HairColor) : Builder
- + withHairType(hairType : HairType) : Builder
- + withWeapon(weapon : Weapon) : Builder
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
+ enum Armor {
+ + CHAIN_MAIL {static}
+ + CLOTHES {static}
+ + LEATHER {static}
+ + PLATE_MAIL {static}
+ - title : String
+ + toString() : String
+ + valueOf(name : String) : Armor {static}
+ + values() : Armor[] {static}
+ }
+ enum HairColor {
+ + BLACK {static}
+ + BLOND {static}
+ + BROWN {static}
+ + RED {static}
+ + WHITE {static}
+ + toString() : String
+ + valueOf(name : String) : HairColor {static}
+ + values() : HairColor[] {static}
+ }
+ enum HairType {
+ + BALD {static}
+ + CURLY {static}
+ + LONG_CURLY {static}
+ + LONG_STRAIGHT {static}
+ + SHORT {static}
+ - title : String
+ + toString() : String
+ + valueOf(name : String) : HairType {static}
+ + values() : HairType[] {static}
+ }
class Hero {
- armor : Armor
- hairColor : HairColor
@@ -34,25 +52,19 @@ package com.iluwatar.builder {
+ getWeapon() : Weapon
+ toString() : String
}
- enum Weapon {
- + AXE {static}
- + BOW {static}
- + DAGGER {static}
- + SWORD {static}
- + WARHAMMER {static}
- + toString() : String
- + valueOf(name : String) : Weapon {static}
- + values() : Weapon[] {static}
- }
- enum HairColor {
- + BLACK {static}
- + BLOND {static}
- + BROWN {static}
- + RED {static}
- + WHITE {static}
- + toString() : String
- + valueOf(name : String) : HairColor {static}
- + values() : HairColor[] {static}
+ class Builder {
+ - armor : Armor
+ - hairColor : HairColor
+ - hairType : HairType
+ - name : String
+ - profession : Profession
+ - weapon : Weapon
+ + Builder(profession : Profession, name : String)
+ + build() : Hero
+ + withArmor(armor : Armor) : Builder
+ + withHairColor(hairColor : HairColor) : Builder
+ + withHairType(hairType : HairType) : Builder
+ + withWeapon(weapon : Weapon) : Builder
}
enum Profession {
+ MAGE {static}
@@ -63,35 +75,23 @@ package com.iluwatar.builder {
+ valueOf(name : String) : Profession {static}
+ values() : Profession[] {static}
}
- enum Armor {
- + CHAIN_MAIL {static}
- + CLOTHES {static}
- + LEATHER {static}
- + PLATE_MAIL {static}
- - title : String
+ enum Weapon {
+ + AXE {static}
+ + BOW {static}
+ + DAGGER {static}
+ + SWORD {static}
+ + WARHAMMER {static}
+ toString() : String
- + valueOf(name : String) : Armor {static}
- + values() : Armor[] {static}
- }
- enum HairType {
- + BALD {static}
- + CURLY {static}
- + LONG_CURLY {static}
- + LONG_STRAIGHT {static}
- + SHORT {static}
- - title : String
- + toString() : String
- + valueOf(name : String) : HairType {static}
- + values() : HairType[] {static}
+ + valueOf(name : String) : Weapon {static}
+ + values() : Weapon[] {static}
}
}
Hero --> "-profession" Profession
Builder ..+ Hero
Hero --> "-armor" Armor
-App --+ Hero
Builder --> "-weapon" Weapon
-Builder --> "-hairColor" HairColor
Builder --> "-hairType" HairType
+Builder --> "-hairColor" HairColor
Hero --> "-hairColor" HairColor
Builder --> "-profession" Profession
Hero --> "-weapon" Weapon
diff --git a/builder/pom.xml b/builder/pom.xml
index 030990fa2..ddfc07aac 100644
--- a/builder/pom.xml
+++ b/builder/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
diff --git a/builder/src/main/java/com/iluwatar/builder/App.java b/builder/src/main/java/com/iluwatar/builder/App.java
index d421de7b6..9fcfdb65a 100644
--- a/builder/src/main/java/com/iluwatar/builder/App.java
+++ b/builder/src/main/java/com/iluwatar/builder/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
@@ -23,6 +23,8 @@
package com.iluwatar.builder;
import com.iluwatar.builder.Hero.Builder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -50,6 +52,8 @@ import com.iluwatar.builder.Hero.Builder;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -60,18 +64,18 @@ public class App {
Hero mage =
new Hero.Builder(Profession.MAGE, "Riobard").withHairColor(HairColor.BLACK)
.withWeapon(Weapon.DAGGER).build();
- System.out.println(mage);
+ LOGGER.info(mage.toString());
Hero warrior =
new Hero.Builder(Profession.WARRIOR, "Amberjill").withHairColor(HairColor.BLOND)
.withHairType(HairType.LONG_CURLY).withArmor(Armor.CHAIN_MAIL).withWeapon(Weapon.SWORD)
.build();
- System.out.println(warrior);
+ LOGGER.info(warrior.toString());
Hero thief =
new Hero.Builder(Profession.THIEF, "Desmond").withHairType(HairType.BALD)
.withWeapon(Weapon.BOW).build();
- System.out.println(thief);
+ LOGGER.info(thief.toString());
}
}
diff --git a/builder/src/main/java/com/iluwatar/builder/Armor.java b/builder/src/main/java/com/iluwatar/builder/Armor.java
index a0a4fe582..0deb9712c 100644
--- a/builder/src/main/java/com/iluwatar/builder/Armor.java
+++ b/builder/src/main/java/com/iluwatar/builder/Armor.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
diff --git a/builder/src/main/java/com/iluwatar/builder/HairColor.java b/builder/src/main/java/com/iluwatar/builder/HairColor.java
index 3c3195cc6..a3f03abfc 100644
--- a/builder/src/main/java/com/iluwatar/builder/HairColor.java
+++ b/builder/src/main/java/com/iluwatar/builder/HairColor.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
diff --git a/builder/src/main/java/com/iluwatar/builder/HairType.java b/builder/src/main/java/com/iluwatar/builder/HairType.java
index 8d15b0f30..604a0836d 100644
--- a/builder/src/main/java/com/iluwatar/builder/HairType.java
+++ b/builder/src/main/java/com/iluwatar/builder/HairType.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
diff --git a/builder/src/main/java/com/iluwatar/builder/Hero.java b/builder/src/main/java/com/iluwatar/builder/Hero.java
index 25445851a..e7f0b3cab 100644
--- a/builder/src/main/java/com/iluwatar/builder/Hero.java
+++ b/builder/src/main/java/com/iluwatar/builder/Hero.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
diff --git a/builder/src/main/java/com/iluwatar/builder/Profession.java b/builder/src/main/java/com/iluwatar/builder/Profession.java
index 7be5b999e..579eed787 100644
--- a/builder/src/main/java/com/iluwatar/builder/Profession.java
+++ b/builder/src/main/java/com/iluwatar/builder/Profession.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
diff --git a/builder/src/main/java/com/iluwatar/builder/Weapon.java b/builder/src/main/java/com/iluwatar/builder/Weapon.java
index 97d347d24..86c910a44 100644
--- a/builder/src/main/java/com/iluwatar/builder/Weapon.java
+++ b/builder/src/main/java/com/iluwatar/builder/Weapon.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
diff --git a/builder/src/test/java/com/iluwatar/builder/AppTest.java b/builder/src/test/java/com/iluwatar/builder/AppTest.java
index e83db9f9f..b30c50cda 100644
--- a/builder/src/test/java/com/iluwatar/builder/AppTest.java
+++ b/builder/src/test/java/com/iluwatar/builder/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
diff --git a/builder/src/test/java/com/iluwatar/builder/HeroTest.java b/builder/src/test/java/com/iluwatar/builder/HeroTest.java
index b0a73a9d0..c111fb853 100644
--- a/builder/src/test/java/com/iluwatar/builder/HeroTest.java
+++ b/builder/src/test/java/com/iluwatar/builder/HeroTest.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
diff --git a/business-delegate/etc/business-delegate.urm.puml b/business-delegate/etc/business-delegate.urm.puml
index a58136c8c..e78b147e0 100644
--- a/business-delegate/etc/business-delegate.urm.puml
+++ b/business-delegate/etc/business-delegate.urm.puml
@@ -1,29 +1,9 @@
@startuml
package com.iluwatar.business.delegate {
- class EjbService {
- + EjbService()
- + doProcessing()
- }
- class BusinessLookup {
- - ejbService : EjbService
- - jmsService : JmsService
- + BusinessLookup()
- + getBusinessService(serviceType : ServiceType) : BusinessService
- + setEjbService(ejbService : EjbService)
- + setJmsService(jmsService : JmsService)
- }
class App {
+ App()
+ main(args : String[]) {static}
}
- interface BusinessService {
- + doProcessing() {abstract}
- }
- class Client {
- - businessDelegate : BusinessDelegate
- + Client(businessDelegate : BusinessDelegate)
- + doTask()
- }
class BusinessDelegate {
- businessService : BusinessService
- lookupService : BusinessLookup
@@ -33,7 +13,29 @@ package com.iluwatar.business.delegate {
+ setLookupService(businessLookup : BusinessLookup)
+ setServiceType(serviceType : ServiceType)
}
+ class BusinessLookup {
+ - ejbService : EjbService
+ - jmsService : JmsService
+ + BusinessLookup()
+ + getBusinessService(serviceType : ServiceType) : BusinessService
+ + setEjbService(ejbService : EjbService)
+ + setJmsService(jmsService : JmsService)
+ }
+ interface BusinessService {
+ + doProcessing() {abstract}
+ }
+ class Client {
+ - businessDelegate : BusinessDelegate
+ + Client(businessDelegate : BusinessDelegate)
+ + doTask()
+ }
+ class EjbService {
+ - LOGGER : Logger {static}
+ + EjbService()
+ + doProcessing()
+ }
class JmsService {
+ - LOGGER : Logger {static}
+ JmsService()
+ doProcessing()
}
diff --git a/business-delegate/pom.xml b/business-delegate/pom.xml
index 2b0ce9119..5be756edf 100644
--- a/business-delegate/pom.xml
+++ b/business-delegate/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
diff --git a/business-delegate/src/main/java/com/iluwatar/business/delegate/App.java b/business-delegate/src/main/java/com/iluwatar/business/delegate/App.java
index e9a264322..945f09c0a 100644
--- a/business-delegate/src/main/java/com/iluwatar/business/delegate/App.java
+++ b/business-delegate/src/main/java/com/iluwatar/business/delegate/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
diff --git a/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessDelegate.java b/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessDelegate.java
index 81aa9a0f1..32b2bc770 100644
--- a/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessDelegate.java
+++ b/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessDelegate.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
diff --git a/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessLookup.java b/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessLookup.java
index 7e1045e7f..ae3c54b86 100644
--- a/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessLookup.java
+++ b/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessLookup.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
diff --git a/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessService.java b/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessService.java
index f5784964a..fbda6c67e 100644
--- a/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessService.java
+++ b/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessService.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
diff --git a/business-delegate/src/main/java/com/iluwatar/business/delegate/Client.java b/business-delegate/src/main/java/com/iluwatar/business/delegate/Client.java
index 8c6bf59a1..e521426ae 100644
--- a/business-delegate/src/main/java/com/iluwatar/business/delegate/Client.java
+++ b/business-delegate/src/main/java/com/iluwatar/business/delegate/Client.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
diff --git a/business-delegate/src/main/java/com/iluwatar/business/delegate/EjbService.java b/business-delegate/src/main/java/com/iluwatar/business/delegate/EjbService.java
index 7296f63b4..afe53600a 100644
--- a/business-delegate/src/main/java/com/iluwatar/business/delegate/EjbService.java
+++ b/business-delegate/src/main/java/com/iluwatar/business/delegate/EjbService.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.business.delegate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Service EJB implementation
@@ -29,8 +32,10 @@ package com.iluwatar.business.delegate;
*/
public class EjbService implements BusinessService {
+ private static final Logger LOGGER = LoggerFactory.getLogger(EjbService.class);
+
@Override
public void doProcessing() {
- System.out.println("EjbService is now processing");
+ LOGGER.info("EjbService is now processing");
}
}
diff --git a/business-delegate/src/main/java/com/iluwatar/business/delegate/JmsService.java b/business-delegate/src/main/java/com/iluwatar/business/delegate/JmsService.java
index 5b71ce57d..4b112906e 100644
--- a/business-delegate/src/main/java/com/iluwatar/business/delegate/JmsService.java
+++ b/business-delegate/src/main/java/com/iluwatar/business/delegate/JmsService.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.business.delegate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Service JMS implementation
@@ -29,8 +32,10 @@ package com.iluwatar.business.delegate;
*/
public class JmsService implements BusinessService {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JmsService.class);
+
@Override
public void doProcessing() {
- System.out.println("JmsService is now processing");
+ LOGGER.info("JmsService is now processing");
}
}
diff --git a/business-delegate/src/main/java/com/iluwatar/business/delegate/ServiceType.java b/business-delegate/src/main/java/com/iluwatar/business/delegate/ServiceType.java
index 06d0a42b9..ac82d7daf 100644
--- a/business-delegate/src/main/java/com/iluwatar/business/delegate/ServiceType.java
+++ b/business-delegate/src/main/java/com/iluwatar/business/delegate/ServiceType.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
diff --git a/business-delegate/src/test/java/com/iluwatar/business/delegate/AppTest.java b/business-delegate/src/test/java/com/iluwatar/business/delegate/AppTest.java
index 1767b7ac5..d02109d37 100644
--- a/business-delegate/src/test/java/com/iluwatar/business/delegate/AppTest.java
+++ b/business-delegate/src/test/java/com/iluwatar/business/delegate/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
diff --git a/business-delegate/src/test/java/com/iluwatar/business/delegate/BusinessDelegateTest.java b/business-delegate/src/test/java/com/iluwatar/business/delegate/BusinessDelegateTest.java
index aec4ea14b..48d576319 100644
--- a/business-delegate/src/test/java/com/iluwatar/business/delegate/BusinessDelegateTest.java
+++ b/business-delegate/src/test/java/com/iluwatar/business/delegate/BusinessDelegateTest.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
diff --git a/caching/etc/caching.urm.puml b/caching/etc/caching.urm.puml
index b8f4fb49b..6ac3fd4cc 100644
--- a/caching/etc/caching.urm.puml
+++ b/caching/etc/caching.urm.puml
@@ -1,56 +1,68 @@
@startuml
package com.iluwatar.caching {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
+ + useCacheAsideStategy()
+ useReadAndWriteThroughStrategy()
+ useReadThroughAndWriteAroundStrategy()
+ useReadThroughAndWriteBehindStrategy()
}
- ~class Node {
- ~ next : Node
- ~ previous : Node
- ~ userAccount : UserAccount
- ~ userId : String
- + Node(this$0 : String, userId : UserAccount)
- }
- class CacheStore {
- ~ cache : LruCache {static}
- - CacheStore()
- + clearCache() {static}
- + flushCache() {static}
- + initCapacity(capacity : int) {static}
- + print() : String {static}
- + readThrough(userId : String) : UserAccount {static}
- + readThroughWithWriteBackPolicy(userId : String) : UserAccount {static}
- + writeAround(userAccount : UserAccount) {static}
- + writeBehind(userAccount : UserAccount) {static}
- + writeThrough(userAccount : UserAccount) {static}
- }
class AppManager {
- cachingPolicy : CachingPolicy {static}
- AppManager()
+ find(userId : String) : UserAccount {static}
+ - findAside(userId : String) : UserAccount {static}
+ initCacheCapacity(capacity : int) {static}
+ initCachingPolicy(policy : CachingPolicy) {static}
+ initDb(useMongoDb : boolean) {static}
+ printCacheContent() : String {static}
+ save(userAccount : UserAccount) {static}
+ - saveAside(userAccount : UserAccount) {static}
}
- class UserAccount {
- - additionalInfo : String
- - userId : String
- - userName : String
- + UserAccount(userId : String, userName : String, additionalInfo : String)
- + getAdditionalInfo() : String
- + getUserId() : String
- + getUserName() : String
- + setAdditionalInfo(additionalInfo : String)
- + setUserId(userId : String)
- + setUserName(userName : String)
- + toString() : String
+ class CacheStore {
+ - LOGGER : Logger {static}
+ ~ cache : LruCache {static}
+ - CacheStore()
+ + clearCache() {static}
+ + flushCache() {static}
+ + get(userId : String) : UserAccount {static}
+ + initCapacity(capacity : int) {static}
+ + invalidate(userId : String) {static}
+ + print() : String {static}
+ + readThrough(userId : String) : UserAccount {static}
+ + readThroughWithWriteBackPolicy(userId : String) : UserAccount {static}
+ + set(userId : String, userAccount : UserAccount) {static}
+ + writeAround(userAccount : UserAccount) {static}
+ + writeBehind(userAccount : UserAccount) {static}
+ + writeThrough(userAccount : UserAccount) {static}
+ }
+ enum CachingPolicy {
+ + AROUND {static}
+ + ASIDE {static}
+ + BEHIND {static}
+ + THROUGH {static}
+ - policy : String
+ + getPolicy() : String
+ + valueOf(name : String) : CachingPolicy {static}
+ + values() : CachingPolicy[] {static}
+ }
+ class DbManager {
+ - db : MongoDatabase {static}
+ - mongoClient : MongoClient {static}
+ - useMongoDB : boolean {static}
+ - virtualDB : Map<String, UserAccount> {static}
+ - DbManager()
+ + connect() {static}
+ + createVirtualDb() {static}
+ + readFromDb(userId : String) : UserAccount {static}
+ + updateDb(userAccount : UserAccount) {static}
+ + upsertDb(userAccount : UserAccount) {static}
+ + writeToDb(userAccount : UserAccount) {static}
}
class LruCache {
+ - LOGGER : Logger {static}
~ cache : Map<String, Node>
~ capacity : int
~ end : Node
@@ -68,31 +80,29 @@ package com.iluwatar.caching {
+ setCapacity(newCapacity : int)
+ setHead(node : Node)
}
- class DbManager {
- - db : MongoDatabase {static}
- - mongoClient : MongoClient {static}
- - useMongoDB : boolean {static}
- - virtualDB : Map<String, UserAccount> {static}
- - DbManager()
- + connect() {static}
- + createVirtualDb() {static}
- + readFromDb(userId : String) : UserAccount {static}
- + updateDb(userAccount : UserAccount) {static}
- + upsertDb(userAccount : UserAccount) {static}
- + writeToDb(userAccount : UserAccount) {static}
+ ~class Node {
+ ~ next : Node
+ ~ previous : Node
+ ~ userAccount : UserAccount
+ ~ userId : String
+ + Node(this$0 : String, userId : UserAccount)
}
- enum CachingPolicy {
- + AROUND {static}
- + BEHIND {static}
- + THROUGH {static}
- - policy : String
- + getPolicy() : String
- + valueOf(name : String) : CachingPolicy {static}
- + values() : CachingPolicy[] {static}
+ class UserAccount {
+ - additionalInfo : String
+ - userId : String
+ - userName : String
+ + UserAccount(userId : String, userName : String, additionalInfo : String)
+ + getAdditionalInfo() : String
+ + getUserId() : String
+ + getUserName() : String
+ + setAdditionalInfo(additionalInfo : String)
+ + setUserId(userId : String)
+ + setUserName(userName : String)
+ + toString() : String
}
}
-Node --+ LruCache
LruCache --> "-head" Node
+Node --+ LruCache
Node --> "-previous" Node
AppManager --> "-cachingPolicy" CachingPolicy
Node --> "-userAccount" UserAccount
diff --git a/caching/pom.xml b/caching/pom.xml
index 07347e5c7..121ea698a 100644
--- a/caching/pom.xml
+++ b/caching/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
diff --git a/caching/src/main/java/com/iluwatar/caching/App.java b/caching/src/main/java/com/iluwatar/caching/App.java
index 1b1b5e1ca..589b26245 100644
--- a/caching/src/main/java/com/iluwatar/caching/App.java
+++ b/caching/src/main/java/com/iluwatar/caching/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.caching;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* The Caching pattern describes how to avoid expensive re-acquisition of resources by not releasing
@@ -60,6 +63,9 @@ package com.iluwatar.caching;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
+
/**
* Program entry point
*
@@ -82,13 +88,13 @@ public class App {
* Read-through and write-through
*/
public void useReadAndWriteThroughStrategy() {
- System.out.println("# CachingPolicy.THROUGH");
+ LOGGER.info("# CachingPolicy.THROUGH");
AppManager.initCachingPolicy(CachingPolicy.THROUGH);
UserAccount userAccount1 = new UserAccount("001", "John", "He is a boy.");
AppManager.save(userAccount1);
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
AppManager.find("001");
AppManager.find("001");
}
@@ -97,21 +103,21 @@ public class App {
* Read-through and write-around
*/
public void useReadThroughAndWriteAroundStrategy() {
- System.out.println("# CachingPolicy.AROUND");
+ LOGGER.info("# CachingPolicy.AROUND");
AppManager.initCachingPolicy(CachingPolicy.AROUND);
UserAccount userAccount2 = new UserAccount("002", "Jane", "She is a girl.");
AppManager.save(userAccount2);
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
AppManager.find("002");
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
userAccount2 = AppManager.find("002");
userAccount2.setUserName("Jane G.");
AppManager.save(userAccount2);
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
AppManager.find("002");
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
AppManager.find("002");
}
@@ -119,7 +125,7 @@ public class App {
* Read-through and write-behind
*/
public void useReadThroughAndWriteBehindStrategy() {
- System.out.println("# CachingPolicy.BEHIND");
+ LOGGER.info("# CachingPolicy.BEHIND");
AppManager.initCachingPolicy(CachingPolicy.BEHIND);
UserAccount userAccount3 = new UserAccount("003", "Adam", "He likes food.");
@@ -129,23 +135,23 @@ public class App {
AppManager.save(userAccount3);
AppManager.save(userAccount4);
AppManager.save(userAccount5);
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
AppManager.find("003");
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
UserAccount userAccount6 = new UserAccount("006", "Yasha", "She is an only child.");
AppManager.save(userAccount6);
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
AppManager.find("004");
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
}
/**
* Cache-Aside
*/
public void useCacheAsideStategy() {
- System.out.println("# CachingPolicy.ASIDE");
+ LOGGER.info("# CachingPolicy.ASIDE");
AppManager.initCachingPolicy(CachingPolicy.ASIDE);
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
UserAccount userAccount3 = new UserAccount("003", "Adam", "He likes food.");
UserAccount userAccount4 = new UserAccount("004", "Rita", "She hates cats.");
@@ -154,10 +160,10 @@ public class App {
AppManager.save(userAccount4);
AppManager.save(userAccount5);
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
AppManager.find("003");
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
AppManager.find("004");
- System.out.println(AppManager.printCacheContent());
+ LOGGER.info(AppManager.printCacheContent());
}
}
diff --git a/caching/src/main/java/com/iluwatar/caching/AppManager.java b/caching/src/main/java/com/iluwatar/caching/AppManager.java
index 2d6a424a3..2acc1accd 100644
--- a/caching/src/main/java/com/iluwatar/caching/AppManager.java
+++ b/caching/src/main/java/com/iluwatar/caching/AppManager.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
diff --git a/caching/src/main/java/com/iluwatar/caching/CacheStore.java b/caching/src/main/java/com/iluwatar/caching/CacheStore.java
index c2b95a1bd..f22a731b4 100644
--- a/caching/src/main/java/com/iluwatar/caching/CacheStore.java
+++ b/caching/src/main/java/com/iluwatar/caching/CacheStore.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.caching;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.List;
/**
@@ -31,6 +34,8 @@ import java.util.List;
*/
public class CacheStore {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CacheStore.class);
+
static LruCache cache;
private CacheStore() {
@@ -52,10 +57,10 @@ public class CacheStore {
*/
public static UserAccount readThrough(String userId) {
if (cache.contains(userId)) {
- System.out.println("# Cache Hit!");
+ LOGGER.info("# Cache Hit!");
return cache.get(userId);
}
- System.out.println("# Cache Miss!");
+ LOGGER.info("# Cache Miss!");
UserAccount userAccount = DbManager.readFromDb(userId);
cache.set(userId, userAccount);
return userAccount;
@@ -91,13 +96,13 @@ public class CacheStore {
*/
public static UserAccount readThroughWithWriteBackPolicy(String userId) {
if (cache.contains(userId)) {
- System.out.println("# Cache Hit!");
+ LOGGER.info("# Cache Hit!");
return cache.get(userId);
}
- System.out.println("# Cache Miss!");
+ LOGGER.info("# Cache Miss!");
UserAccount userAccount = DbManager.readFromDb(userId);
if (cache.isFull()) {
- System.out.println("# Cache is FULL! Writing LRU data to DB...");
+ LOGGER.info("# Cache is FULL! Writing LRU data to DB...");
UserAccount toBeWrittenToDb = cache.getLruData();
DbManager.upsertDb(toBeWrittenToDb);
}
@@ -110,7 +115,7 @@ public class CacheStore {
*/
public static void writeBehind(UserAccount userAccount) {
if (cache.isFull() && !cache.contains(userAccount.getUserId())) {
- System.out.println("# Cache is FULL! Writing LRU data to DB...");
+ LOGGER.info("# Cache is FULL! Writing LRU data to DB...");
UserAccount toBeWrittenToDb = cache.getLruData();
DbManager.upsertDb(toBeWrittenToDb);
}
@@ -130,7 +135,7 @@ public class CacheStore {
* Writes remaining content in the cache into the DB.
*/
public static void flushCache() {
- System.out.println("# flushCache...");
+ LOGGER.info("# flushCache...");
if (null == cache) {
return;
}
diff --git a/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java b/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java
index 5ad32f699..9f7c92b2e 100644
--- a/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java
+++ b/caching/src/main/java/com/iluwatar/caching/CachingPolicy.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
diff --git a/caching/src/main/java/com/iluwatar/caching/DbManager.java b/caching/src/main/java/com/iluwatar/caching/DbManager.java
index 455302106..6fccaf43e 100644
--- a/caching/src/main/java/com/iluwatar/caching/DbManager.java
+++ b/caching/src/main/java/com/iluwatar/caching/DbManager.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
diff --git a/caching/src/main/java/com/iluwatar/caching/LruCache.java b/caching/src/main/java/com/iluwatar/caching/LruCache.java
index 00e27ccf1..2fc37ce44 100644
--- a/caching/src/main/java/com/iluwatar/caching/LruCache.java
+++ b/caching/src/main/java/com/iluwatar/caching/LruCache.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.caching;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -38,6 +41,8 @@ import java.util.Map;
*/
public class LruCache {
+ private static final Logger LOGGER = LoggerFactory.getLogger(LruCache.class);
+
class Node {
String userId;
UserAccount userAccount;
@@ -115,7 +120,7 @@ public class LruCache {
} else {
Node newNode = new Node(userId, userAccount);
if (cache.size() >= capacity) {
- System.out.println("# Cache is FULL! Removing " + end.userId + " from cache...");
+ LOGGER.info("# Cache is FULL! Removing {} from cache...", end.userId);
cache.remove(end.userId); // remove LRU data from cache.
remove(end);
setHead(newNode);
@@ -136,7 +141,7 @@ public class LruCache {
public void invalidate(String userId) {
Node toBeRemoved = cache.remove(userId);
if (toBeRemoved != null) {
- System.out.println("# " + userId + " has been updated! Removing older version from cache...");
+ LOGGER.info("# {} has been updated! Removing older version from cache...", userId);
remove(toBeRemoved);
}
}
diff --git a/caching/src/main/java/com/iluwatar/caching/UserAccount.java b/caching/src/main/java/com/iluwatar/caching/UserAccount.java
index 657f12fa3..769eef6f6 100644
--- a/caching/src/main/java/com/iluwatar/caching/UserAccount.java
+++ b/caching/src/main/java/com/iluwatar/caching/UserAccount.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
diff --git a/caching/src/test/java/com/iluwatar/caching/AppTest.java b/caching/src/test/java/com/iluwatar/caching/AppTest.java
index 90ed1c275..3ac513033 100644
--- a/caching/src/test/java/com/iluwatar/caching/AppTest.java
+++ b/caching/src/test/java/com/iluwatar/caching/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
diff --git a/caching/src/test/java/com/iluwatar/caching/CachingTest.java b/caching/src/test/java/com/iluwatar/caching/CachingTest.java
index 9d2299902..4d8dea7a4 100644
--- a/caching/src/test/java/com/iluwatar/caching/CachingTest.java
+++ b/caching/src/test/java/com/iluwatar/caching/CachingTest.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
diff --git a/callback/etc/callback.urm.puml b/callback/etc/callback.urm.puml
index b9e1ca694..02545e80f 100644
--- a/callback/etc/callback.urm.puml
+++ b/callback/etc/callback.urm.puml
@@ -1,25 +1,28 @@
@startuml
package com.iluwatar.callback {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
interface Callback {
+ call() {abstract}
}
+ class LambdasApp {
+ - LOGGER : Logger {static}
+ + LambdasApp()
+ + main(args : String[]) {static}
+ }
+ class SimpleTask {
+ - LOGGER : Logger {static}
+ + SimpleTask()
+ + execute()
+ }
abstract class Task {
+ Task()
+ execute() {abstract}
+ executeWith(callback : Callback)
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
- class SimpleTask {
- + SimpleTask()
- + execute()
- }
- class LambdasApp {
- + LambdasApp()
- + main(args : String[]) {static}
- }
}
SimpleTask --|> Task
@enduml
\ No newline at end of file
diff --git a/callback/pom.xml b/callback/pom.xml
index 70dd8e5e2..afb578ae2 100644
--- a/callback/pom.xml
+++ b/callback/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
diff --git a/callback/src/main/java/com/iluwatar/callback/App.java b/callback/src/main/java/com/iluwatar/callback/App.java
index bc1b2890e..278975db9 100644
--- a/callback/src/main/java/com/iluwatar/callback/App.java
+++ b/callback/src/main/java/com/iluwatar/callback/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.callback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Callback pattern is more native for functional languages where functions are treated as
@@ -31,6 +34,8 @@ package com.iluwatar.callback;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*/
@@ -39,7 +44,7 @@ public class App {
Callback callback = new Callback() {
@Override
public void call() {
- System.out.println("I'm done now.");
+ LOGGER.info("I'm done now.");
}
};
task.executeWith(callback);
diff --git a/callback/src/main/java/com/iluwatar/callback/Callback.java b/callback/src/main/java/com/iluwatar/callback/Callback.java
index 78932a24e..670d446c3 100644
--- a/callback/src/main/java/com/iluwatar/callback/Callback.java
+++ b/callback/src/main/java/com/iluwatar/callback/Callback.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
diff --git a/callback/src/main/java/com/iluwatar/callback/LambdasApp.java b/callback/src/main/java/com/iluwatar/callback/LambdasApp.java
index 78ca63e0b..57ab816f1 100644
--- a/callback/src/main/java/com/iluwatar/callback/LambdasApp.java
+++ b/callback/src/main/java/com/iluwatar/callback/LambdasApp.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.callback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* This example generates the exact same output as {@link App} however the callback has been
@@ -30,12 +33,14 @@ package com.iluwatar.callback;
*/
public class LambdasApp {
+ private static final Logger LOGGER = LoggerFactory.getLogger(LambdasApp.class);
+
/**
* Program entry point
*/
public static void main(String[] args) {
Task task = new SimpleTask();
- Callback c = () -> System.out.println("I'm done now.");
+ Callback c = () -> LOGGER.info("I'm done now.");
task.executeWith(c);
}
}
diff --git a/callback/src/main/java/com/iluwatar/callback/SimpleTask.java b/callback/src/main/java/com/iluwatar/callback/SimpleTask.java
index 2a7385607..091699442 100644
--- a/callback/src/main/java/com/iluwatar/callback/SimpleTask.java
+++ b/callback/src/main/java/com/iluwatar/callback/SimpleTask.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.callback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Implementation of task that need to be executed
@@ -29,8 +32,10 @@ package com.iluwatar.callback;
*/
public class SimpleTask extends Task {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SimpleTask.class);
+
@Override
public void execute() {
- System.out.println("Perform some important activity and after call the callback method.");
+ LOGGER.info("Perform some important activity and after call the callback method.");
}
}
diff --git a/callback/src/main/java/com/iluwatar/callback/Task.java b/callback/src/main/java/com/iluwatar/callback/Task.java
index 9580c91cb..9e4ebf35f 100644
--- a/callback/src/main/java/com/iluwatar/callback/Task.java
+++ b/callback/src/main/java/com/iluwatar/callback/Task.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
diff --git a/callback/src/test/java/com/iluwatar/callback/AppTest.java b/callback/src/test/java/com/iluwatar/callback/AppTest.java
index b7ab3fe75..9e3355f47 100644
--- a/callback/src/test/java/com/iluwatar/callback/AppTest.java
+++ b/callback/src/test/java/com/iluwatar/callback/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
diff --git a/callback/src/test/java/com/iluwatar/callback/CallbackTest.java b/callback/src/test/java/com/iluwatar/callback/CallbackTest.java
index b48ac36ff..d6f804f45 100644
--- a/callback/src/test/java/com/iluwatar/callback/CallbackTest.java
+++ b/callback/src/test/java/com/iluwatar/callback/CallbackTest.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
diff --git a/chain/etc/chain.urm.puml b/chain/etc/chain.urm.puml
index 21365765d..3add4037d 100644
--- a/chain/etc/chain.urm.puml
+++ b/chain/etc/chain.urm.puml
@@ -1,9 +1,8 @@
@startuml
package com.iluwatar.chain {
- class OrcSoldier {
- + OrcSoldier(handler : RequestHandler)
- + handleRequest(req : Request)
- + toString() : String
+ class App {
+ + App()
+ + main(args : String[]) {static}
}
class OrcCommander {
+ OrcCommander(handler : RequestHandler)
@@ -16,6 +15,16 @@ package com.iluwatar.chain {
- buildChain()
+ makeRequest(req : Request)
}
+ class OrcOfficer {
+ + OrcOfficer(handler : RequestHandler)
+ + handleRequest(req : Request)
+ + toString() : String
+ }
+ class OrcSoldier {
+ + OrcSoldier(handler : RequestHandler)
+ + handleRequest(req : Request)
+ + toString() : String
+ }
class Request {
- handled : boolean
- requestDescription : String
@@ -27,22 +36,14 @@ package com.iluwatar.chain {
+ markHandled()
+ toString() : String
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
abstract class RequestHandler {
+ - LOGGER : Logger {static}
- next : RequestHandler
+ RequestHandler(next : RequestHandler)
+ handleRequest(req : Request)
# printHandling(req : Request)
+ toString() : String {abstract}
}
- class OrcOfficer {
- + OrcOfficer(handler : RequestHandler)
- + handleRequest(req : Request)
- + toString() : String
- }
enum RequestType {
+ COLLECT_TAX {static}
+ DEFEND_CASTLE {static}
@@ -52,9 +53,9 @@ package com.iluwatar.chain {
}
}
RequestHandler --> "-next" RequestHandler
-Request --> "-requestType" RequestType
OrcKing --> "-chain" RequestHandler
-OrcSoldier --|> RequestHandler
+Request --> "-requestType" RequestType
OrcCommander --|> RequestHandler
OrcOfficer --|> RequestHandler
+OrcSoldier --|> RequestHandler
@enduml
\ No newline at end of file
diff --git a/chain/pom.xml b/chain/pom.xml
index 5593d3e73..affe2c945 100644
--- a/chain/pom.xml
+++ b/chain/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
diff --git a/chain/src/main/java/com/iluwatar/chain/App.java b/chain/src/main/java/com/iluwatar/chain/App.java
index cd6a200de..456609e4f 100644
--- a/chain/src/main/java/com/iluwatar/chain/App.java
+++ b/chain/src/main/java/com/iluwatar/chain/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
diff --git a/chain/src/main/java/com/iluwatar/chain/OrcCommander.java b/chain/src/main/java/com/iluwatar/chain/OrcCommander.java
index a1f2bf284..048ba4954 100644
--- a/chain/src/main/java/com/iluwatar/chain/OrcCommander.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcCommander.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
diff --git a/chain/src/main/java/com/iluwatar/chain/OrcKing.java b/chain/src/main/java/com/iluwatar/chain/OrcKing.java
index 3b13c4a53..35bdbb3c1 100644
--- a/chain/src/main/java/com/iluwatar/chain/OrcKing.java
+++ b/chain/src/main/java/com/iluwatar/chain/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
diff --git a/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java b/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java
index ea35722c1..8e90b7ca0 100644
--- a/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcOfficer.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
diff --git a/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java b/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java
index d7601bf4f..99e0d5022 100644
--- a/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcSoldier.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
diff --git a/chain/src/main/java/com/iluwatar/chain/Request.java b/chain/src/main/java/com/iluwatar/chain/Request.java
index 399eddb36..c9ac2505b 100644
--- a/chain/src/main/java/com/iluwatar/chain/Request.java
+++ b/chain/src/main/java/com/iluwatar/chain/Request.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
diff --git a/chain/src/main/java/com/iluwatar/chain/RequestHandler.java b/chain/src/main/java/com/iluwatar/chain/RequestHandler.java
index 78d68e5dc..81e41fb7c 100644
--- a/chain/src/main/java/com/iluwatar/chain/RequestHandler.java
+++ b/chain/src/main/java/com/iluwatar/chain/RequestHandler.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.chain;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* RequestHandler
@@ -29,6 +32,8 @@ package com.iluwatar.chain;
*/
public abstract class RequestHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(RequestHandler.class);
+
private RequestHandler next;
public RequestHandler(RequestHandler next) {
@@ -45,7 +50,7 @@ public abstract class RequestHandler {
}
protected void printHandling(Request req) {
- System.out.println(this + " handling request \"" + req + "\"");
+ LOGGER.info("{} handling request \"{}\"", this, req);
}
@Override
diff --git a/chain/src/main/java/com/iluwatar/chain/RequestType.java b/chain/src/main/java/com/iluwatar/chain/RequestType.java
index ff6dcff4d..f4d83edc3 100644
--- a/chain/src/main/java/com/iluwatar/chain/RequestType.java
+++ b/chain/src/main/java/com/iluwatar/chain/RequestType.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
diff --git a/chain/src/test/java/com/iluwatar/chain/AppTest.java b/chain/src/test/java/com/iluwatar/chain/AppTest.java
index 93a8a4096..2a3b6b197 100644
--- a/chain/src/test/java/com/iluwatar/chain/AppTest.java
+++ b/chain/src/test/java/com/iluwatar/chain/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
diff --git a/chain/src/test/java/com/iluwatar/chain/OrcKingTest.java b/chain/src/test/java/com/iluwatar/chain/OrcKingTest.java
index be3650613..208e6ecb6 100644
--- a/chain/src/test/java/com/iluwatar/chain/OrcKingTest.java
+++ b/chain/src/test/java/com/iluwatar/chain/OrcKingTest.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
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 60de4a697..37799eee8 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.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
diff --git a/checkstyle.xml b/checkstyle.xml
index 19b6d2ec4..46b1aa354 100644
--- a/checkstyle.xml
+++ b/checkstyle.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
diff --git a/command/etc/command.urm.puml b/command/etc/command.urm.puml
index 27bff7330..9bdbce64d 100644
--- a/command/etc/command.urm.puml
+++ b/command/etc/command.urm.puml
@@ -1,13 +1,5 @@
@startuml
package com.iluwatar.command {
- class InvisibilitySpell {
- - target : Target
- + InvisibilitySpell()
- + execute(target : Target)
- + redo()
- + toString() : String
- + undo()
- }
class App {
+ App()
+ main(args : String[]) {static}
@@ -23,25 +15,13 @@ package com.iluwatar.command {
+ Goblin()
+ toString() : String
}
- abstract class Target {
- - size : Size
- - visibility : Visibility
- + Target()
- + getSize() : Size
- + getVisibility() : Visibility
- + printStatus()
- + setSize(size : Size)
- + setVisibility(visibility : Visibility)
- + toString() : String {abstract}
- }
- class Wizard {
- - redoStack : Deque<Command>
- - undoStack : Deque<Command>
- + Wizard()
- + castSpell(command : Command, target : Target)
- + redoLastSpell()
+ class InvisibilitySpell {
+ - target : Target
+ + InvisibilitySpell()
+ + execute(target : Target)
+ + redo()
+ toString() : String
- + undoLastSpell()
+ + undo()
}
class ShrinkSpell {
- oldSize : Size
@@ -62,6 +42,18 @@ package com.iluwatar.command {
+ valueOf(name : String) : Size {static}
+ values() : Size[] {static}
}
+ abstract class Target {
+ - LOGGER : Logger {static}
+ - size : Size
+ - visibility : Visibility
+ + Target()
+ + getSize() : Size
+ + getVisibility() : Visibility
+ + printStatus()
+ + setSize(size : Size)
+ + setVisibility(visibility : Visibility)
+ + toString() : String {abstract}
+ }
enum Visibility {
+ INVISIBLE {static}
+ UNDEFINED {static}
@@ -71,6 +63,16 @@ package com.iluwatar.command {
+ valueOf(name : String) : Visibility {static}
+ values() : Visibility[] {static}
}
+ class Wizard {
+ - LOGGER : Logger {static}
+ - redoStack : Deque<Command>
+ - undoStack : Deque<Command>
+ + Wizard()
+ + castSpell(command : Command, target : Target)
+ + redoLastSpell()
+ + toString() : String
+ + undoLastSpell()
+ }
}
Target --> "-size" Size
Wizard --> "-undoStack" Command
@@ -78,7 +80,7 @@ ShrinkSpell --> "-oldSize" Size
InvisibilitySpell --> "-target" Target
ShrinkSpell --> "-target" Target
Target --> "-visibility" Visibility
-InvisibilitySpell --|> Command
Goblin --|> Target
+InvisibilitySpell --|> Command
ShrinkSpell --|> Command
@enduml
\ No newline at end of file
diff --git a/command/pom.xml b/command/pom.xml
index 406c6d100..15f80a754 100644
--- a/command/pom.xml
+++ b/command/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
diff --git a/command/src/main/java/com/iluwatar/command/App.java b/command/src/main/java/com/iluwatar/command/App.java
index 93f9c376a..abf2bb442 100644
--- a/command/src/main/java/com/iluwatar/command/App.java
+++ b/command/src/main/java/com/iluwatar/command/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
diff --git a/command/src/main/java/com/iluwatar/command/Command.java b/command/src/main/java/com/iluwatar/command/Command.java
index c7b0c43bb..13464a9bc 100644
--- a/command/src/main/java/com/iluwatar/command/Command.java
+++ b/command/src/main/java/com/iluwatar/command/Command.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
diff --git a/command/src/main/java/com/iluwatar/command/Goblin.java b/command/src/main/java/com/iluwatar/command/Goblin.java
index 9e21cdefd..fac7fdcd6 100644
--- a/command/src/main/java/com/iluwatar/command/Goblin.java
+++ b/command/src/main/java/com/iluwatar/command/Goblin.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
diff --git a/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java b/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java
index 9435e7245..0622e0a49 100644
--- a/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java
+++ b/command/src/main/java/com/iluwatar/command/InvisibilitySpell.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
diff --git a/command/src/main/java/com/iluwatar/command/ShrinkSpell.java b/command/src/main/java/com/iluwatar/command/ShrinkSpell.java
index e88447353..eec600d40 100644
--- a/command/src/main/java/com/iluwatar/command/ShrinkSpell.java
+++ b/command/src/main/java/com/iluwatar/command/ShrinkSpell.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
diff --git a/command/src/main/java/com/iluwatar/command/Size.java b/command/src/main/java/com/iluwatar/command/Size.java
index d33a19453..1e72474cc 100644
--- a/command/src/main/java/com/iluwatar/command/Size.java
+++ b/command/src/main/java/com/iluwatar/command/Size.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
diff --git a/command/src/main/java/com/iluwatar/command/Target.java b/command/src/main/java/com/iluwatar/command/Target.java
index 2e49ab663..282a4dd46 100644
--- a/command/src/main/java/com/iluwatar/command/Target.java
+++ b/command/src/main/java/com/iluwatar/command/Target.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.command;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Base class for spell targets.
@@ -29,6 +32,8 @@ package com.iluwatar.command;
*/
public abstract class Target {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Target.class);
+
private Size size;
private Visibility visibility;
@@ -56,8 +61,6 @@ public abstract class Target {
* Print status
*/
public void printStatus() {
- System.out.println(String.format("%s, [size=%s] [visibility=%s]", this, getSize(),
- getVisibility()));
- System.out.println();
+ LOGGER.info("{}, [size={}] [visibility={}]", this, getSize(), getVisibility());
}
}
diff --git a/command/src/main/java/com/iluwatar/command/Visibility.java b/command/src/main/java/com/iluwatar/command/Visibility.java
index 4ab079d18..802927b9d 100644
--- a/command/src/main/java/com/iluwatar/command/Visibility.java
+++ b/command/src/main/java/com/iluwatar/command/Visibility.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
diff --git a/command/src/main/java/com/iluwatar/command/Wizard.java b/command/src/main/java/com/iluwatar/command/Wizard.java
index bd0ef85d4..501676984 100644
--- a/command/src/main/java/com/iluwatar/command/Wizard.java
+++ b/command/src/main/java/com/iluwatar/command/Wizard.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.command;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Deque;
import java.util.LinkedList;
@@ -32,6 +35,8 @@ import java.util.LinkedList;
*/
public class Wizard {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Wizard.class);
+
private Deque<Command> undoStack = new LinkedList<>();
private Deque<Command> redoStack = new LinkedList<>();
@@ -41,7 +46,7 @@ public class Wizard {
* Cast spell
*/
public void castSpell(Command command, Target target) {
- System.out.println(this + " casts " + command + " at " + target);
+ LOGGER.info("{} casts {} at {}", this, command, target);
command.execute(target);
undoStack.offerLast(command);
}
@@ -53,7 +58,7 @@ public class Wizard {
if (!undoStack.isEmpty()) {
Command previousSpell = undoStack.pollLast();
redoStack.offerLast(previousSpell);
- System.out.println(this + " undoes " + previousSpell);
+ LOGGER.info("{} undoes {}", this, previousSpell);
previousSpell.undo();
}
}
@@ -65,7 +70,7 @@ public class Wizard {
if (!redoStack.isEmpty()) {
Command previousSpell = redoStack.pollLast();
undoStack.offerLast(previousSpell);
- System.out.println(this + " redoes " + previousSpell);
+ LOGGER.info("{} redoes {}", this, previousSpell);
previousSpell.redo();
}
}
diff --git a/command/src/test/java/com/iluwatar/command/AppTest.java b/command/src/test/java/com/iluwatar/command/AppTest.java
index 560594272..5b4b742d8 100644
--- a/command/src/test/java/com/iluwatar/command/AppTest.java
+++ b/command/src/test/java/com/iluwatar/command/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
diff --git a/command/src/test/java/com/iluwatar/command/CommandTest.java b/command/src/test/java/com/iluwatar/command/CommandTest.java
index 8201d50c6..5c3fa6fe1 100644
--- a/command/src/test/java/com/iluwatar/command/CommandTest.java
+++ b/command/src/test/java/com/iluwatar/command/CommandTest.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
diff --git a/composite/etc/composite.urm.puml b/composite/etc/composite.urm.puml
index 82e9b65eb..82f2cab0d 100644
--- a/composite/etc/composite.urm.puml
+++ b/composite/etc/composite.urm.puml
@@ -1,30 +1,16 @@
@startuml
package com.iluwatar.composite {
- class Word {
- + Word(letters : List<Letter>)
- # printThisAfter()
- # printThisBefore()
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
- class Messenger {
- + Messenger()
- ~ messageFromElves() : LetterComposite
- ~ messageFromOrcs() : LetterComposite
- }
class Letter {
- c : char
+ Letter(c : char)
# printThisAfter()
# printThisBefore()
}
- class Sentence {
- + Sentence(words : List<Word>)
- # printThisAfter()
- # printThisBefore()
- }
abstract class LetterComposite {
- children : List<LetterComposite>
+ LetterComposite()
@@ -34,9 +20,24 @@ package com.iluwatar.composite {
# printThisAfter() {abstract}
# printThisBefore() {abstract}
}
+ class Messenger {
+ + Messenger()
+ ~ messageFromElves() : LetterComposite
+ ~ messageFromOrcs() : LetterComposite
+ }
+ class Sentence {
+ + Sentence(words : List<Word>)
+ # printThisAfter()
+ # printThisBefore()
+ }
+ class Word {
+ + Word(letters : List<Letter>)
+ # printThisAfter()
+ # printThisBefore()
+ }
}
LetterComposite --> "-children" LetterComposite
-Word --|> LetterComposite
Letter --|> LetterComposite
Sentence --|> LetterComposite
+Word --|> LetterComposite
@enduml
\ No newline at end of file
diff --git a/composite/pom.xml b/composite/pom.xml
index 48d693d2f..1a21d5034 100644
--- a/composite/pom.xml
+++ b/composite/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
diff --git a/composite/src/main/java/com/iluwatar/composite/App.java b/composite/src/main/java/com/iluwatar/composite/App.java
index cfe37876f..5d725c082 100644
--- a/composite/src/main/java/com/iluwatar/composite/App.java
+++ b/composite/src/main/java/com/iluwatar/composite/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.composite;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* The Composite pattern is a partitioning design pattern. The Composite pattern describes that a
* group of objects is to be treated in the same way as a single instance of an object. The intent
@@ -35,20 +38,22 @@ package com.iluwatar.composite;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
* @param args command line args
*/
public static void main(String[] args) {
- System.out.println("Message from the orcs: ");
+ LOGGER.info("Message from the orcs: ");
LetterComposite orcMessage = new Messenger().messageFromOrcs();
orcMessage.print();
- System.out.println("\n");
+ LOGGER.info("\n");
- System.out.println("Message from the elves: ");
+ LOGGER.info("Message from the elves: ");
LetterComposite elfMessage = new Messenger().messageFromElves();
elfMessage.print();
diff --git a/composite/src/main/java/com/iluwatar/composite/Letter.java b/composite/src/main/java/com/iluwatar/composite/Letter.java
index d6a4005d2..036854f5d 100644
--- a/composite/src/main/java/com/iluwatar/composite/Letter.java
+++ b/composite/src/main/java/com/iluwatar/composite/Letter.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
@@ -23,7 +23,7 @@
package com.iluwatar.composite;
/**
- *
+ *
* Letter
*
*/
diff --git a/composite/src/main/java/com/iluwatar/composite/LetterComposite.java b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java
index 940562969..c7c1344a0 100644
--- a/composite/src/main/java/com/iluwatar/composite/LetterComposite.java
+++ b/composite/src/main/java/com/iluwatar/composite/LetterComposite.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
diff --git a/composite/src/main/java/com/iluwatar/composite/Messenger.java b/composite/src/main/java/com/iluwatar/composite/Messenger.java
index 3b758d680..998d7e7d0 100644
--- a/composite/src/main/java/com/iluwatar/composite/Messenger.java
+++ b/composite/src/main/java/com/iluwatar/composite/Messenger.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
diff --git a/composite/src/main/java/com/iluwatar/composite/Sentence.java b/composite/src/main/java/com/iluwatar/composite/Sentence.java
index eea1d4b1d..e83406619 100644
--- a/composite/src/main/java/com/iluwatar/composite/Sentence.java
+++ b/composite/src/main/java/com/iluwatar/composite/Sentence.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
@@ -25,7 +25,7 @@ package com.iluwatar.composite;
import java.util.List;
/**
- *
+ *
* Sentence
*
*/
diff --git a/composite/src/main/java/com/iluwatar/composite/Word.java b/composite/src/main/java/com/iluwatar/composite/Word.java
index 819f166dc..1efc3465f 100644
--- a/composite/src/main/java/com/iluwatar/composite/Word.java
+++ b/composite/src/main/java/com/iluwatar/composite/Word.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
@@ -25,7 +25,7 @@ package com.iluwatar.composite;
import java.util.List;
/**
- *
+ *
* Word
*
*/
diff --git a/composite/src/test/java/com/iluwatar/composite/AppTest.java b/composite/src/test/java/com/iluwatar/composite/AppTest.java
index 336438a99..0862d5c20 100644
--- a/composite/src/test/java/com/iluwatar/composite/AppTest.java
+++ b/composite/src/test/java/com/iluwatar/composite/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
diff --git a/composite/src/test/java/com/iluwatar/composite/MessengerTest.java b/composite/src/test/java/com/iluwatar/composite/MessengerTest.java
index 5f75ea017..3746b236a 100644
--- a/composite/src/test/java/com/iluwatar/composite/MessengerTest.java
+++ b/composite/src/test/java/com/iluwatar/composite/MessengerTest.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
diff --git a/dao/etc/dao.urm.puml b/dao/etc/dao.urm.puml
index 90a9c9725..2b3f7fca6 100644
--- a/dao/etc/dao.urm.puml
+++ b/dao/etc/dao.urm.puml
@@ -1,25 +1,5 @@
@startuml
package com.iluwatar.dao {
- class InMemoryCustomerDao {
- - idToCustomer : Map<Integer, Customer>
- + InMemoryCustomerDao()
- + add(customer : Customer) : boolean
- + delete(customer : Customer) : boolean
- + getAll() : Stream<Customer>
- + getById(id : int) : Optional<Customer>
- + update(customer : Customer) : boolean
- }
- interface CustomerSchemaSql {
- + CREATE_SCHEMA_SQL : String {static}
- + DELETE_SCHEMA_SQL : String {static}
- }
- interface CustomerDao {
- + add(Customer) : boolean {abstract}
- + delete(Customer) : boolean {abstract}
- + getAll() : Stream<Customer> {abstract}
- + getById(int) : Optional<Customer> {abstract}
- + update(Customer) : boolean {abstract}
- }
class App {
- DB_URL : String {static}
- log : Logger {static}
@@ -32,18 +12,6 @@ package com.iluwatar.dao {
+ main(args : String[]) {static}
- performOperationsUsing(customerDao : CustomerDao) {static}
}
- class DbCustomerDao {
- - dataSource : DataSource
- + DbCustomerDao(dataSource : DataSource)
- + add(customer : Customer) : boolean
- - createCustomer(resultSet : ResultSet) : Customer
- + delete(customer : Customer) : boolean
- + getAll() : Stream<Customer>
- + getById(id : int) : Optional<Customer>
- - getConnection() : Connection
- - mutedClose(connection : Connection)
- + update(customer : Customer) : boolean
- }
class Customer {
- firstName : String
- id : int
@@ -59,7 +27,39 @@ package com.iluwatar.dao {
+ setLastName(lastName : String)
+ toString() : String
}
+ interface CustomerDao {
+ + add(Customer) : boolean {abstract}
+ + delete(Customer) : boolean {abstract}
+ + getAll() : Stream<Customer> {abstract}
+ + getById(int) : Optional<Customer> {abstract}
+ + update(Customer) : boolean {abstract}
+ }
+ interface CustomerSchemaSql {
+ + CREATE_SCHEMA_SQL : String {static}
+ + DELETE_SCHEMA_SQL : String {static}
+ }
+ class DbCustomerDao {
+ - dataSource : DataSource
+ + DbCustomerDao(dataSource : DataSource)
+ + add(customer : Customer) : boolean
+ - createCustomer(resultSet : ResultSet) : Customer
+ + delete(customer : Customer) : boolean
+ + getAll() : Stream<Customer>
+ + getById(id : int) : Optional<Customer>
+ - getConnection() : Connection
+ - mutedClose(connection : Connection)
+ + update(customer : Customer) : boolean
+ }
+ class InMemoryCustomerDao {
+ - idToCustomer : Map<Integer, Customer>
+ + InMemoryCustomerDao()
+ + add(customer : Customer) : boolean
+ + delete(customer : Customer) : boolean
+ + getAll() : Stream<Customer>
+ + getById(id : int) : Optional<Customer>
+ + update(customer : Customer) : boolean
+ }
}
-InMemoryCustomerDao ..|> CustomerDao
DbCustomerDao ..|> CustomerDao
+InMemoryCustomerDao ..|> CustomerDao
@enduml
\ No newline at end of file
diff --git a/dao/pom.xml b/dao/pom.xml
index e414f2b27..0a26bd01b 100644
--- a/dao/pom.xml
+++ b/dao/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
diff --git a/dao/src/main/java/com/iluwatar/dao/App.java b/dao/src/main/java/com/iluwatar/dao/App.java
index 8a0c06739..d2fa945b6 100644
--- a/dao/src/main/java/com/iluwatar/dao/App.java
+++ b/dao/src/main/java/com/iluwatar/dao/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
diff --git a/dao/src/main/java/com/iluwatar/dao/Customer.java b/dao/src/main/java/com/iluwatar/dao/Customer.java
index d6b512dd6..a133bf2b0 100644
--- a/dao/src/main/java/com/iluwatar/dao/Customer.java
+++ b/dao/src/main/java/com/iluwatar/dao/Customer.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
diff --git a/dao/src/main/java/com/iluwatar/dao/CustomerDao.java b/dao/src/main/java/com/iluwatar/dao/CustomerDao.java
index 059a9e9f7..6156bb8d7 100644
--- a/dao/src/main/java/com/iluwatar/dao/CustomerDao.java
+++ b/dao/src/main/java/com/iluwatar/dao/CustomerDao.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
diff --git a/dao/src/main/java/com/iluwatar/dao/CustomerSchemaSql.java b/dao/src/main/java/com/iluwatar/dao/CustomerSchemaSql.java
index 860826abf..6b8acffd2 100644
--- a/dao/src/main/java/com/iluwatar/dao/CustomerSchemaSql.java
+++ b/dao/src/main/java/com/iluwatar/dao/CustomerSchemaSql.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
diff --git a/dao/src/main/java/com/iluwatar/dao/DbCustomerDao.java b/dao/src/main/java/com/iluwatar/dao/DbCustomerDao.java
index 622b5b1f0..c5dc7da3f 100644
--- a/dao/src/main/java/com/iluwatar/dao/DbCustomerDao.java
+++ b/dao/src/main/java/com/iluwatar/dao/DbCustomerDao.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
diff --git a/dao/src/main/java/com/iluwatar/dao/InMemoryCustomerDao.java b/dao/src/main/java/com/iluwatar/dao/InMemoryCustomerDao.java
index 15c63d1de..38acca60f 100644
--- a/dao/src/main/java/com/iluwatar/dao/InMemoryCustomerDao.java
+++ b/dao/src/main/java/com/iluwatar/dao/InMemoryCustomerDao.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
diff --git a/dao/src/main/resources/log4j.xml b/dao/src/main/resources/log4j.xml
index b591c17e1..14f043ff7 100644
--- a/dao/src/main/resources/log4j.xml
+++ b/dao/src/main/resources/log4j.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
diff --git a/dao/src/test/java/com/iluwatar/dao/AppTest.java b/dao/src/test/java/com/iluwatar/dao/AppTest.java
index 169fc046e..73534eb02 100644
--- a/dao/src/test/java/com/iluwatar/dao/AppTest.java
+++ b/dao/src/test/java/com/iluwatar/dao/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
diff --git a/dao/src/test/java/com/iluwatar/dao/CustomerTest.java b/dao/src/test/java/com/iluwatar/dao/CustomerTest.java
index 6a02fd6be..a0f9035ab 100644
--- a/dao/src/test/java/com/iluwatar/dao/CustomerTest.java
+++ b/dao/src/test/java/com/iluwatar/dao/CustomerTest.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
diff --git a/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java b/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java
index ac69699df..213aef206 100644
--- a/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java
+++ b/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.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
diff --git a/dao/src/test/java/com/iluwatar/dao/InMemoryCustomerDaoTest.java b/dao/src/test/java/com/iluwatar/dao/InMemoryCustomerDaoTest.java
index 65a087b9b..2532b2fad 100644
--- a/dao/src/test/java/com/iluwatar/dao/InMemoryCustomerDaoTest.java
+++ b/dao/src/test/java/com/iluwatar/dao/InMemoryCustomerDaoTest.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
diff --git a/data-mapper/etc/data-mapper.urm.puml b/data-mapper/etc/data-mapper.urm.puml
index a16df0020..041cbb07b 100644
--- a/data-mapper/etc/data-mapper.urm.puml
+++ b/data-mapper/etc/data-mapper.urm.puml
@@ -1,11 +1,5 @@
@startuml
package com.iluwatar.datamapper {
- interface StudentDataMapper {
- + delete(Student) {abstract}
- + find(int) : Optional<Student> {abstract}
- + insert(Student) {abstract}
- + update(Student) {abstract}
- }
class App {
- log : Logger {static}
- App()
@@ -27,6 +21,12 @@ package com.iluwatar.datamapper {
+ setStudentId(studentId : int)
+ toString() : String
}
+ interface StudentDataMapper {
+ + delete(Student) {abstract}
+ + find(int) : Optional<Student> {abstract}
+ + insert(Student) {abstract}
+ + update(Student) {abstract}
+ }
class StudentDataMapperImpl {
- students : List<Student>
+ StudentDataMapperImpl()
diff --git a/data-mapper/src/main/resources/log4j.xml b/data-mapper/src/main/resources/log4j.xml
index b591c17e1..14f043ff7 100644
--- a/data-mapper/src/main/resources/log4j.xml
+++ b/data-mapper/src/main/resources/log4j.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
diff --git a/decorator/README.md b/decorator/README.md
index 819873429..d2ba55afa 100644
--- a/decorator/README.md
+++ b/decorator/README.md
@@ -24,9 +24,9 @@ functionality.
## Applicability
Use Decorator
-* to add responsibilities to individual objects dynamically and transparently, that is, without affecting other objects
-* for responsibilities that can be withdrawn
-* when extension by subclassing is impractical. Sometimes a large number of independent extensions are possible and would produce an explosion of subclasses to support every combination. Or a class definition may be hidden or otherwise unavailable for subclassing
+* To add responsibilities to individual objects dynamically and transparently, that is, without affecting other objects
+* For responsibilities that can be withdrawn
+* When extension by subclassing is impractical. Sometimes a large number of independent extensions are possible and would produce an explosion of subclasses to support every combination. Or a class definition may be hidden or otherwise unavailable for subclassing
## Real world examples
* [java.io.InputStream](http://docs.oracle.com/javase/8/docs/api/java/io/InputStream.html), [java.io.OutputStream](http://docs.oracle.com/javase/8/docs/api/java/io/OutputStream.html),
diff --git a/decorator/etc/decorator.png b/decorator/etc/decorator.png
index 47a87b20b..35a7ef35d 100644
Binary files a/decorator/etc/decorator.png and b/decorator/etc/decorator.png differ
diff --git a/decorator/etc/decorator.ucls b/decorator/etc/decorator.ucls
index a5353d4ec..88bea6987 100644
--- a/decorator/etc/decorator.ucls
+++ b/decorator/etc/decorator.ucls
@@ -1,66 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
-<class-diagram version="1.1.9" icons="true" always-add-relationships="false" generalizations="true" realizations="true"
- associations="true" dependencies="false" nesting-relationships="true" router="FAN">
- <interface id="1" language="java" name="com.iluwatar.decorator.Hostile" project="decorator"
- file="/decorator/src/main/java/com/iluwatar/decorator/Hostile.java" binary="false" corner="BOTTOM_RIGHT">
- <position height="-1" width="-1" x="554" y="188"/>
+<class-diagram version="1.1.11" icons="true" automaticImage="PNG" always-add-relationships="false"
+ generalizations="true" realizations="true" associations="true" dependencies="false" nesting-relationships="true"
+ router="FAN">
+ <class id="1" language="java" name="com.iluwatar.decorator.App" project="decorator"
+ file="/decorator/src/main/java/com/iluwatar/decorator/App.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="113" width="114" x="177" y="237"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <class id="2" language="java" name="com.iluwatar.decorator.SimpleTroll" project="decorator"
+ file="/decorator/src/main/java/com/iluwatar/decorator/SimpleTroll.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="149" width="125" x="496" y="237"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <class id="3" language="java" name="com.iluwatar.decorator.ClubbedTroll" project="decorator"
+ file="/decorator/src/main/java/com/iluwatar/decorator/ClubbedTroll.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="149" width="125" x="249" y="426"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <class id="4" language="java" name="com.iluwatar.decorator.TrollDecorator" project="decorator"
+ file="/decorator/src/main/java/com/iluwatar/decorator/TrollDecorator.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="149" width="125" x="331" y="237"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <interface id="5" language="java" name="com.iluwatar.decorator.Troll" project="decorator"
+ file="/decorator/src/main/java/com/iluwatar/decorator/Troll.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="113" width="125" x="414" y="426"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</interface>
- <class id="2" language="java" name="com.iluwatar.decorator.App" project="decorator"
- file="/decorator/src/main/java/com/iluwatar/decorator/App.java" binary="false" corner="BOTTOM_RIGHT">
- <position height="-1" width="-1" x="117" y="202"/>
- <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
- sort-features="false" accessors="true" visibility="true">
- <attributes public="true" package="true" protected="true" private="true" static="true"/>
- <operations public="true" package="true" protected="true" private="true" static="true"/>
- </display>
- </class>
- <class id="3" language="java" name="com.iluwatar.decorator.Troll" project="decorator"
- file="/decorator/src/main/java/com/iluwatar/decorator/Troll.java" binary="false" corner="BOTTOM_RIGHT">
- <position height="-1" width="-1" x="315" y="100"/>
- <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
- sort-features="false" accessors="true" visibility="true">
- <attributes public="true" package="true" protected="true" private="true" static="true"/>
- <operations public="true" package="true" protected="true" private="true" static="true"/>
- </display>
- </class>
- <class id="4" language="java" name="com.iluwatar.decorator.SmartHostile" project="decorator"
- file="/decorator/src/main/java/com/iluwatar/decorator/SmartHostile.java" binary="false" corner="BOTTOM_RIGHT">
- <position height="-1" width="-1" x="318" y="315"/>
- <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
- sort-features="false" accessors="true" visibility="true">
- <attributes public="true" package="true" protected="true" private="true" static="true"/>
- <operations public="true" package="true" protected="true" private="true" static="true"/>
- </display>
- </class>
- <dependency id="5">
- <end type="SOURCE" refId="2"/>
- <end type="TARGET" refId="4"/>
- </dependency>
<realization id="6">
- <end type="SOURCE" refId="3"/>
- <end type="TARGET" refId="1"/>
+ <end type="SOURCE" refId="4"/>
+ <end type="TARGET" refId="5"/>
</realization>
- <association id="7">
+ <generalization id="7">
+ <end type="SOURCE" refId="3"/>
+ <end type="TARGET" refId="4"/>
+ </generalization>
+ <realization id="8">
+ <end type="SOURCE" refId="2"/>
+ <end type="TARGET" refId="5"/>
+ </realization>
+ <association id="9">
<end type="SOURCE" refId="4" navigable="false">
- <attribute id="8" name="decorated"/>
- <multiplicity id="9" minimum="0" maximum="1"/>
+ <attribute id="10" name="decorated"/>
+ <multiplicity id="11" minimum="0" maximum="1"/>
</end>
- <end type="TARGET" refId="1" navigable="true"/>
+ <end type="TARGET" refId="5" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
- <realization id="10">
- <end type="SOURCE" refId="4"/>
- <end type="TARGET" refId="1"/>
- </realization>
- <dependency id="11">
- <end type="SOURCE" refId="2"/>
- <end type="TARGET" refId="3"/>
- </dependency>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
diff --git a/decorator/etc/decorator.urm.puml b/decorator/etc/decorator.urm.puml
index 4862ddfeb..be878bd91 100644
--- a/decorator/etc/decorator.urm.puml
+++ b/decorator/etc/decorator.urm.puml
@@ -1,29 +1,38 @@
@startuml
package com.iluwatar.decorator {
- interface Hostile {
- + attack() {abstract}
- + fleeBattle() {abstract}
- + getAttackPower() : int {abstract}
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
- class Troll {
- + Troll()
+ class ClubbedTroll {
+ - LOGGER : Logger {static}
+ + ClubbedTroll(decorated : Troll)
+ + attack()
+ + getAttackPower() : int
+ }
+ class SimpleTroll {
+ - LOGGER : Logger {static}
+ + SimpleTroll()
+ attack()
+ fleeBattle()
+ getAttackPower() : int
}
- class SmartHostile {
- - decorated : Hostile
- + SmartHostile(decorated : Hostile)
+ interface Troll {
+ + attack() {abstract}
+ + fleeBattle() {abstract}
+ + getAttackPower() : int {abstract}
+ }
+ class TrollDecorator {
+ - decorated : Troll
+ + TrollDecorator(decorated : Troll)
+ attack()
+ fleeBattle()
+ getAttackPower() : int
}
}
-SmartHostile --> "-decorated" Hostile
-Troll ..|> Hostile
-SmartHostile ..|> Hostile
+TrollDecorator --> "-decorated" Troll
+ClubbedTroll --|> TrollDecorator
+SimpleTroll ..|> Troll
+TrollDecorator ..|> Troll
@enduml
\ No newline at end of file
diff --git a/decorator/pom.xml b/decorator/pom.xml
index 36c3eef01..b8d52f66c 100644
--- a/decorator/pom.xml
+++ b/decorator/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
diff --git a/decorator/src/main/java/com/iluwatar/decorator/App.java b/decorator/src/main/java/com/iluwatar/decorator/App.java
index bdc574fbc..14cb8aa89 100644
--- a/decorator/src/main/java/com/iluwatar/decorator/App.java
+++ b/decorator/src/main/java/com/iluwatar/decorator/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,20 +22,25 @@
*/
package com.iluwatar.decorator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* The Decorator pattern is a more flexible alternative to subclassing. The Decorator class
- * implements the same interface as the target and uses composition to "decorate" calls to the
+ * implements the same interface as the target and uses aggregation to "decorate" calls to the
* target. Using the Decorator pattern it is possible to change the behavior of the class during
* runtime.
* <p>
- * In this example we show how the simple {@link Troll} first attacks and then flees the battle.
- * Then we decorate the {@link Troll} with a {@link SmartHostile} and perform the attack again. You
+ * In this example we show how the simple {@link SimpleTroll} first attacks and then flees the battle.
+ * Then we decorate the {@link SimpleTroll} with a {@link ClubbedTroll} and perform the attack again. You
* can see how the behavior changes after the decoration.
*
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -44,17 +49,17 @@ public class App {
public static void main(String[] args) {
// simple troll
- System.out.println("A simple looking troll approaches.");
- Hostile troll = new Troll();
+ LOGGER.info("A simple looking troll approaches.");
+ Troll troll = new SimpleTroll();
troll.attack();
troll.fleeBattle();
- System.out.printf("Simple troll power %d.\n", troll.getAttackPower());
+ LOGGER.info("Simple troll power {}.\n", troll.getAttackPower());
// change the behavior of the simple troll by adding a decorator
- System.out.println("\nA smart looking troll surprises you.");
- Hostile smart = new SmartHostile(troll);
- smart.attack();
- smart.fleeBattle();
- System.out.printf("Smart troll power %d.\n", smart.getAttackPower());
+ LOGGER.info("A troll with huge club surprises you.");
+ Troll clubbed = new ClubbedTroll(troll);
+ clubbed.attack();
+ clubbed.fleeBattle();
+ LOGGER.info("Clubbed troll power {}.\n", clubbed.getAttackPower());
}
}
diff --git a/decorator/src/main/java/com/iluwatar/decorator/ClubbedTroll.java b/decorator/src/main/java/com/iluwatar/decorator/ClubbedTroll.java
new file mode 100644
index 000000000..e309f17cd
--- /dev/null
+++ b/decorator/src/main/java/com/iluwatar/decorator/ClubbedTroll.java
@@ -0,0 +1,49 @@
+/**
+ * The MIT License
+ * 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
+ * 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.decorator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Decorator that adds a club for the troll
+ */
+public class ClubbedTroll extends TrollDecorator {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ClubbedTroll.class);
+
+ public ClubbedTroll(Troll decorated) {
+ super(decorated);
+ }
+
+ @Override
+ public void attack() {
+ super.attack();
+ LOGGER.info("The troll swings at you with a club!");
+ }
+
+ @Override
+ public int getAttackPower() {
+ return super.getAttackPower() + 10;
+ }
+}
diff --git a/decorator/src/main/java/com/iluwatar/decorator/SimpleTroll.java b/decorator/src/main/java/com/iluwatar/decorator/SimpleTroll.java
new file mode 100644
index 000000000..5d5e05183
--- /dev/null
+++ b/decorator/src/main/java/com/iluwatar/decorator/SimpleTroll.java
@@ -0,0 +1,51 @@
+/**
+ * The MIT License
+ * 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
+ * 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.decorator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * SimpleTroll implements {@link Troll} interface directly.
+ *
+ */
+public class SimpleTroll implements Troll {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(SimpleTroll.class);
+
+ @Override
+ public void attack() {
+ LOGGER.info("The troll tries to grab you!");
+ }
+
+ @Override
+ public int getAttackPower() {
+ return 10;
+ }
+
+ @Override
+ public void fleeBattle() {
+ LOGGER.info("The troll shrieks in horror and runs away!");
+ }
+}
diff --git a/decorator/src/main/java/com/iluwatar/decorator/Troll.java b/decorator/src/main/java/com/iluwatar/decorator/Troll.java
index 628adda4b..ffc7e5b52 100644
--- a/decorator/src/main/java/com/iluwatar/decorator/Troll.java
+++ b/decorator/src/main/java/com/iluwatar/decorator/Troll.java
@@ -1,46 +1,38 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.decorator;
-
-/**
- *
- * Troll implements {@link Hostile} interface directly.
- *
- */
-public class Troll implements Hostile {
-
- @Override
- public void attack() {
- System.out.println("The troll swings at you with a club!");
- }
-
- @Override
- public int getAttackPower() {
- return 10;
- }
-
- @Override
- public void fleeBattle() {
- System.out.println("The troll shrieks in horror and runs away!");
- }
-}
+/**
+ * The MIT License
+ * 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
+ * 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.decorator;
+
+/**
+ *
+ * Interface for trolls
+ *
+ */
+public interface Troll {
+
+ void attack();
+
+ int getAttackPower();
+
+ void fleeBattle();
+
+}
diff --git a/decorator/src/main/java/com/iluwatar/decorator/SmartHostile.java b/decorator/src/main/java/com/iluwatar/decorator/TrollDecorator.java
similarity index 74%
rename from decorator/src/main/java/com/iluwatar/decorator/SmartHostile.java
rename to decorator/src/main/java/com/iluwatar/decorator/TrollDecorator.java
index 3b4b86276..d84c3a2b3 100644
--- a/decorator/src/main/java/com/iluwatar/decorator/SmartHostile.java
+++ b/decorator/src/main/java/com/iluwatar/decorator/TrollDecorator.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
@@ -23,34 +23,31 @@
package com.iluwatar.decorator;
/**
- * SmartHostile is a decorator for {@link Hostile} objects. The calls to the {@link Hostile} interface
- * are intercepted and decorated. Finally the calls are delegated to the decorated {@link Hostile}
+ * TrollDecorator is a decorator for {@link Troll} objects. The calls to the {@link Troll} interface
+ * are intercepted and decorated. Finally the calls are delegated to the decorated {@link Troll}
* object.
*
*/
-public class SmartHostile implements Hostile {
+public class TrollDecorator implements Troll {
- private Hostile decorated;
+ private Troll decorated;
- public SmartHostile(Hostile decorated) {
+ public TrollDecorator(Troll decorated) {
this.decorated = decorated;
}
@Override
public void attack() {
- System.out.println("It throws a rock at you!");
decorated.attack();
}
@Override
public int getAttackPower() {
- // decorated hostile's power + 20 because it is smart
- return decorated.getAttackPower() + 20;
+ return decorated.getAttackPower();
}
@Override
public void fleeBattle() {
- System.out.println("It calls for help!");
decorated.fleeBattle();
}
}
diff --git a/decorator/src/test/java/com/iluwatar/decorator/AppTest.java b/decorator/src/test/java/com/iluwatar/decorator/AppTest.java
index 747144c6d..466fa1552 100644
--- a/decorator/src/test/java/com/iluwatar/decorator/AppTest.java
+++ b/decorator/src/test/java/com/iluwatar/decorator/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
diff --git a/decorator/src/test/java/com/iluwatar/decorator/SmartHostileTest.java b/decorator/src/test/java/com/iluwatar/decorator/ClubbedTrollTest.java
similarity index 77%
rename from decorator/src/test/java/com/iluwatar/decorator/SmartHostileTest.java
rename to decorator/src/test/java/com/iluwatar/decorator/ClubbedTrollTest.java
index 6432d4e90..a097752cd 100644
--- a/decorator/src/test/java/com/iluwatar/decorator/SmartHostileTest.java
+++ b/decorator/src/test/java/com/iluwatar/decorator/ClubbedTrollTest.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
@@ -29,30 +29,26 @@ import static org.mockito.Mockito.*;
import static org.mockito.internal.verification.VerificationModeFactory.times;
/**
- * Date: 12/7/15 - 7:47 PM
- *
- * @author Jeroen Meulemeester
+ * Tests for {@link ClubbedTroll}
*/
-public class SmartHostileTest {
+public class ClubbedTrollTest {
@Test
public void testSmartHostile() throws Exception {
// Create a normal troll first, but make sure we can spy on it later on.
- final Hostile simpleTroll = spy(new Troll());
+ final Troll simpleTroll = spy(new SimpleTroll());
- // Now we want to decorate the troll to make it smarter ...
- final Hostile smartTroll = new SmartHostile(simpleTroll);
- assertEquals(30, smartTroll.getAttackPower());
+ // Now we want to decorate the troll to make it stronger ...
+ final Troll clubbed = new ClubbedTroll(simpleTroll);
+ assertEquals(20, clubbed.getAttackPower());
verify(simpleTroll, times(1)).getAttackPower();
- // Check if the smart troll actions are delegated to the decorated troll
- smartTroll.attack();
+ // Check if the clubbed troll actions are delegated to the decorated troll
+ clubbed.attack();
verify(simpleTroll, times(1)).attack();
- smartTroll.fleeBattle();
+ clubbed.fleeBattle();
verify(simpleTroll, times(1)).fleeBattle();
verifyNoMoreInteractions(simpleTroll);
-
}
-
}
diff --git a/decorator/src/test/java/com/iluwatar/decorator/TrollTest.java b/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java
similarity index 54%
rename from decorator/src/test/java/com/iluwatar/decorator/TrollTest.java
rename to decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java
index 84b0f6d20..5c6b2bbe7 100644
--- a/decorator/src/test/java/com/iluwatar/decorator/TrollTest.java
+++ b/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.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,63 +22,70 @@
*/
package com.iluwatar.decorator;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.LoggerFactory;
-import java.io.PrintStream;
+import java.util.LinkedList;
+import java.util.List;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
-import static org.mockito.internal.verification.VerificationModeFactory.times;
/**
- * Date: 12/7/15 - 7:26 PM
- *
- * @author Jeroen Meulemeester
+ * Tests for {@link SimpleTroll}
*/
-public class TrollTest {
+public class SimpleTrollTest {
- /**
- * The mocked standard out stream, required since the actions don't have any influence on other
- * objects, except for writing to the std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
+ private InMemoryAppender appender;
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
@Before
public void setUp() {
- System.setOut(this.stdOutMock);
+ appender = new InMemoryAppender(SimpleTroll.class);
}
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
@After
public void tearDown() {
- System.setOut(this.stdOutOrig);
+ appender.stop();
}
@Test
public void testTrollActions() throws Exception {
- final Troll troll = new Troll();
+ final SimpleTroll troll = new SimpleTroll();
assertEquals(10, troll.getAttackPower());
troll.attack();
- verify(this.stdOutMock, times(1)).println(eq("The troll swings at you with a club!"));
+ assertEquals("The troll tries to grab you!", appender.getLastMessage());
troll.fleeBattle();
- verify(this.stdOutMock, times(1)).println(eq("The troll shrieks in horror and runs away!"));
+ assertEquals("The troll shrieks in horror and runs away!", appender.getLastMessage());
- verifyNoMoreInteractions(this.stdOutMock);
+ assertEquals(2, appender.getLogSize());
}
-}
\ No newline at end of file
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getMessage();
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+ }
+}
diff --git a/delegation/etc/delegation.urm.puml b/delegation/etc/delegation.urm.puml
index 378587019..419cf350b 100644
--- a/delegation/etc/delegation.urm.puml
+++ b/delegation/etc/delegation.urm.puml
@@ -1,15 +1,18 @@
@startuml
package com.iluwatar.delegation.simple.printers {
- class HpPrinter {
- + HpPrinter()
+ class CanonPrinter {
+ - LOGGER : Logger {static}
+ + CanonPrinter()
+ print(message : String)
}
class EpsonPrinter {
+ - LOGGER : Logger {static}
+ EpsonPrinter()
+ print(message : String)
}
- class CanonPrinter {
- + CanonPrinter()
+ class HpPrinter {
+ - LOGGER : Logger {static}
+ + HpPrinter()
+ print(message : String)
}
}
@@ -19,18 +22,18 @@ package com.iluwatar.delegation.simple {
+ App()
+ main(args : String[]) {static}
}
+ interface Printer {
+ + print(String) {abstract}
+ }
class PrinterController {
- printer : Printer
+ PrinterController(printer : Printer)
+ print(message : String)
}
- interface Printer {
- + print(String) {abstract}
- }
}
PrinterController --> "-printer" Printer
-HpPrinter ..|> Printer
PrinterController ..|> Printer
-EpsonPrinter ..|> Printer
CanonPrinter ..|> Printer
+EpsonPrinter ..|> Printer
+HpPrinter ..|> Printer
@enduml
\ No newline at end of file
diff --git a/delegation/pom.xml b/delegation/pom.xml
index ed5f6608e..368e4d2bb 100644
--- a/delegation/pom.xml
+++ b/delegation/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
diff --git a/delegation/src/main/java/com/iluwatar/delegation/simple/App.java b/delegation/src/main/java/com/iluwatar/delegation/simple/App.java
index 1940e7ae2..5f410d09b 100644
--- a/delegation/src/main/java/com/iluwatar/delegation/simple/App.java
+++ b/delegation/src/main/java/com/iluwatar/delegation/simple/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
diff --git a/delegation/src/main/java/com/iluwatar/delegation/simple/Printer.java b/delegation/src/main/java/com/iluwatar/delegation/simple/Printer.java
index a25f0fba3..ee4d54938 100644
--- a/delegation/src/main/java/com/iluwatar/delegation/simple/Printer.java
+++ b/delegation/src/main/java/com/iluwatar/delegation/simple/Printer.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
diff --git a/delegation/src/main/java/com/iluwatar/delegation/simple/PrinterController.java b/delegation/src/main/java/com/iluwatar/delegation/simple/PrinterController.java
index 8a4f20dd2..86b841a28 100644
--- a/delegation/src/main/java/com/iluwatar/delegation/simple/PrinterController.java
+++ b/delegation/src/main/java/com/iluwatar/delegation/simple/PrinterController.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
diff --git a/delegation/src/main/java/com/iluwatar/delegation/simple/printers/CanonPrinter.java b/delegation/src/main/java/com/iluwatar/delegation/simple/printers/CanonPrinter.java
index 5e3966d85..8f024122f 100644
--- a/delegation/src/main/java/com/iluwatar/delegation/simple/printers/CanonPrinter.java
+++ b/delegation/src/main/java/com/iluwatar/delegation/simple/printers/CanonPrinter.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
@@ -23,6 +23,8 @@
package com.iluwatar.delegation.simple.printers;
import com.iluwatar.delegation.simple.Printer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Specialised Implementation of {@link Printer} for a Canon Printer, in
@@ -32,12 +34,14 @@ import com.iluwatar.delegation.simple.Printer;
*/
public class CanonPrinter implements Printer {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CanonPrinter.class);
+
/**
* {@inheritDoc}
*/
@Override
public void print(String message) {
- System.out.print("Canon Printer : " + message);
+ LOGGER.info("Canon Printer : {}", message);
}
}
diff --git a/delegation/src/main/java/com/iluwatar/delegation/simple/printers/EpsonPrinter.java b/delegation/src/main/java/com/iluwatar/delegation/simple/printers/EpsonPrinter.java
index d37fbf613..fb763d21a 100644
--- a/delegation/src/main/java/com/iluwatar/delegation/simple/printers/EpsonPrinter.java
+++ b/delegation/src/main/java/com/iluwatar/delegation/simple/printers/EpsonPrinter.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
@@ -23,6 +23,8 @@
package com.iluwatar.delegation.simple.printers;
import com.iluwatar.delegation.simple.Printer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Specialised Implementation of {@link Printer} for a Epson Printer, in
@@ -32,12 +34,14 @@ import com.iluwatar.delegation.simple.Printer;
*/
public class EpsonPrinter implements Printer {
+ private static final Logger LOGGER = LoggerFactory.getLogger(EpsonPrinter.class);
+
/**
* {@inheritDoc}
*/
@Override
public void print(String message) {
- System.out.print("Epson Printer : " + message);
+ LOGGER.info("Epson Printer : {}", message);
}
}
diff --git a/delegation/src/main/java/com/iluwatar/delegation/simple/printers/HpPrinter.java b/delegation/src/main/java/com/iluwatar/delegation/simple/printers/HpPrinter.java
index f81debf62..d80bb7aa7 100644
--- a/delegation/src/main/java/com/iluwatar/delegation/simple/printers/HpPrinter.java
+++ b/delegation/src/main/java/com/iluwatar/delegation/simple/printers/HpPrinter.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
@@ -23,6 +23,8 @@
package com.iluwatar.delegation.simple.printers;
import com.iluwatar.delegation.simple.Printer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Specialised Implementation of {@link Printer} for a HP Printer, in
@@ -32,12 +34,14 @@ import com.iluwatar.delegation.simple.Printer;
*/
public class HpPrinter implements Printer {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HpPrinter.class);
+
/**
* {@inheritDoc}
*/
@Override
public void print(String message) {
- System.out.print("HP Printer : " + message);
+ LOGGER.info("HP Printer : {}", message);
}
}
diff --git a/delegation/src/test/java/com/iluwatar/delegation/simple/AppTest.java b/delegation/src/test/java/com/iluwatar/delegation/simple/AppTest.java
index 63e469a59..a8fae59e3 100644
--- a/delegation/src/test/java/com/iluwatar/delegation/simple/AppTest.java
+++ b/delegation/src/test/java/com/iluwatar/delegation/simple/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
diff --git a/delegation/src/test/java/com/iluwatar/delegation/simple/DelegateTest.java b/delegation/src/test/java/com/iluwatar/delegation/simple/DelegateTest.java
index 6a19c9a1a..b27539def 100644
--- a/delegation/src/test/java/com/iluwatar/delegation/simple/DelegateTest.java
+++ b/delegation/src/test/java/com/iluwatar/delegation/simple/DelegateTest.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,28 +22,44 @@
*/
package com.iluwatar.delegation.simple;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import com.iluwatar.delegation.simple.printers.CanonPrinter;
import com.iluwatar.delegation.simple.printers.EpsonPrinter;
import com.iluwatar.delegation.simple.printers.HpPrinter;
-import org.junit.Rule;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.junit.contrib.java.lang.system.SystemOutRule;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+import java.util.List;
import static org.junit.Assert.assertEquals;
public class DelegateTest {
- private static final String MESSAGE = "Test Message Printed";
+ private InMemoryAppender appender;
- @Rule
- public final SystemOutRule systemOutRule = new SystemOutRule().enableLog();
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
+
+ private static final String MESSAGE = "Test Message Printed";
@Test
public void testCanonPrinter() throws Exception {
PrinterController printerController = new PrinterController(new CanonPrinter());
printerController.print(MESSAGE);
- assertEquals("Canon Printer : Test Message Printed", systemOutRule.getLog());
+ assertEquals("Canon Printer : Test Message Printed", appender.getLastMessage());
}
@Test
@@ -51,7 +67,7 @@ public class DelegateTest {
PrinterController printerController = new PrinterController(new HpPrinter());
printerController.print(MESSAGE);
- assertEquals("HP Printer : Test Message Printed", systemOutRule.getLog());
+ assertEquals("HP Printer : Test Message Printed", appender.getLastMessage());
}
@Test
@@ -59,7 +75,30 @@ public class DelegateTest {
PrinterController printerController = new PrinterController(new EpsonPrinter());
printerController.print(MESSAGE);
- assertEquals("Epson Printer : Test Message Printed", systemOutRule.getLog());
+ assertEquals("Epson Printer : Test Message Printed", appender.getLastMessage());
+ }
+
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
}
}
diff --git a/dependency-injection/etc/dependency-injection.urm.puml b/dependency-injection/etc/dependency-injection.urm.puml
index bf4d10599..80f15fce3 100644
--- a/dependency-injection/etc/dependency-injection.urm.puml
+++ b/dependency-injection/etc/dependency-injection.urm.puml
@@ -5,44 +5,45 @@ package com.iluwatar.dependency.injection {
+ AdvancedWizard(tobacco : Tobacco)
+ smoke()
}
- interface Wizard {
- + smoke() {abstract}
- }
- class RivendellTobacco {
- + RivendellTobacco()
- }
- class SimpleWizard {
- - tobacco : OldTobyTobacco
- + SimpleWizard()
- + smoke()
- }
- class OldTobyTobacco {
- + OldTobyTobacco()
- }
- class SecondBreakfastTobacco {
- + SecondBreakfastTobacco()
- }
class App {
+ App()
+ main(args : String[]) {static}
}
- abstract class Tobacco {
- + Tobacco()
- + smoke(wizard : Wizard)
- }
class GuiceWizard {
- tobacco : Tobacco
+ GuiceWizard(tobacco : Tobacco)
+ smoke()
}
+ class OldTobyTobacco {
+ + OldTobyTobacco()
+ }
+ class RivendellTobacco {
+ + RivendellTobacco()
+ }
+ class SecondBreakfastTobacco {
+ + SecondBreakfastTobacco()
+ }
+ class SimpleWizard {
+ - tobacco : OldTobyTobacco
+ + SimpleWizard()
+ + smoke()
+ }
+ abstract class Tobacco {
+ - LOGGER : Logger {static}
+ + Tobacco()
+ + smoke(wizard : Wizard)
+ }
+ interface Wizard {
+ + smoke() {abstract}
+ }
}
SimpleWizard --> "-tobacco" OldTobyTobacco
AdvancedWizard --> "-tobacco" Tobacco
GuiceWizard --> "-tobacco" Tobacco
AdvancedWizard ..|> Wizard
-RivendellTobacco --|> Tobacco
-SimpleWizard ..|> Wizard
-OldTobyTobacco --|> Tobacco
-SecondBreakfastTobacco --|> Tobacco
GuiceWizard ..|> Wizard
+OldTobyTobacco --|> Tobacco
+RivendellTobacco --|> Tobacco
+SecondBreakfastTobacco --|> Tobacco
+SimpleWizard ..|> Wizard
@enduml
\ No newline at end of file
diff --git a/dependency-injection/pom.xml b/dependency-injection/pom.xml
index ab4619b63..66f05381d 100644
--- a/dependency-injection/pom.xml
+++ b/dependency-injection/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
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/AdvancedWizard.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/AdvancedWizard.java
index 4eeaccdea..913a8bd6e 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/AdvancedWizard.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/AdvancedWizard.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
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/App.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/App.java
index faf2a6a43..c7b9d6fb6 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/App.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/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
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/GuiceWizard.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/GuiceWizard.java
index 6e3baee5a..89db63f18 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/GuiceWizard.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/GuiceWizard.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
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/OldTobyTobacco.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/OldTobyTobacco.java
index 523be1d37..68f456405 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/OldTobyTobacco.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/OldTobyTobacco.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
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/RivendellTobacco.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/RivendellTobacco.java
index 18691a161..29a9c9c21 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/RivendellTobacco.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/RivendellTobacco.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
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/SecondBreakfastTobacco.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/SecondBreakfastTobacco.java
index 57565daf0..4bc373dba 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/SecondBreakfastTobacco.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/SecondBreakfastTobacco.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
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/SimpleWizard.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/SimpleWizard.java
index 6928fe7fe..c800d70a0 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/SimpleWizard.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/SimpleWizard.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
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/Tobacco.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/Tobacco.java
index 74a564ab5..9676e49e8 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/Tobacco.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/Tobacco.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.dependency.injection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Tobacco abstraction
@@ -29,8 +32,10 @@ package com.iluwatar.dependency.injection;
*/
public abstract class Tobacco {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Tobacco.class);
+
public void smoke(Wizard wizard) {
- System.out.println(String.format("%s smoking %s", wizard.getClass().getSimpleName(), this
- .getClass().getSimpleName()));
+ LOGGER.info("{} smoking {}", wizard.getClass().getSimpleName(),
+ this.getClass().getSimpleName());
}
}
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/TobaccoModule.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/TobaccoModule.java
index b8d4df676..4f26b78a5 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/TobaccoModule.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/TobaccoModule.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
diff --git a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/Wizard.java b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/Wizard.java
index a5d4d68e0..d4c4cbbb4 100644
--- a/dependency-injection/src/main/java/com/iluwatar/dependency/injection/Wizard.java
+++ b/dependency-injection/src/main/java/com/iluwatar/dependency/injection/Wizard.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
diff --git a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/AdvancedWizardTest.java b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/AdvancedWizardTest.java
index d1f5e574c..2d6857912 100644
--- a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/AdvancedWizardTest.java
+++ b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/AdvancedWizardTest.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,18 +22,31 @@
*/
package com.iluwatar.dependency.injection;
+import com.iluwatar.dependency.injection.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/10/15 - 8:40 PM
*
* @author Jeroen Meulemeester
*/
-public class AdvancedWizardTest extends StdOutTest {
+public class AdvancedWizardTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(Tobacco.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* Test if the {@link AdvancedWizard} smokes whatever instance of {@link Tobacco} is passed to him
@@ -51,12 +64,13 @@ public class AdvancedWizardTest extends StdOutTest {
advancedWizard.smoke();
// Verify if the wizard is smoking the correct tobacco ...
- verify(getStdOutMock(), times(1)).println("AdvancedWizard smoking " + tobacco.getClass().getSimpleName());
+ assertEquals("AdvancedWizard smoking " + tobacco.getClass().getSimpleName(), appender.getLastMessage());
- // ... and nothing else is happening.
- verifyNoMoreInteractions(getStdOutMock());
}
+ // ... and nothing else is happening.
+ assertEquals(tobaccos.length, appender.getLogSize());
+
}
-}
\ No newline at end of file
+}
diff --git a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/AppTest.java b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/AppTest.java
index 2003933ac..41f04c9b3 100644
--- a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/AppTest.java
+++ b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/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
diff --git a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/GuiceWizardTest.java b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/GuiceWizardTest.java
index 1d3d679df..e58a9f3b5 100644
--- a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/GuiceWizardTest.java
+++ b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/GuiceWizardTest.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
@@ -25,19 +25,31 @@ package com.iluwatar.dependency.injection;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
-
+import com.iluwatar.dependency.injection.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/10/15 - 8:57 PM
*
* @author Jeroen Meulemeester
*/
-public class GuiceWizardTest extends StdOutTest {
+public class GuiceWizardTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(Tobacco.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* Test if the {@link GuiceWizard} smokes whatever instance of {@link Tobacco} is passed to him
@@ -55,12 +67,11 @@ public class GuiceWizardTest extends StdOutTest {
guiceWizard.smoke();
// Verify if the wizard is smoking the correct tobacco ...
- verify(getStdOutMock(), times(1)).println("GuiceWizard smoking " + tobacco.getClass().getSimpleName());
-
- // ... and nothing else is happening.
- verifyNoMoreInteractions(getStdOutMock());
+ assertEquals("GuiceWizard smoking " + tobacco.getClass().getSimpleName(), appender.getLastMessage());
}
+ // ... and nothing else is happening.
+ assertEquals(tobaccos.length, appender.getLogSize());
}
/**
@@ -89,12 +100,11 @@ public class GuiceWizardTest extends StdOutTest {
guiceWizard.smoke();
// Verify if the wizard is smoking the correct tobacco ...
- verify(getStdOutMock(), times(1)).println("GuiceWizard smoking " + tobaccoClass.getSimpleName());
-
- // ... and nothing else is happening.
- verifyNoMoreInteractions(getStdOutMock());
+ assertEquals("GuiceWizard smoking " + tobaccoClass.getSimpleName(), appender.getLastMessage());
}
+ // ... and nothing else is happening.
+ assertEquals(tobaccos.length, appender.getLogSize());
}
-}
\ No newline at end of file
+}
diff --git a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/SimpleWizardTest.java b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/SimpleWizardTest.java
index e5a856e8d..4ce69e095 100644
--- a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/SimpleWizardTest.java
+++ b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/SimpleWizardTest.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,16 +22,31 @@
*/
package com.iluwatar.dependency.injection;
+import com.iluwatar.dependency.injection.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/10/15 - 8:26 PM
*
* @author Jeroen Meulemeester
*/
-public class SimpleWizardTest extends StdOutTest {
+public class SimpleWizardTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(Tobacco.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* Test if the {@link SimpleWizard} does the only thing it can do: Smoke it's {@link
@@ -41,8 +56,8 @@ public class SimpleWizardTest extends StdOutTest {
public void testSmoke() {
final SimpleWizard simpleWizard = new SimpleWizard();
simpleWizard.smoke();
- verify(getStdOutMock(), times(1)).println("SimpleWizard smoking OldTobyTobacco");
- verifyNoMoreInteractions(getStdOutMock());
+ assertEquals("SimpleWizard smoking OldTobyTobacco", appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
-}
\ No newline at end of file
+}
diff --git a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/StdOutTest.java b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/StdOutTest.java
deleted file mode 100644
index 57272c511..000000000
--- a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/StdOutTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.dependency.injection;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since the actions of the wizard don't
- * have any influence on any other accessible objects, except for writing to std-out using {@link
- * System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-}
diff --git a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/utils/InMemoryAppender.java b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/utils/InMemoryAppender.java
new file mode 100644
index 000000000..76d1cc1dd
--- /dev/null
+++ b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/utils/InMemoryAppender.java
@@ -0,0 +1,54 @@
+/**
+ * The MIT License
+ * 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
+ * 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.dependency.injection.utils;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+}
diff --git a/double-checked-locking/etc/double-checked-locking.urm.puml b/double-checked-locking/etc/double-checked-locking.urm.puml
index 6feb98901..242519fce 100644
--- a/double-checked-locking/etc/double-checked-locking.urm.puml
+++ b/double-checked-locking/etc/double-checked-locking.urm.puml
@@ -1,10 +1,12 @@
@startuml
package com.iluwatar.doublechecked.locking {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
class Inventory {
+ - LOGGER : Logger {static}
- inventorySize : int
- items : List<Item>
- lock : Lock
diff --git a/double-checked-locking/pom.xml b/double-checked-locking/pom.xml
index 27c97479a..0a4ef9c7b 100644
--- a/double-checked-locking/pom.xml
+++ b/double-checked-locking/pom.xml
@@ -1,7 +1,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
diff --git a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/App.java b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/App.java
index 98309e181..c814f98bc 100644
--- a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/App.java
+++ b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/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.doublechecked.locking;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -40,6 +43,8 @@ import java.util.concurrent.TimeUnit;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -58,7 +63,7 @@ public class App {
try {
executorService.awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- System.out.println("Error waiting for ExecutorService shutdown");
+ LOGGER.error("Error waiting for ExecutorService shutdown");
}
}
}
diff --git a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java
index 176203a44..80f97a215 100644
--- a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java
+++ b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.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.doublechecked.locking;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -35,6 +38,8 @@ import java.util.concurrent.locks.ReentrantLock;
*/
public class Inventory {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Inventory.class);
+
private final int inventorySize;
private final List<Item> items;
private final Lock lock;
@@ -57,8 +62,7 @@ public class Inventory {
try {
if (items.size() < inventorySize) {
items.add(item);
- System.out.println(Thread.currentThread() + ": items.size()=" + items.size()
- + ", inventorySize=" + inventorySize);
+ LOGGER.info("{}: items.size()={}, inventorySize={}", Thread.currentThread(), items.size(), inventorySize);
return true;
}
} finally {
diff --git a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java
index c805022ab..7ff8c4965 100644
--- a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java
+++ b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.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
diff --git a/double-checked-locking/src/main/resources/logback.xml b/double-checked-locking/src/main/resources/logback.xml
new file mode 100644
index 000000000..525f2f665
--- /dev/null
+++ b/double-checked-locking/src/main/resources/logback.xml
@@ -0,0 +1,52 @@
+<!--
+
+ The MIT License
+ 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
+ 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.
+
+-->
+<configuration>
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>double-checked-locking.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>double-checked-locking-%d.log</fileNamePattern>
+ <maxHistory>5</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="com.iluwatar" additivity="false">
+ <level value="DEBUG"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</configuration>
diff --git a/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/AppTest.java b/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/AppTest.java
index 748c66c6a..672d83f0a 100644
--- a/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/AppTest.java
+++ b/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/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
diff --git a/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/InventoryTest.java b/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/InventoryTest.java
index 485c9573e..0b1487e11 100644
--- a/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/InventoryTest.java
+++ b/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/InventoryTest.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,24 +22,23 @@
*/
package com.iluwatar.doublechecked.locking;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.ArgumentCaptor;
+import org.slf4j.LoggerFactory;
-import java.io.PrintStream;
+import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import static junit.framework.Assert.assertTrue;
import static junit.framework.TestCase.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.junit.Assert.assertTrue;
/**
* Date: 12/10/15 - 9:34 PM
@@ -48,31 +47,16 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
*/
public class InventoryTest {
- /**
- * The mocked standard out {@link PrintStream}, used to verify a steady increasing size of the
- * {@link Inventory} while adding items from multiple threads concurrently
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
+ private InMemoryAppender appender;
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
@Before
public void setUp() {
- System.setOut(this.stdOutMock);
+ appender = new InMemoryAppender(Inventory.class);
}
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
@After
public void tearDown() {
- System.setOut(this.stdOutOrig);
+ appender.stop();
}
/**
@@ -112,21 +96,32 @@ public class InventoryTest {
assertNotNull(items);
assertEquals(INVENTORY_SIZE, items.size());
- // Capture all stdOut messages ...
- final ArgumentCaptor<String> stdOutCaptor = ArgumentCaptor.forClass(String.class);
- verify(this.stdOutMock, times(INVENTORY_SIZE)).println(stdOutCaptor.capture());
-
- // ... verify if we got all 1000
- final List<String> values = stdOutCaptor.getAllValues();
- assertEquals(INVENTORY_SIZE, values.size());
+ assertEquals(INVENTORY_SIZE, appender.getLogSize());
// ... and check if the inventory size is increasing continuously
- for (int i = 0; i < values.size(); i++) {
- assertNotNull(values.get(i));
- assertTrue(values.get(i).contains("items.size()=" + (i + 1)));
+ for (int i = 0; i < items.size(); i++) {
+ assertTrue(appender.log.get(i).getFormattedMessage().contains("items.size()=" + (i + 1)));
}
-
- verifyNoMoreInteractions(this.stdOutMock);
}
-}
\ No newline at end of file
+
+
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+ }
+
+}
diff --git a/double-dispatch/etc/double-dispatch.urm.puml b/double-dispatch/etc/double-dispatch.urm.puml
index 78d361326..447cf3081 100644
--- a/double-dispatch/etc/double-dispatch.urm.puml
+++ b/double-dispatch/etc/double-dispatch.urm.puml
@@ -1,5 +1,14 @@
@startuml
package com.iluwatar.doubledispatch {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
+ class FlamingAsteroid {
+ + FlamingAsteroid(left : int, top : int, right : int, bottom : int)
+ + collision(gameObject : GameObject)
+ }
abstract class GameObject {
- damaged : boolean
- onFire : boolean
@@ -15,23 +24,8 @@ package com.iluwatar.doubledispatch {
+ setOnFire(onFire : boolean)
+ toString() : String
}
- class SpaceStationIss {
- + SpaceStationIss(left : int, top : int, right : int, bottom : int)
- + collision(gameObject : GameObject)
- }
- class FlamingAsteroid {
- + FlamingAsteroid(left : int, top : int, right : int, bottom : int)
- + collision(gameObject : GameObject)
- }
- class SpaceStationMir {
- + SpaceStationMir(left : int, top : int, right : int, bottom : int)
- + collision(gameObject : GameObject)
- + collisionResolve(asteroid : FlamingAsteroid)
- + collisionResolve(iss : SpaceStationIss)
- + collisionResolve(meteoroid : Meteoroid)
- + collisionResolve(mir : SpaceStationMir)
- }
class Meteoroid {
+ - LOGGER : Logger {static}
+ Meteoroid(left : int, top : int, right : int, bottom : int)
+ collision(gameObject : GameObject)
+ collisionResolve(asteroid : FlamingAsteroid)
@@ -52,14 +46,23 @@ package com.iluwatar.doubledispatch {
~ intersectsWith(r : Rectangle) : boolean
+ toString() : String
}
- class App {
- + App()
- + main(args : String[]) {static}
+ class SpaceStationIss {
+ + SpaceStationIss(left : int, top : int, right : int, bottom : int)
+ + collision(gameObject : GameObject)
+ }
+ class SpaceStationMir {
+ - LOGGER : Logger {static}
+ + SpaceStationMir(left : int, top : int, right : int, bottom : int)
+ + collision(gameObject : GameObject)
+ + collisionResolve(asteroid : FlamingAsteroid)
+ + collisionResolve(iss : SpaceStationIss)
+ + collisionResolve(meteoroid : Meteoroid)
+ + collisionResolve(mir : SpaceStationMir)
}
}
-GameObject --|> Rectangle
-SpaceStationIss --|> SpaceStationMir
FlamingAsteroid --|> Meteoroid
-SpaceStationMir --|> GameObject
+GameObject --|> Rectangle
Meteoroid --|> GameObject
+SpaceStationIss --|> SpaceStationMir
+SpaceStationMir --|> GameObject
@enduml
\ No newline at end of file
diff --git a/double-dispatch/pom.xml b/double-dispatch/pom.xml
index 5093cced8..2b19be0df 100644
--- a/double-dispatch/pom.xml
+++ b/double-dispatch/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
diff --git a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/App.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/App.java
index 40a0485a5..acb57d457 100644
--- a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/App.java
+++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/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.doubledispatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.List;
@@ -45,6 +48,8 @@ import java.util.List;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -58,8 +63,8 @@ public class App {
objects.add(new SpaceStationMir(1, 1, 2, 2));
objects.add(new Meteoroid(10, 10, 15, 15));
objects.add(new SpaceStationIss(12, 12, 14, 14));
- objects.stream().forEach(o -> System.out.println(o));
- System.out.println("");
+ objects.stream().forEach(o -> LOGGER.info(o.toString()));
+ LOGGER.info("");
// collision check
objects.stream().forEach(o1 -> objects.stream().forEach(o2 -> {
@@ -67,10 +72,10 @@ public class App {
o1.collision(o2);
}
}));
- System.out.println("");
+ LOGGER.info("");
// output eventual object statuses
- objects.stream().forEach(o -> System.out.println(o));
- System.out.println("");
+ objects.stream().forEach(o -> LOGGER.info(o.toString()));
+ LOGGER.info("");
}
}
diff --git a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/FlamingAsteroid.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/FlamingAsteroid.java
index 6cff89f58..6ca8a8f08 100644
--- a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/FlamingAsteroid.java
+++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/FlamingAsteroid.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
diff --git a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/GameObject.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/GameObject.java
index fea0cdfd1..42c0c9a5e 100644
--- a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/GameObject.java
+++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/GameObject.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
diff --git a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Meteoroid.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Meteoroid.java
index cc68a85ec..311ffa0e1 100644
--- a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Meteoroid.java
+++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Meteoroid.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.doubledispatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Meteoroid game object
@@ -29,6 +32,8 @@ package com.iluwatar.doubledispatch;
*/
public class Meteoroid extends GameObject {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Meteoroid.class);
+
public Meteoroid(int left, int top, int right, int bottom) {
super(left, top, right, bottom);
}
@@ -40,25 +45,21 @@ public class Meteoroid extends GameObject {
@Override
public void collisionResolve(FlamingAsteroid asteroid) {
- System.out.println(String.format("%s hits %s.", asteroid.getClass().getSimpleName(), this
- .getClass().getSimpleName()));
+ LOGGER.info("{} hits {}.", asteroid.getClass().getSimpleName(), this.getClass().getSimpleName());
}
@Override
public void collisionResolve(Meteoroid meteoroid) {
- System.out.println(String.format("%s hits %s.", meteoroid.getClass().getSimpleName(), this
- .getClass().getSimpleName()));
+ LOGGER.info("{} hits {}.", meteoroid.getClass().getSimpleName(), this.getClass().getSimpleName());
}
@Override
public void collisionResolve(SpaceStationMir mir) {
- System.out.println(String.format("%s hits %s.", mir.getClass().getSimpleName(), this.getClass()
- .getSimpleName()));
+ LOGGER.info("{} hits {}.", mir.getClass().getSimpleName(), this.getClass().getSimpleName());
}
@Override
public void collisionResolve(SpaceStationIss iss) {
- System.out.println(String.format("%s hits %s.", iss.getClass().getSimpleName(), this.getClass()
- .getSimpleName()));
+ LOGGER.info("{} hits {}.", iss.getClass().getSimpleName(), this.getClass().getSimpleName());
}
}
diff --git a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Rectangle.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Rectangle.java
index 496bb8769..5e668f4ba 100644
--- a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Rectangle.java
+++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Rectangle.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
diff --git a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationIss.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationIss.java
index 1150fc60b..868e8ae81 100644
--- a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationIss.java
+++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationIss.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
diff --git a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationMir.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationMir.java
index e7a55d0ee..419be2e30 100644
--- a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationMir.java
+++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationMir.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.doubledispatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Space station Mir game object
@@ -29,6 +32,8 @@ package com.iluwatar.doubledispatch;
*/
public class SpaceStationMir extends GameObject {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SpaceStationMir.class);
+
public SpaceStationMir(int left, int top, int right, int bottom) {
super(left, top, right, bottom);
}
@@ -40,31 +45,30 @@ public class SpaceStationMir extends GameObject {
@Override
public void collisionResolve(FlamingAsteroid asteroid) {
- System.out.println(String.format("%s hits %s. %s is damaged! %s is set on fire!", asteroid
- .getClass().getSimpleName(), this.getClass().getSimpleName(), this.getClass()
- .getSimpleName(), this.getClass().getSimpleName()));
+ LOGGER.info("{} hits {}. {} is damaged! {} is set on fire!", asteroid.getClass().getSimpleName(),
+ this.getClass().getSimpleName(), this.getClass().getSimpleName(), this.getClass().getSimpleName());
setDamaged(true);
setOnFire(true);
}
@Override
public void collisionResolve(Meteoroid meteoroid) {
- System.out.println(String.format("%s hits %s. %s is damaged!", meteoroid.getClass()
- .getSimpleName(), this.getClass().getSimpleName(), this.getClass().getSimpleName()));
+ LOGGER.info("{} hits {}. {} is damaged!", meteoroid.getClass().getSimpleName(),
+ this.getClass().getSimpleName(), this.getClass().getSimpleName());
setDamaged(true);
}
@Override
public void collisionResolve(SpaceStationMir mir) {
- System.out.println(String.format("%s hits %s. %s is damaged!", mir.getClass().getSimpleName(),
- this.getClass().getSimpleName(), this.getClass().getSimpleName()));
+ LOGGER.info("{} hits {}. {} is damaged!", mir.getClass().getSimpleName(),
+ this.getClass().getSimpleName(), this.getClass().getSimpleName());
setDamaged(true);
}
@Override
public void collisionResolve(SpaceStationIss iss) {
- System.out.println(String.format("%s hits %s. %s is damaged!", iss.getClass().getSimpleName(),
- this.getClass().getSimpleName(), this.getClass().getSimpleName()));
+ LOGGER.info("{} hits {}. {} is damaged!", iss.getClass().getSimpleName(),
+ this.getClass().getSimpleName(), this.getClass().getSimpleName());
setDamaged(true);
}
}
diff --git a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/AppTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/AppTest.java
index c1a6aa690..dce6afd86 100644
--- a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/AppTest.java
+++ b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/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
diff --git a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/CollisionTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/CollisionTest.java
index dbc8fc55e..5e9a001e7 100644
--- a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/CollisionTest.java
+++ b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/CollisionTest.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,17 +22,9 @@
*/
package com.iluwatar.doubledispatch;
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
import java.util.Objects;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* Date: 12/10/15 - 8:37 PM
@@ -41,43 +33,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
*/
public abstract class CollisionTest<O extends GameObject> {
- /**
- * The mocked standard out {@link PrintStream}, required if some of the actions on the tested
- * object don't have a direct influence on any other accessible objects, except for writing to
- * std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
/**
* Get the tested object
*
@@ -106,9 +61,6 @@ public abstract class CollisionTest<O extends GameObject> {
tested.collision(other);
- verify(getStdOutMock(), times(1)).println(description);
- verifyNoMoreInteractions(getStdOutMock());
-
testOnFire(other, tested, otherOnFire);
testDamaged(other, tested, otherDamaged);
@@ -129,8 +81,8 @@ public abstract class CollisionTest<O extends GameObject> {
final String targetName = target.getClass().getSimpleName();
final String otherName = other.getClass().getSimpleName();
- final String errorMessage = expectTargetOnFire
- ? "Expected [" + targetName + "] to be on fire after colliding with [" + otherName + "] but it was not!"
+ final String errorMessage = expectTargetOnFire
+ ? "Expected [" + targetName + "] to be on fire after colliding with [" + otherName + "] but it was not!"
: "Expected [" + targetName + "] not to be on fire after colliding with [" + otherName + "] but it was!";
assertEquals(errorMessage, expectTargetOnFire, target.isOnFire());
@@ -149,7 +101,7 @@ public abstract class CollisionTest<O extends GameObject> {
final String otherName = other.getClass().getSimpleName();
final String errorMessage = expectedDamage
- ? "Expected [" + targetName + "] to be damaged after colliding with [" + otherName + "] but it was not!"
+ ? "Expected [" + targetName + "] to be damaged after colliding with [" + otherName + "] but it was not!"
: "Expected [" + targetName + "] not to be damaged after colliding with [" + otherName + "] but it was!";
assertEquals(errorMessage, expectedDamage, target.isDamaged());
diff --git a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/FlamingAsteroidTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/FlamingAsteroidTest.java
index 31a16f093..120c9a883 100644
--- a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/FlamingAsteroidTest.java
+++ b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/FlamingAsteroidTest.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
diff --git a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/MeteoroidTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/MeteoroidTest.java
index 147fe430a..8eed497c0 100644
--- a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/MeteoroidTest.java
+++ b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/MeteoroidTest.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
diff --git a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/RectangleTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/RectangleTest.java
index b7c0dbd2e..1f4e476de 100644
--- a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/RectangleTest.java
+++ b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/RectangleTest.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
diff --git a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/SpaceStationIssTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/SpaceStationIssTest.java
index d06f84b22..8cde65d11 100644
--- a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/SpaceStationIssTest.java
+++ b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/SpaceStationIssTest.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
diff --git a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/SpaceStationMirTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/SpaceStationMirTest.java
index c107aed8b..3dbab58ba 100644
--- a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/SpaceStationMirTest.java
+++ b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/SpaceStationMirTest.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
diff --git a/event-aggregator/etc/event-aggregator.urm.puml b/event-aggregator/etc/event-aggregator.urm.puml
index 3ccfea536..341d7d65e 100644
--- a/event-aggregator/etc/event-aggregator.urm.puml
+++ b/event-aggregator/etc/event-aggregator.urm.puml
@@ -1,9 +1,17 @@
@startuml
package com.iluwatar.event.aggregator {
- class LordVarys {
- + LordVarys()
- + LordVarys(obs : EventObserver)
- + timePasses(day : Weekday)
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
+ enum Event {
+ + STARK_SIGHTED {static}
+ + TRAITOR_DETECTED {static}
+ + WARSHIPS_APPROACHING {static}
+ - description : String
+ + toString() : String
+ + valueOf(name : String) : Event {static}
+ + values() : Event[] {static}
}
abstract class EventEmitter {
- observers : List<EventObserver>
@@ -13,33 +21,35 @@ package com.iluwatar.event.aggregator {
+ registerObserver(obs : EventObserver)
+ timePasses(Weekday) {abstract}
}
- class KingJoffrey {
- + KingJoffrey()
- + onEvent(e : Event)
- }
- class LordBaelish {
- + LordBaelish()
- + LordBaelish(obs : EventObserver)
- + timePasses(day : Weekday)
- }
interface EventObserver {
+ onEvent(Event) {abstract}
}
+ class KingJoffrey {
+ - LOGGER : Logger {static}
+ + KingJoffrey()
+ + onEvent(e : Event)
+ }
class KingsHand {
+ KingsHand()
+ KingsHand(obs : EventObserver)
+ onEvent(e : Event)
+ timePasses(day : Weekday)
}
+ class LordBaelish {
+ + LordBaelish()
+ + LordBaelish(obs : EventObserver)
+ + timePasses(day : Weekday)
+ }
+ class LordVarys {
+ + LordVarys()
+ + LordVarys(obs : EventObserver)
+ + timePasses(day : Weekday)
+ }
class Scout {
+ Scout()
+ Scout(obs : EventObserver)
+ timePasses(day : Weekday)
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
enum Weekday {
+ FRIDAY {static}
+ MONDAY {static}
@@ -53,21 +63,12 @@ package com.iluwatar.event.aggregator {
+ valueOf(name : String) : Weekday {static}
+ values() : Weekday[] {static}
}
- enum Event {
- + STARK_SIGHTED {static}
- + TRAITOR_DETECTED {static}
- + WARSHIPS_APPROACHING {static}
- - description : String
- + toString() : String
- + valueOf(name : String) : Event {static}
- + values() : Event[] {static}
- }
}
EventEmitter --> "-observers" EventObserver
-LordVarys --|> EventEmitter
KingJoffrey ..|> EventObserver
-LordBaelish --|> EventEmitter
KingsHand ..|> EventObserver
KingsHand --|> EventEmitter
+LordBaelish --|> EventEmitter
+LordVarys --|> EventEmitter
Scout --|> EventEmitter
@enduml
\ No newline at end of file
diff --git a/event-aggregator/pom.xml b/event-aggregator/pom.xml
index 29d99ca2b..2c81ff65e 100644
--- a/event-aggregator/pom.xml
+++ b/event-aggregator/pom.xml
@@ -1,7 +1,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
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/App.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/App.java
index 879355b65..2c489ff5b 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/App.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/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
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.java
index 7397530ef..daa3a9674 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.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
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java
index b34235df5..af19727b2 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.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
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventObserver.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventObserver.java
index 020f23284..e88d571fb 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventObserver.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventObserver.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
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingJoffrey.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingJoffrey.java
index fdda59693..9e341f1c7 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingJoffrey.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingJoffrey.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.event.aggregator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* KingJoffrey observes events from {@link KingsHand}.
@@ -29,8 +32,10 @@ package com.iluwatar.event.aggregator;
*/
public class KingJoffrey implements EventObserver {
+ private static final Logger LOGGER = LoggerFactory.getLogger(KingJoffrey.class);
+
@Override
public void onEvent(Event e) {
- System.out.println("Received event from the King's Hand: " + e.toString());
+ LOGGER.info("Received event from the King's Hand: {}", e.toString());
}
}
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingsHand.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingsHand.java
index 32c8d98d6..2de7021b3 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingsHand.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingsHand.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
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordBaelish.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordBaelish.java
index 2fdfeada9..9204aa572 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordBaelish.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordBaelish.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
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordVarys.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordVarys.java
index b22708d63..dc6009b8c 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordVarys.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordVarys.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
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Scout.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Scout.java
index 3b0945367..c8dcf5ba3 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Scout.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Scout.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
diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Weekday.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Weekday.java
index d6f10ce22..2072e227c 100644
--- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Weekday.java
+++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Weekday.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
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/AppTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/AppTest.java
index 2330e1f1e..6cd678704 100644
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/AppTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/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
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java
index 63fc31a1f..ba7ecbc2d 100644
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.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
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventTest.java
index 33d1796e9..54c511f8c 100644
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventTest.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
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingJoffreyTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingJoffreyTest.java
index 3e0028ac4..1743c3211 100644
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingJoffreyTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingJoffreyTest.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,17 +22,18 @@
*/
package com.iluwatar.event.aggregator;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.LoggerFactory;
-import java.io.PrintStream;
+import java.util.LinkedList;
+import java.util.List;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/12/15 - 3:04 PM
@@ -41,31 +42,16 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
*/
public class KingJoffreyTest {
- /**
- * The mocked standard out {@link PrintStream}, required since {@link KingJoffrey} does nothing
- * except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
+ private InMemoryAppender appender;
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
@Before
public void setUp() {
- System.setOut(this.stdOutMock);
+ appender = new InMemoryAppender(KingJoffrey.class);
}
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
@After
public void tearDown() {
- System.setOut(this.stdOutOrig);
+ appender.stop();
}
/**
@@ -75,15 +61,38 @@ public class KingJoffreyTest {
public void testOnEvent() {
final KingJoffrey kingJoffrey = new KingJoffrey();
- for (final Event event : Event.values()) {
- verifyZeroInteractions(this.stdOutMock);
+ for (int i = 0; i < Event.values().length; ++i) {
+ assertEquals(i, appender.getLogSize());
+ Event event = Event.values()[i];
kingJoffrey.onEvent(event);
final String expectedMessage = "Received event from the King's Hand: " + event.toString();
- verify(this.stdOutMock, times(1)).println(expectedMessage);
- verifyNoMoreInteractions(this.stdOutMock);
+ assertEquals(expectedMessage, appender.getLastMessage());
+ assertEquals(i + 1, appender.getLogSize());
}
}
-}
\ No newline at end of file
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+ }
+
+}
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java
index 93116a071..ba1327182 100644
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.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
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordBaelishTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordBaelishTest.java
index 2432e7b40..5042c8f8d 100644
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordBaelishTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordBaelishTest.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
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordVarysTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordVarysTest.java
index d65c3f8e6..7af5d9be8 100644
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordVarysTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/LordVarysTest.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
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/ScoutTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/ScoutTest.java
index 701323485..87ed209d4 100644
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/ScoutTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/ScoutTest.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
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/WeekdayTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/WeekdayTest.java
index 1e91aab74..ab25d7ccc 100644
--- a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/WeekdayTest.java
+++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/WeekdayTest.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
diff --git a/event-asynchronous/etc/event-asynchronous.urm.puml b/event-asynchronous/etc/event-asynchronous.urm.puml
index c5b183187..0d683d27d 100644
--- a/event-asynchronous/etc/event-asynchronous.urm.puml
+++ b/event-asynchronous/etc/event-asynchronous.urm.puml
@@ -1,6 +1,18 @@
@startuml
package com.iluwatar.event.asynchronous {
+ class App {
+ - LOGGER : Logger {static}
+ + PROP_FILE_NAME : String {static}
+ ~ interactiveMode : boolean
+ + App()
+ + main(args : String[]) {static}
+ + quickRun()
+ + run()
+ + runInteractiveMode()
+ + setUp()
+ }
class Event {
+ - LOGGER : Logger {static}
- eventId : int
- eventListener : ThreadCompleteListener
- eventTime : int
@@ -17,9 +29,6 @@ package com.iluwatar.event.asynchronous {
+ status()
+ stop()
}
- interface ThreadCompleteListener {
- + completedEventHandler(int) {abstract}
- }
class EventManager {
+ MAX_EVENT_TIME : int {static}
+ MAX_ID : int {static}
@@ -42,24 +51,16 @@ package com.iluwatar.event.asynchronous {
+ status(eventId : int)
+ statusOfAllEvents()
}
- class App {
- + PROP_FILE_NAME : String {static}
- ~ interactiveMode : boolean
- + App()
- + main(args : String[]) {static}
- + quickRun()
- + run()
- + runInteractiveMode()
- + setUp()
- }
interface IEvent {
+ start() {abstract}
+ status() {abstract}
+ stop() {abstract}
}
+ interface ThreadCompleteListener {
+ + completedEventHandler(int) {abstract}
+ }
}
Event --> "-eventListener" ThreadCompleteListener
-EventManager --+ Map
Event ..|> IEvent
EventManager ..|> ThreadCompleteListener
@enduml
\ No newline at end of file
diff --git a/event-asynchronous/pom.xml b/event-asynchronous/pom.xml
index 1bc4549d4..0855736a9 100644
--- a/event-asynchronous/pom.xml
+++ b/event-asynchronous/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
diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/App.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/App.java
index 5a2565940..6e9138d3c 100644
--- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/App.java
+++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/App.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
@@ -16,38 +16,43 @@
*/
package com.iluwatar.event.asynchronous;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import java.util.Scanner;
/**
- *
+ *
* This application demonstrates the <b>Event-based Asynchronous</b> pattern. Essentially, users (of the pattern) may
* choose to run events in an Asynchronous or Synchronous mode. There can be multiple Asynchronous events running at
* once but only one Synchronous event can run at a time. Asynchronous events are synonymous to multi-threads. The key
* point here is that the threads run in the background and the user is free to carry on with other processes. Once an
* event is complete, the appropriate listener/callback method will be called. The listener then proceeds to carry out
* further processing depending on the needs of the user.
- *
+ *
* The {@link EventManager} manages the events/threads that the user creates. Currently, the supported event operations
* are: <code>start</code>, <code>stop</code>, <code>getStatus</code>. For Synchronous events, the user is unable to
* start another (Synchronous) event if one is already running at the time. The running event would have to either be
* stopped or completed before a new event can be started.
- *
+ *
* The Event-based Asynchronous Pattern makes available the advantages of multithreaded applications while hiding many
* of the complex issues inherent in multithreaded design. Using a class that supports this pattern can allow you to:-
* (1) Perform time-consuming tasks, such as downloads and database operations, "in the background," without
* interrupting your application. (2) Execute multiple operations simultaneously, receiving notifications when each
* completes. (3) Wait for resources to become available without stopping ("hanging") your application. (4) Communicate
* with pending asynchronous operations using the familiar events-and-delegates model.
- *
+ *
* @see EventManager
* @see Event
*
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
public static final String PROP_FILE_NAME = "config.properties";
boolean interactiveMode = false;
@@ -77,7 +82,7 @@ public class App {
try {
prop.load(inputStream);
} catch (IOException e) {
- System.out.println(PROP_FILE_NAME + " was not found. Defaulting to non-interactive mode.");
+ LOGGER.error("{} was not found. Defaulting to non-interactive mode.", PROP_FILE_NAME, e);
}
String property = prop.getProperty("INTERACTIVE_MODE");
if (property.equalsIgnoreCase("YES")) {
@@ -106,27 +111,27 @@ public class App {
try {
// Create an Asynchronous event.
int aEventId = eventManager.createAsync(60);
- System.out.println("Async Event [" + aEventId + "] has been created.");
+ LOGGER.info("Async Event [{}] has been created.", aEventId);
eventManager.start(aEventId);
- System.out.println("Async Event [" + aEventId + "] has been started.");
+ LOGGER.info("Async Event [{}] has been started.", aEventId);
// Create a Synchronous event.
int sEventId = eventManager.create(60);
- System.out.println("Sync Event [" + sEventId + "] has been created.");
+ LOGGER.info("Sync Event [{}] has been created.", sEventId);
eventManager.start(sEventId);
- System.out.println("Sync Event [" + sEventId + "] has been started.");
+ LOGGER.info("Sync Event [{}] has been started.", sEventId);
eventManager.status(aEventId);
eventManager.status(sEventId);
eventManager.cancel(aEventId);
- System.out.println("Async Event [" + aEventId + "] has been stopped.");
+ LOGGER.info("Async Event [{}] has been stopped.", aEventId);
eventManager.cancel(sEventId);
- System.out.println("Sync Event [" + sEventId + "] has been stopped.");
+ LOGGER.info("Sync Event [{}] has been stopped.", sEventId);
} catch (MaxNumOfEventsAllowedException | LongRunningEventException | EventDoesNotExistException
| InvalidOperationException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
}
@@ -139,58 +144,58 @@ public class App {
Scanner s = new Scanner(System.in);
int option = -1;
while (option != 4) {
- System.out.println("Hello. Would you like to boil some eggs?");
- System.out.println("(1) BOIL AN EGG \n(2) STOP BOILING THIS EGG \n(3) HOW ARE MY EGGS? \n(4) EXIT");
- System.out.print("Choose [1,2,3,4]: ");
+ LOGGER.info("Hello. Would you like to boil some eggs?");
+ LOGGER.info("(1) BOIL AN EGG \n(2) STOP BOILING THIS EGG \n(3) HOW ARE MY EGGS? \n(4) EXIT");
+ LOGGER.info("Choose [1,2,3,4]: ");
option = s.nextInt();
if (option == 1) {
s.nextLine();
- System.out.print("Boil multiple eggs at once (A) or boil them one-by-one (S)?: ");
+ LOGGER.info("Boil multiple eggs at once (A) or boil them one-by-one (S)?: ");
String eventType = s.nextLine();
- System.out.print("How long should this egg be boiled for (in seconds)?: ");
+ LOGGER.info("How long should this egg be boiled for (in seconds)?: ");
int eventTime = s.nextInt();
if (eventType.equalsIgnoreCase("A")) {
try {
int eventId = eventManager.createAsync(eventTime);
eventManager.start(eventId);
- System.out.println("Egg [" + eventId + "] is being boiled.");
+ LOGGER.info("Egg [{}] is being boiled.", eventId);
} catch (MaxNumOfEventsAllowedException | LongRunningEventException | EventDoesNotExistException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
} else if (eventType.equalsIgnoreCase("S")) {
try {
int eventId = eventManager.create(eventTime);
eventManager.start(eventId);
- System.out.println("Egg [" + eventId + "] is being boiled.");
+ LOGGER.info("Egg [{}] is being boiled.", eventId);
} catch (MaxNumOfEventsAllowedException | InvalidOperationException | LongRunningEventException
| EventDoesNotExistException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
} else {
- System.out.println("Unknown event type.");
+ LOGGER.info("Unknown event type.");
}
} else if (option == 2) {
- System.out.print("Which egg?: ");
+ LOGGER.info("Which egg?: ");
int eventId = s.nextInt();
try {
eventManager.cancel(eventId);
- System.out.println("Egg [" + eventId + "] is removed from boiler.");
+ LOGGER.info("Egg [{}] is removed from boiler.", eventId);
} catch (EventDoesNotExistException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
} else if (option == 3) {
s.nextLine();
- System.out.print("Just one egg (O) OR all of them (A) ?: ");
+ LOGGER.info("Just one egg (O) OR all of them (A) ?: ");
String eggChoice = s.nextLine();
if (eggChoice.equalsIgnoreCase("O")) {
- System.out.print("Which egg?: ");
+ LOGGER.info("Which egg?: ");
int eventId = s.nextInt();
try {
eventManager.status(eventId);
} catch (EventDoesNotExistException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
} else if (eggChoice.equalsIgnoreCase("A")) {
eventManager.statusOfAllEvents();
diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/Event.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/Event.java
index 5e557fff2..5dc069bc7 100644
--- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/Event.java
+++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/Event.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
@@ -16,13 +16,18 @@
*/
package com.iluwatar.event.asynchronous;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
- *
+ *
* Each Event runs as a separate/individual thread.
*
*/
public class Event implements IEvent, Runnable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Event.class);
+
private int eventId;
private int eventTime;
private boolean isSynchronous;
@@ -31,7 +36,7 @@ public class Event implements IEvent, Runnable {
private ThreadCompleteListener eventListener;
/**
- *
+ *
* @param eventId event ID
* @param eventTime event time
* @param isSynchronous is of synchronous type
@@ -63,9 +68,9 @@ public class Event implements IEvent, Runnable {
@Override
public void status() {
if (!isComplete) {
- System.out.println("[" + eventId + "] is not done.");
+ LOGGER.info("[{}] is not done.", eventId);
} else {
- System.out.println("[" + eventId + "] is done.");
+ LOGGER.info("[{}] is done.", eventId);
}
}
diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventDoesNotExistException.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventDoesNotExistException.java
index 77c1d479b..85edaa815 100644
--- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventDoesNotExistException.java
+++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventDoesNotExistException.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventManager.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventManager.java
index dae995e38..729900620 100644
--- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventManager.java
+++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventManager.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
@@ -22,7 +22,7 @@ import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
/**
- *
+ *
* EventManager handles and maintains a pool of event threads. {@link Event} threads are created upon user request. Thre
* are two types of events; Asynchronous and Synchronous. There can be multiple Asynchronous events running at once but
* only one Synchronous event running at a time. Currently supported event operations are: start, stop, and getStatus.
@@ -52,7 +52,7 @@ public class EventManager implements ThreadCompleteListener {
/**
* Create a Synchronous event.
- *
+ *
* @param eventTime Time an event should run for.
* @return eventId
* @throws MaxNumOfEventsAllowedException When too many events are running at a time.
@@ -74,7 +74,7 @@ public class EventManager implements ThreadCompleteListener {
/**
* Create an Asynchronous event.
- *
+ *
* @param eventTime Time an event should run for.
* @return eventId
* @throws MaxNumOfEventsAllowedException When too many events are running at a time.
@@ -106,7 +106,7 @@ public class EventManager implements ThreadCompleteListener {
/**
* Starts event.
- *
+ *
* @param eventId The event that needs to be started.
* @throws EventDoesNotExistException If event does not exist in our eventPool.
*/
@@ -120,7 +120,7 @@ public class EventManager implements ThreadCompleteListener {
/**
* Stops event.
- *
+ *
* @param eventId The event that needs to be stopped.
* @throws EventDoesNotExistException If event does not exist in our eventPool.
*/
@@ -139,7 +139,7 @@ public class EventManager implements ThreadCompleteListener {
/**
* Get status of a running event.
- *
+ *
* @param eventId The event to inquire status of.
* @throws EventDoesNotExistException If event does not exist in our eventPool.
*/
diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/IEvent.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/IEvent.java
index bcd78b6c0..296a312a3 100644
--- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/IEvent.java
+++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/IEvent.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/InvalidOperationException.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/InvalidOperationException.java
index 4fd5b0eed..3c930d935 100644
--- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/InvalidOperationException.java
+++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/InvalidOperationException.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/LongRunningEventException.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/LongRunningEventException.java
index 6817b1dd8..7c9091a15 100644
--- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/LongRunningEventException.java
+++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/LongRunningEventException.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/MaxNumOfEventsAllowedException.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/MaxNumOfEventsAllowedException.java
index 9f8f2891c..2b8f2221c 100644
--- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/MaxNumOfEventsAllowedException.java
+++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/MaxNumOfEventsAllowedException.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/ThreadCompleteListener.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/ThreadCompleteListener.java
index fd62a3e80..be4ecf93b 100644
--- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/ThreadCompleteListener.java
+++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/ThreadCompleteListener.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
diff --git a/event-asynchronous/src/main/resources/config.properties b/event-asynchronous/src/main/resources/config.properties
index d8bfa1f7e..f76c07bb4 100644
--- a/event-asynchronous/src/main/resources/config.properties
+++ b/event-asynchronous/src/main/resources/config.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
diff --git a/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/AppTest.java b/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/AppTest.java
index 8736fcf77..2056dcf18 100644
--- a/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/AppTest.java
+++ b/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/AppTest.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
diff --git a/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/EventAsynchronousTest.java b/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/EventAsynchronousTest.java
index 213439203..8e0860286 100644
--- a/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/EventAsynchronousTest.java
+++ b/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/EventAsynchronousTest.java
@@ -1,5 +1,5 @@
/**
- * The MIT License Copyright (c) 2014 Ilkka Seppälä
+ * The MIT License 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 in the Software without restriction, including without limitation the
@@ -16,10 +16,12 @@
*/
package com.iluwatar.event.asynchronous;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.Assert.assertTrue;
/**
*
@@ -29,6 +31,8 @@ import org.junit.Test;
public class EventAsynchronousTest {
App app;
+ private static final Logger LOGGER = LoggerFactory.getLogger(EventAsynchronousTest.class);
+
@Before
public void setUp() {
app = new App();
@@ -46,7 +50,7 @@ public class EventAsynchronousTest {
eventManager.cancel(aEventId);
assertTrue(eventManager.getEventPool().size() == 0);
} catch (MaxNumOfEventsAllowedException | LongRunningEventException | EventDoesNotExistException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
}
@@ -63,7 +67,7 @@ public class EventAsynchronousTest {
assertTrue(eventManager.getEventPool().size() == 0);
} catch (MaxNumOfEventsAllowedException | LongRunningEventException | EventDoesNotExistException
| InvalidOperationException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
}
@@ -76,7 +80,7 @@ public class EventAsynchronousTest {
sEventId = eventManager.create(60);
eventManager.start(sEventId);
} catch (MaxNumOfEventsAllowedException | LongRunningEventException | EventDoesNotExistException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
}
@@ -101,7 +105,7 @@ public class EventAsynchronousTest {
} catch (MaxNumOfEventsAllowedException | LongRunningEventException | EventDoesNotExistException
| InvalidOperationException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
}
@@ -129,7 +133,7 @@ public class EventAsynchronousTest {
assertTrue(eventManager.getEventPool().size() == 0);
} catch (MaxNumOfEventsAllowedException | LongRunningEventException | EventDoesNotExistException e) {
- System.out.println(e.getMessage());
+ LOGGER.error(e.getMessage());
}
}
}
diff --git a/event-driven-architecture/etc/event-driven-architecture.urm.puml b/event-driven-architecture/etc/event-driven-architecture.urm.puml
index 8314913a6..6b67f0a0e 100644
--- a/event-driven-architecture/etc/event-driven-architecture.urm.puml
+++ b/event-driven-architecture/etc/event-driven-architecture.urm.puml
@@ -1,10 +1,12 @@
@startuml
package com.iluwatar.eda.handler {
class UserCreatedEventHandler {
+ - LOGGER : Logger {static}
+ UserCreatedEventHandler()
+ onEvent(event : UserCreatedEvent)
}
class UserUpdatedEventHandler {
+ - LOGGER : Logger {static}
+ UserUpdatedEventHandler()
+ onEvent(event : UserUpdatedEvent)
}
@@ -26,8 +28,8 @@ package com.iluwatar.eda.event {
}
}
package com.iluwatar.eda.framework {
- interface Handler<E extends Event> {
- + onEvent(E extends Event) {abstract}
+ interface Event {
+ + getType() : Class<? extends Event> {abstract}
}
class EventDispatcher {
- handlers : Map<Class<? extends Event>, Handler<? extends Event>>
@@ -35,8 +37,8 @@ package com.iluwatar.eda.framework {
+ dispatch(event : E extends Event)
+ registerHandler(eventType : Class<E extends Event>, handler : Handler<E extends Event>)
}
- interface Event {
- + getType() : Class<? extends Event> {abstract}
+ interface Handler<E extends Event> {
+ + onEvent(E extends Event) {abstract}
}
}
package com.iluwatar.eda.model {
@@ -52,11 +54,11 @@ package com.iluwatar.eda {
+ main(args : String[]) {static}
}
}
-UserUpdatedEvent --> "-user" User
UserCreatedEvent --> "-user" User
+UserUpdatedEvent --> "-user" User
AbstractEvent ..|> Event
UserCreatedEvent --|> AbstractEvent
-UserCreatedEventHandler ..|> Handler
UserUpdatedEvent --|> AbstractEvent
+UserCreatedEventHandler ..|> Handler
UserUpdatedEventHandler ..|> Handler
@enduml
\ No newline at end of file
diff --git a/event-driven-architecture/pom.xml b/event-driven-architecture/pom.xml
index 149ca7409..6ef837a93 100644
--- a/event-driven-architecture/pom.xml
+++ b/event-driven-architecture/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
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/App.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/App.java
index 866b3c9e9..5ed2b2ad8 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/App.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/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
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/AbstractEvent.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/AbstractEvent.java
index 54a916c7b..be6d70ec1 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/AbstractEvent.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/AbstractEvent.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
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserCreatedEvent.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserCreatedEvent.java
index 717ed1a9d..af209f4a9 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserCreatedEvent.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserCreatedEvent.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
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserUpdatedEvent.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserUpdatedEvent.java
index 9646957dc..e1046cdcb 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserUpdatedEvent.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/event/UserUpdatedEvent.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
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Event.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Event.java
index c63d2746f..fdcd00584 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Event.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Event.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
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/EventDispatcher.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/EventDispatcher.java
index 9f8e29315..427d7bd36 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/EventDispatcher.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/EventDispatcher.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
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Handler.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Handler.java
index 44bdab6dc..e2b58cd49 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Handler.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/framework/Handler.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
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/handler/UserCreatedEventHandler.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/handler/UserCreatedEventHandler.java
index 3ef4e8255..3d8e2779f 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/handler/UserCreatedEventHandler.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/handler/UserCreatedEventHandler.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
@@ -24,17 +24,19 @@ package com.iluwatar.eda.handler;
import com.iluwatar.eda.event.UserCreatedEvent;
import com.iluwatar.eda.framework.Handler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handles the {@link UserCreatedEvent} message.
*/
public class UserCreatedEventHandler implements Handler<UserCreatedEvent> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(UserCreatedEventHandler.class);
+
@Override
public void onEvent(UserCreatedEvent event) {
-
- System.out.println(String.format(
- "User '%s' has been Created!", event.getUser().getUsername()));
+ LOGGER.info("User '{}' has been Created!", event.getUser().getUsername());
}
}
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/handler/UserUpdatedEventHandler.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/handler/UserUpdatedEventHandler.java
index 0311d5781..eef5f6785 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/handler/UserUpdatedEventHandler.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/handler/UserUpdatedEventHandler.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
@@ -24,16 +24,18 @@ package com.iluwatar.eda.handler;
import com.iluwatar.eda.event.UserUpdatedEvent;
import com.iluwatar.eda.framework.Handler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handles the {@link UserUpdatedEvent} message.
*/
public class UserUpdatedEventHandler implements Handler<UserUpdatedEvent> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(UserUpdatedEventHandler.class);
+
@Override
public void onEvent(UserUpdatedEvent event) {
-
- System.out.println(String.format(
- "User '%s' has been Updated!", event.getUser().getUsername()));
+ LOGGER.info("User '{}' has been Updated!", event.getUser().getUsername());
}
}
diff --git a/event-driven-architecture/src/main/java/com/iluwatar/eda/model/User.java b/event-driven-architecture/src/main/java/com/iluwatar/eda/model/User.java
index 82ef960de..92ea232bc 100644
--- a/event-driven-architecture/src/main/java/com/iluwatar/eda/model/User.java
+++ b/event-driven-architecture/src/main/java/com/iluwatar/eda/model/User.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
diff --git a/event-driven-architecture/src/test/java/com/iluwatar/eda/AppTest.java b/event-driven-architecture/src/test/java/com/iluwatar/eda/AppTest.java
index 603d0a61b..e7d642b95 100644
--- a/event-driven-architecture/src/test/java/com/iluwatar/eda/AppTest.java
+++ b/event-driven-architecture/src/test/java/com/iluwatar/eda/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
diff --git a/event-driven-architecture/src/test/java/com/iluwatar/eda/event/UserCreatedEventTest.java b/event-driven-architecture/src/test/java/com/iluwatar/eda/event/UserCreatedEventTest.java
index b9074faf2..6e95f5fd2 100644
--- a/event-driven-architecture/src/test/java/com/iluwatar/eda/event/UserCreatedEventTest.java
+++ b/event-driven-architecture/src/test/java/com/iluwatar/eda/event/UserCreatedEventTest.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
diff --git a/event-driven-architecture/src/test/java/com/iluwatar/eda/framework/EventDispatcherTest.java b/event-driven-architecture/src/test/java/com/iluwatar/eda/framework/EventDispatcherTest.java
index 21956afec..7501653f6 100644
--- a/event-driven-architecture/src/test/java/com/iluwatar/eda/framework/EventDispatcherTest.java
+++ b/event-driven-architecture/src/test/java/com/iluwatar/eda/framework/EventDispatcherTest.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
diff --git a/exclude-pmd.properties b/exclude-pmd.properties
index aeda4353d..288ee9b2d 100644
--- a/exclude-pmd.properties
+++ b/exclude-pmd.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
diff --git a/execute-around/etc/execute-around.urm.puml b/execute-around/etc/execute-around.urm.puml
index 4fdc4bffb..fd01a5fe1 100644
--- a/execute-around/etc/execute-around.urm.puml
+++ b/execute-around/etc/execute-around.urm.puml
@@ -1,8 +1,5 @@
@startuml
package com.iluwatar.execute.around {
- class SimpleFileWriter {
- + SimpleFileWriter(filename : String, action : FileWriterAction)
- }
class App {
+ App()
+ main(args : String[]) {static}
@@ -10,5 +7,8 @@ package com.iluwatar.execute.around {
interface FileWriterAction {
+ writeFile(FileWriter) {abstract}
}
+ class SimpleFileWriter {
+ + SimpleFileWriter(filename : String, action : FileWriterAction)
+ }
}
@enduml
\ No newline at end of file
diff --git a/execute-around/pom.xml b/execute-around/pom.xml
index 115c201cb..96a17ffd6 100644
--- a/execute-around/pom.xml
+++ b/execute-around/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
diff --git a/execute-around/src/main/java/com/iluwatar/execute/around/App.java b/execute-around/src/main/java/com/iluwatar/execute/around/App.java
index f8ccebdcf..11775462a 100644
--- a/execute-around/src/main/java/com/iluwatar/execute/around/App.java
+++ b/execute-around/src/main/java/com/iluwatar/execute/around/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
diff --git a/execute-around/src/main/java/com/iluwatar/execute/around/FileWriterAction.java b/execute-around/src/main/java/com/iluwatar/execute/around/FileWriterAction.java
index 159786134..83670c361 100644
--- a/execute-around/src/main/java/com/iluwatar/execute/around/FileWriterAction.java
+++ b/execute-around/src/main/java/com/iluwatar/execute/around/FileWriterAction.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
diff --git a/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java b/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java
index 111bad73e..3c98597cb 100644
--- a/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java
+++ b/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.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
diff --git a/execute-around/src/test/java/com/iluwatar/execute/around/AppTest.java b/execute-around/src/test/java/com/iluwatar/execute/around/AppTest.java
index b74f53a25..7604db16d 100644
--- a/execute-around/src/test/java/com/iluwatar/execute/around/AppTest.java
+++ b/execute-around/src/test/java/com/iluwatar/execute/around/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
diff --git a/execute-around/src/test/java/com/iluwatar/execute/around/SimpleFileWriterTest.java b/execute-around/src/test/java/com/iluwatar/execute/around/SimpleFileWriterTest.java
index abad14935..fd13a92a9 100644
--- a/execute-around/src/test/java/com/iluwatar/execute/around/SimpleFileWriterTest.java
+++ b/execute-around/src/test/java/com/iluwatar/execute/around/SimpleFileWriterTest.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
diff --git a/facade/etc/facade.urm.puml b/facade/etc/facade.urm.puml
index 8c53cb728..477f9eee7 100644
--- a/facade/etc/facade.urm.puml
+++ b/facade/etc/facade.urm.puml
@@ -1,6 +1,17 @@
@startuml
package com.iluwatar.facade {
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
+ class DwarvenCartOperator {
+ - LOGGER : Logger {static}
+ + DwarvenCartOperator()
+ + name() : String
+ + work()
+ }
class DwarvenGoldDigger {
+ - LOGGER : Logger {static}
+ DwarvenGoldDigger()
+ name() : String
+ work()
@@ -13,12 +24,8 @@ package com.iluwatar.facade {
- makeActions(workers : Collection<DwarvenMineWorker>, actions : Action[]) {static}
+ startNewDay()
}
- class DwarvenTunnelDigger {
- + DwarvenTunnelDigger()
- + name() : String
- + work()
- }
abstract class DwarvenMineWorker {
+ - LOGGER : Logger {static}
+ DwarvenMineWorker()
- action(action : Action)
+ action(actions : Action[])
@@ -29,15 +36,6 @@ package com.iluwatar.facade {
+ wakeUp()
+ work() {abstract}
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
- class DwarvenCartOperator {
- + DwarvenCartOperator()
- + name() : String
- + work()
- }
~enum Action {
+ GO_HOME {static}
+ GO_TO_MINE {static}
@@ -47,11 +45,16 @@ package com.iluwatar.facade {
+ valueOf(name : String) : Action {static}
+ values() : Action[] {static}
}
+ class DwarvenTunnelDigger {
+ - LOGGER : Logger {static}
+ + DwarvenTunnelDigger()
+ + name() : String
+ + work()
+ }
}
-DwarvenGoldmineFacade --+ DwarvenMineWorker
DwarvenGoldmineFacade --> "-workers" DwarvenMineWorker
Action ..+ DwarvenMineWorker
+DwarvenCartOperator --|> DwarvenMineWorker
DwarvenGoldDigger --|> DwarvenMineWorker
DwarvenTunnelDigger --|> DwarvenMineWorker
-DwarvenCartOperator --|> DwarvenMineWorker
@enduml
\ No newline at end of file
diff --git a/facade/pom.xml b/facade/pom.xml
index 7816d51e6..9af019df4 100644
--- a/facade/pom.xml
+++ b/facade/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
diff --git a/facade/src/main/java/com/iluwatar/facade/App.java b/facade/src/main/java/com/iluwatar/facade/App.java
index 242bfc9c4..93c38710b 100644
--- a/facade/src/main/java/com/iluwatar/facade/App.java
+++ b/facade/src/main/java/com/iluwatar/facade/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
diff --git a/facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.java b/facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.java
index bdc839f57..01737dc85 100644
--- a/facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.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.facade;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* DwarvenCartOperator is one of the goldmine subsystems.
@@ -29,9 +32,11 @@ package com.iluwatar.facade;
*/
public class DwarvenCartOperator extends DwarvenMineWorker {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenCartOperator.class);
+
@Override
public void work() {
- System.out.println(name() + " moves gold chunks out of the mine.");
+ LOGGER.info("{} moves gold chunks out of the mine.", name());
}
@Override
diff --git a/facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.java b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.java
index 54fa821f4..a4e547f9e 100644
--- a/facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.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.facade;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* DwarvenGoldDigger is one of the goldmine subsystems.
@@ -29,9 +32,11 @@ package com.iluwatar.facade;
*/
public class DwarvenGoldDigger extends DwarvenMineWorker {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenGoldDigger.class);
+
@Override
public void work() {
- System.out.println(name() + " digs for gold.");
+ LOGGER.info("{} digs for gold.", name());
}
@Override
diff --git a/facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java
index 4f6e3be4c..d6cce8efd 100644
--- a/facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.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
diff --git a/facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java b/facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java
index f27054c53..bb80ae874 100644
--- a/facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.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.facade;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* DwarvenMineWorker is one of the goldmine subsystems.
@@ -29,20 +32,22 @@ package com.iluwatar.facade;
*/
public abstract class DwarvenMineWorker {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenMineWorker.class);
+
public void goToSleep() {
- System.out.println(name() + " goes to sleep.");
+ LOGGER.info("{} goes to sleep.", name());
}
public void wakeUp() {
- System.out.println(name() + " wakes up.");
+ LOGGER.info("{} wakes up.", name());
}
public void goHome() {
- System.out.println(name() + " goes home.");
+ LOGGER.info("{} goes home.", name());
}
public void goToMine() {
- System.out.println(name() + " goes to the mine.");
+ LOGGER.info("{} goes to the mine.", name());
}
private void action(Action action) {
@@ -63,7 +68,7 @@ public abstract class DwarvenMineWorker {
work();
break;
default:
- System.out.println("Undefined action");
+ LOGGER.info("Undefined action");
break;
}
}
diff --git a/facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.java b/facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.java
index 74d8b89cc..ac573b242 100644
--- a/facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.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.facade;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* DwarvenTunnelDigger is one of the goldmine subsystems.
@@ -29,9 +32,11 @@ package com.iluwatar.facade;
*/
public class DwarvenTunnelDigger extends DwarvenMineWorker {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DwarvenTunnelDigger.class);
+
@Override
public void work() {
- System.out.println(name() + " creates another promising tunnel.");
+ LOGGER.info("{} creates another promising tunnel.", name());
}
@Override
diff --git a/facade/src/test/java/com/iluwatar/facade/AppTest.java b/facade/src/test/java/com/iluwatar/facade/AppTest.java
index 115fcc405..e890f42d4 100644
--- a/facade/src/test/java/com/iluwatar/facade/AppTest.java
+++ b/facade/src/test/java/com/iluwatar/facade/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
diff --git a/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java b/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java
index 4a3b218e2..6457307cf 100644
--- a/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java
+++ b/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.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,17 +22,19 @@
*/
package com.iluwatar.facade;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.LoggerFactory;
-import java.io.PrintStream;
+import java.util.LinkedList;
+import java.util.List;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.internal.verification.VerificationModeFactory.times;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* Date: 12/9/15 - 9:40 PM
@@ -41,35 +43,19 @@ import static org.mockito.internal.verification.VerificationModeFactory.times;
*/
public class DwarvenGoldmineFacadeTest {
- /**
- * The mocked standard out {@link PrintStream}, required since the actions on the gold mine facade
- * don't have any influence on any other accessible objects, except for writing to std-out using
- * {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
+ private InMemoryAppender appender;
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
@Before
public void setUp() {
- System.setOut(this.stdOutMock);
+ appender = new InMemoryAppender();
}
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
@After
public void tearDown() {
- System.setOut(this.stdOutOrig);
+ appender.stop();
}
- /**
+ /**
* Test a complete day cycle in the gold mine by executing all three different steps: {@link
* DwarvenGoldmineFacade#startNewDay()}, {@link DwarvenGoldmineFacade#digOutGold()} and {@link
* DwarvenGoldmineFacade#endDay()}.
@@ -82,44 +68,68 @@ public class DwarvenGoldmineFacadeTest {
goldMine.startNewDay();
// On the start of a day, all workers should wake up ...
- verify(this.stdOutMock, times(1)).println(eq("Dwarf gold digger wakes up."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarf cart operator wakes up."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarven tunnel digger wakes up."));
+ assertTrue(appender.logContains("Dwarf gold digger wakes up."));
+ assertTrue(appender.logContains("Dwarf cart operator wakes up."));
+ assertTrue(appender.logContains("Dwarven tunnel digger wakes up."));
// ... and go to the mine
- verify(this.stdOutMock, times(1)).println(eq("Dwarf gold digger goes to the mine."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarf cart operator goes to the mine."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarven tunnel digger goes to the mine."));
+ assertTrue(appender.logContains("Dwarf gold digger goes to the mine."));
+ assertTrue(appender.logContains("Dwarf cart operator goes to the mine."));
+ assertTrue(appender.logContains("Dwarven tunnel digger goes to the mine."));
// No other actions were invoked, so the workers shouldn't have done (printed) anything else
- verifyNoMoreInteractions(this.stdOutMock);
+ assertEquals(6, appender.getLogSize());
// Now do some actual work, start digging gold!
goldMine.digOutGold();
// Since we gave the dig command, every worker should be doing it's job ...
- verify(this.stdOutMock, times(1)).println(eq("Dwarf gold digger digs for gold."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarf cart operator moves gold chunks out of the mine."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarven tunnel digger creates another promising tunnel."));
+ assertTrue(appender.logContains("Dwarf gold digger digs for gold."));
+ assertTrue(appender.logContains("Dwarf cart operator moves gold chunks out of the mine."));
+ assertTrue(appender.logContains("Dwarven tunnel digger creates another promising tunnel."));
// Again, they shouldn't be doing anything else.
- verifyNoMoreInteractions(this.stdOutMock);
+ assertEquals(9, appender.getLogSize());
// Enough gold, lets end the day.
goldMine.endDay();
// Check if the workers go home ...
- verify(this.stdOutMock, times(1)).println(eq("Dwarf gold digger goes home."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarf cart operator goes home."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarven tunnel digger goes home."));
+ assertTrue(appender.logContains("Dwarf gold digger goes home."));
+ assertTrue(appender.logContains("Dwarf cart operator goes home."));
+ assertTrue(appender.logContains("Dwarven tunnel digger goes home."));
// ... and go to sleep. We need well rested workers the next day :)
- verify(this.stdOutMock, times(1)).println(eq("Dwarf gold digger goes to sleep."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarf cart operator goes to sleep."));
- verify(this.stdOutMock, times(1)).println(eq("Dwarven tunnel digger goes to sleep."));
+ assertTrue(appender.logContains("Dwarf gold digger goes to sleep."));
+ assertTrue(appender.logContains("Dwarf cart operator goes to sleep."));
+ assertTrue(appender.logContains("Dwarven tunnel digger goes to sleep."));
// Every worker should be sleeping now, no other actions allowed
- verifyNoMoreInteractions(this.stdOutMock);
+ assertEquals(15, appender.getLogSize());
}
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+
+ public boolean logContains(String message) {
+ return log.stream().anyMatch(event -> event.getFormattedMessage().equals(message));
+ }
+ }
+
+
}
diff --git a/factory-kit/etc/factory-kit.urm.puml b/factory-kit/etc/factory-kit.urm.puml
index fdee9a01c..23cf658f4 100644
--- a/factory-kit/etc/factory-kit.urm.puml
+++ b/factory-kit/etc/factory-kit.urm.puml
@@ -1,27 +1,14 @@
@startuml
package com.iluwatar.factorykit {
- class Spear {
- + Spear()
- + toString() : String
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
- interface Weapon {
- }
- interface WeaponFactory {
- + create(WeaponType) : Weapon {abstract}
- + factory(consumer : Consumer<Builder>) : WeaponFactory {static}
- }
class Axe {
+ Axe()
+ toString() : String
}
- class Sword {
- + Sword()
- + toString() : String
- }
class Bow {
+ Bow()
+ toString() : String
@@ -29,6 +16,20 @@ package com.iluwatar.factorykit {
interface Builder {
+ add(WeaponType, Supplier<Weapon>) {abstract}
}
+ class Spear {
+ + Spear()
+ + toString() : String
+ }
+ class Sword {
+ + Sword()
+ + toString() : String
+ }
+ interface Weapon {
+ }
+ interface WeaponFactory {
+ + create(WeaponType) : Weapon {abstract}
+ + factory(consumer : Consumer<Builder>) : WeaponFactory {static}
+ }
enum WeaponType {
+ AXE {static}
+ BOW {static}
@@ -38,8 +39,8 @@ package com.iluwatar.factorykit {
+ values() : WeaponType[] {static}
}
}
-Spear ..|> Weapon
Axe ..|> Weapon
-Sword ..|> Weapon
Bow ..|> Weapon
+Spear ..|> Weapon
+Sword ..|> Weapon
@enduml
\ No newline at end of file
diff --git a/factory-kit/pom.xml b/factory-kit/pom.xml
index 32705cc46..b861c9571 100644
--- a/factory-kit/pom.xml
+++ b/factory-kit/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
diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/App.java b/factory-kit/src/main/java/com/iluwatar/factorykit/App.java
index f27bee170..03a4ece83 100644
--- a/factory-kit/src/main/java/com/iluwatar/factorykit/App.java
+++ b/factory-kit/src/main/java/com/iluwatar/factorykit/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.factorykit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Factory-kit is a creational pattern which defines a factory of immutable content
* with separated builder and factory interfaces to deal with the problem of
@@ -36,6 +39,9 @@ package com.iluwatar.factorykit;
* be mapped explicitly with desired class type in the factory instance.
*/
public class App {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point.
*
@@ -49,6 +55,6 @@ public class App {
builder.add(WeaponType.BOW, Bow::new);
});
Weapon axe = factory.create(WeaponType.AXE);
- System.out.println(axe);
+ LOGGER.info(axe.toString());
}
}
diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/Axe.java b/factory-kit/src/main/java/com/iluwatar/factorykit/Axe.java
index 826a1f9ec..96ce73a35 100644
--- a/factory-kit/src/main/java/com/iluwatar/factorykit/Axe.java
+++ b/factory-kit/src/main/java/com/iluwatar/factorykit/Axe.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
diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/Bow.java b/factory-kit/src/main/java/com/iluwatar/factorykit/Bow.java
index 5aa952c3d..b9b2708c9 100644
--- a/factory-kit/src/main/java/com/iluwatar/factorykit/Bow.java
+++ b/factory-kit/src/main/java/com/iluwatar/factorykit/Bow.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
diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/Builder.java b/factory-kit/src/main/java/com/iluwatar/factorykit/Builder.java
index 1049c7b6f..8426c36a5 100644
--- a/factory-kit/src/main/java/com/iluwatar/factorykit/Builder.java
+++ b/factory-kit/src/main/java/com/iluwatar/factorykit/Builder.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
diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/Spear.java b/factory-kit/src/main/java/com/iluwatar/factorykit/Spear.java
index c32811e8c..080007093 100644
--- a/factory-kit/src/main/java/com/iluwatar/factorykit/Spear.java
+++ b/factory-kit/src/main/java/com/iluwatar/factorykit/Spear.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
diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/Sword.java b/factory-kit/src/main/java/com/iluwatar/factorykit/Sword.java
index 208cd6bbb..504ddb397 100644
--- a/factory-kit/src/main/java/com/iluwatar/factorykit/Sword.java
+++ b/factory-kit/src/main/java/com/iluwatar/factorykit/Sword.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
diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/Weapon.java b/factory-kit/src/main/java/com/iluwatar/factorykit/Weapon.java
index 3d668e352..cf6a140dc 100644
--- a/factory-kit/src/main/java/com/iluwatar/factorykit/Weapon.java
+++ b/factory-kit/src/main/java/com/iluwatar/factorykit/Weapon.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
diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/WeaponFactory.java b/factory-kit/src/main/java/com/iluwatar/factorykit/WeaponFactory.java
index 80a6fd9d3..4e8d1f77d 100644
--- a/factory-kit/src/main/java/com/iluwatar/factorykit/WeaponFactory.java
+++ b/factory-kit/src/main/java/com/iluwatar/factorykit/WeaponFactory.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
diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/WeaponType.java b/factory-kit/src/main/java/com/iluwatar/factorykit/WeaponType.java
index 283f252de..3f0520190 100644
--- a/factory-kit/src/main/java/com/iluwatar/factorykit/WeaponType.java
+++ b/factory-kit/src/main/java/com/iluwatar/factorykit/WeaponType.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
diff --git a/factory-kit/src/test/java/com/iluwatar/factorykit/app/AppTest.java b/factory-kit/src/test/java/com/iluwatar/factorykit/app/AppTest.java
index 036326d97..add378296 100644
--- a/factory-kit/src/test/java/com/iluwatar/factorykit/app/AppTest.java
+++ b/factory-kit/src/test/java/com/iluwatar/factorykit/app/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
diff --git a/factory-kit/src/test/java/com/iluwatar/factorykit/factorykit/FactoryKitTest.java b/factory-kit/src/test/java/com/iluwatar/factorykit/factorykit/FactoryKitTest.java
index c57bee3e3..da39caa8f 100644
--- a/factory-kit/src/test/java/com/iluwatar/factorykit/factorykit/FactoryKitTest.java
+++ b/factory-kit/src/test/java/com/iluwatar/factorykit/factorykit/FactoryKitTest.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
diff --git a/factory-method/etc/factory-method.urm.puml b/factory-method/etc/factory-method.urm.puml
index d61984a85..73a05e178 100644
--- a/factory-method/etc/factory-method.urm.puml
+++ b/factory-method/etc/factory-method.urm.puml
@@ -1,33 +1,34 @@
@startuml
package com.iluwatar.factory.method {
- class OrcBlacksmith {
- + OrcBlacksmith()
- + manufactureWeapon(weaponType : WeaponType) : Weapon
+ class App {
+ - LOGGER : Logger {static}
+ - blacksmith : Blacksmith
+ + App(blacksmith : Blacksmith)
+ + main(args : String[]) {static}
+ - manufactureWeapons()
+ }
+ interface Blacksmith {
+ + manufactureWeapon(WeaponType) : Weapon {abstract}
}
class ElfBlacksmith {
+ ElfBlacksmith()
+ manufactureWeapon(weaponType : WeaponType) : Weapon
}
- class OrcWeapon {
- - weaponType : WeaponType
- + OrcWeapon(weaponType : WeaponType)
- + getWeaponType() : WeaponType
- + toString() : String
- }
- interface Blacksmith {
- + manufactureWeapon(WeaponType) : Weapon {abstract}
- }
class ElfWeapon {
- weaponType : WeaponType
+ ElfWeapon(weaponType : WeaponType)
+ getWeaponType() : WeaponType
+ toString() : String
}
- class App {
- - blacksmith : Blacksmith
- + App(blacksmith : Blacksmith)
- + main(args : String[]) {static}
- - manufactureWeapons()
+ class OrcBlacksmith {
+ + OrcBlacksmith()
+ + manufactureWeapon(weaponType : WeaponType) : Weapon
+ }
+ class OrcWeapon {
+ - weaponType : WeaponType
+ + OrcWeapon(weaponType : WeaponType)
+ + getWeaponType() : WeaponType
+ + toString() : String
}
interface Weapon {
+ getWeaponType() : WeaponType {abstract}
@@ -46,8 +47,8 @@ package com.iluwatar.factory.method {
ElfWeapon --> "-weaponType" WeaponType
OrcWeapon --> "-weaponType" WeaponType
App --> "-blacksmith" Blacksmith
-OrcBlacksmith ..|> Blacksmith
ElfBlacksmith ..|> Blacksmith
-OrcWeapon ..|> Weapon
ElfWeapon ..|> Weapon
+OrcBlacksmith ..|> Blacksmith
+OrcWeapon ..|> Weapon
@enduml
\ No newline at end of file
diff --git a/factory-method/pom.xml b/factory-method/pom.xml
index 74dc91a02..e27bd2444 100644
--- a/factory-method/pom.xml
+++ b/factory-method/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
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/App.java b/factory-method/src/main/java/com/iluwatar/factory/method/App.java
index cd7a6e6e7..3fb105682 100644
--- a/factory-method/src/main/java/com/iluwatar/factory/method/App.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/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.factory.method;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* The Factory Method is a creational design pattern which uses factory methods to deal with the
@@ -38,6 +41,8 @@ package com.iluwatar.factory.method;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
private final Blacksmith blacksmith;
/**
@@ -70,8 +75,8 @@ public class App {
private void manufactureWeapons() {
Weapon weapon;
weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
- System.out.println(weapon);
+ LOGGER.info(weapon.toString());
weapon = blacksmith.manufactureWeapon(WeaponType.AXE);
- System.out.println(weapon);
+ LOGGER.info(weapon.toString());
}
}
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java
index 9d90bebbc..e856d467e 100644
--- a/factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.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
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java
index 52844691f..66938bb17 100644
--- a/factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.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
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java b/factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java
index c06674d49..95771e248 100644
--- a/factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.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
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java
index 75247f4a2..e2921a4b5 100644
--- a/factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.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
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java b/factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java
index abae770ed..59ae0e7dc 100644
--- a/factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.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
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java b/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java
index d9c8cac0c..c642622c3 100644
--- a/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.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
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java b/factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java
index 34921ae5c..9f5ce1876 100644
--- a/factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.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
diff --git a/factory-method/src/test/java/com/iluwatar/factory/method/AppTest.java b/factory-method/src/test/java/com/iluwatar/factory/method/AppTest.java
index 818ee96cd..88b40d4fe 100644
--- a/factory-method/src/test/java/com/iluwatar/factory/method/AppTest.java
+++ b/factory-method/src/test/java/com/iluwatar/factory/method/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
diff --git a/factory-method/src/test/java/com/iluwatar/factory/method/FactoryMethodTest.java b/factory-method/src/test/java/com/iluwatar/factory/method/FactoryMethodTest.java
index 2f8d1c9bb..4f3a5930d 100644
--- a/factory-method/src/test/java/com/iluwatar/factory/method/FactoryMethodTest.java
+++ b/factory-method/src/test/java/com/iluwatar/factory/method/FactoryMethodTest.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
diff --git a/feature-toggle/etc/feature-toggle.urm.puml b/feature-toggle/etc/feature-toggle.urm.puml
index 6c935f3e6..0febb2631 100644
--- a/feature-toggle/etc/feature-toggle.urm.puml
+++ b/feature-toggle/etc/feature-toggle.urm.puml
@@ -37,6 +37,7 @@ package com.iluwatar.featuretoggle.pattern.propertiesversion {
}
package com.iluwatar.featuretoggle {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
diff --git a/feature-toggle/pom.xml b/feature-toggle/pom.xml
index eebc433e8..69a6580cb 100644
--- a/feature-toggle/pom.xml
+++ b/feature-toggle/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
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/App.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/App.java
index debe99580..29676e0c9 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/App.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/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.featuretoggle.pattern.Service;
import com.iluwatar.featuretoggle.pattern.propertiesversion.PropertiesFeatureToggleVersion;
import com.iluwatar.featuretoggle.user.User;
import com.iluwatar.featuretoggle.user.UserGroup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Properties;
@@ -45,6 +47,8 @@ import java.util.Properties;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Block 1 shows the {@link PropertiesFeatureToggleVersion} being run with {@link Properties} setting the feature
* toggle to enabled.
@@ -70,7 +74,7 @@ public class App {
properties.put("enhancedWelcome", true);
Service service = new PropertiesFeatureToggleVersion(properties);
final String welcomeMessage = service.getWelcomeMessage(new User("Jamie No Code"));
- System.out.println(welcomeMessage);
+ LOGGER.info(welcomeMessage);
// ---------------------------------------------
@@ -78,7 +82,7 @@ public class App {
turnedOff.put("enhancedWelcome", false);
Service turnedOffService = new PropertiesFeatureToggleVersion(turnedOff);
final String welcomeMessageturnedOff = turnedOffService.getWelcomeMessage(new User("Jamie No Code"));
- System.out.println(welcomeMessageturnedOff);
+ LOGGER.info(welcomeMessageturnedOff);
// --------------------------------------------
@@ -90,7 +94,7 @@ public class App {
final String welcomeMessagePaidUser = service.getWelcomeMessage(paidUser);
final String welcomeMessageFreeUser = service.getWelcomeMessage(freeUser);
- System.out.println(welcomeMessageFreeUser);
- System.out.println(welcomeMessagePaidUser);
+ LOGGER.info(welcomeMessageFreeUser);
+ LOGGER.info(welcomeMessagePaidUser);
}
}
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java
index d2542b2b7..9650b9f67 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.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
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersion.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersion.java
index 761d7d39a..a474423db 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersion.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersion.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
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java
index 124c9533f..42b7412c0 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.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
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java
index ce7b54b7b..baf25aa8b 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.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
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/UserGroup.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/UserGroup.java
index c9d9fd027..cb84ec533 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/UserGroup.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/UserGroup.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
diff --git a/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersionTest.java b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersionTest.java
index 69afc9bb4..def53b97c 100644
--- a/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersionTest.java
+++ b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersionTest.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
diff --git a/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java
index dca1d9b82..6c33b260c 100644
--- a/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java
+++ b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.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
diff --git a/feature-toggle/src/test/java/com/iluwatar/featuretoggle/user/UserGroupTest.java b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/user/UserGroupTest.java
index 6659815d3..c6ff30855 100644
--- a/feature-toggle/src/test/java/com/iluwatar/featuretoggle/user/UserGroupTest.java
+++ b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/user/UserGroupTest.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
diff --git a/fluentinterface/etc/fluentinterface.urm.puml b/fluentinterface/etc/fluentinterface.urm.puml
index 0283e20b5..ef71a0f4b 100644
--- a/fluentinterface/etc/fluentinterface.urm.puml
+++ b/fluentinterface/etc/fluentinterface.urm.puml
@@ -21,6 +21,7 @@ package com.iluwatar.fluentinterface.fluentiterable.simple {
}
package com.iluwatar.fluentinterface.app {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
- negatives() : Predicate<? super Integer> {static}
diff --git a/fluentinterface/pom.xml b/fluentinterface/pom.xml
index b438103e4..09306836b 100644
--- a/fluentinterface/pom.xml
+++ b/fluentinterface/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
diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java
index 1be2b1e70..fd6fc66dd 100644
--- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java
+++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/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
@@ -35,6 +35,8 @@ import java.util.function.Predicate;
import com.iluwatar.fluentinterface.fluentiterable.FluentIterable;
import com.iluwatar.fluentinterface.fluentiterable.lazy.LazyFluentIterable;
import com.iluwatar.fluentinterface.fluentiterable.simple.SimpleFluentIterable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Fluent Interface pattern is useful when you want to provide an easy readable, flowing API.
@@ -50,6 +52,8 @@ import com.iluwatar.fluentinterface.fluentiterable.simple.SimpleFluentIterable;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*/
@@ -74,9 +78,7 @@ public class App {
.fromCopyOf(integerList)
.filter(number -> number % 2 == 0)
.first()
- .ifPresent(
- evenNumber -> System.out.println(String.format("The first even number is: %d",
- evenNumber)));
+ .ifPresent(evenNumber -> LOGGER.info("The first even number is: {}", evenNumber));
List<String> transformedList =
@@ -97,9 +99,7 @@ public class App {
.filter(negatives())
.first(2)
.last()
- .ifPresent(
- lastOfFirstTwo -> System.out.println(String.format(
- "The last of the first two negatives is: %d", lastOfFirstTwo)));
+ .ifPresent(lastOfFirstTwo -> LOGGER.info("The last of the first two negatives is: {}", lastOfFirstTwo));
}
private static Function<Integer, String> transformToString() {
@@ -126,6 +126,6 @@ public class App {
joiner.add(iterator.next().toString());
}
- System.out.println(joiner);
+ LOGGER.info(joiner.toString());
}
}
diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java
index f6d7e2e2b..693585962 100644
--- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java
+++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.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
diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/DecoratingIterator.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/DecoratingIterator.java
index 07d7f5739..54d367c20 100644
--- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/DecoratingIterator.java
+++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/DecoratingIterator.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
diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.java
index 63247875c..1a4c88ed7 100644
--- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.java
+++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.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
diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.java
index 153f3faa5..fde259f9b 100644
--- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.java
+++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.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
diff --git a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/app/AppTest.java b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/app/AppTest.java
index 5b750c604..6d6420d55 100644
--- a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/app/AppTest.java
+++ b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/app/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
diff --git a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterableTest.java b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterableTest.java
index 4037bed49..4cc2b1a7a 100644
--- a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterableTest.java
+++ b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterableTest.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
diff --git a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterableTest.java b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterableTest.java
index c422903c8..4f4a11863 100644
--- a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterableTest.java
+++ b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterableTest.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
diff --git a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterableTest.java b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterableTest.java
index e4e80641c..23b93b0a0 100644
--- a/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterableTest.java
+++ b/fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterableTest.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
diff --git a/flux/etc/flux.urm.puml b/flux/etc/flux.urm.puml
index a4e0b0622..40637d624 100644
--- a/flux/etc/flux.urm.puml
+++ b/flux/etc/flux.urm.puml
@@ -1,34 +1,26 @@
@startuml
package com.iluwatar.flux.view {
- interface View {
- + render() {abstract}
- + storeChanged(Store) {abstract}
+ class ContentView {
+ - LOGGER : Logger {static}
+ - content : Content
+ + ContentView()
+ + render()
+ + storeChanged(store : Store)
}
class MenuView {
+ - LOGGER : Logger {static}
- selected : MenuItem
+ MenuView()
+ itemClicked(item : MenuItem)
+ render()
+ storeChanged(store : Store)
}
- class ContentView {
- - content : Content
- + ContentView()
- + render()
- + storeChanged(store : Store)
+ interface View {
+ + render() {abstract}
+ + storeChanged(Store) {abstract}
}
}
package com.iluwatar.flux.action {
- class MenuAction {
- - menuItem : MenuItem
- + MenuAction(menuItem : MenuItem)
- + getMenuItem() : MenuItem
- }
- class ContentAction {
- - content : Content
- + ContentAction(content : Content)
- + getContent() : Content
- }
abstract class Action {
- type : ActionType
+ Action(type : ActionType)
@@ -40,6 +32,24 @@ package com.iluwatar.flux.action {
+ valueOf(name : String) : ActionType {static}
+ values() : ActionType[] {static}
}
+ enum Content {
+ + COMPANY {static}
+ + PRODUCTS {static}
+ - title : String
+ + toString() : String
+ + valueOf(name : String) : Content {static}
+ + values() : Content[] {static}
+ }
+ class ContentAction {
+ - content : Content
+ + ContentAction(content : Content)
+ + getContent() : Content
+ }
+ class MenuAction {
+ - menuItem : MenuItem
+ + MenuAction(menuItem : MenuItem)
+ + getMenuItem() : MenuItem
+ }
enum MenuItem {
+ COMPANY {static}
+ HOME {static}
@@ -49,14 +59,6 @@ package com.iluwatar.flux.action {
+ valueOf(name : String) : MenuItem {static}
+ values() : MenuItem[] {static}
}
- enum Content {
- + COMPANY {static}
- + PRODUCTS {static}
- - title : String
- + toString() : String
- + valueOf(name : String) : Content {static}
- + values() : Content[] {static}
- }
}
package com.iluwatar.flux.app {
class App {
@@ -64,17 +66,6 @@ package com.iluwatar.flux.app {
+ main(args : String[]) {static}
}
}
-package com.iluwatar.flux.dispatcher {
- class Dispatcher {
- - instance : Dispatcher {static}
- - stores : List<Store>
- - Dispatcher()
- - dispatchAction(action : Action)
- + getInstance() : Dispatcher {static}
- + menuItemSelected(menuItem : MenuItem)
- + registerStore(store : Store)
- }
-}
package com.iluwatar.flux.store {
class ContentStore {
- content : Content
@@ -96,20 +87,31 @@ package com.iluwatar.flux.store {
+ registerView(view : View)
}
}
+package com.iluwatar.flux.dispatcher {
+ class Dispatcher {
+ - instance : Dispatcher {static}
+ - stores : List<Store>
+ - Dispatcher()
+ - dispatchAction(action : Action)
+ + getInstance() : Dispatcher {static}
+ + menuItemSelected(menuItem : MenuItem)
+ + registerStore(store : Store)
+ }
+}
MenuAction --> "-menuItem" MenuItem
-Action --> "-type" ActionType
MenuStore --> "-selected" MenuItem
+Action --> "-type" ActionType
Dispatcher --> "-instance" Dispatcher
ContentView --> "-content" Content
Dispatcher --> "-stores" Store
MenuView --> "-selected" MenuItem
Store --> "-views" View
-ContentAction --> "-content" Content
ContentStore --> "-content" Content
-ContentStore --|> Store
-MenuAction --|> Action
-MenuStore --|> Store
+ContentAction --> "-content" Content
ContentAction --|> Action
-MenuView ..|> View
+MenuAction --|> Action
+ContentStore --|> Store
+MenuStore --|> Store
ContentView ..|> View
+MenuView ..|> View
@enduml
\ No newline at end of file
diff --git a/flux/pom.xml b/flux/pom.xml
index 50f5d395a..713732563 100644
--- a/flux/pom.xml
+++ b/flux/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
diff --git a/flux/src/main/java/com/iluwatar/flux/action/Action.java b/flux/src/main/java/com/iluwatar/flux/action/Action.java
index 7fc0fe51a..31765177a 100644
--- a/flux/src/main/java/com/iluwatar/flux/action/Action.java
+++ b/flux/src/main/java/com/iluwatar/flux/action/Action.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
diff --git a/flux/src/main/java/com/iluwatar/flux/action/ActionType.java b/flux/src/main/java/com/iluwatar/flux/action/ActionType.java
index db8046d5e..f5b5a2f81 100644
--- a/flux/src/main/java/com/iluwatar/flux/action/ActionType.java
+++ b/flux/src/main/java/com/iluwatar/flux/action/ActionType.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
diff --git a/flux/src/main/java/com/iluwatar/flux/action/Content.java b/flux/src/main/java/com/iluwatar/flux/action/Content.java
index 49a06b5ad..596b466db 100644
--- a/flux/src/main/java/com/iluwatar/flux/action/Content.java
+++ b/flux/src/main/java/com/iluwatar/flux/action/Content.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
diff --git a/flux/src/main/java/com/iluwatar/flux/action/ContentAction.java b/flux/src/main/java/com/iluwatar/flux/action/ContentAction.java
index c066ba933..f6005b8d7 100644
--- a/flux/src/main/java/com/iluwatar/flux/action/ContentAction.java
+++ b/flux/src/main/java/com/iluwatar/flux/action/ContentAction.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
diff --git a/flux/src/main/java/com/iluwatar/flux/action/MenuAction.java b/flux/src/main/java/com/iluwatar/flux/action/MenuAction.java
index 09c720503..6dc95f5bc 100644
--- a/flux/src/main/java/com/iluwatar/flux/action/MenuAction.java
+++ b/flux/src/main/java/com/iluwatar/flux/action/MenuAction.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
diff --git a/flux/src/main/java/com/iluwatar/flux/action/MenuItem.java b/flux/src/main/java/com/iluwatar/flux/action/MenuItem.java
index ce8c5ed64..5e0f0d6f1 100644
--- a/flux/src/main/java/com/iluwatar/flux/action/MenuItem.java
+++ b/flux/src/main/java/com/iluwatar/flux/action/MenuItem.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
diff --git a/flux/src/main/java/com/iluwatar/flux/app/App.java b/flux/src/main/java/com/iluwatar/flux/app/App.java
index 81aac980c..c758652c7 100644
--- a/flux/src/main/java/com/iluwatar/flux/app/App.java
+++ b/flux/src/main/java/com/iluwatar/flux/app/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
diff --git a/flux/src/main/java/com/iluwatar/flux/dispatcher/Dispatcher.java b/flux/src/main/java/com/iluwatar/flux/dispatcher/Dispatcher.java
index 10f064efa..3be55dc46 100644
--- a/flux/src/main/java/com/iluwatar/flux/dispatcher/Dispatcher.java
+++ b/flux/src/main/java/com/iluwatar/flux/dispatcher/Dispatcher.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
diff --git a/flux/src/main/java/com/iluwatar/flux/store/ContentStore.java b/flux/src/main/java/com/iluwatar/flux/store/ContentStore.java
index bca8e29bf..b457dccbb 100644
--- a/flux/src/main/java/com/iluwatar/flux/store/ContentStore.java
+++ b/flux/src/main/java/com/iluwatar/flux/store/ContentStore.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
diff --git a/flux/src/main/java/com/iluwatar/flux/store/MenuStore.java b/flux/src/main/java/com/iluwatar/flux/store/MenuStore.java
index 2b3b418b3..124e027bd 100644
--- a/flux/src/main/java/com/iluwatar/flux/store/MenuStore.java
+++ b/flux/src/main/java/com/iluwatar/flux/store/MenuStore.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
diff --git a/flux/src/main/java/com/iluwatar/flux/store/Store.java b/flux/src/main/java/com/iluwatar/flux/store/Store.java
index f7cc2ccbf..42a546c10 100644
--- a/flux/src/main/java/com/iluwatar/flux/store/Store.java
+++ b/flux/src/main/java/com/iluwatar/flux/store/Store.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
diff --git a/flux/src/main/java/com/iluwatar/flux/view/ContentView.java b/flux/src/main/java/com/iluwatar/flux/view/ContentView.java
index cb351bfae..a501485c5 100644
--- a/flux/src/main/java/com/iluwatar/flux/view/ContentView.java
+++ b/flux/src/main/java/com/iluwatar/flux/view/ContentView.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
@@ -25,6 +25,8 @@ package com.iluwatar.flux.view;
import com.iluwatar.flux.action.Content;
import com.iluwatar.flux.store.ContentStore;
import com.iluwatar.flux.store.Store;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -33,6 +35,8 @@ import com.iluwatar.flux.store.Store;
*/
public class ContentView implements View {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ContentView.class);
+
private Content content = Content.PRODUCTS;
@Override
@@ -44,6 +48,6 @@ public class ContentView implements View {
@Override
public void render() {
- System.out.println(content.toString());
+ LOGGER.info(content.toString());
}
}
diff --git a/flux/src/main/java/com/iluwatar/flux/view/MenuView.java b/flux/src/main/java/com/iluwatar/flux/view/MenuView.java
index 6cd9005dc..0744adce6 100644
--- a/flux/src/main/java/com/iluwatar/flux/view/MenuView.java
+++ b/flux/src/main/java/com/iluwatar/flux/view/MenuView.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
@@ -26,6 +26,8 @@ import com.iluwatar.flux.action.MenuItem;
import com.iluwatar.flux.dispatcher.Dispatcher;
import com.iluwatar.flux.store.MenuStore;
import com.iluwatar.flux.store.Store;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -34,6 +36,8 @@ import com.iluwatar.flux.store.Store;
*/
public class MenuView implements View {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MenuView.class);
+
private MenuItem selected = MenuItem.HOME;
@Override
@@ -47,9 +51,9 @@ public class MenuView implements View {
public void render() {
for (MenuItem item : MenuItem.values()) {
if (selected.equals(item)) {
- System.out.println(String.format("* %s", item.toString()));
+ LOGGER.info("* {}", item);
} else {
- System.out.println(item.toString());
+ LOGGER.info(item.toString());
}
}
}
diff --git a/flux/src/main/java/com/iluwatar/flux/view/View.java b/flux/src/main/java/com/iluwatar/flux/view/View.java
index 0a34f1fdf..c7cc6036a 100644
--- a/flux/src/main/java/com/iluwatar/flux/view/View.java
+++ b/flux/src/main/java/com/iluwatar/flux/view/View.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
diff --git a/flux/src/test/java/com/iluwatar/flux/action/ContentTest.java b/flux/src/test/java/com/iluwatar/flux/action/ContentTest.java
index 90e66d69a..3ddf7805c 100644
--- a/flux/src/test/java/com/iluwatar/flux/action/ContentTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/action/ContentTest.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
diff --git a/flux/src/test/java/com/iluwatar/flux/action/MenuItemTest.java b/flux/src/test/java/com/iluwatar/flux/action/MenuItemTest.java
index 02c8e972b..e40133586 100644
--- a/flux/src/test/java/com/iluwatar/flux/action/MenuItemTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/action/MenuItemTest.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
diff --git a/flux/src/test/java/com/iluwatar/flux/app/AppTest.java b/flux/src/test/java/com/iluwatar/flux/app/AppTest.java
index f25beaefa..7e6475ee7 100644
--- a/flux/src/test/java/com/iluwatar/flux/app/AppTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/app/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
diff --git a/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java b/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java
index 9f3f610d1..b245de6ac 100644
--- a/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.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
diff --git a/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java b/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java
index 6e2cc5b35..85c0e46f4 100644
--- a/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.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
diff --git a/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java b/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java
index 7d68656a2..63d1dfdfb 100644
--- a/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.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
diff --git a/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.java b/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.java
index cb26f97d6..b97d751bf 100644
--- a/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.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
diff --git a/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java b/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java
index 8a5d62f24..528549e9c 100644
--- a/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.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
diff --git a/flyweight/etc/flyweight.urm.puml b/flyweight/etc/flyweight.urm.puml
index 3f2203712..648c223af 100644
--- a/flyweight/etc/flyweight.urm.puml
+++ b/flyweight/etc/flyweight.urm.puml
@@ -1,19 +1,7 @@
@startuml
package com.iluwatar.flyweight {
- class PotionFactory {
- - potions : Map<PotionType, Potion>
- + PotionFactory()
- ~ createPotion(type : PotionType) : Potion
- }
- class HealingPotion {
- + HealingPotion()
- + drink()
- }
- class InvisibilityPotion {
- + InvisibilityPotion()
- + drink()
- }
class AlchemistShop {
+ - LOGGER : Logger {static}
- bottomShelf : List<Potion>
- topShelf : List<Potion>
+ AlchemistShop()
@@ -26,21 +14,34 @@ package com.iluwatar.flyweight {
+ App()
+ main(args : String[]) {static}
}
- interface Potion {
- + drink() {abstract}
- }
- class PoisonPotion {
- + PoisonPotion()
- + drink()
- }
- class StrengthPotion {
- + StrengthPotion()
+ class HealingPotion {
+ - LOGGER : Logger {static}
+ + HealingPotion()
+ drink()
}
class HolyWaterPotion {
+ - LOGGER : Logger {static}
+ HolyWaterPotion()
+ drink()
}
+ class InvisibilityPotion {
+ - LOGGER : Logger {static}
+ + InvisibilityPotion()
+ + drink()
+ }
+ class PoisonPotion {
+ - LOGGER : Logger {static}
+ + PoisonPotion()
+ + drink()
+ }
+ interface Potion {
+ + drink() {abstract}
+ }
+ class PotionFactory {
+ - potions : Map<PotionType, Potion>
+ + PotionFactory()
+ ~ createPotion(type : PotionType) : Potion
+ }
enum PotionType {
+ HEALING {static}
+ HOLY_WATER {static}
@@ -50,11 +51,16 @@ package com.iluwatar.flyweight {
+ valueOf(name : String) : PotionType {static}
+ values() : PotionType[] {static}
}
+ class StrengthPotion {
+ - LOGGER : Logger {static}
+ + StrengthPotion()
+ + drink()
+ }
}
AlchemistShop --> "-topShelf" Potion
HealingPotion ..|> Potion
+HolyWaterPotion ..|> Potion
InvisibilityPotion ..|> Potion
PoisonPotion ..|> Potion
StrengthPotion ..|> Potion
-HolyWaterPotion ..|> Potion
@enduml
\ No newline at end of file
diff --git a/flyweight/pom.xml b/flyweight/pom.xml
index eb168c486..127a92b73 100644
--- a/flyweight/pom.xml
+++ b/flyweight/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
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java b/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java
index 507de7a6a..01320e082 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.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.flyweight;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -33,6 +36,8 @@ import java.util.List;
*/
public class AlchemistShop {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AlchemistShop.class);
+
private List<Potion> topShelf;
private List<Potion> bottomShelf;
@@ -88,13 +93,13 @@ public class AlchemistShop {
*/
public void enumerate() {
- System.out.println("Enumerating top shelf potions\n");
+ LOGGER.info("Enumerating top shelf potions\n");
for (Potion p : topShelf) {
p.drink();
}
- System.out.println("\nEnumerating bottom shelf potions\n");
+ LOGGER.info("Enumerating bottom shelf potions\n");
for (Potion p : bottomShelf) {
p.drink();
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/App.java b/flyweight/src/main/java/com/iluwatar/flyweight/App.java
index 49c17e465..043321b5f 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/App.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/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
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.java
index 464675a61..060aaea4a 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.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.flyweight;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* HealingPotion
@@ -29,8 +32,10 @@ package com.iluwatar.flyweight;
*/
public class HealingPotion implements Potion {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HealingPotion.class);
+
@Override
public void drink() {
- System.out.println("You feel healed. (Potion=" + System.identityHashCode(this) + ")");
+ LOGGER.info("You feel healed. (Potion={})", System.identityHashCode(this));
}
}
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.java
index b05b4af11..1b14f56be 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.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.flyweight;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* HolyWaterPotion
@@ -29,8 +32,10 @@ package com.iluwatar.flyweight;
*/
public class HolyWaterPotion implements Potion {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HolyWaterPotion.class);
+
@Override
public void drink() {
- System.out.println("You feel blessed. (Potion=" + System.identityHashCode(this) + ")");
+ LOGGER.info("You feel blessed. (Potion={})", System.identityHashCode(this));
}
}
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.java
index 5aeb5d3a4..8baec7c13 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.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.flyweight;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* InvisibilityPotion
@@ -29,8 +32,10 @@ package com.iluwatar.flyweight;
*/
public class InvisibilityPotion implements Potion {
+ private static final Logger LOGGER = LoggerFactory.getLogger(InvisibilityPotion.class);
+
@Override
public void drink() {
- System.out.println("You become invisible. (Potion=" + System.identityHashCode(this) + ")");
+ LOGGER.info("You become invisible. (Potion={})", System.identityHashCode(this));
}
}
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.java
index a9d13088e..8f6bc113f 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.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.flyweight;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* PoisonPotion
@@ -29,8 +32,10 @@ package com.iluwatar.flyweight;
*/
public class PoisonPotion implements Potion {
+ private static final Logger LOGGER = LoggerFactory.getLogger(PoisonPotion.class);
+
@Override
public void drink() {
- System.out.println("Urgh! This is poisonous. (Potion=" + System.identityHashCode(this) + ")");
+ LOGGER.info("Urgh! This is poisonous. (Potion={})", System.identityHashCode(this));
}
}
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/Potion.java b/flyweight/src/main/java/com/iluwatar/flyweight/Potion.java
index d2520c316..c6ce38760 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/Potion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/Potion.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
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.java b/flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.java
index 436095081..c93707000 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.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
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/PotionType.java b/flyweight/src/main/java/com/iluwatar/flyweight/PotionType.java
index 89c6fdbe3..3ee938838 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/PotionType.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/PotionType.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
diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.java
index 2c21e7df1..787e717fc 100644
--- a/flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.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.flyweight;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* StrengthPotion
@@ -29,8 +32,10 @@ package com.iluwatar.flyweight;
*/
public class StrengthPotion implements Potion {
+ private static final Logger LOGGER = LoggerFactory.getLogger(StrengthPotion.class);
+
@Override
public void drink() {
- System.out.println("You feel strong. (Potion=" + System.identityHashCode(this) + ")");
+ LOGGER.info("You feel strong. (Potion={})", System.identityHashCode(this));
}
}
diff --git a/flyweight/src/test/java/com/iluwatar/flyweight/AlchemistShopTest.java b/flyweight/src/test/java/com/iluwatar/flyweight/AlchemistShopTest.java
index efb0a6e2e..96cc455a7 100644
--- a/flyweight/src/test/java/com/iluwatar/flyweight/AlchemistShopTest.java
+++ b/flyweight/src/test/java/com/iluwatar/flyweight/AlchemistShopTest.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
diff --git a/flyweight/src/test/java/com/iluwatar/flyweight/AppTest.java b/flyweight/src/test/java/com/iluwatar/flyweight/AppTest.java
index 282311920..5d2d6815f 100644
--- a/flyweight/src/test/java/com/iluwatar/flyweight/AppTest.java
+++ b/flyweight/src/test/java/com/iluwatar/flyweight/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
diff --git a/front-controller/etc/front-controller.urm.puml b/front-controller/etc/front-controller.urm.puml
index 8fb9be184..246e7657c 100644
--- a/front-controller/etc/front-controller.urm.puml
+++ b/front-controller/etc/front-controller.urm.puml
@@ -1,23 +1,34 @@
@startuml
package com.iluwatar.front.controller {
- class ArcherView {
- + ArcherView()
- + display()
- }
- interface View {
- + display() {abstract}
- }
- class CatapultView {
- + CatapultView()
- + display()
+ class App {
+ + App()
+ + main(args : String[]) {static}
}
class ArcherCommand {
+ ArcherCommand()
+ process()
}
- class App {
- + App()
- + main(args : String[]) {static}
+ class ArcherView {
+ - LOGGER : Logger {static}
+ + ArcherView()
+ + display()
+ }
+ class CatapultCommand {
+ + CatapultCommand()
+ + process()
+ }
+ class CatapultView {
+ - LOGGER : Logger {static}
+ + CatapultView()
+ + display()
+ }
+ interface Command {
+ + process() {abstract}
+ }
+ class ErrorView {
+ - LOGGER : Logger {static}
+ + ErrorView()
+ + display()
}
class FrontController {
+ FrontController()
@@ -29,22 +40,14 @@ package com.iluwatar.front.controller {
+ UnknownCommand()
+ process()
}
- class ErrorView {
- + ErrorView()
- + display()
- }
- class CatapultCommand {
- + CatapultCommand()
- + process()
- }
- interface Command {
- + process() {abstract}
+ interface View {
+ + display() {abstract}
}
}
-ArcherView ..|> View
-CatapultView ..|> View
ArcherCommand ..|> Command
-UnknownCommand ..|> Command
-ErrorView ..|> View
+ArcherView ..|> View
CatapultCommand ..|> Command
+CatapultView ..|> View
+ErrorView ..|> View
+UnknownCommand ..|> Command
@enduml
\ No newline at end of file
diff --git a/front-controller/pom.xml b/front-controller/pom.xml
index c08ed8d0f..51be506ee 100644
--- a/front-controller/pom.xml
+++ b/front-controller/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
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/App.java b/front-controller/src/main/java/com/iluwatar/front/controller/App.java
index 909578b3b..92f43e363 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/App.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/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
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/ApplicationException.java b/front-controller/src/main/java/com/iluwatar/front/controller/ApplicationException.java
index aa50fe2ce..882784bbf 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/ApplicationException.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/ApplicationException.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
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/ArcherCommand.java b/front-controller/src/main/java/com/iluwatar/front/controller/ArcherCommand.java
index a1a391979..b1bb77d3c 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/ArcherCommand.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/ArcherCommand.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
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/ArcherView.java b/front-controller/src/main/java/com/iluwatar/front/controller/ArcherView.java
index a7cf8ca27..af6c72d0d 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/ArcherView.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/ArcherView.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,15 +22,20 @@
*/
package com.iluwatar.front.controller;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* View for archers.
*
*/
public class ArcherView implements View {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ArcherView.class);
@Override
public void display() {
- System.out.println("Displaying archers");
+ LOGGER.info("Displaying archers");
}
}
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/CatapultCommand.java b/front-controller/src/main/java/com/iluwatar/front/controller/CatapultCommand.java
index c4b3c6ea3..e5cc47043 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/CatapultCommand.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/CatapultCommand.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
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/CatapultView.java b/front-controller/src/main/java/com/iluwatar/front/controller/CatapultView.java
index 90e4c7896..2191fcaa6 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/CatapultView.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/CatapultView.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.front.controller;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* View for catapults.
@@ -29,8 +32,10 @@ package com.iluwatar.front.controller;
*/
public class CatapultView implements View {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CatapultView.class);
+
@Override
public void display() {
- System.out.println("Displaying catapults");
+ LOGGER.info("Displaying catapults");
}
}
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/Command.java b/front-controller/src/main/java/com/iluwatar/front/controller/Command.java
index ed49572e4..998d7dea8 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/Command.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/Command.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
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/ErrorView.java b/front-controller/src/main/java/com/iluwatar/front/controller/ErrorView.java
index cbfd4bd2e..22961ef7b 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/ErrorView.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/ErrorView.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.front.controller;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* View for errors.
@@ -29,8 +32,10 @@ package com.iluwatar.front.controller;
*/
public class ErrorView implements View {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ErrorView.class);
+
@Override
public void display() {
- System.out.println("Error 500");
+ LOGGER.error("Error 500");
}
}
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/FrontController.java b/front-controller/src/main/java/com/iluwatar/front/controller/FrontController.java
index 6e2cccb0f..19f4a39f1 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/FrontController.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/FrontController.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
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/UnknownCommand.java b/front-controller/src/main/java/com/iluwatar/front/controller/UnknownCommand.java
index 6e5b33987..ad888bf9e 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/UnknownCommand.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/UnknownCommand.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
diff --git a/front-controller/src/main/java/com/iluwatar/front/controller/View.java b/front-controller/src/main/java/com/iluwatar/front/controller/View.java
index 536bb9750..ad43d0b02 100644
--- a/front-controller/src/main/java/com/iluwatar/front/controller/View.java
+++ b/front-controller/src/main/java/com/iluwatar/front/controller/View.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
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/AppTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/AppTest.java
index 8eec47b0a..dd15be495 100644
--- a/front-controller/src/test/java/com/iluwatar/front/controller/AppTest.java
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/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
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java
index 26157acde..c68a4ebf6 100644
--- a/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.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
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java
index c4d9ae625..edb5032ed 100644
--- a/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.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.front.controller;
+import com.iluwatar.front.controller.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -30,9 +33,7 @@ import org.junit.runners.Parameterized.Parameters;
import java.util.ArrayList;
import java.util.List;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/13/15 - 1:39 PM
@@ -40,7 +41,19 @@ import static org.mockito.Mockito.verifyZeroInteractions;
* @author Jeroen Meulemeester
*/
@RunWith(Parameterized.class)
-public class CommandTest extends StdOutTest {
+public class CommandTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
@Parameters
public static List<Object[]> data() {
@@ -75,10 +88,10 @@ public class CommandTest extends StdOutTest {
@Test
public void testDisplay() {
final FrontController frontController = new FrontController();
- verifyZeroInteractions(getStdOutMock());
+ assertEquals(0, appender.getLogSize());
frontController.handleRequest(request);
- verify(getStdOutMock()).println(displayMessage);
- verifyNoMoreInteractions(getStdOutMock());
+ assertEquals(displayMessage, appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
}
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/FrontControllerTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/FrontControllerTest.java
index 0822ffcd0..5367403f9 100644
--- a/front-controller/src/test/java/com/iluwatar/front/controller/FrontControllerTest.java
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/FrontControllerTest.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.front.controller;
+import com.iluwatar.front.controller.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -30,9 +33,7 @@ import org.junit.runners.Parameterized.Parameters;
import java.util.ArrayList;
import java.util.List;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/13/15 - 1:39 PM
@@ -40,7 +41,19 @@ import static org.mockito.Mockito.verifyZeroInteractions;
* @author Jeroen Meulemeester
*/
@RunWith(Parameterized.class)
-public class FrontControllerTest extends StdOutTest {
+public class FrontControllerTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
@Parameters
public static List<Object[]> data() {
@@ -74,10 +87,10 @@ public class FrontControllerTest extends StdOutTest {
@Test
public void testDisplay() {
- verifyZeroInteractions(getStdOutMock());
+ assertEquals(0, appender.getLogSize());
this.command.process();
- verify(getStdOutMock()).println(displayMessage);
- verifyNoMoreInteractions(getStdOutMock());
+ assertEquals(displayMessage, appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
}
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/StdOutTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/StdOutTest.java
deleted file mode 100644
index bc32a1b3c..000000000
--- a/front-controller/src/test/java/com/iluwatar/front/controller/StdOutTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.front.controller;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since the actions of the views don't have
- * any influence on any other accessible objects, except for writing to std-out using {@link
- * System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/ViewTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/ViewTest.java
index cdabd66ef..a5786b97e 100644
--- a/front-controller/src/test/java/com/iluwatar/front/controller/ViewTest.java
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/ViewTest.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.front.controller;
+import com.iluwatar.front.controller.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -30,9 +33,7 @@ import org.junit.runners.Parameterized.Parameters;
import java.util.ArrayList;
import java.util.List;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/13/15 - 1:39 PM
@@ -40,7 +41,19 @@ import static org.mockito.Mockito.verifyZeroInteractions;
* @author Jeroen Meulemeester
*/
@RunWith(Parameterized.class)
-public class ViewTest extends StdOutTest {
+public class ViewTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
@Parameters
public static List<Object[]> data() {
@@ -74,10 +87,10 @@ public class ViewTest extends StdOutTest {
@Test
public void testDisplay() {
- verifyZeroInteractions(getStdOutMock());
+ assertEquals(0, appender.getLogSize());
this.view.display();
- verify(getStdOutMock()).println(displayMessage);
- verifyNoMoreInteractions(getStdOutMock());
+ assertEquals(displayMessage, appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
-}
\ No newline at end of file
+}
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/utils/InMemoryAppender.java b/front-controller/src/test/java/com/iluwatar/front/controller/utils/InMemoryAppender.java
new file mode 100644
index 000000000..62a234d0d
--- /dev/null
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/utils/InMemoryAppender.java
@@ -0,0 +1,54 @@
+/**
+ * The MIT License
+ * 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
+ * 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.front.controller.utils;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+}
diff --git a/half-sync-half-async/etc/half-sync-half-async.urm.puml b/half-sync-half-async/etc/half-sync-half-async.urm.puml
index 88f49eb4d..1dd9c1d83 100644
--- a/half-sync-half-async/etc/half-sync-half-async.urm.puml
+++ b/half-sync-half-async/etc/half-sync-half-async.urm.puml
@@ -1,9 +1,10 @@
@startuml
package com.iluwatar.halfsynchalfasync {
- class AsynchronousService {
- - service : ExecutorService
- + AsynchronousService(workQueue : BlockingQueue<Runnable>)
- + execute(task : AsyncTask<T>)
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ - ap(i : long) : long {static}
+ + main(args : String[]) {static}
}
~class ArithmeticSumTask {
- n : long
@@ -13,17 +14,17 @@ package com.iluwatar.halfsynchalfasync {
+ onPostCall(result : Long)
+ onPreCall()
}
- class App {
- + App()
- - ap(i : long) : long {static}
- + main(args : String[]) {static}
- }
interface AsyncTask<O> {
+ call() : O {abstract}
+ onError(Throwable) {abstract}
+ onPostCall(O) {abstract}
+ onPreCall() {abstract}
}
+ class AsynchronousService {
+ - service : ExecutorService
+ + AsynchronousService(workQueue : BlockingQueue<Runnable>)
+ + execute(task : AsyncTask<T>)
+ }
}
ArithmeticSumTask ..+ App
ArithmeticSumTask ..|> AsyncTask
diff --git a/half-sync-half-async/pom.xml b/half-sync-half-async/pom.xml
index d22e65a5e..30a297488 100644
--- a/half-sync-half-async/pom.xml
+++ b/half-sync-half-async/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
diff --git a/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/App.java b/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/App.java
index 17839bb32..bf35416ca 100644
--- a/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/App.java
+++ b/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/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.halfsynchalfasync;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.concurrent.LinkedBlockingQueue;
/**
@@ -66,6 +69,8 @@ import java.util.concurrent.LinkedBlockingQueue;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -128,7 +133,7 @@ public class App {
@Override
public void onPostCall(Long result) {
// Handle the result of computation
- System.out.println(result);
+ LOGGER.info(result.toString());
}
@Override
@@ -141,7 +146,7 @@ public class App {
try {
Thread.sleep(i);
} catch (InterruptedException e) {
- System.out.println(e);
+ LOGGER.error("Exception caught.", e);
}
return i * (i + 1) / 2;
}
diff --git a/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/AsyncTask.java b/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/AsyncTask.java
index 91e36069e..2751b9870 100644
--- a/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/AsyncTask.java
+++ b/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/AsyncTask.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
diff --git a/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/AsynchronousService.java b/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/AsynchronousService.java
index b42f551f2..4e2f9c23a 100644
--- a/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/AsynchronousService.java
+++ b/half-sync-half-async/src/main/java/com/iluwatar/halfsynchalfasync/AsynchronousService.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
diff --git a/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AppTest.java b/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AppTest.java
index e791cc310..2dfc2bf5c 100644
--- a/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AppTest.java
+++ b/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/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
diff --git a/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java b/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java
index 7fcbd1541..c6d00b1ac 100644
--- a/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java
+++ b/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.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
diff --git a/hexagonal/README.md b/hexagonal/README.md
index 27d31520c..88908421d 100644
--- a/hexagonal/README.md
+++ b/hexagonal/README.md
@@ -23,15 +23,18 @@ Allow an application to equally be driven by users, programs, automated test or
## Applicability
Use Hexagonal Architecture pattern when
-* it is important that the application is fully testable
-* you use Domain Driven Design methodology and/or Microservices architectural style
+* When the application needs to be independent of any frameworks
+* When it is important that the application highly maintainable and fully testable
## Tutorials
* [Build Maintainable Systems With Hexagonal Architecture](http://java-design-patterns.com/blog/build-maintainable-systems-with-hexagonal-architecture/)
+## Presentations
+* [Hexagonal Architecture](https://github.com/iluwatar/java-design-patterns/tree/master/hexagonal/etc/presentation.html)
+
## Real world examples
-* [Apache Isis](https://isis.apache.org/)
+* [Apache Isis](https://isis.apache.org/) builds generic UI and REST API directly from the underlying domain objects
## Credits
diff --git a/hexagonal/etc/hexagonal.urm.puml b/hexagonal/etc/hexagonal.urm.puml
index a2f5d0469..f6dd970c0 100644
--- a/hexagonal/etc/hexagonal.urm.puml
+++ b/hexagonal/etc/hexagonal.urm.puml
@@ -9,6 +9,7 @@ package com.iluwatar.hexagonal.sampledata {
}
package com.iluwatar.hexagonal.service {
class ConsoleLottery {
+ - LOGGER : Logger {static}
+ ConsoleLottery()
+ main(args : String[]) {static}
- printMainMenu() {static}
@@ -24,16 +25,6 @@ package com.iluwatar.hexagonal.mongo {
}
}
package com.iluwatar.hexagonal.domain {
- class LotteryTicketId {
- - id : int
- - numAllocated : int {static}
- + LotteryTicketId()
- + LotteryTicketId(id : int)
- + equals(o : Object) : boolean
- + getId() : int
- + hashCode() : int
- + toString() : String
- }
class LotteryAdministration {
- notifications : LotteryEventLog
- repository : LotteryTicketRepository
@@ -43,6 +34,14 @@ package com.iluwatar.hexagonal.domain {
+ performLottery() : LotteryNumbers
+ resetLottery()
}
+ class LotteryConstants {
+ + PLAYER_MAX_SALDO : int {static}
+ + PRIZE_AMOUNT : int {static}
+ + SERVICE_BANK_ACCOUNT : String {static}
+ + SERVICE_BANK_ACCOUNT_SALDO : int {static}
+ + TICKET_PRIZE : int {static}
+ - LotteryConstants()
+ }
class LotteryNumbers {
+ MAX_NUMBER : int {static}
+ MIN_NUMBER : int {static}
@@ -59,6 +58,11 @@ package com.iluwatar.hexagonal.domain {
+ hashCode() : int
+ toString() : String
}
+ -class RandomNumberGenerator {
+ - randomIterator : OfInt
+ + RandomNumberGenerator(min : int, max : int)
+ + nextInt() : int
+ }
class LotteryService {
- notifications : LotteryEventLog
- repository : LotteryTicketRepository
@@ -67,41 +71,6 @@ package com.iluwatar.hexagonal.domain {
+ checkTicketForPrize(id : LotteryTicketId, winningNumbers : LotteryNumbers) : LotteryTicketCheckResult
+ submitTicket(ticket : LotteryTicket) : Optional<LotteryTicketId>
}
- -class RandomNumberGenerator {
- - randomIterator : OfInt
- + RandomNumberGenerator(min : int, max : int)
- + nextInt() : int
- }
- class PlayerDetails {
- - bankAccountNumber : String
- - emailAddress : String
- - phoneNumber : String
- + PlayerDetails(email : String, bankAccount : String, phone : String)
- + equals(obj : Object) : boolean
- + getBankAccount() : String
- + getEmail() : String
- + getPhoneNumber() : String
- + hashCode() : int
- + toString() : String
- }
- class LotteryTicketCheckResult {
- - checkResult : CheckResult
- - prizeAmount : int
- + LotteryTicketCheckResult(result : CheckResult)
- + LotteryTicketCheckResult(result : CheckResult, amount : int)
- + equals(obj : Object) : boolean
- + getPrizeAmount() : int
- + getResult() : CheckResult
- + hashCode() : int
- }
- class LotteryConstants {
- + PLAYER_MAX_SALDO : int {static}
- + PRIZE_AMOUNT : int {static}
- + SERVICE_BANK_ACCOUNT : String {static}
- + SERVICE_BANK_ACCOUNT_SALDO : int {static}
- + TICKET_PRIZE : int {static}
- - LotteryConstants()
- }
class LotteryTicket {
- id : LotteryTicketId
- lotteryNumbers : LotteryNumbers
@@ -115,9 +84,15 @@ package com.iluwatar.hexagonal.domain {
+ setId(id : LotteryTicketId)
+ toString() : String
}
- class LotteryUtils {
- - LotteryUtils()
- + checkTicketForPrize(repository : LotteryTicketRepository, id : LotteryTicketId, winningNumbers : LotteryNumbers) : LotteryTicketCheckResult {static}
+ class LotteryTicketCheckResult {
+ - checkResult : CheckResult
+ - prizeAmount : int
+ + LotteryTicketCheckResult(result : CheckResult)
+ + LotteryTicketCheckResult(result : CheckResult, amount : int)
+ + equals(obj : Object) : boolean
+ + getPrizeAmount() : int
+ + getResult() : CheckResult
+ + hashCode() : int
}
enum CheckResult {
+ NO_PRIZE {static}
@@ -126,12 +101,40 @@ package com.iluwatar.hexagonal.domain {
+ valueOf(name : String) : CheckResult {static}
+ values() : CheckResult[] {static}
}
+ class LotteryTicketId {
+ - id : int
+ - numAllocated : int {static}
+ + LotteryTicketId()
+ + LotteryTicketId(id : int)
+ + equals(o : Object) : boolean
+ + getId() : int
+ + hashCode() : int
+ + toString() : String
+ }
+ class LotteryUtils {
+ - LotteryUtils()
+ + checkTicketForPrize(repository : LotteryTicketRepository, id : LotteryTicketId, winningNumbers : LotteryNumbers) : LotteryTicketCheckResult {static}
+ }
+ class PlayerDetails {
+ - bankAccountNumber : String
+ - emailAddress : String
+ - phoneNumber : String
+ + PlayerDetails(email : String, bankAccount : String, phone : String)
+ + equals(obj : Object) : boolean
+ + getBankAccount() : String
+ + getEmail() : String
+ + getPhoneNumber() : String
+ + hashCode() : int
+ + toString() : String
+ }
}
package com.iluwatar.hexagonal.banking {
- interface WireTransfers {
- + getFunds(String) : int {abstract}
- + setFunds(String, int) {abstract}
- + transferFunds(int, String, String) : boolean {abstract}
+ class InMemoryBank {
+ - accounts : Map<String, Integer> {static}
+ + InMemoryBank()
+ + getFunds(bankAccount : String) : int
+ + setFunds(bankAccount : String, amount : int)
+ + transferFunds(amount : int, sourceBackAccount : String, destinationBankAccount : String) : boolean
}
class MongoBank {
- DEFAULT_ACCOUNTS_COLLECTION : String {static}
@@ -150,15 +153,27 @@ package com.iluwatar.hexagonal.banking {
+ setFunds(bankAccount : String, amount : int)
+ transferFunds(amount : int, sourceBackAccount : String, destinationBankAccount : String) : boolean
}
- class InMemoryBank {
- - accounts : Map<String, Integer> {static}
- + InMemoryBank()
- + getFunds(bankAccount : String) : int
- + setFunds(bankAccount : String, amount : int)
- + transferFunds(amount : int, sourceBackAccount : String, destinationBankAccount : String) : boolean
+ interface WireTransfers {
+ + getFunds(String) : int {abstract}
+ + setFunds(String, int) {abstract}
+ + transferFunds(int, String, String) : boolean {abstract}
}
}
package com.iluwatar.hexagonal.database {
+ class InMemoryTicketRepository {
+ - tickets : Map<LotteryTicketId, LotteryTicket> {static}
+ + InMemoryTicketRepository()
+ + deleteAll()
+ + findAll() : Map<LotteryTicketId, LotteryTicket>
+ + findById(id : LotteryTicketId) : Optional<LotteryTicket>
+ + save(ticket : LotteryTicket) : Optional<LotteryTicketId>
+ }
+ interface LotteryTicketRepository {
+ + deleteAll() {abstract}
+ + findAll() : Map<LotteryTicketId, LotteryTicket> {abstract}
+ + findById(LotteryTicketId) : Optional<LotteryTicket> {abstract}
+ + save(LotteryTicket) : Optional<LotteryTicketId> {abstract}
+ }
class MongoTicketRepository {
- DEFAULT_COUNTERS_COLLECTION : String {static}
- DEFAULT_DB : String {static}
@@ -183,20 +198,6 @@ package com.iluwatar.hexagonal.database {
- initCounters()
+ save(ticket : LotteryTicket) : Optional<LotteryTicketId>
}
- class InMemoryTicketRepository {
- - tickets : Map<LotteryTicketId, LotteryTicket> {static}
- + InMemoryTicketRepository()
- + deleteAll()
- + findAll() : Map<LotteryTicketId, LotteryTicket>
- + findById(id : LotteryTicketId) : Optional<LotteryTicket>
- + save(ticket : LotteryTicket) : Optional<LotteryTicketId>
- }
- interface LotteryTicketRepository {
- + deleteAll() {abstract}
- + findAll() : Map<LotteryTicketId, LotteryTicket> {abstract}
- + findById(LotteryTicketId) : Optional<LotteryTicket> {abstract}
- + save(LotteryTicket) : Optional<LotteryTicketId> {abstract}
- }
}
package com.iluwatar.hexagonal {
class App {
@@ -206,6 +207,7 @@ package com.iluwatar.hexagonal {
}
package com.iluwatar.hexagonal.administration {
class ConsoleAdministration {
+ - LOGGER : Logger {static}
+ ConsoleAdministration()
+ main(args : String[]) {static}
- printMainMenu() {static}
@@ -220,14 +222,6 @@ package com.iluwatar.hexagonal.eventlog {
+ ticketSubmitted(PlayerDetails) {abstract}
+ ticketWon(PlayerDetails, int) {abstract}
}
- class StdOutEventLog {
- + StdOutEventLog()
- + prizeError(details : PlayerDetails, prizeAmount : int)
- + ticketDidNotWin(details : PlayerDetails)
- + ticketSubmitError(details : PlayerDetails)
- + ticketSubmitted(details : PlayerDetails)
- + ticketWon(details : PlayerDetails, prizeAmount : int)
- }
class MongoEventLog {
- DEFAULT_DB : String {static}
- DEFAULT_EVENTS_COLLECTION : String {static}
@@ -248,29 +242,34 @@ package com.iluwatar.hexagonal.eventlog {
+ ticketSubmitted(details : PlayerDetails)
+ ticketWon(details : PlayerDetails, prizeAmount : int)
}
+ class StdOutEventLog {
+ - LOGGER : Logger {static}
+ + StdOutEventLog()
+ + prizeError(details : PlayerDetails, prizeAmount : int)
+ + ticketDidNotWin(details : PlayerDetails)
+ + ticketSubmitError(details : PlayerDetails)
+ + ticketSubmitted(details : PlayerDetails)
+ + ticketWon(details : PlayerDetails, prizeAmount : int)
+ }
}
-LotteryAdministration --+ LotteryTicketCheckResult
-LotteryTicket --> "-playerDetails" PlayerDetails
-MongoEventLog --> "-stdOutEventLog" StdOutEventLog
-LotteryService --> "-wireTransfers" WireTransfers
-LotteryAdministration --> "-notifications" LotteryEventLog
-RandomNumberGenerator ..+ PrimitiveIterator
LotteryAdministration --> "-wireTransfers" WireTransfers
LotteryTicket --> "-id" LotteryTicketId
+LotteryTicket --> "-playerDetails" PlayerDetails
LotteryService --> "-notifications" LotteryEventLog
LotteryAdministration --> "-repository" LotteryTicketRepository
LotteryTicket --> "-lotteryNumbers" LotteryNumbers
+MongoEventLog --> "-stdOutEventLog" StdOutEventLog
+LotteryService --> "-wireTransfers" WireTransfers
SampleData --> "-PLAYERS" PlayerDetails
-ConsoleLottery --+ LotteryTicketCheckResult
+LotteryAdministration --> "-notifications" LotteryEventLog
RandomNumberGenerator ..+ LotteryNumbers
LotteryService --> "-repository" LotteryTicketRepository
-LotteryUtils --+ LotteryTicketCheckResult
-LotteryTicketCheckResult --> "-checkResult" CheckResult
CheckResult ..+ LotteryTicketCheckResult
-MongoTicketRepository ..|> LotteryTicketRepository
-MongoBank ..|> WireTransfers
+LotteryTicketCheckResult --> "-checkResult" CheckResult
InMemoryBank ..|> WireTransfers
-StdOutEventLog ..|> LotteryEventLog
+MongoBank ..|> WireTransfers
InMemoryTicketRepository ..|> LotteryTicketRepository
+MongoTicketRepository ..|> LotteryTicketRepository
MongoEventLog ..|> LotteryEventLog
+StdOutEventLog ..|> LotteryEventLog
@enduml
\ No newline at end of file
diff --git a/hexagonal/etc/layers.png b/hexagonal/etc/layers.png
new file mode 100644
index 000000000..cb5a9c90b
Binary files /dev/null and b/hexagonal/etc/layers.png differ
diff --git a/hexagonal/etc/ports_and_adapters.png b/hexagonal/etc/ports_and_adapters.png
new file mode 100644
index 000000000..d285045de
Binary files /dev/null and b/hexagonal/etc/ports_and_adapters.png differ
diff --git a/hexagonal/etc/ports_and_adapters.xml b/hexagonal/etc/ports_and_adapters.xml
new file mode 100644
index 000000000..0e64414b8
--- /dev/null
+++ b/hexagonal/etc/ports_and_adapters.xml
@@ -0,0 +1 @@
+<mxfile userAgent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.90 Safari/537.36" version="6.0.1.3" editor="www.draw.io" type="device"><diagram name="Page-1">7Zpdk6I4FIZ/jbdbJAHEyx7nY/diqrqqd2tnLiOJSDUSK6ZHe3/9BkmUfFiDDqBM2TcNBwLxOe85nBOYoPl6/4XjzeorI7SYwIDsJ+jjBEKA4kj+qyzvtWUag9qQ8Zyok06Gl/w/qoyBsr7lhG6NEwVjhcg3pjFlZUlTYdgw52xnnrZkhXnXDc6oY3hJceFa/82JWNXWJApO9j9pnq30nUGgjixw+ppx9laq+00gWh7+6sNrrK+lzt+uMGG7hgl9mqA5Z0zUW+v9nBYVW42tHvf5zNHjvDktRZsBqB7wAxdvVM/4MC/xrlnIKW6qzRXd44yVE/RhQ3m+poLyk/X5ZPqwW+WCvmxwWo3aSYFI20qsC7kH5Ka6I+WC7s/OGhxZSI1RJi/N3+UpagBMFD4lL6D3dydnIa2lVcNRMFZGrASSHa99giQ3FCc/MzhKZmgaGcyOKBrMAPQwO2r7V5iFDrM549ThJgfJEKc/B7LMi2LOCsYP46oYg2kq7VvB2SttHCHxIo7ibhCGATARJshBqDNfk2AXoot+Lrpr4RFMk6UXXpwmdLHsCF5s6W/qwkMe+aEO4MW/GzwEPQmvJ3jT0cMDMxNeGA0GLxk7PDQ1H7VDKm82fnh2zoODwdPlz3jphdCUHoyGkx5oUeRdTS+iCQl99BK4QHFHxUoUWfQ89V5v9Fq0FXdOz9ZeMCC9Nk/ckjxVfa7cK1lJTWJ0n4tvje3vcjuotks5k2/Nne/6rJJ8zqsJHQ7Vd6PE6ZEtenJG7I2n1KhQBeYZFU0duJAbECMPRG3jtMAi/2HOwkdW3eGZ5XJ+Z7vECFjOqWevRjWbZOtCCJkXCu2Cvv7NzoUOjj7+7Ha+b1MwXOz7P6IefQwfPr7Qx33WNYNkR5s60nXuANkR9lnXDEIPWc8WNBvu2aJn+8v5JfDkF/V0Ac2nS3e5J/Hkntkj91yWe7S7O/U/OO/9/nzfWC5/+L6d70dfldsrOSEcbiXHs4R9ZeTUGdEXO41E2mX0TD3Rc1+Vue2gq6Mn6S963BX4Z8bF1hGBlLcwPW/GhFJGM4CUCRd5VsrdVDrz8FaoCpY8xcWTOrDOCSnOBWcH8YVmoYHzGDgNWYS+12pdxJe7SP/PVlKQZ1Q0ltVvtVEfXrRSojD3/w4NALvudd9hAN97x7ALQO6ywN90WwUDzqiS903h2CvFiZucZ32xcdvmv6RqMi6zFCtvjuZY4et851lN6g2N221+xAIv8Pb28RQHJhcwG04yOrU1uHxl6au0kLvBYz3dYOTi6S3doPF2irpKNAqe2I96mIIHWJ6Mr20XgF059dcuoD5axWEEoOsRQwDThwAuFECbfvE+Ox5dlxkCSB4CuFAAXbW8vpcRvldRHT4CfAK46WrhKAXQ5quzOxUAdAWAbrpkOEoBuE35E8Eb2Y//XuseVh+CPP1ZR+secvf0dXftkdMn9OjT/w==</diagram></mxfile>
\ No newline at end of file
diff --git a/hexagonal/etc/presentation.html b/hexagonal/etc/presentation.html
new file mode 100644
index 000000000..74361ad27
--- /dev/null
+++ b/hexagonal/etc/presentation.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Title</title>
+ <meta charset="utf-8">
+ <style>
+ @import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz);
+ @import url(https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic);
+ @import url(https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic);
+
+ body { font-family: 'Droid Serif'; }
+ h1, h2, h3 {
+ font-family: 'Yanone Kaffeesatz';
+ font-weight: normal;
+ }
+ .remark-code, .remark-inline-code { font-family: 'Ubuntu Mono'; }
+ </style>
+ </head>
+ <body>
+ <textarea id="source">
+
+class: center, middle
+
+# Hexagonal Architecture
+
+---
+
+# Also known as
+
+* Ports and Adapters
+* Clean Architecture
+* Onion Architecture
+
+---
+
+# Layered architecture problems
+
+* No clear application core
+* Business logic leaks to the presentation layer
+<br />
+<br />
+
+.center[]
+
+---
+
+# Intent
+
+* Application can be driven by users, programs, automated test or batch scripts
+* Application can be developed and tested in isolation from its eventual run-time devices and databases
+
+---
+
+# Applicability
+
+Use Hexagonal Architecture pattern
+
+* When the application needs to be independent of any frameworks
+* When it is important that the application highly maintainable and fully testable
+
+---
+
+# Concepts
+
+* Ports are interfaces
+* The ports that drive the application are called primary ports
+* The ports that are driven by the application are called secondary ports
+
+---
+
+# Concepts
+
+* Adapters are interface implementations
+* Typically different adapters for testing and production are provided
+
+---
+
+# Diagram
+
+.center[]
+
+---
+
+# Real world examples
+
+* [Apache Isis](https://isis.apache.org/) builds generic UI and REST API directly from the underlying domain objects
+
+---
+
+# Tutorials
+
+* Blog http://java-design-patterns.com/blog/build-maintainable-systems-with-hexagonal-architecture/
+* Source code http://java-design-patterns.com/patterns/hexagonal/
+
+ </textarea>
+ <script src="https://gnab.github.io/remark/downloads/remark-latest.min.js">
+ </script>
+ <script>
+ var slideshow = remark.create();
+ </script>
+ </body>
+</html>
+
diff --git a/hexagonal/pom.xml b/hexagonal/pom.xml
index c489c45c4..a02c049ca 100644
--- a/hexagonal/pom.xml
+++ b/hexagonal/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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/App.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/App.java
index 97190937c..651498607 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/App.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/ConsoleAdministration.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/ConsoleAdministration.java
index ea2f33699..ec35d0350 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/ConsoleAdministration.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/ConsoleAdministration.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
@@ -30,6 +30,8 @@ import com.iluwatar.hexagonal.domain.LotteryService;
import com.iluwatar.hexagonal.module.LotteryModule;
import com.iluwatar.hexagonal.mongo.MongoConnectionPropertiesLoader;
import com.iluwatar.hexagonal.sampledata.SampleData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Scanner;
@@ -38,6 +40,8 @@ import java.util.Scanner;
*/
public class ConsoleAdministration {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleAdministration.class);
+
/**
* Program entry point
*/
@@ -53,29 +57,29 @@ public class ConsoleAdministration {
printMainMenu();
String cmd = readString(scanner);
if (cmd.equals("1")) {
- administartion.getAllSubmittedTickets().forEach((k,v)->System.out.println("Key: " + k + " Value: " + v));
+ administartion.getAllSubmittedTickets().forEach((k,v)->LOGGER.info("Key: {}, Value: {}", k, v));
} else if (cmd.equals("2")) {
LotteryNumbers numbers = administartion.performLottery();
- System.out.println("The winning numbers: " + numbers.getNumbersAsString());
- System.out.println("Time to reset the database for next round, eh?");
+ LOGGER.info("The winning numbers: {}", numbers.getNumbersAsString());
+ LOGGER.info("Time to reset the database for next round, eh?");
} else if (cmd.equals("3")) {
administartion.resetLottery();
- System.out.println("The lottery ticket database was cleared.");
+ LOGGER.info("The lottery ticket database was cleared.");
} else if (cmd.equals("4")) {
exit = true;
} else {
- System.out.println("Unknown command: " + cmd);
+ LOGGER.info("Unknown command: {}", cmd);
}
}
}
private static void printMainMenu() {
- System.out.println("");
- System.out.println("### Lottery Administration Console ###");
- System.out.println("(1) Show all submitted tickets");
- System.out.println("(2) Perform lottery draw");
- System.out.println("(3) Reset lottery ticket database");
- System.out.println("(4) Exit");
+ LOGGER.info("");
+ LOGGER.info("### Lottery Administration Console ###");
+ LOGGER.info("(1) Show all submitted tickets");
+ LOGGER.info("(2) Perform lottery draw");
+ LOGGER.info("(3) Reset lottery ticket database");
+ LOGGER.info("(4) Exit");
}
private static String readString(Scanner scanner) {
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/InMemoryBank.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/InMemoryBank.java
index 85b4121eb..a8eb7817c 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/InMemoryBank.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/InMemoryBank.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/MongoBank.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/MongoBank.java
index 23a0e376a..fd0c1086f 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/MongoBank.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/MongoBank.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/WireTransfers.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/WireTransfers.java
index 7d21e7bf3..670824cb8 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/WireTransfers.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/WireTransfers.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/InMemoryTicketRepository.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/InMemoryTicketRepository.java
index 0d510b411..f2f4c7db2 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/InMemoryTicketRepository.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/InMemoryTicketRepository.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepository.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepository.java
index 4c6522838..5daf3af9c 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepository.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepository.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/MongoTicketRepository.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/MongoTicketRepository.java
index 13a937a1b..a68eee59a 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/MongoTicketRepository.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/MongoTicketRepository.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java
index bc264a9ef..b8681b57e 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryConstants.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryConstants.java
index 28fd4e2f4..9ecbb74b9 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryConstants.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryConstants.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryNumbers.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryNumbers.java
index 930c919da..a688647fa 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryNumbers.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryNumbers.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java
index dceac26e4..3640b59b7 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicket.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicket.java
index 9fa318e4c..2c5340b63 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicket.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicket.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketCheckResult.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketCheckResult.java
index ded65d270..6b779470d 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketCheckResult.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketCheckResult.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketId.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketId.java
index 2f8a59bba..838fdb32b 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketId.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketId.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryUtils.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryUtils.java
index dc34c7f7d..2f3c3be22 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryUtils.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryUtils.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/PlayerDetails.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/PlayerDetails.java
index 7af115a7c..6f47d6cf5 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/PlayerDetails.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/PlayerDetails.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/LotteryEventLog.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/LotteryEventLog.java
index e47640e27..fd6bfebdf 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/LotteryEventLog.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/LotteryEventLog.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/MongoEventLog.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/MongoEventLog.java
index 7f9b4da5e..b187d08f0 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/MongoEventLog.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/MongoEventLog.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/StdOutEventLog.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/StdOutEventLog.java
index 4150dd401..6d5af3280 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/StdOutEventLog.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/StdOutEventLog.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
@@ -23,42 +23,42 @@
package com.iluwatar.hexagonal.eventlog;
import com.iluwatar.hexagonal.domain.PlayerDetails;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Standard output event log
*/
public class StdOutEventLog implements LotteryEventLog {
+ private static final Logger LOGGER = LoggerFactory.getLogger(StdOutEventLog.class);
+
@Override
public void ticketSubmitted(PlayerDetails details) {
- System.out.println(String.format("Lottery ticket for %s was submitted. Bank account %s was charged for 3 credits.",
- details.getEmail(), details.getBankAccount()));
+ LOGGER.info("Lottery ticket for {} was submitted. Bank account {} was charged for 3 credits.",
+ details.getEmail(), details.getBankAccount());
}
@Override
public void ticketDidNotWin(PlayerDetails details) {
- System.out.println(String.format("Lottery ticket for %s was checked and unfortunately did not win this time.",
- details.getEmail()));
+ LOGGER.info("Lottery ticket for {} was checked and unfortunately did not win this time.", details.getEmail());
}
@Override
public void ticketWon(PlayerDetails details, int prizeAmount) {
- System.out
- .println(String.format("Lottery ticket for %s has won! The bank account %s was deposited with %d credits.",
- details.getEmail(), details.getBankAccount(), prizeAmount));
+ LOGGER.info("Lottery ticket for {} has won! The bank account {} was deposited with {} credits.",
+ details.getEmail(), details.getBankAccount(), prizeAmount);
}
@Override
public void prizeError(PlayerDetails details, int prizeAmount) {
- System.out
- .println(String.format("Lottery ticket for %s has won! Unfortunately the bank credit transfer of %d failed.",
- details.getEmail(), prizeAmount));
+ LOGGER.error("Lottery ticket for {} has won! Unfortunately the bank credit transfer of {} failed.",
+ details.getEmail(), prizeAmount);
}
@Override
public void ticketSubmitError(PlayerDetails details) {
- System.out.println(
- String.format("Lottery ticket for %s could not be submitted because the credit transfer of 3 credits failed.",
- details.getEmail()));
+ LOGGER.error("Lottery ticket for {} could not be submitted because the credit transfer of 3 credits failed.",
+ details.getEmail());
}
}
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/module/LotteryModule.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/module/LotteryModule.java
index 7e784548d..72fb78dad 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/module/LotteryModule.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/module/LotteryModule.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/module/LotteryTestingModule.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/module/LotteryTestingModule.java
index 2a1ad1155..624acf578 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/module/LotteryTestingModule.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/module/LotteryTestingModule.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/mongo/MongoConnectionPropertiesLoader.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/mongo/MongoConnectionPropertiesLoader.java
index a9bb39803..f8de9b551 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/mongo/MongoConnectionPropertiesLoader.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/mongo/MongoConnectionPropertiesLoader.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/sampledata/SampleData.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/sampledata/SampleData.java
index 13458d02a..23d409ff4 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/sampledata/SampleData.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/sampledata/SampleData.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
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/service/ConsoleLottery.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/service/ConsoleLottery.java
index cc13d389d..dd168e587 100644
--- a/hexagonal/src/main/java/com/iluwatar/hexagonal/service/ConsoleLottery.java
+++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/service/ConsoleLottery.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
@@ -33,6 +33,8 @@ import com.iluwatar.hexagonal.domain.LotteryTicketId;
import com.iluwatar.hexagonal.domain.PlayerDetails;
import com.iluwatar.hexagonal.module.LotteryModule;
import com.iluwatar.hexagonal.mongo.MongoConnectionPropertiesLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Optional;
@@ -44,6 +46,7 @@ import java.util.Set;
*/
public class ConsoleLottery {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleLottery.class);
/**
* Program entry point
@@ -59,25 +62,25 @@ public class ConsoleLottery {
printMainMenu();
String cmd = readString(scanner);
if (cmd.equals("1")) {
- System.out.println("What is the account number?");
+ LOGGER.info("What is the account number?");
String account = readString(scanner);
- System.out.println(String.format("The account %s has %d credits.", account, bank.getFunds(account)));
+ LOGGER.info("The account {} has {} credits.", account, bank.getFunds(account));
} else if (cmd.equals("2")) {
- System.out.println("What is the account number?");
+ LOGGER.info("What is the account number?");
String account = readString(scanner);
- System.out.println("How many credits do you want to deposit?");
+ LOGGER.info("How many credits do you want to deposit?");
String amount = readString(scanner);
bank.setFunds(account, Integer.parseInt(amount));
- System.out.println(String.format("The account %s now has %d credits.", account, bank.getFunds(account)));
+ LOGGER.info("The account {} now has {} credits.", account, bank.getFunds(account));
} else if (cmd.equals("3")) {
- System.out.println("What is your email address?");
+ LOGGER.info("What is your email address?");
String email = readString(scanner);
- System.out.println("What is your bank account number?");
+ LOGGER.info("What is your bank account number?");
String account = readString(scanner);
- System.out.println("What is your phone number?");
+ LOGGER.info("What is your phone number?");
String phone = readString(scanner);
PlayerDetails details = new PlayerDetails(email, account, phone);
- System.out.println("Give 4 comma separated lottery numbers?");
+ LOGGER.info("Give 4 comma separated lottery numbers?");
String numbers = readString(scanner);
try {
String[] parts = numbers.split(",");
@@ -89,17 +92,17 @@ public class ConsoleLottery {
LotteryTicket lotteryTicket = new LotteryTicket(new LotteryTicketId(), details, lotteryNumbers);
Optional<LotteryTicketId> id = service.submitTicket(lotteryTicket);
if (id.isPresent()) {
- System.out.println("Submitted lottery ticket with id: " + id.get());
+ LOGGER.info("Submitted lottery ticket with id: {}", id.get());
} else {
- System.out.println("Failed submitting lottery ticket - please try again.");
+ LOGGER.info("Failed submitting lottery ticket - please try again.");
}
} catch (Exception e) {
- System.out.println("Failed submitting lottery ticket - please try again.");
+ LOGGER.info("Failed submitting lottery ticket - please try again.");
}
} else if (cmd.equals("4")) {
- System.out.println("What is the ID of the lottery ticket?");
+ LOGGER.info("What is the ID of the lottery ticket?");
String id = readString(scanner);
- System.out.println("Give the 4 comma separated winning numbers?");
+ LOGGER.info("Give the 4 comma separated winning numbers?");
String numbers = readString(scanner);
try {
String[] parts = numbers.split(",");
@@ -110,31 +113,31 @@ public class ConsoleLottery {
LotteryTicketCheckResult result = service.checkTicketForPrize(
new LotteryTicketId(Integer.parseInt(id)), LotteryNumbers.create(winningNumbers));
if (result.getResult().equals(LotteryTicketCheckResult.CheckResult.WIN_PRIZE)) {
- System.out.println("Congratulations! The lottery ticket has won!");
+ LOGGER.info("Congratulations! The lottery ticket has won!");
} else if (result.getResult().equals(LotteryTicketCheckResult.CheckResult.NO_PRIZE)) {
- System.out.println("Unfortunately the lottery ticket did not win.");
+ LOGGER.info("Unfortunately the lottery ticket did not win.");
} else {
- System.out.println("Such lottery ticket has not been submitted.");
+ LOGGER.info("Such lottery ticket has not been submitted.");
}
} catch (Exception e) {
- System.out.println("Failed checking the lottery ticket - please try again.");
+ LOGGER.info("Failed checking the lottery ticket - please try again.");
}
} else if (cmd.equals("5")) {
exit = true;
} else {
- System.out.println("Unknown command");
+ LOGGER.info("Unknown command");
}
}
}
private static void printMainMenu() {
- System.out.println("");
- System.out.println("### Lottery Service Console ###");
- System.out.println("(1) Query lottery account funds");
- System.out.println("(2) Add funds to lottery account");
- System.out.println("(3) Submit ticket");
- System.out.println("(4) Check ticket");
- System.out.println("(5) Exit");
+ LOGGER.info("");
+ LOGGER.info("### Lottery Service Console ###");
+ LOGGER.info("(1) Query lottery account funds");
+ LOGGER.info("(2) Add funds to lottery account");
+ LOGGER.info("(3) Submit ticket");
+ LOGGER.info("(4) Check ticket");
+ LOGGER.info("(5) Exit");
}
private static String readString(Scanner scanner) {
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/AppTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/AppTest.java
index 8e19cca35..1e35847b2 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/AppTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/InMemoryBankTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/InMemoryBankTest.java
index c5efda240..9c265a2ab 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/InMemoryBankTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/InMemoryBankTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/MongoBankTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/MongoBankTest.java
index ce5c9ff1a..61529f3e4 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/MongoBankTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/MongoBankTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/database/InMemoryTicketRepositoryTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/database/InMemoryTicketRepositoryTest.java
index d32e594a8..ce5038369 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/database/InMemoryTicketRepositoryTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/database/InMemoryTicketRepositoryTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/database/MongoTicketRepositoryTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/database/MongoTicketRepositoryTest.java
index e30468f99..8b248de8c 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/database/MongoTicketRepositoryTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/database/MongoTicketRepositoryTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryNumbersTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryNumbersTest.java
index 4f2751167..8bd61db9c 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryNumbersTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryNumbersTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java
index 943440f07..4af8da3ea 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketCheckResultTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketCheckResultTest.java
index 237ab85d3..454d0dd01 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketCheckResultTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketCheckResultTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketIdTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketIdTest.java
index c5e4c1541..d4f0848ba 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketIdTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketIdTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketTest.java
index ce1e6b4b0..8aaa83681 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/PlayerDetailsTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/PlayerDetailsTest.java
index 53aa2d9d5..2271ebf7c 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/PlayerDetailsTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/PlayerDetailsTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/eventlog/MongoEventLogTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/eventlog/MongoEventLogTest.java
index d02694826..07c40691b 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/eventlog/MongoEventLogTest.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/eventlog/MongoEventLogTest.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
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/test/LotteryTestUtils.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/test/LotteryTestUtils.java
index ae15cd3d7..7f6c0edab 100644
--- a/hexagonal/src/test/java/com/iluwatar/hexagonal/test/LotteryTestUtils.java
+++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/test/LotteryTestUtils.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
diff --git a/intercepting-filter/etc/intercepting-filter.urm.puml b/intercepting-filter/etc/intercepting-filter.urm.puml
index e3616c3ab..2b090cfff 100644
--- a/intercepting-filter/etc/intercepting-filter.urm.puml
+++ b/intercepting-filter/etc/intercepting-filter.urm.puml
@@ -1,8 +1,13 @@
@startuml
package com.iluwatar.intercepting.filter {
- class DepositFilter {
- + DepositFilter()
+ abstract class AbstractFilter {
+ - next : Filter
+ + AbstractFilter()
+ + AbstractFilter(next : Filter)
+ execute(order : Order) : String
+ + getLast() : Filter
+ + getNext() : Filter
+ + setNext(filter : Filter)
}
class AddressFilter {
+ AddressFilter()
@@ -12,14 +17,35 @@ package com.iluwatar.intercepting.filter {
+ App()
+ main(args : String[]) {static}
}
- abstract class AbstractFilter {
- - next : Filter
- + AbstractFilter()
- + AbstractFilter(next : Filter)
+ class ContactFilter {
+ + ContactFilter()
+ + execute(order : Order) : String
+ }
+ class DepositFilter {
+ + DepositFilter()
+ + execute(order : Order) : String
+ }
+ interface Filter {
+ + execute(Order) : String {abstract}
+ + getLast() : Filter {abstract}
+ + getNext() : Filter {abstract}
+ + setNext(Filter) {abstract}
+ }
+ class FilterChain {
+ - chain : Filter
+ + FilterChain()
+ + addFilter(filter : Filter)
+ + execute(order : Order) : String
+ }
+ class FilterManager {
+ - filterChain : FilterChain
+ + FilterManager()
+ + addFilter(filter : Filter)
+ + filterRequest(order : Order) : String
+ }
+ class NameFilter {
+ + NameFilter()
+ execute(order : Order) : String
- + getLast() : Filter
- + getNext() : Filter
- + setNext(filter : Filter)
}
class Order {
- address : String
@@ -40,49 +66,23 @@ package com.iluwatar.intercepting.filter {
+ setName(name : String)
+ setOrder(order : String)
}
- class FilterManager {
- - filterChain : FilterChain
- + FilterManager()
- + addFilter(filter : Filter)
- + filterRequest(order : Order) : String
- }
- class NameFilter {
- + NameFilter()
+ class OrderFilter {
+ + OrderFilter()
+ execute(order : Order) : String
}
- class ContactFilter {
- + ContactFilter()
- + execute(order : Order) : String
- }
- interface Filter {
- + execute(Order) : String {abstract}
- + getLast() : Filter {abstract}
- + getNext() : Filter {abstract}
- + setNext(Filter) {abstract}
- }
~class DListener {
~ DListener()
+ actionPerformed(e : ActionEvent)
}
- class OrderFilter {
- + OrderFilter()
- + execute(order : Order) : String
- }
- class FilterChain {
- - chain : Filter
- + FilterChain()
- + addFilter(filter : Filter)
- + execute(order : Order) : String
- }
}
AbstractFilter --> "-next" Filter
DListener --+ Target
-FilterChain --> "-chain" Filter
FilterManager --> "-filterChain" FilterChain
-DepositFilter --|> AbstractFilter
-AddressFilter --|> AbstractFilter
+FilterChain --> "-chain" Filter
AbstractFilter ..|> Filter
-NameFilter --|> AbstractFilter
+AddressFilter --|> AbstractFilter
ContactFilter --|> AbstractFilter
+DepositFilter --|> AbstractFilter
+NameFilter --|> AbstractFilter
OrderFilter --|> AbstractFilter
@enduml
\ No newline at end of file
diff --git a/intercepting-filter/pom.xml b/intercepting-filter/pom.xml
index 487ac1c14..77bf04549 100644
--- a/intercepting-filter/pom.xml
+++ b/intercepting-filter/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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AbstractFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AbstractFilter.java
index e81531297..2e48f73b2 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AbstractFilter.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AbstractFilter.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AddressFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AddressFilter.java
index 5b6ff4155..1ba7ee8d3 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AddressFilter.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AddressFilter.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/App.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/App.java
index 9d16737d0..1315f1318 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/App.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java
index f2f1a6fbc..f404ee046 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/ContactFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/ContactFilter.java
index 098de178b..52a0487c4 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/ContactFilter.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/ContactFilter.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/DepositFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/DepositFilter.java
index 08285f79d..cc06c339d 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/DepositFilter.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/DepositFilter.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Filter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Filter.java
index 9979df0e7..0cf2a1b6f 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Filter.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Filter.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java
index 7c5d74b4c..7012fb273 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterManager.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterManager.java
index b0e125522..e9897ec92 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterManager.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterManager.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/NameFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/NameFilter.java
index ea8d17413..7efb181bb 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/NameFilter.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/NameFilter.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java
index 8a60bed9d..c74cd1b00 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java
index 9bfe890f3..8c2ec4d9f 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.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
diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java
index e8fc693bc..803c0d5c6 100644
--- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java
+++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.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
diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/AppTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/AppTest.java
index c91fc3297..eb347dce7 100644
--- a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/AppTest.java
+++ b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/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
diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java
index 4d7187727..9b77ea19c 100644
--- a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java
+++ b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.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
diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.java
index c18a743d2..877340355 100644
--- a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.java
+++ b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.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
diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java
index 5ef98b872..9148cc84c 100644
--- a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java
+++ b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.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
diff --git a/interpreter/etc/interpreter.urm.puml b/interpreter/etc/interpreter.urm.puml
index dc0d83bf2..e79ad1989 100644
--- a/interpreter/etc/interpreter.urm.puml
+++ b/interpreter/etc/interpreter.urm.puml
@@ -1,20 +1,7 @@
@startuml
package com.iluwatar.interpreter {
- class NumberExpression {
- - number : int
- + NumberExpression(number : int)
- + NumberExpression(s : String)
- + interpret() : int
- + toString() : String
- }
- class MinusExpression {
- - leftExpression : Expression
- - rightExpression : Expression
- + MinusExpression(leftExpression : Expression, rightExpression : Expression)
- + interpret() : int
- + toString() : String
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ getOperatorInstance(s : String, left : Expression, right : Expression) : Expression {static}
+ isOperator(s : String) : boolean {static}
@@ -25,6 +12,13 @@ package com.iluwatar.interpreter {
+ interpret() : int {abstract}
+ toString() : String {abstract}
}
+ class MinusExpression {
+ - leftExpression : Expression
+ - rightExpression : Expression
+ + MinusExpression(leftExpression : Expression, rightExpression : Expression)
+ + interpret() : int
+ + toString() : String
+ }
class MultiplyExpression {
- leftExpression : Expression
- rightExpression : Expression
@@ -32,6 +26,13 @@ package com.iluwatar.interpreter {
+ interpret() : int
+ toString() : String
}
+ class NumberExpression {
+ - number : int
+ + NumberExpression(number : int)
+ + NumberExpression(s : String)
+ + interpret() : int
+ + toString() : String
+ }
class PlusExpression {
- leftExpression : Expression
- rightExpression : Expression
@@ -43,8 +44,8 @@ package com.iluwatar.interpreter {
MultiplyExpression --> "-leftExpression" Expression
MinusExpression --> "-leftExpression" Expression
PlusExpression --> "-leftExpression" Expression
-NumberExpression --|> Expression
MinusExpression --|> Expression
MultiplyExpression --|> Expression
+NumberExpression --|> Expression
PlusExpression --|> Expression
@enduml
\ No newline at end of file
diff --git a/interpreter/pom.xml b/interpreter/pom.xml
index e2c8f4d4d..c46aa9b39 100644
--- a/interpreter/pom.xml
+++ b/interpreter/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
diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/App.java b/interpreter/src/main/java/com/iluwatar/interpreter/App.java
index 708f06e6f..7404f9757 100644
--- a/interpreter/src/main/java/com/iluwatar/interpreter/App.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/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.interpreter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Stack;
/**
@@ -37,6 +40,8 @@ import java.util.Stack;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
*
* Program entry point.
@@ -56,21 +61,21 @@ public class App {
if (isOperator(s)) {
Expression rightExpression = stack.pop();
Expression leftExpression = stack.pop();
- System.out.println(String.format("popped from stack left: %d right: %d",
- leftExpression.interpret(), rightExpression.interpret()));
+ LOGGER.info("popped from stack left: {} right: {}",
+ leftExpression.interpret(), rightExpression.interpret());
Expression operator = getOperatorInstance(s, leftExpression, rightExpression);
- System.out.println(String.format("operator: %s", operator));
+ LOGGER.info("operator: {}", operator);
int result = operator.interpret();
NumberExpression resultExpression = new NumberExpression(result);
stack.push(resultExpression);
- System.out.println(String.format("push result to stack: %d", resultExpression.interpret()));
+ LOGGER.info("push result to stack: {}", resultExpression.interpret());
} else {
Expression i = new NumberExpression(s);
stack.push(i);
- System.out.println(String.format("push to stack: %d", i.interpret()));
+ LOGGER.info("push to stack: {}", i.interpret());
}
}
- System.out.println(String.format("result: %d", stack.pop().interpret()));
+ LOGGER.info("result: {}", stack.pop().interpret());
}
public static boolean isOperator(String s) {
diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/Expression.java b/interpreter/src/main/java/com/iluwatar/interpreter/Expression.java
index 20cdb512a..bea4d4051 100644
--- a/interpreter/src/main/java/com/iluwatar/interpreter/Expression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/Expression.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
diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java
index 53748baf8..b3f2299c3 100644
--- a/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.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
diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java
index bd060d3c0..809b5331c 100644
--- a/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.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
diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java
index 891c926bd..2309d3190 100644
--- a/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.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
diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java
index 066d536b1..56c68b9db 100644
--- a/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.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
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/AppTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/AppTest.java
index 01b927e67..b2d6db157 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/AppTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/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
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/ExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/ExpressionTest.java
index d07ee84fb..95a65e82c 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/ExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/ExpressionTest.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
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/MinusExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/MinusExpressionTest.java
index fe4ebc58f..65e7e4515 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/MinusExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/MinusExpressionTest.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
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/MultiplyExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/MultiplyExpressionTest.java
index f876dda34..12ea35863 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/MultiplyExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/MultiplyExpressionTest.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
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/NumberExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/NumberExpressionTest.java
index d055fcd47..9f18355ef 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/NumberExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/NumberExpressionTest.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
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/PlusExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/PlusExpressionTest.java
index e99d49555..d11ba8a8d 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/PlusExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/PlusExpressionTest.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
diff --git a/iterator/etc/iterator.urm.puml b/iterator/etc/iterator.urm.puml
index 032cd4c16..881b9a6d4 100644
--- a/iterator/etc/iterator.urm.puml
+++ b/iterator/etc/iterator.urm.puml
@@ -1,6 +1,7 @@
@startuml
package com.iluwatar.iterator {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
@@ -12,21 +13,6 @@ package com.iluwatar.iterator {
+ setType(type : ItemType)
+ toString() : String
}
- class TreasureChestItemIterator {
- - chest : TreasureChest
- - idx : int
- - type : ItemType
- + TreasureChestItemIterator(chest : TreasureChest, type : ItemType)
- - findNextIdx() : int
- + hasNext() : boolean
- + next() : Item
- }
- class TreasureChest {
- - items : List<Item>
- + TreasureChest()
- + getItems() : List<Item>
- ~ iterator(itemType : ItemType) : ItemIterator
- }
interface ItemIterator {
+ hasNext() : boolean {abstract}
+ next() : Item {abstract}
@@ -39,6 +25,21 @@ package com.iluwatar.iterator {
+ valueOf(name : String) : ItemType {static}
+ values() : ItemType[] {static}
}
+ class TreasureChest {
+ - items : List<Item>
+ + TreasureChest()
+ + getItems() : List<Item>
+ ~ iterator(itemType : ItemType) : ItemIterator
+ }
+ class TreasureChestItemIterator {
+ - chest : TreasureChest
+ - idx : int
+ - type : ItemType
+ + TreasureChestItemIterator(chest : TreasureChest, type : ItemType)
+ - findNextIdx() : int
+ + hasNext() : boolean
+ + next() : Item
+ }
}
Item --> "-type" ItemType
TreasureChest --> "-items" Item
diff --git a/iterator/pom.xml b/iterator/pom.xml
index 6d589b4a7..17100f9c4 100644
--- a/iterator/pom.xml
+++ b/iterator/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
diff --git a/iterator/src/main/java/com/iluwatar/iterator/App.java b/iterator/src/main/java/com/iluwatar/iterator/App.java
index 8da0a7433..d283347cb 100644
--- a/iterator/src/main/java/com/iluwatar/iterator/App.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/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.iterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* The Iterator pattern is a design pattern in which an iterator is used to traverse a container and
@@ -34,6 +37,8 @@ package com.iluwatar.iterator;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -44,28 +49,28 @@ public class App {
ItemIterator ringIterator = chest.iterator(ItemType.RING);
while (ringIterator.hasNext()) {
- System.out.println(ringIterator.next());
+ LOGGER.info(ringIterator.next().toString());
}
- System.out.println("----------");
+ LOGGER.info("----------");
ItemIterator potionIterator = chest.iterator(ItemType.POTION);
while (potionIterator.hasNext()) {
- System.out.println(potionIterator.next());
+ LOGGER.info(potionIterator.next().toString());
}
- System.out.println("----------");
+ LOGGER.info("----------");
ItemIterator weaponIterator = chest.iterator(ItemType.WEAPON);
while (weaponIterator.hasNext()) {
- System.out.println(weaponIterator.next());
+ LOGGER.info(weaponIterator.next().toString());
}
- System.out.println("----------");
+ LOGGER.info("----------");
ItemIterator it = chest.iterator(ItemType.ANY);
while (it.hasNext()) {
- System.out.println(it.next());
+ LOGGER.info(it.next().toString());
}
}
}
diff --git a/iterator/src/main/java/com/iluwatar/iterator/Item.java b/iterator/src/main/java/com/iluwatar/iterator/Item.java
index 8bb540fbd..47bc11354 100644
--- a/iterator/src/main/java/com/iluwatar/iterator/Item.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/Item.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
diff --git a/iterator/src/main/java/com/iluwatar/iterator/ItemIterator.java b/iterator/src/main/java/com/iluwatar/iterator/ItemIterator.java
index fa1ff633b..0eab2f075 100644
--- a/iterator/src/main/java/com/iluwatar/iterator/ItemIterator.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/ItemIterator.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
diff --git a/iterator/src/main/java/com/iluwatar/iterator/ItemType.java b/iterator/src/main/java/com/iluwatar/iterator/ItemType.java
index 0b1def25b..4cf36926e 100644
--- a/iterator/src/main/java/com/iluwatar/iterator/ItemType.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/ItemType.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
diff --git a/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java b/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java
index 2c5d698e9..4b9959269 100644
--- a/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.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
diff --git a/iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.java b/iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.java
index 7c80422c2..9d841259f 100644
--- a/iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.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
diff --git a/iterator/src/test/java/com/iluwatar/iterator/AppTest.java b/iterator/src/test/java/com/iluwatar/iterator/AppTest.java
index 7259386bb..75cad3ced 100644
--- a/iterator/src/test/java/com/iluwatar/iterator/AppTest.java
+++ b/iterator/src/test/java/com/iluwatar/iterator/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
diff --git a/iterator/src/test/java/com/iluwatar/iterator/TreasureChestTest.java b/iterator/src/test/java/com/iluwatar/iterator/TreasureChestTest.java
index 9bef322d6..196e08216 100644
--- a/iterator/src/test/java/com/iluwatar/iterator/TreasureChestTest.java
+++ b/iterator/src/test/java/com/iluwatar/iterator/TreasureChestTest.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
diff --git a/layers/etc/layers.urm.puml b/layers/etc/layers.urm.puml
index 2ec6e142e..e597c7546 100644
--- a/layers/etc/layers.urm.puml
+++ b/layers/etc/layers.urm.puml
@@ -1,14 +1,54 @@
@startuml
package com.iluwatar.layers {
- interface View {
- + render() {abstract}
+ class App {
+ - cakeBakingService : CakeBakingService {static}
+ + App()
+ - initializeData(cakeBakingService : CakeBakingService) {static}
+ + main(args : String[]) {static}
}
- class CakeToppingInfo {
- + calories : int
+ class Cake {
+ - id : Long
+ - layers : Set<CakeLayer>
+ - topping : CakeTopping
+ + Cake()
+ + addLayer(layer : CakeLayer)
+ + getId() : Long
+ + getLayers() : Set<CakeLayer>
+ + getTopping() : CakeTopping
+ + setId(id : Long)
+ + setLayers(layers : Set<CakeLayer>)
+ + setTopping(topping : CakeTopping)
+ + toString() : String
+ }
+ interface CakeBakingService {
+ + bakeNewCake(CakeInfo) {abstract}
+ + getAllCakes() : List<CakeInfo> {abstract}
+ + getAvailableLayers() : List<CakeLayerInfo> {abstract}
+ + getAvailableToppings() : List<CakeToppingInfo> {abstract}
+ + saveNewLayer(CakeLayerInfo) {abstract}
+ + saveNewTopping(CakeToppingInfo) {abstract}
+ }
+ class CakeBakingServiceImpl {
+ - context : AbstractApplicationContext
+ + CakeBakingServiceImpl()
+ + bakeNewCake(cakeInfo : CakeInfo)
+ + getAllCakes() : List<CakeInfo>
+ - getAvailableLayerEntities() : List<CakeLayer>
+ + getAvailableLayers() : List<CakeLayerInfo>
+ - getAvailableToppingEntities() : List<CakeTopping>
+ + getAvailableToppings() : List<CakeToppingInfo>
+ + saveNewLayer(layerInfo : CakeLayerInfo)
+ + saveNewTopping(toppingInfo : CakeToppingInfo)
+ }
+ interface CakeDao {
+ }
+ class CakeInfo {
+ + cakeLayerInfos : List<CakeLayerInfo>
+ + cakeToppingInfo : CakeToppingInfo
+ id : Optional<Long>
- + name : String
- + CakeToppingInfo(id : Long, name : String, calories : int)
- + CakeToppingInfo(name : String, calories : int)
+ + CakeInfo(cakeToppingInfo : CakeToppingInfo, cakeLayerInfos : List<CakeLayerInfo>)
+ + CakeInfo(id : Long, cakeToppingInfo : CakeToppingInfo, cakeLayerInfos : List<CakeLayerInfo>)
+ + calculateTotalCalories() : int
+ toString() : String
}
class CakeLayer {
@@ -28,6 +68,8 @@ package com.iluwatar.layers {
+ setName(name : String)
+ toString() : String
}
+ interface CakeLayerDao {
+ }
class CakeLayerInfo {
+ calories : int
+ id : Optional<Long>
@@ -36,23 +78,6 @@ package com.iluwatar.layers {
+ CakeLayerInfo(name : String, calories : int)
+ toString() : String
}
- class CakeViewImpl {
- - cakeBakingService : CakeBakingService
- + CakeViewImpl(cakeBakingService : CakeBakingService)
- + render()
- }
- class CakeBakingServiceImpl {
- - context : AbstractApplicationContext
- + CakeBakingServiceImpl()
- + bakeNewCake(cakeInfo : CakeInfo)
- + getAllCakes() : List<CakeInfo>
- - getAvailableLayerEntities() : List<CakeLayer>
- + getAvailableLayers() : List<CakeLayerInfo>
- - getAvailableToppingEntities() : List<CakeTopping>
- + getAvailableToppings() : List<CakeToppingInfo>
- + saveNewLayer(layerInfo : CakeLayerInfo)
- + saveNewTopping(toppingInfo : CakeToppingInfo)
- }
class CakeTopping {
- cake : Cake
- calories : int
@@ -70,49 +95,25 @@ package com.iluwatar.layers {
+ setName(name : String)
+ toString() : String
}
- class Cake {
- - id : Long
- - layers : Set<CakeLayer>
- - topping : CakeTopping
- + Cake()
- + addLayer(layer : CakeLayer)
- + getId() : Long
- + getLayers() : Set<CakeLayer>
- + getTopping() : CakeTopping
- + setId(id : Long)
- + setLayers(layers : Set<CakeLayer>)
- + setTopping(topping : CakeTopping)
- + toString() : String
- }
interface CakeToppingDao {
}
- interface CakeBakingService {
- + bakeNewCake(CakeInfo) {abstract}
- + getAllCakes() : List<CakeInfo> {abstract}
- + getAvailableLayers() : List<CakeLayerInfo> {abstract}
- + getAvailableToppings() : List<CakeToppingInfo> {abstract}
- + saveNewLayer(CakeLayerInfo) {abstract}
- + saveNewTopping(CakeToppingInfo) {abstract}
- }
- class App {
- - cakeBakingService : CakeBakingService {static}
- + App()
- - initializeData(cakeBakingService : CakeBakingService) {static}
- + main(args : String[]) {static}
- }
- interface CakeDao {
- }
- interface CakeLayerDao {
- }
- class CakeInfo {
- + cakeLayerInfos : List<CakeLayerInfo>
- + cakeToppingInfo : CakeToppingInfo
+ class CakeToppingInfo {
+ + calories : int
+ id : Optional<Long>
- + CakeInfo(cakeToppingInfo : CakeToppingInfo, cakeLayerInfos : List<CakeLayerInfo>)
- + CakeInfo(id : Long, cakeToppingInfo : CakeToppingInfo, cakeLayerInfos : List<CakeLayerInfo>)
- + calculateTotalCalories() : int
+ + name : String
+ + CakeToppingInfo(id : Long, name : String, calories : int)
+ + CakeToppingInfo(name : String, calories : int)
+ toString() : String
}
+ class CakeViewImpl {
+ - LOGGER : Logger {static}
+ - cakeBakingService : CakeBakingService
+ + CakeViewImpl(cakeBakingService : CakeBakingService)
+ + render()
+ }
+ interface View {
+ + render() {abstract}
+ }
}
CakeViewImpl --> "-cakeBakingService" CakeBakingService
CakeInfo --> "-cakeToppingInfo" CakeToppingInfo
@@ -120,6 +121,6 @@ CakeInfo --> "-cakeLayerInfos" CakeLayerInfo
App --> "-cakeBakingService" CakeBakingService
CakeLayer --> "-cake" Cake
Cake --> "-topping" CakeTopping
-CakeViewImpl ..|> View
CakeBakingServiceImpl ..|> CakeBakingService
+CakeViewImpl ..|> View
@enduml
\ No newline at end of file
diff --git a/layers/pom.xml b/layers/pom.xml
index 811f5e050..36b30aaf6 100644
--- a/layers/pom.xml
+++ b/layers/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
diff --git a/layers/src/main/java/com/iluwatar/layers/App.java b/layers/src/main/java/com/iluwatar/layers/App.java
index f8a1648bf..2dfeee905 100644
--- a/layers/src/main/java/com/iluwatar/layers/App.java
+++ b/layers/src/main/java/com/iluwatar/layers/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
diff --git a/layers/src/main/java/com/iluwatar/layers/Cake.java b/layers/src/main/java/com/iluwatar/layers/Cake.java
index f6eae2ad7..10490709e 100644
--- a/layers/src/main/java/com/iluwatar/layers/Cake.java
+++ b/layers/src/main/java/com/iluwatar/layers/Cake.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeBakingException.java b/layers/src/main/java/com/iluwatar/layers/CakeBakingException.java
index 4e79f34e1..fa338a40a 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeBakingException.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeBakingException.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java b/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
index 1cb5b3574..080d4f6a4 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeBakingService.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java b/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
index e8518b625..85a362d90 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeDao.java b/layers/src/main/java/com/iluwatar/layers/CakeDao.java
index 15107b030..d1788b1e0 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeDao.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeDao.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeInfo.java b/layers/src/main/java/com/iluwatar/layers/CakeInfo.java
index e71da5d30..a1a2cb12e 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeInfo.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeInfo.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeLayer.java b/layers/src/main/java/com/iluwatar/layers/CakeLayer.java
index 50632f1b0..a6dc920f9 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeLayer.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeLayer.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeLayerDao.java b/layers/src/main/java/com/iluwatar/layers/CakeLayerDao.java
index 2eea55eaa..d1edebe7a 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeLayerDao.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeLayerDao.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java b/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
index 7f327cac3..f776c320e 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeTopping.java b/layers/src/main/java/com/iluwatar/layers/CakeTopping.java
index 7db86d0f6..47b2a44ba 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeTopping.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeTopping.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeToppingDao.java b/layers/src/main/java/com/iluwatar/layers/CakeToppingDao.java
index 7a7b32aa7..fdbc0f3b4 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeToppingDao.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeToppingDao.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java b/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
index 9acb0526e..031243f4a 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.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
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeViewImpl.java b/layers/src/main/java/com/iluwatar/layers/CakeViewImpl.java
index bc489e16e..57bb0a561 100644
--- a/layers/src/main/java/com/iluwatar/layers/CakeViewImpl.java
+++ b/layers/src/main/java/com/iluwatar/layers/CakeViewImpl.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.layers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* View implementation for displaying cakes
@@ -29,6 +32,8 @@ package com.iluwatar.layers;
*/
public class CakeViewImpl implements View {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CakeViewImpl.class);
+
private CakeBakingService cakeBakingService;
public CakeViewImpl(CakeBakingService cakeBakingService) {
@@ -36,6 +41,6 @@ public class CakeViewImpl implements View {
}
public void render() {
- cakeBakingService.getAllCakes().stream().forEach(cake -> System.out.println(cake));
+ cakeBakingService.getAllCakes().stream().forEach(cake -> LOGGER.info(cake.toString()));
}
}
diff --git a/layers/src/main/java/com/iluwatar/layers/View.java b/layers/src/main/java/com/iluwatar/layers/View.java
index fa4f307ca..7cf565308 100644
--- a/layers/src/main/java/com/iluwatar/layers/View.java
+++ b/layers/src/main/java/com/iluwatar/layers/View.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
diff --git a/layers/src/main/resources/META-INF/persistence.xml b/layers/src/main/resources/META-INF/persistence.xml
index 32afb9fd4..da9820d8a 100644
--- a/layers/src/main/resources/META-INF/persistence.xml
+++ b/layers/src/main/resources/META-INF/persistence.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
diff --git a/layers/src/main/resources/applicationContext.xml b/layers/src/main/resources/applicationContext.xml
index e1ddc7427..eca3670b0 100644
--- a/layers/src/main/resources/applicationContext.xml
+++ b/layers/src/main/resources/applicationContext.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
diff --git a/layers/src/main/resources/logback.xml b/layers/src/main/resources/logback.xml
new file mode 100644
index 000000000..1da6e5828
--- /dev/null
+++ b/layers/src/main/resources/logback.xml
@@ -0,0 +1,57 @@
+<!--
+
+ The MIT License
+ 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
+ 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.
+
+-->
+<configuration>
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>layers.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>layers-%d.log</fileNamePattern>
+ <maxHistory>5</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="com.iluwatar" additivity="false">
+ <level value="DEBUG"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+ <logger name="org.hibernate" additivity="false">
+ <level value="ERROR"/>
+ <appender-ref ref="STDOUT"/>
+ </logger>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</configuration>
diff --git a/layers/src/test/java/com/iluwatar/layers/AppTest.java b/layers/src/test/java/com/iluwatar/layers/AppTest.java
index 5a5374def..841d0ecb5 100644
--- a/layers/src/test/java/com/iluwatar/layers/AppTest.java
+++ b/layers/src/test/java/com/iluwatar/layers/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
diff --git a/layers/src/test/java/com/iluwatar/layers/CakeBakingExceptionTest.java b/layers/src/test/java/com/iluwatar/layers/CakeBakingExceptionTest.java
index 1cca98472..abefc9f2c 100644
--- a/layers/src/test/java/com/iluwatar/layers/CakeBakingExceptionTest.java
+++ b/layers/src/test/java/com/iluwatar/layers/CakeBakingExceptionTest.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
diff --git a/layers/src/test/java/com/iluwatar/layers/CakeBakingServiceImplTest.java b/layers/src/test/java/com/iluwatar/layers/CakeBakingServiceImplTest.java
index e1c539cf2..1c6eb1517 100644
--- a/layers/src/test/java/com/iluwatar/layers/CakeBakingServiceImplTest.java
+++ b/layers/src/test/java/com/iluwatar/layers/CakeBakingServiceImplTest.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
diff --git a/layers/src/test/java/com/iluwatar/layers/CakeTest.java b/layers/src/test/java/com/iluwatar/layers/CakeTest.java
index 6cd50106c..f43f5508f 100644
--- a/layers/src/test/java/com/iluwatar/layers/CakeTest.java
+++ b/layers/src/test/java/com/iluwatar/layers/CakeTest.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
diff --git a/layers/src/test/java/com/iluwatar/layers/CakeViewImplTest.java b/layers/src/test/java/com/iluwatar/layers/CakeViewImplTest.java
index a69aa23bb..8a62e074b 100644
--- a/layers/src/test/java/com/iluwatar/layers/CakeViewImplTest.java
+++ b/layers/src/test/java/com/iluwatar/layers/CakeViewImplTest.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,11 +22,19 @@
*/
package com.iluwatar.layers;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;
/**
@@ -34,7 +42,19 @@ import static org.mockito.Mockito.*;
*
* @author Jeroen Meulemeester
*/
-public class CakeViewImplTest extends StdOutTest {
+public class CakeViewImplTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(CakeViewImpl.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* Verify if the cake view renders the expected result
@@ -56,11 +76,34 @@ public class CakeViewImplTest extends StdOutTest {
final CakeViewImpl cakeView = new CakeViewImpl(bakingService);
- verifyZeroInteractions(getStdOutMock());
+ assertEquals(0, appender.getLogSize());
cakeView.render();
- verify(getStdOutMock(), times(1)).println(cake);
+ assertEquals(cake.toString(), appender.getLastMessage());
}
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+ }
+
}
diff --git a/layers/src/test/java/com/iluwatar/layers/StdOutTest.java b/layers/src/test/java/com/iluwatar/layers/StdOutTest.java
deleted file mode 100644
index 3c94b178c..000000000
--- a/layers/src/test/java/com/iluwatar/layers/StdOutTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.layers;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since the actions of the views don't have
- * any influence on any other accessible objects, except for writing to std-out using {@link
- * System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/lazy-loading/etc/lazy-loading.urm.puml b/lazy-loading/etc/lazy-loading.urm.puml
index 80192160a..e982cb0d3 100644
--- a/lazy-loading/etc/lazy-loading.urm.puml
+++ b/lazy-loading/etc/lazy-loading.urm.puml
@@ -1,33 +1,38 @@
@startuml
package com.iluwatar.lazy.loading {
- ~class HeavyFactory {
- - heavyInstance : Heavy
- ~ HeavyFactory()
- + get() : Heavy
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
- class HolderThreadSafe {
- - heavy : Heavy
- + HolderThreadSafe()
- + getHeavy() : Heavy
- }
class Heavy {
+ - LOGGER : Logger {static}
+ Heavy()
}
class HolderNaive {
+ - LOGGER : Logger {static}
- heavy : Heavy
+ HolderNaive()
+ getHeavy() : Heavy
}
+ class HolderThreadSafe {
+ - LOGGER : Logger {static}
+ - heavy : Heavy
+ + HolderThreadSafe()
+ + getHeavy() : Heavy
+ }
class Java8Holder {
+ - LOGGER : Logger {static}
- heavy : Supplier<Heavy>
+ Java8Holder()
- createAndCacheHeavy() : Heavy
+ getHeavy() : Heavy
}
+ ~class HeavyFactory {
+ - heavyInstance : Heavy
+ ~ HeavyFactory()
+ + get() : Heavy
+ }
}
HolderNaive --> "-heavy" Heavy
HolderThreadSafe --> "-heavy" Heavy
diff --git a/lazy-loading/pom.xml b/lazy-loading/pom.xml
index d70587395..cc212b86d 100644
--- a/lazy-loading/pom.xml
+++ b/lazy-loading/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
diff --git a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/App.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/App.java
index 7a658a8c6..0a5eac759 100644
--- a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/App.java
+++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/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.lazy.loading;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Lazy loading idiom defers object creation until needed.
@@ -33,6 +36,9 @@ package com.iluwatar.lazy.loading;
*
*/
public class App {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -43,16 +49,16 @@ public class App {
// Simple lazy loader - not thread safe
HolderNaive holderNaive = new HolderNaive();
Heavy heavy = holderNaive.getHeavy();
- System.out.println("heavy=" + heavy);
+ LOGGER.info("heavy={}", heavy);
// Thread safe lazy loader, but with heavy synchronization on each access
HolderThreadSafe holderThreadSafe = new HolderThreadSafe();
Heavy another = holderThreadSafe.getHeavy();
- System.out.println("another=" + another);
+ LOGGER.info("another={}", another);
// The most efficient lazy loader utilizing Java 8 features
Java8Holder java8Holder = new Java8Holder();
Heavy next = java8Holder.getHeavy();
- System.out.println("next=" + next);
+ LOGGER.info("next={}", next);
}
}
diff --git a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Heavy.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Heavy.java
index 57e8e263e..1c23611c3 100644
--- a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Heavy.java
+++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Heavy.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.lazy.loading;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Heavy objects are expensive to create.
@@ -29,16 +32,18 @@ package com.iluwatar.lazy.loading;
*/
public class Heavy {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Heavy.class);
+
/**
* Constructor
*/
public Heavy() {
- System.out.println("Creating Heavy ...");
+ LOGGER.info("Creating Heavy ...");
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
- e.printStackTrace();
+ LOGGER.error("Exception caught.", e);
}
- System.out.println("... Heavy created");
+ LOGGER.info("... Heavy created");
}
}
diff --git a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderNaive.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderNaive.java
index 75c65d1b9..5e4552ecf 100644
--- a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderNaive.java
+++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderNaive.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.lazy.loading;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Simple implementation of the lazy loading idiom. However, this is not thread safe.
@@ -29,13 +32,15 @@ package com.iluwatar.lazy.loading;
*/
public class HolderNaive {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HolderNaive.class);
+
private Heavy heavy;
/**
* Constructor
*/
public HolderNaive() {
- System.out.println("HolderNaive created");
+ LOGGER.info("HolderNaive created");
}
/**
diff --git a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderThreadSafe.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderThreadSafe.java
index c6e0fcfd9..b36ec24ba 100644
--- a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderThreadSafe.java
+++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderThreadSafe.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.lazy.loading;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Same as HolderNaive but with added synchronization. This implementation is thread safe, but each
@@ -30,13 +33,15 @@ package com.iluwatar.lazy.loading;
*/
public class HolderThreadSafe {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HolderThreadSafe.class);
+
private Heavy heavy;
/**
* Constructor
*/
public HolderThreadSafe() {
- System.out.println("HolderThreadSafe created");
+ LOGGER.info("HolderThreadSafe created");
}
/**
diff --git a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Java8Holder.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Java8Holder.java
index e4ce394cc..faa553c5e 100644
--- a/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Java8Holder.java
+++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Java8Holder.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.lazy.loading;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.function.Supplier;
/**
@@ -32,10 +35,12 @@ import java.util.function.Supplier;
*/
public class Java8Holder {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Java8Holder.class);
+
private Supplier<Heavy> heavy = () -> createAndCacheHeavy();
public Java8Holder() {
- System.out.println("Java8Holder created");
+ LOGGER.info("Java8Holder created");
}
public Heavy getHeavy() {
diff --git a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/AbstractHolderTest.java b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/AbstractHolderTest.java
index 3118847d9..917ccb8d3 100644
--- a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/AbstractHolderTest.java
+++ b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/AbstractHolderTest.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
diff --git a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/AppTest.java b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/AppTest.java
index 36cdedb6a..cefa9918a 100644
--- a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/AppTest.java
+++ b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/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
diff --git a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderNaiveTest.java b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderNaiveTest.java
index a9c1b6afb..39e8a55d7 100644
--- a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderNaiveTest.java
+++ b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderNaiveTest.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
diff --git a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderThreadSafeTest.java b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderThreadSafeTest.java
index 3803a482e..d4017363d 100644
--- a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderThreadSafeTest.java
+++ b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderThreadSafeTest.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
diff --git a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/Java8HolderTest.java b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/Java8HolderTest.java
index 08a3995f9..3e5078397 100644
--- a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/Java8HolderTest.java
+++ b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/Java8HolderTest.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
diff --git a/mediator/etc/mediator.urm.puml b/mediator/etc/mediator.urm.puml
index 330e024ab..04e75d2b8 100644
--- a/mediator/etc/mediator.urm.puml
+++ b/mediator/etc/mediator.urm.puml
@@ -1,48 +1,5 @@
@startuml
package com.iluwatar.mediator {
- interface Party {
- + act(PartyMember, Action) {abstract}
- + addMember(PartyMember) {abstract}
- }
- interface PartyMember {
- + act(Action) {abstract}
- + joinedParty(Party) {abstract}
- + partyAction(Action) {abstract}
- }
- class Rogue {
- + Rogue()
- + toString() : String
- }
- class Hunter {
- + Hunter()
- + toString() : String
- }
- class PartyImpl {
- - members : List<PartyMember>
- + PartyImpl()
- + act(actor : PartyMember, action : Action)
- + addMember(member : PartyMember)
- }
- class Hobbit {
- + Hobbit()
- + toString() : String
- }
- class Wizard {
- + Wizard()
- + toString() : String
- }
- abstract class PartyMemberBase {
- # party : Party
- + PartyMemberBase()
- + act(action : Action)
- + joinedParty(party : Party)
- + partyAction(action : Action)
- + toString() : String {abstract}
- }
- class App {
- + App()
- + main(args : String[]) {static}
- }
enum Action {
+ ENEMY {static}
+ GOLD {static}
@@ -56,13 +13,57 @@ package com.iluwatar.mediator {
+ valueOf(name : String) : Action {static}
+ values() : Action[] {static}
}
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
+ class Hobbit {
+ + Hobbit()
+ + toString() : String
+ }
+ class Hunter {
+ + Hunter()
+ + toString() : String
+ }
+ interface Party {
+ + act(PartyMember, Action) {abstract}
+ + addMember(PartyMember) {abstract}
+ }
+ class PartyImpl {
+ - members : List<PartyMember>
+ + PartyImpl()
+ + act(actor : PartyMember, action : Action)
+ + addMember(member : PartyMember)
+ }
+ interface PartyMember {
+ + act(Action) {abstract}
+ + joinedParty(Party) {abstract}
+ + partyAction(Action) {abstract}
+ }
+ abstract class PartyMemberBase {
+ - LOGGER : Logger {static}
+ # party : Party
+ + PartyMemberBase()
+ + act(action : Action)
+ + joinedParty(party : Party)
+ + partyAction(action : Action)
+ + toString() : String {abstract}
+ }
+ class Rogue {
+ + Rogue()
+ + toString() : String
+ }
+ class Wizard {
+ + Wizard()
+ + toString() : String
+ }
}
PartyImpl --> "-members" PartyMember
PartyMemberBase --> "-party" Party
-Rogue --|> PartyMemberBase
+Hobbit --|> PartyMemberBase
Hunter --|> PartyMemberBase
PartyImpl ..|> Party
-Hobbit --|> PartyMemberBase
-Wizard --|> PartyMemberBase
PartyMemberBase ..|> PartyMember
+Rogue --|> PartyMemberBase
+Wizard --|> PartyMemberBase
@enduml
\ No newline at end of file
diff --git a/mediator/pom.xml b/mediator/pom.xml
index e3b227237..84fc0c550 100644
--- a/mediator/pom.xml
+++ b/mediator/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
diff --git a/mediator/src/main/java/com/iluwatar/mediator/Action.java b/mediator/src/main/java/com/iluwatar/mediator/Action.java
index b2dc25ed3..4deb0388d 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/Action.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Action.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
diff --git a/mediator/src/main/java/com/iluwatar/mediator/App.java b/mediator/src/main/java/com/iluwatar/mediator/App.java
index 57aec35d2..09433da26 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/App.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/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
diff --git a/mediator/src/main/java/com/iluwatar/mediator/Hobbit.java b/mediator/src/main/java/com/iluwatar/mediator/Hobbit.java
index 41ed5f5bd..654048d55 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/Hobbit.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Hobbit.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
diff --git a/mediator/src/main/java/com/iluwatar/mediator/Hunter.java b/mediator/src/main/java/com/iluwatar/mediator/Hunter.java
index 0ff2a550e..23988bd58 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/Hunter.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Hunter.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
diff --git a/mediator/src/main/java/com/iluwatar/mediator/Party.java b/mediator/src/main/java/com/iluwatar/mediator/Party.java
index c3c2f1666..d68e02791 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/Party.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Party.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
diff --git a/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java
index f45c2869a..d30ee3ba4 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.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
diff --git a/mediator/src/main/java/com/iluwatar/mediator/PartyMember.java b/mediator/src/main/java/com/iluwatar/mediator/PartyMember.java
index 1406ca889..09f64c215 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/PartyMember.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/PartyMember.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
diff --git a/mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.java b/mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.java
index 7d3ca3dbf..4c60a3b43 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.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.mediator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Abstract base class for party members.
@@ -29,23 +32,25 @@ package com.iluwatar.mediator;
*/
public abstract class PartyMemberBase implements PartyMember {
+ private static final Logger LOGGER = LoggerFactory.getLogger(PartyMemberBase.class);
+
protected Party party;
@Override
public void joinedParty(Party party) {
- System.out.println(this + " joins the party");
+ LOGGER.info("{} joins the party", this);
this.party = party;
}
@Override
public void partyAction(Action action) {
- System.out.println(this + " " + action.getDescription());
+ LOGGER.info("{} {}", this, action.getDescription());
}
@Override
public void act(Action action) {
if (party != null) {
- System.out.println(this + " " + action.toString());
+ LOGGER.info("{} {}", this, action);
party.act(this, action);
}
}
diff --git a/mediator/src/main/java/com/iluwatar/mediator/Rogue.java b/mediator/src/main/java/com/iluwatar/mediator/Rogue.java
index b15d81d51..e0b6c7847 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/Rogue.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Rogue.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
diff --git a/mediator/src/main/java/com/iluwatar/mediator/Wizard.java b/mediator/src/main/java/com/iluwatar/mediator/Wizard.java
index 6f9d4433b..fb0833e57 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/Wizard.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Wizard.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
diff --git a/mediator/src/test/java/com/iluwatar/mediator/AppTest.java b/mediator/src/test/java/com/iluwatar/mediator/AppTest.java
index 7691e11b0..d92b8969b 100644
--- a/mediator/src/test/java/com/iluwatar/mediator/AppTest.java
+++ b/mediator/src/test/java/com/iluwatar/mediator/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
diff --git a/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java b/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java
index 7e9181fd7..bb3c51474 100644
--- a/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java
+++ b/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.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
diff --git a/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java b/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java
index 0bf43f9cd..4d578c333 100644
--- a/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java
+++ b/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.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,22 +22,25 @@
*/
package com.iluwatar.mediator;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.LoggerFactory;
-import java.io.PrintStream;
import java.util.Arrays;
import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
import java.util.function.Supplier;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
/**
* Date: 12/19/15 - 10:13 PM
@@ -57,34 +60,6 @@ public class PartyMemberTest {
);
}
- /**
- * The mocked standard out {@link PrintStream}, required since some actions on a {@link
- * PartyMember} have any influence on any other accessible objects, except for writing to std-out
- * using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
/**
* The factory, used to create a new instance of the tested party member
*/
@@ -99,6 +74,18 @@ public class PartyMemberTest {
this.memberSupplier = memberSupplier;
}
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(PartyMemberBase.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
+
/**
* Verify if a party action triggers the correct output to the std-Out
*/
@@ -108,10 +95,10 @@ public class PartyMemberTest {
for (final Action action : Action.values()) {
member.partyAction(action);
- verify(this.stdOutMock).println(member.toString() + " " + action.getDescription());
+ assertEquals(member.toString() + " " + action.getDescription(), appender.getLastMessage());
}
- verifyNoMoreInteractions(this.stdOutMock);
+ assertEquals(Action.values().length, appender.getLogSize());
}
/**
@@ -122,19 +109,19 @@ public class PartyMemberTest {
final PartyMember member = this.memberSupplier.get();
member.act(Action.GOLD);
- verifyZeroInteractions(this.stdOutMock);
+ assertEquals(0, appender.getLogSize());
final Party party = mock(Party.class);
member.joinedParty(party);
- verify(this.stdOutMock).println(member.toString() + " joins the party");
+ assertEquals(member.toString() + " joins the party", appender.getLastMessage());
for (final Action action : Action.values()) {
member.act(action);
- verify(this.stdOutMock).println(member.toString() + " " + action.toString());
+ assertEquals(member.toString() + " " + action.toString(), appender.getLastMessage());
verify(party).act(member, action);
}
- verifyNoMoreInteractions(party, this.stdOutMock);
+ assertEquals(Action.values().length + 1, appender.getLogSize());
}
/**
@@ -147,4 +134,27 @@ public class PartyMemberTest {
assertEquals(memberClass.getSimpleName(), member.toString());
}
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+ }
+
+
}
diff --git a/memento/etc/memento.urm.puml b/memento/etc/memento.urm.puml
index 316d4047d..319227ad2 100644
--- a/memento/etc/memento.urm.puml
+++ b/memento/etc/memento.urm.puml
@@ -1,5 +1,20 @@
@startuml
package com.iluwatar.memento {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
+ class Star {
+ - ageYears : int
+ - massTons : int
+ - type : StarType
+ + Star(startType : StarType, startAge : int, startMass : int)
+ ~ getMemento() : StarMemento
+ ~ setMemento(memento : StarMemento)
+ + timePasses()
+ + toString() : String
+ }
-class StarMementoInternal {
- ageYears : int
- massTons : int
@@ -12,22 +27,8 @@ package com.iluwatar.memento {
+ setMassTons(massTons : int)
+ setType(type : StarType)
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
interface StarMemento {
}
- class Star {
- - ageYears : int
- - massTons : int
- - type : StarType
- + Star(startType : StarType, startAge : int, startMass : int)
- ~ getMemento() : StarMemento
- ~ setMemento(memento : StarMemento)
- + timePasses()
- + toString() : String
- }
enum StarType {
+ DEAD {static}
+ RED_GIANT {static}
diff --git a/memento/pom.xml b/memento/pom.xml
index 3dc7e5f52..c22e5ec0d 100644
--- a/memento/pom.xml
+++ b/memento/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
diff --git a/memento/src/main/java/com/iluwatar/memento/App.java b/memento/src/main/java/com/iluwatar/memento/App.java
index e1ee349b1..c20ad4654 100644
--- a/memento/src/main/java/com/iluwatar/memento/App.java
+++ b/memento/src/main/java/com/iluwatar/memento/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.memento;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Stack;
/**
@@ -45,6 +48,8 @@ import java.util.Stack;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*/
@@ -52,22 +57,22 @@ public class App {
Stack<StarMemento> states = new Stack<>();
Star star = new Star(StarType.SUN, 10000000, 500000);
- System.out.println(star);
+ LOGGER.info(star.toString());
states.add(star.getMemento());
star.timePasses();
- System.out.println(star);
+ LOGGER.info(star.toString());
states.add(star.getMemento());
star.timePasses();
- System.out.println(star);
+ LOGGER.info(star.toString());
states.add(star.getMemento());
star.timePasses();
- System.out.println(star);
+ LOGGER.info(star.toString());
states.add(star.getMemento());
star.timePasses();
- System.out.println(star);
+ LOGGER.info(star.toString());
while (states.size() > 0) {
star.setMemento(states.pop());
- System.out.println(star);
+ LOGGER.info(star.toString());
}
}
}
diff --git a/memento/src/main/java/com/iluwatar/memento/Star.java b/memento/src/main/java/com/iluwatar/memento/Star.java
index d2df823a0..aac1e75fc 100644
--- a/memento/src/main/java/com/iluwatar/memento/Star.java
+++ b/memento/src/main/java/com/iluwatar/memento/Star.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
diff --git a/memento/src/main/java/com/iluwatar/memento/StarMemento.java b/memento/src/main/java/com/iluwatar/memento/StarMemento.java
index 5f66b2939..94e6da186 100644
--- a/memento/src/main/java/com/iluwatar/memento/StarMemento.java
+++ b/memento/src/main/java/com/iluwatar/memento/StarMemento.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
diff --git a/memento/src/main/java/com/iluwatar/memento/StarType.java b/memento/src/main/java/com/iluwatar/memento/StarType.java
index ffd2f1adb..414cccc46 100644
--- a/memento/src/main/java/com/iluwatar/memento/StarType.java
+++ b/memento/src/main/java/com/iluwatar/memento/StarType.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
diff --git a/memento/src/test/java/com/iluwatar/memento/AppTest.java b/memento/src/test/java/com/iluwatar/memento/AppTest.java
index cfdce9471..b98757122 100644
--- a/memento/src/test/java/com/iluwatar/memento/AppTest.java
+++ b/memento/src/test/java/com/iluwatar/memento/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
diff --git a/memento/src/test/java/com/iluwatar/memento/StarTest.java b/memento/src/test/java/com/iluwatar/memento/StarTest.java
index 8f81fcfa7..2a7efc70f 100644
--- a/memento/src/test/java/com/iluwatar/memento/StarTest.java
+++ b/memento/src/test/java/com/iluwatar/memento/StarTest.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
diff --git a/message-channel/etc/message-channel.urm.puml b/message-channel/etc/message-channel.urm.puml
index 9e2b24032..852f190b4 100644
--- a/message-channel/etc/message-channel.urm.puml
+++ b/message-channel/etc/message-channel.urm.puml
@@ -1,6 +1,7 @@
@startuml
package com.iluwatar.message.channel {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
diff --git a/message-channel/pom.xml b/message-channel/pom.xml
index 7c1825b5e..85edd5b88 100644
--- a/message-channel/pom.xml
+++ b/message-channel/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
diff --git a/message-channel/src/main/java/com/iluwatar/message/channel/App.java b/message-channel/src/main/java/com/iluwatar/message/channel/App.java
index dab04bd37..d2974e20b 100644
--- a/message-channel/src/main/java/com/iluwatar/message/channel/App.java
+++ b/message-channel/src/main/java/com/iluwatar/message/channel/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
@@ -25,6 +25,8 @@ package com.iluwatar.message.channel;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -50,6 +52,8 @@ import org.apache.camel.impl.DefaultCamelContext;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*/
@@ -66,7 +70,7 @@ public class App {
});
context.start();
- context.getRoutes().stream().forEach(r -> System.out.println(r));
+ context.getRoutes().stream().forEach(r -> LOGGER.info(r.toString()));
context.stop();
}
}
diff --git a/message-channel/src/test/java/com/iluwatar/message/channel/AppTest.java b/message-channel/src/test/java/com/iluwatar/message/channel/AppTest.java
index ace457c16..e41977a00 100644
--- a/message-channel/src/test/java/com/iluwatar/message/channel/AppTest.java
+++ b/message-channel/src/test/java/com/iluwatar/message/channel/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
diff --git a/model-view-controller/etc/model-view-controller.urm.puml b/model-view-controller/etc/model-view-controller.urm.puml
index ad979fe0e..92ec1e949 100644
--- a/model-view-controller/etc/model-view-controller.urm.puml
+++ b/model-view-controller/etc/model-view-controller.urm.puml
@@ -1,17 +1,17 @@
@startuml
package com.iluwatar.model.view.controller {
- class GiantModel {
- - fatigue : Fatigue
- - health : Health
- - nourishment : Nourishment
- ~ GiantModel(health : Health, fatigue : Fatigue, nourishment : Nourishment)
- + getFatigue() : Fatigue
- + getHealth() : Health
- + getNourishment() : Nourishment
- + setFatigue(fatigue : Fatigue)
- + setHealth(health : Health)
- + setNourishment(nourishment : Nourishment)
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
+ enum Fatigue {
+ + ALERT {static}
+ + SLEEPING {static}
+ + TIRED {static}
+ - title : String
+ toString() : String
+ + valueOf(name : String) : Fatigue {static}
+ + values() : Fatigue[] {static}
}
class GiantController {
- giant : GiantModel
@@ -25,14 +25,24 @@ package com.iluwatar.model.view.controller {
+ setNourishment(nourishment : Nourishment)
+ updateView()
}
+ class GiantModel {
+ - fatigue : Fatigue
+ - health : Health
+ - nourishment : Nourishment
+ ~ GiantModel(health : Health, fatigue : Fatigue, nourishment : Nourishment)
+ + getFatigue() : Fatigue
+ + getHealth() : Health
+ + getNourishment() : Nourishment
+ + setFatigue(fatigue : Fatigue)
+ + setHealth(health : Health)
+ + setNourishment(nourishment : Nourishment)
+ + toString() : String
+ }
class GiantView {
+ - LOGGER : Logger {static}
+ GiantView()
+ displayGiant(giant : GiantModel)
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
enum Health {
+ DEAD {static}
+ HEALTHY {static}
@@ -51,15 +61,6 @@ package com.iluwatar.model.view.controller {
+ valueOf(name : String) : Nourishment {static}
+ values() : Nourishment[] {static}
}
- enum Fatigue {
- + ALERT {static}
- + SLEEPING {static}
- + TIRED {static}
- - title : String
- + toString() : String
- + valueOf(name : String) : Fatigue {static}
- + values() : Fatigue[] {static}
- }
}
GiantModel --> "-nourishment" Nourishment
GiantController --> "-giant" GiantModel
diff --git a/model-view-controller/pom.xml b/model-view-controller/pom.xml
index 38e756313..e85f26115 100644
--- a/model-view-controller/pom.xml
+++ b/model-view-controller/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
diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/App.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/App.java
index 4a3d2b41e..a2f8d7a6e 100644
--- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/App.java
+++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/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
diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java
index 38d3030e0..8c9ec4466 100644
--- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java
+++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.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
diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantController.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantController.java
index e291e682c..2d2d7f311 100644
--- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantController.java
+++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantController.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
diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java
index 9b9303de7..96ccfa233 100644
--- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java
+++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.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
diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantView.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantView.java
index dd4361487..36beadf70 100644
--- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantView.java
+++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantView.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.model.view.controller;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* GiantView displays the giant
@@ -29,7 +32,9 @@ package com.iluwatar.model.view.controller;
*/
public class GiantView {
+ private static final Logger LOGGER = LoggerFactory.getLogger(GiantView.class);
+
public void displayGiant(GiantModel giant) {
- System.out.println(giant);
+ LOGGER.info(giant.toString());
}
}
diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java
index 4efe0100b..0adcaf99b 100644
--- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java
+++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.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
diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java
index e2d41ccf8..1f3e2a20f 100644
--- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java
+++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.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
diff --git a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/AppTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/AppTest.java
index aad850d69..66062faf5 100644
--- a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/AppTest.java
+++ b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/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
diff --git a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java
index 7e0532d30..ab9b3e0a4 100644
--- a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java
+++ b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.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
diff --git a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantModelTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantModelTest.java
index 8e322fc59..ecf713a61 100644
--- a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantModelTest.java
+++ b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantModelTest.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
diff --git a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantViewTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantViewTest.java
index 89d503d4e..ba72fea1a 100644
--- a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantViewTest.java
+++ b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantViewTest.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,15 +22,19 @@
*/
package com.iluwatar.model.view.controller;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.LoggerFactory;
-import java.io.PrintStream;
+import java.util.LinkedList;
+import java.util.List;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* Date: 12/20/15 - 2:04 PM
@@ -39,32 +43,16 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
*/
public class GiantViewTest {
- /**
- * The mocked standard out {@link PrintStream}, required since the actions of the views don't have
- * any influence on any other accessible objects, except for writing to std-out using {@link
- * System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
+ private InMemoryAppender appender;
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
@Before
public void setUp() {
- System.setOut(this.stdOutMock);
+ appender = new InMemoryAppender(GiantView.class);
}
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
@After
public void tearDown() {
- System.setOut(this.stdOutOrig);
+ appender.stop();
}
/**
@@ -78,9 +66,29 @@ public class GiantViewTest {
final GiantModel model = mock(GiantModel.class);
view.displayGiant(model);
- verify(this.stdOutMock).println(model);
- verifyNoMoreInteractions(model, this.stdOutMock);
-
+ assertEquals(model.toString(), appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
-}
\ No newline at end of file
+ public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getMessage();
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+ }
+}
diff --git a/model-view-presenter/etc/data/test.txt b/model-view-presenter/etc/data/test.txt
index 85aa49612..3f3607972 100644
--- a/model-view-presenter/etc/data/test.txt
+++ b/model-view-presenter/etc/data/test.txt
@@ -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
diff --git a/model-view-presenter/etc/model-view-presenter.urm.puml b/model-view-presenter/etc/model-view-presenter.urm.puml
index 0cec653e4..188b3fb4d 100644
--- a/model-view-presenter/etc/model-view-presenter.urm.puml
+++ b/model-view-presenter/etc/model-view-presenter.urm.puml
@@ -1,34 +1,8 @@
@startuml
package com.iluwatar.model.view.presenter {
- interface FileSelectorView {
- + close() {abstract}
- + displayData(String) {abstract}
- + getFileName() : String {abstract}
- + getPresenter() : FileSelectorPresenter {abstract}
- + isOpened() : boolean {abstract}
- + open() {abstract}
- + setFileName(String) {abstract}
- + setPresenter(FileSelectorPresenter) {abstract}
- + showMessage(String) {abstract}
- }
- class FileSelectorStub {
- - dataDisplayed : boolean
- - name : String
- - numOfMessageSent : int
- - opened : boolean
- - presenter : FileSelectorPresenter
- + FileSelectorStub()
- + close()
- + dataDisplayed() : boolean
- + displayData(data : String)
- + getFileName() : String
- + getMessagesSent() : int
- + getPresenter() : FileSelectorPresenter
- + isOpened() : boolean
- + open()
- + setFileName(name : String)
- + setPresenter(presenter : FileSelectorPresenter)
- + showMessage(message : String)
+ class App {
+ + App()
+ + main(args : String[]) {static}
}
class FileLoader {
- fileName : String
@@ -40,20 +14,6 @@ package com.iluwatar.model.view.presenter {
+ loadData() : String
+ setFileName(fileName : String)
}
- class FileSelectorPresenter {
- - loader : FileLoader
- - view : FileSelectorView
- + FileSelectorPresenter(view : FileSelectorView)
- + cancelled()
- + confirmed()
- + fileNameChanged()
- + setLoader(loader : FileLoader)
- + start()
- }
- class App {
- + App()
- + main(args : String[]) {static}
- }
class FileSelectorJFrame {
- area : JTextArea
- cancel : JButton
@@ -77,11 +37,51 @@ package com.iluwatar.model.view.presenter {
+ setPresenter(presenter : FileSelectorPresenter)
+ showMessage(message : String)
}
+ class FileSelectorPresenter {
+ - loader : FileLoader
+ - view : FileSelectorView
+ + FileSelectorPresenter(view : FileSelectorView)
+ + cancelled()
+ + confirmed()
+ + fileNameChanged()
+ + setLoader(loader : FileLoader)
+ + start()
+ }
+ class FileSelectorStub {
+ - dataDisplayed : boolean
+ - name : String
+ - numOfMessageSent : int
+ - opened : boolean
+ - presenter : FileSelectorPresenter
+ + FileSelectorStub()
+ + close()
+ + dataDisplayed() : boolean
+ + displayData(data : String)
+ + getFileName() : String
+ + getMessagesSent() : int
+ + getPresenter() : FileSelectorPresenter
+ + isOpened() : boolean
+ + open()
+ + setFileName(name : String)
+ + setPresenter(presenter : FileSelectorPresenter)
+ + showMessage(message : String)
+ }
+ interface FileSelectorView {
+ + close() {abstract}
+ + displayData(String) {abstract}
+ + getFileName() : String {abstract}
+ + getPresenter() : FileSelectorPresenter {abstract}
+ + isOpened() : boolean {abstract}
+ + open() {abstract}
+ + setFileName(String) {abstract}
+ + setPresenter(FileSelectorPresenter) {abstract}
+ + showMessage(String) {abstract}
+ }
}
-FileSelectorJFrame --> "-presenter" FileSelectorPresenter
FileSelectorStub --> "-presenter" FileSelectorPresenter
+FileSelectorJFrame --> "-presenter" FileSelectorPresenter
FileSelectorPresenter --> "-loader" FileLoader
FileSelectorPresenter --> "-view" FileSelectorView
-FileSelectorStub ..|> FileSelectorView
FileSelectorJFrame ..|> FileSelectorView
+FileSelectorStub ..|> FileSelectorView
@enduml
\ No newline at end of file
diff --git a/model-view-presenter/pom.xml b/model-view-presenter/pom.xml
index 6fb7ab31e..88176d5dc 100644
--- a/model-view-presenter/pom.xml
+++ b/model-view-presenter/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
diff --git a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/App.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/App.java
index 2c8985252..26f16bcec 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/App.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/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
diff --git a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileLoader.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileLoader.java
index b9e36fd00..c9b023925 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileLoader.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileLoader.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
diff --git a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java
index 9cf883086..b39db04a8 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.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
diff --git a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorPresenter.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorPresenter.java
index 54f9a91c6..f2fefe8eb 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorPresenter.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorPresenter.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
diff --git a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorStub.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorStub.java
index b9ce73878..e4510eabe 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorStub.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorStub.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
diff --git a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorView.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorView.java
index 94edcf7d0..cfafadbab 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorView.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorView.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
diff --git a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/AppTest.java b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/AppTest.java
index 4e329e3bc..83639c0b2 100644
--- a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/AppTest.java
+++ b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/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
diff --git a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileLoaderTest.java b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileLoaderTest.java
index eed01b835..8e9a558a7 100644
--- a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileLoaderTest.java
+++ b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileLoaderTest.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
diff --git a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java
index 42afdb2b8..057d4dcdc 100644
--- a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java
+++ b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.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
diff --git a/module/README.md b/module/README.md
new file mode 100644
index 000000000..24bd3f543
--- /dev/null
+++ b/module/README.md
@@ -0,0 +1,25 @@
+---
+layout: pattern
+title: Module
+folder: module
+permalink: /patterns/module/
+pumlid: JShB3OGm303HLg20nFVjnYGM1CN6ycTfVtFSsnjfzY5jPgUqkLqHwXy0mxUU8wuyqidQ8q4IjJqCO-QBWGOtVh5qyd5AKOmW4mT6Nu2-ZiAekapH_hkcSTNa-GC0
+categories: Creational Pattern
+tags:
+ - Java
+ - Difficulty-Beginner
+---
+
+## Intent
+Module pattern is used to implement the concept of software modules, defined by modular programming, in a programming language with incomplete direct support for the concept.
+
+
+
+## Applicability
+The Module pattern can be considered a creational pattern and a structural pattern. It manages the creation and organization of other elements, and groups them as the structural pattern does.
+
+An object that applies this pattern can provide the equivalent of a namespace, providing the initialization and finalization process of a static class or a class with static members with cleaner, more concise syntax and semantics.
+
+## Credits
+
+* [Module](https://en.wikipedia.org/wiki/Module_pattern)
diff --git a/module/etc/module.png b/module/etc/module.png
new file mode 100644
index 000000000..a26807d29
Binary files /dev/null and b/module/etc/module.png differ
diff --git a/module/etc/module.ucls b/module/etc/module.ucls
new file mode 100644
index 000000000..d2519b856
--- /dev/null
+++ b/module/etc/module.ucls
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.9" icons="true" always-add-relationships="false" generalizations="true" realizations="true"
+ associations="true" dependencies="false" nesting-relationships="true" router="FAN">
+ <class id="1" language="java" name="com.iluwatar.module.FileLoggerModule" project="module"
+ file="/module/src/main/java/com/iluwatar/module/FileLoggerModule.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="401" y="190"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <class id="2" language="java" name="com.iluwatar.module.ConsoleLoggerModule" project="module"
+ file="/module/src/main/java/com/iluwatar/module/ConsoleLoggerModule.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="686" y="176"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <class id="3" language="java" name="com.iluwatar.module.App" project="module"
+ file="/module/src/main/java/com/iluwatar/module/App.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="558" y="501"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <association id="4">
+ <end type="SOURCE" refId="1" navigable="false">
+ <attribute id="5" name="singleton"/>
+ <multiplicity id="6" minimum="0" maximum="1"/>
+ </end>
+ <end type="TARGET" refId="1" navigable="true"/>
+ <display labels="true" multiplicity="true"/>
+ </association>
+ <association id="7">
+ <end type="SOURCE" refId="2" navigable="false">
+ <attribute id="8" name="singleton"/>
+ <multiplicity id="9" minimum="0" maximum="1"/>
+ </end>
+ <end type="TARGET" refId="2" navigable="true"/>
+ <display labels="true" multiplicity="true"/>
+ </association>
+ <association id="10">
+ <end type="SOURCE" refId="3" navigable="false">
+ <attribute id="11" name="consoleLoggerModule"/>
+ <multiplicity id="12" minimum="0" maximum="1"/>
+ </end>
+ <end type="TARGET" refId="2" navigable="true"/>
+ <display labels="true" multiplicity="true"/>
+ </association>
+ <association id="13">
+ <end type="SOURCE" refId="3" navigable="false">
+ <attribute id="14" name="fileLoggerModule"/>
+ <multiplicity id="15" minimum="0" maximum="1"/>
+ </end>
+ <end type="TARGET" refId="1" navigable="true"/>
+ <display labels="true" multiplicity="true"/>
+ </association>
+ <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </classifier-display>
+ <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/module/etc/module.urm.puml b/module/etc/module.urm.puml
new file mode 100644
index 000000000..d78f12da8
--- /dev/null
+++ b/module/etc/module.urm.puml
@@ -0,0 +1,43 @@
+@startuml
+package com.iluwatar.module {
+ class App {
+ + consoleLoggerModule : ConsoleLoggerModule {static}
+ + fileLoggerModule : FileLoggerModule {static}
+ - App()
+ + execute(args : String[]) {static}
+ + main(args : String[]) {static}
+ + prepare() {static}
+ + unprepare() {static}
+ }
+ class ConsoleLoggerModule {
+ - LOGGER : Logger {static}
+ + error : PrintStream
+ + output : PrintStream
+ - singleton : ConsoleLoggerModule {static}
+ - ConsoleLoggerModule()
+ + getSingleton() : ConsoleLoggerModule {static}
+ + prepare()
+ + printErrorString(value : String)
+ + printString(value : String)
+ + unprepare()
+ }
+ class FileLoggerModule {
+ - ERROR_FILE : String {static}
+ - LOGGER : Logger {static}
+ - OUTPUT_FILE : String {static}
+ + error : PrintStream
+ + output : PrintStream
+ - singleton : FileLoggerModule {static}
+ - FileLoggerModule()
+ + getSingleton() : FileLoggerModule {static}
+ + prepare()
+ + printErrorString(value : String)
+ + printString(value : String)
+ + unprepare()
+ }
+}
+FileLoggerModule --> "-singleton" FileLoggerModule
+App --> "-consoleLoggerModule" ConsoleLoggerModule
+ConsoleLoggerModule --> "-singleton" ConsoleLoggerModule
+App --> "-fileLoggerModule" FileLoggerModule
+@enduml
\ No newline at end of file
diff --git a/module/pom.xml b/module/pom.xml
new file mode 100644
index 000000000..bc43e3e09
--- /dev/null
+++ b/module/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+
+ The MIT License
+ Copyright (c) 2016 Amit Dixit
+
+ 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.
+
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.iluwatar</groupId>
+ <artifactId>java-design-patterns</artifactId>
+ <version>1.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>module</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/module/src/main/java/com/iluwatar/module/App.java b/module/src/main/java/com/iluwatar/module/App.java
new file mode 100644
index 000000000..1c117722f
--- /dev/null
+++ b/module/src/main/java/com/iluwatar/module/App.java
@@ -0,0 +1,92 @@
+/**
+ * The MIT License Copyright (c) 2014 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.module;
+
+import java.io.FileNotFoundException;
+
+/**
+ * The Module pattern can be considered a Creational pattern and a Structural pattern. It manages
+ * the creation and organization of other elements, and groups them as the structural pattern does.
+ * An object that applies this pattern can provide the equivalent of a namespace, providing the
+ * initialization and finalization process of a static class or a class with static members with
+ * cleaner, more concise syntax and semantics.
+ * <p>
+ * The below example demonstrates a use case for testing two different modules: File Logger and
+ * Console Logger
+ *
+ */
+public final class App {
+
+ public static FileLoggerModule fileLoggerModule;
+ public static ConsoleLoggerModule consoleLoggerModule;
+
+ /**
+ * Following method performs the initialization
+ *
+ * @throws FileNotFoundException if program is not able to find log files (output.txt and
+ * error.txt)
+ */
+ public static void prepare() throws FileNotFoundException {
+
+ /* Create new singleton objects and prepare their modules */
+ fileLoggerModule = FileLoggerModule.getSingleton().prepare();
+ consoleLoggerModule = ConsoleLoggerModule.getSingleton().prepare();
+ }
+
+ /**
+ * Following method performs the finalization
+ */
+ public static void unprepare() {
+
+ /* Close all resources */
+ fileLoggerModule.unprepare();
+ consoleLoggerModule.unprepare();
+ }
+
+ /**
+ * Following method is main executor
+ *
+ * @param args for providing default program arguments
+ */
+ public static void execute(final String... args) {
+
+ /* Send logs on file system */
+ fileLoggerModule.printString("Message");
+ fileLoggerModule.printErrorString("Error");
+
+ /* Send logs on console */
+ consoleLoggerModule.printString("Message");
+ consoleLoggerModule.printErrorString("Error");
+ }
+
+ /**
+ * Program entry point.
+ *
+ * @param args command line args.
+ * @throws FileNotFoundException if program is not able to find log files (output.txt and
+ * error.txt)
+ */
+ public static void main(final String... args) throws FileNotFoundException {
+ prepare();
+ execute(args);
+ unprepare();
+ }
+
+ private App() {}
+}
diff --git a/module/src/main/java/com/iluwatar/module/ConsoleLoggerModule.java b/module/src/main/java/com/iluwatar/module/ConsoleLoggerModule.java
new file mode 100644
index 000000000..0efdd9033
--- /dev/null
+++ b/module/src/main/java/com/iluwatar/module/ConsoleLoggerModule.java
@@ -0,0 +1,106 @@
+/**
+ * The MIT License Copyright (c) 2014 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.module;
+
+import java.io.PrintStream;
+
+import org.apache.log4j.Logger;
+
+/**
+ * The ConsoleLoggerModule is responsible for showing logs on System Console
+ * <p>
+ * The below example demonstrates a Console logger module, which can print simple and error messages
+ * in two designated formats
+ */
+public final class ConsoleLoggerModule {
+
+ private static final Logger LOGGER = Logger.getLogger(ConsoleLoggerModule.class);
+
+ private static ConsoleLoggerModule singleton = null;
+
+ public PrintStream output = null;
+ public PrintStream error = null;
+
+ private ConsoleLoggerModule() {}
+
+ /**
+ * Static method to get single instance of class
+ *
+ * @return singleton instance of ConsoleLoggerModule
+ */
+ public static ConsoleLoggerModule getSingleton() {
+
+ if (ConsoleLoggerModule.singleton == null) {
+ ConsoleLoggerModule.singleton = new ConsoleLoggerModule();
+ }
+
+ return ConsoleLoggerModule.singleton;
+ }
+
+ /**
+ * Following method performs the initialization
+ */
+ public ConsoleLoggerModule prepare() {
+
+ LOGGER.debug("ConsoleLoggerModule::prepare();");
+
+ this.output = new PrintStream(System.out);
+ this.error = new PrintStream(System.err);
+
+ return this;
+ }
+
+ /**
+ * Following method performs the finalization
+ */
+ public void unprepare() {
+
+ if (this.output != null) {
+
+ this.output.flush();
+ this.output.close();
+ }
+
+ if (this.error != null) {
+
+ this.error.flush();
+ this.error.close();
+ }
+
+ LOGGER.debug("ConsoleLoggerModule::unprepare();");
+ }
+
+ /**
+ * Used to print a message
+ *
+ * @param value will be printed on console
+ */
+ public void printString(final String value) {
+ this.output.println(value);
+ }
+
+ /**
+ * Used to print a error message
+ *
+ * @param value will be printed on error console
+ */
+ public void printErrorString(final String value) {
+ this.error.println(value);
+ }
+}
diff --git a/module/src/main/java/com/iluwatar/module/FileLoggerModule.java b/module/src/main/java/com/iluwatar/module/FileLoggerModule.java
new file mode 100644
index 000000000..e80444dab
--- /dev/null
+++ b/module/src/main/java/com/iluwatar/module/FileLoggerModule.java
@@ -0,0 +1,114 @@
+/**
+ * The MIT License Copyright (c) 2014 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.module;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+
+import org.apache.log4j.Logger;
+
+/**
+ * The FileLoggerModule is responsible for showing logs on File System
+ * <p>
+ * The below example demonstrates a File logger module, which can print simple and error messages in
+ * two designated files
+ */
+public final class FileLoggerModule {
+
+ private static final Logger LOGGER = Logger.getLogger(FileLoggerModule.class);
+
+ private static FileLoggerModule singleton = null;
+
+ private static final String OUTPUT_FILE = "output.txt";
+ private static final String ERROR_FILE = "error.txt";
+
+ public PrintStream output = null;
+ public PrintStream error = null;
+
+ private FileLoggerModule() {}
+
+ /**
+ * Static method to get single instance of class
+ *
+ * @return singleton instance of FileLoggerModule
+ */
+ public static FileLoggerModule getSingleton() {
+
+ if (FileLoggerModule.singleton == null) {
+ FileLoggerModule.singleton = new FileLoggerModule();
+ }
+
+ return FileLoggerModule.singleton;
+ }
+
+ /**
+ * Following method performs the initialization
+ *
+ * @throws FileNotFoundException if program is not able to find log files (output.txt and
+ * error.txt)
+ */
+ public FileLoggerModule prepare() throws FileNotFoundException {
+
+ LOGGER.debug("FileLoggerModule::prepare();");
+
+ this.output = new PrintStream(new FileOutputStream(OUTPUT_FILE));
+ this.error = new PrintStream(new FileOutputStream(ERROR_FILE));
+
+ return this;
+ }
+
+ /**
+ * Following method performs the finalization
+ */
+ public void unprepare() {
+
+ if (this.output != null) {
+
+ this.output.flush();
+ this.output.close();
+ }
+
+ if (this.error != null) {
+
+ this.error.flush();
+ this.error.close();
+ }
+
+ LOGGER.debug("FileLoggerModule::unprepare();");
+ }
+
+ /**
+ * Used to print a message
+ *
+ * @param value will be printed in file
+ */
+ public void printString(final String value) {
+ this.output.println(value);
+ }
+
+ /**
+ * Used to print a error message
+ *
+ * @param value will be printed on error file
+ */
+ public void printErrorString(final String value) {
+ this.error.println(value);
+ }
+}
diff --git a/module/src/main/resources/log4j.xml b/module/src/main/resources/log4j.xml
new file mode 100644
index 000000000..b591c17e1
--- /dev/null
+++ b/module/src/main/resources/log4j.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+ The MIT License
+ Copyright (c) 2014 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.
+
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration debug="true"
+ xmlns:log4j='http://jakarta.apache.org/log4j/'>
+
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" />
+ </layout>
+ </appender>
+
+ <root>
+ <level value="INFO" />
+ <appender-ref ref="console" />
+ </root>
+
+</log4j:configuration>
\ No newline at end of file
diff --git a/module/src/test/java/com/iluwatar/module/AppTest.java b/module/src/test/java/com/iluwatar/module/AppTest.java
new file mode 100644
index 000000000..5df6ab0f3
--- /dev/null
+++ b/module/src/test/java/com/iluwatar/module/AppTest.java
@@ -0,0 +1,37 @@
+/**
+ * The MIT License Copyright (c) 2014 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.module;
+
+import java.io.FileNotFoundException;
+
+import com.iluwatar.module.App;
+
+import org.junit.Test;
+
+/**
+ * Tests that Module example runs without errors.
+ */
+public final class AppTest {
+
+ @Test
+ public void test() throws FileNotFoundException {
+ final String[] args = {};
+ App.main(args);
+ }
+}
diff --git a/module/src/test/java/com/iluwatar/module/FileLoggerModuleTest.java b/module/src/test/java/com/iluwatar/module/FileLoggerModuleTest.java
new file mode 100644
index 000000000..7274aab14
--- /dev/null
+++ b/module/src/test/java/com/iluwatar/module/FileLoggerModuleTest.java
@@ -0,0 +1,182 @@
+/**
+ * The MIT License Copyright (c) 2014 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.module;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+import org.apache.log4j.Logger;
+import org.junit.Test;
+
+/**
+ * The Module pattern can be considered a Creational pattern and a Structural pattern. It manages
+ * the creation and organization of other elements, and groups them as the structural pattern does.
+ * An object that applies this pattern can provide the equivalent of a namespace, providing the
+ * initialization and finalization process of a static class or a class with static members with
+ * cleaner, more concise syntax and semantics.
+ * <p>
+ * The below example demonstrates a JUnit test for testing two different modules: File Logger and
+ * Console Logger
+ */
+public final class FileLoggerModuleTest {
+
+ private static final Logger LOGGER = Logger.getLogger(FileLoggerModuleTest.class);
+
+ private static final String OUTPUT_FILE = "output.txt";
+ private static final String ERROR_FILE = "error.txt";
+
+ private static final String MESSAGE = "MESSAGE";
+ private static final String ERROR = "ERROR";
+
+
+ /**
+ * This test verify that 'MESSAGE' is perfectly printed in output file
+ *
+ * @throws IOException if program is not able to find log files (output.txt and error.txt)
+ */
+ @Test
+ public void testFileMessage() throws IOException {
+
+ /* Get singletong instance of File Logger Module */
+ final FileLoggerModule fileLoggerModule = FileLoggerModule.getSingleton();
+
+ /* Prepare the essential sub modules, to perform the sequence of jobs */
+ fileLoggerModule.prepare();
+
+ /* Print 'Message' in file */
+ fileLoggerModule.printString(MESSAGE);
+
+ /* Test if 'Message' is printed in file */
+ assertEquals(readFirstLine(OUTPUT_FILE), MESSAGE);
+
+ /* Unprepare to cleanup the modules */
+ fileLoggerModule.unprepare();
+ }
+
+ /**
+ * This test verify that nothing is printed in output file
+ *
+ * @throws IOException if program is not able to find log files (output.txt and error.txt)
+ */
+ @Test
+ public void testNoFileMessage() throws IOException {
+
+ /* Get singletong instance of File Logger Module */
+ final FileLoggerModule fileLoggerModule = FileLoggerModule.getSingleton();
+
+ /* Prepare the essential sub modules, to perform the sequence of jobs */
+ fileLoggerModule.prepare();
+
+ /* Test if nothing is printed in file */
+ assertEquals(readFirstLine(OUTPUT_FILE), null);
+
+ /* Unprepare to cleanup the modules */
+ fileLoggerModule.unprepare();
+ }
+
+ /**
+ * This test verify that 'ERROR' is perfectly printed in error file
+ *
+ * @throws FileNotFoundException if program is not able to find log files (output.txt and
+ * error.txt)
+ */
+ @Test
+ public void testFileErrorMessage() throws FileNotFoundException {
+
+ /* Get singletong instance of File Logger Module */
+ final FileLoggerModule fileLoggerModule = FileLoggerModule.getSingleton();
+
+ /* Prepare the essential sub modules, to perform the sequence of jobs */
+ fileLoggerModule.prepare();
+
+ /* Print 'Error' in file */
+ fileLoggerModule.printErrorString(ERROR);
+
+ /* Test if 'Message' is printed in file */
+ assertEquals(readFirstLine(ERROR_FILE), ERROR);
+
+ /* Unprepare to cleanup the modules */
+ fileLoggerModule.unprepare();
+ }
+
+ /**
+ * This test verify that nothing is printed in error file
+ *
+ * @throws FileNotFoundException if program is not able to find log files (output.txt and
+ * error.txt)
+ */
+ @Test
+ public void testNoFileErrorMessage() throws FileNotFoundException {
+
+ /* Get singletong instance of File Logger Module */
+ final FileLoggerModule fileLoggerModule = FileLoggerModule.getSingleton();
+
+ /* Prepare the essential sub modules, to perform the sequence of jobs */
+ fileLoggerModule.prepare();
+
+ /* Test if nothing is printed in file */
+ assertEquals(readFirstLine(ERROR_FILE), null);
+
+ /* Unprepare to cleanup the modules */
+ fileLoggerModule.unprepare();
+ }
+
+ /**
+ * Utility method to read first line of a file
+ *
+ * @param file as file name to be read
+ * @return a string value as first line in file
+ */
+ private static final String readFirstLine(final String file) {
+
+ String firstLine = null;
+ BufferedReader bufferedReader = null;
+ try {
+
+ /* Create a buffered reader */
+ bufferedReader = new BufferedReader(new FileReader(file));
+
+ while (bufferedReader.ready()) {
+
+ /* Read the line */
+ firstLine = bufferedReader.readLine();
+ }
+
+ LOGGER.info("ModuleTest::readFirstLine() : firstLine : " + firstLine);
+
+ } catch (final IOException e) {
+ LOGGER.error("ModuleTest::readFirstLine()", e);
+ } finally {
+
+ if (bufferedReader != null) {
+ try {
+ bufferedReader.close();
+ } catch (final IOException e) {
+ LOGGER.error("ModuleTest::readFirstLine()", e);
+ }
+ }
+ }
+
+ return firstLine;
+ }
+}
diff --git a/monad/etc/monad.urm.puml b/monad/etc/monad.urm.puml
index 6fe037064..c9dcc8db6 100644
--- a/monad/etc/monad.urm.puml
+++ b/monad/etc/monad.urm.puml
@@ -1,18 +1,16 @@
@startuml
package com.iluwatar.monad {
- class Validator<T> {
- - exceptions : List<Throwable>
- - t : T
- - Validator<T>(t : T)
- + get() : T
- + of(t : T) : Validator<T> {static}
- + validate(projection : Function<T, U>, validation : Predicate<U>, message : String) : Validator<T>
- + validate(validation : Predicate<T>, message : String) : Validator<T>
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
+ enum Sex {
+ + FEMALE {static}
+ + MALE {static}
+ + valueOf(name : String) : Sex {static}
+ + values() : Sex[] {static}
+ }
class User {
- age : int
- email : String
@@ -24,11 +22,14 @@ package com.iluwatar.monad {
+ getName() : String
+ getSex() : Sex
}
- enum Sex {
- + FEMALE {static}
- + MALE {static}
- + valueOf(name : String) : Sex {static}
- + values() : Sex[] {static}
+ class Validator<T> {
+ - exceptions : List<Throwable>
+ - t : T
+ - Validator<T>(t : T)
+ + get() : T
+ + of(t : T) : Validator<T> {static}
+ + validate(projection : Function<T, U>, validation : Predicate<U>, message : String) : Validator<T>
+ + validate(validation : Predicate<T>, message : String) : Validator<T>
}
}
User --> "-sex" Sex
diff --git a/monad/pom.xml b/monad/pom.xml
index 482cf4e4d..81a5b08e0 100644
--- a/monad/pom.xml
+++ b/monad/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
diff --git a/monad/src/main/java/com/iluwatar/monad/App.java b/monad/src/main/java/com/iluwatar/monad/App.java
index 7b28fdcf8..9b1ed5096 100644
--- a/monad/src/main/java/com/iluwatar/monad/App.java
+++ b/monad/src/main/java/com/iluwatar/monad/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.monad;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Objects;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -42,6 +45,8 @@ import java.util.function.Predicate;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point.
*
@@ -49,7 +54,7 @@ public class App {
*/
public static void main(String[] args) {
User user = new User("user", 24, Sex.FEMALE, "foobar.com");
- System.out.println(Validator.of(user).validate(User::getName, Objects::nonNull, "name is null")
+ LOGGER.info(Validator.of(user).validate(User::getName, Objects::nonNull, "name is null")
.validate(User::getName, name -> !name.isEmpty(), "name is empty")
.validate(User::getEmail, email -> !email.contains("@"), "email doesn't containt '@'")
.validate(User::getAge, age -> age > 20 && age < 30, "age isn't between...").get().toString());
diff --git a/monad/src/main/java/com/iluwatar/monad/Sex.java b/monad/src/main/java/com/iluwatar/monad/Sex.java
index b5d094d4b..3cbe22971 100644
--- a/monad/src/main/java/com/iluwatar/monad/Sex.java
+++ b/monad/src/main/java/com/iluwatar/monad/Sex.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
diff --git a/monad/src/main/java/com/iluwatar/monad/User.java b/monad/src/main/java/com/iluwatar/monad/User.java
index 471094526..53cf759cf 100644
--- a/monad/src/main/java/com/iluwatar/monad/User.java
+++ b/monad/src/main/java/com/iluwatar/monad/User.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
diff --git a/monad/src/main/java/com/iluwatar/monad/Validator.java b/monad/src/main/java/com/iluwatar/monad/Validator.java
index cc4f36020..13e87b7f5 100644
--- a/monad/src/main/java/com/iluwatar/monad/Validator.java
+++ b/monad/src/main/java/com/iluwatar/monad/Validator.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
diff --git a/monad/src/test/java/com/iluwatar/monad/AppTest.java b/monad/src/test/java/com/iluwatar/monad/AppTest.java
index 78440b468..f661ee1c6 100644
--- a/monad/src/test/java/com/iluwatar/monad/AppTest.java
+++ b/monad/src/test/java/com/iluwatar/monad/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
diff --git a/monad/src/test/java/com/iluwatar/monad/MonadTest.java b/monad/src/test/java/com/iluwatar/monad/MonadTest.java
index 4ada7191d..2676e6e80 100644
--- a/monad/src/test/java/com/iluwatar/monad/MonadTest.java
+++ b/monad/src/test/java/com/iluwatar/monad/MonadTest.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
diff --git a/monostate/etc/monostate.urm.puml b/monostate/etc/monostate.urm.puml
index 6574bcad1..b7797d5e4 100644
--- a/monostate/etc/monostate.urm.puml
+++ b/monostate/etc/monostate.urm.puml
@@ -4,10 +4,6 @@ package com.iluwatar.monostate {
+ App()
+ main(args : String[]) {static}
}
- class Request {
- + value : String
- + Request(value : String)
- }
class LoadBalancer {
- id : int {static}
- lastServedId : int {static}
@@ -18,7 +14,12 @@ package com.iluwatar.monostate {
+ getNoOfServers() : int
+ serverRequest(request : Request)
}
+ class Request {
+ + value : String
+ + Request(value : String)
+ }
class Server {
+ - LOGGER : Logger {static}
+ host : String
+ id : int
+ port : int
diff --git a/monostate/pom.xml b/monostate/pom.xml
index d42870a17..1f300b729 100644
--- a/monostate/pom.xml
+++ b/monostate/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
diff --git a/monostate/src/main/java/com/iluwatar/monostate/App.java b/monostate/src/main/java/com/iluwatar/monostate/App.java
index bfb51fe91..e84bb43ad 100644
--- a/monostate/src/main/java/com/iluwatar/monostate/App.java
+++ b/monostate/src/main/java/com/iluwatar/monostate/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
diff --git a/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java b/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java
index 613f0e105..e440dfba2 100644
--- a/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java
+++ b/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.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
diff --git a/monostate/src/main/java/com/iluwatar/monostate/Request.java b/monostate/src/main/java/com/iluwatar/monostate/Request.java
index 9cdb4d7e4..36b8e11a1 100644
--- a/monostate/src/main/java/com/iluwatar/monostate/Request.java
+++ b/monostate/src/main/java/com/iluwatar/monostate/Request.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
diff --git a/monostate/src/main/java/com/iluwatar/monostate/Server.java b/monostate/src/main/java/com/iluwatar/monostate/Server.java
index bf700a57a..6b98d11e1 100644
--- a/monostate/src/main/java/com/iluwatar/monostate/Server.java
+++ b/monostate/src/main/java/com/iluwatar/monostate/Server.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.monostate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* The Server class. Each Server sits behind a LoadBalancer which delegates the call to the servers
@@ -29,6 +32,9 @@ package com.iluwatar.monostate;
*
*/
public class Server {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
+
public final String host;
public final int port;
public final int id;
@@ -51,7 +57,7 @@ public class Server {
}
public void serve(Request request) {
- System.out.println("Server ID " + id + " associated to host : " + getHost() + " and Port "
- + getPort() + " Processed request with value " + request.value);
+ LOGGER.info("Server ID {} associated to host : {} and port {}. Processed request with value {}",
+ id, host, port, request.value);
}
}
diff --git a/monostate/src/test/java/com/iluwatar/monostate/AppTest.java b/monostate/src/test/java/com/iluwatar/monostate/AppTest.java
index 6b5f11a39..301beea3e 100644
--- a/monostate/src/test/java/com/iluwatar/monostate/AppTest.java
+++ b/monostate/src/test/java/com/iluwatar/monostate/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
diff --git a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
index 70369e8a0..96b4830c7 100644
--- a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
+++ b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.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
diff --git a/multiton/etc/multiton.urm.puml b/multiton/etc/multiton.urm.puml
index c582a6379..63a74b1f1 100644
--- a/multiton/etc/multiton.urm.puml
+++ b/multiton/etc/multiton.urm.puml
@@ -1,6 +1,7 @@
@startuml
package com.iluwatar.multiton {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
diff --git a/multiton/pom.xml b/multiton/pom.xml
index 28e208d0c..e27211074 100644
--- a/multiton/pom.xml
+++ b/multiton/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
diff --git a/multiton/src/main/java/com/iluwatar/multiton/App.java b/multiton/src/main/java/com/iluwatar/multiton/App.java
index 1ffd57a34..28b89e6ab 100644
--- a/multiton/src/main/java/com/iluwatar/multiton/App.java
+++ b/multiton/src/main/java/com/iluwatar/multiton/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.multiton;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Whereas Singleton design pattern introduces single globally accessible object the Multiton
@@ -35,20 +38,22 @@ package com.iluwatar.multiton;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
* @param args command line args
*/
public static void main(String[] args) {
- System.out.println("KHAMUL=" + Nazgul.getInstance(NazgulName.KHAMUL));
- System.out.println("MURAZOR=" + Nazgul.getInstance(NazgulName.MURAZOR));
- System.out.println("DWAR=" + Nazgul.getInstance(NazgulName.DWAR));
- System.out.println("JI_INDUR=" + Nazgul.getInstance(NazgulName.JI_INDUR));
- System.out.println("AKHORAHIL=" + Nazgul.getInstance(NazgulName.AKHORAHIL));
- System.out.println("HOARMURATH=" + Nazgul.getInstance(NazgulName.HOARMURATH));
- System.out.println("ADUNAPHEL=" + Nazgul.getInstance(NazgulName.ADUNAPHEL));
- System.out.println("REN=" + Nazgul.getInstance(NazgulName.REN));
- System.out.println("UVATHA=" + Nazgul.getInstance(NazgulName.UVATHA));
+ LOGGER.info("KHAMUL={}", Nazgul.getInstance(NazgulName.KHAMUL));
+ LOGGER.info("MURAZOR={}", Nazgul.getInstance(NazgulName.MURAZOR));
+ LOGGER.info("DWAR={}", Nazgul.getInstance(NazgulName.DWAR));
+ LOGGER.info("JI_INDUR={}", Nazgul.getInstance(NazgulName.JI_INDUR));
+ LOGGER.info("AKHORAHIL={}", Nazgul.getInstance(NazgulName.AKHORAHIL));
+ LOGGER.info("HOARMURATH={}", Nazgul.getInstance(NazgulName.HOARMURATH));
+ LOGGER.info("ADUNAPHEL={}", Nazgul.getInstance(NazgulName.ADUNAPHEL));
+ LOGGER.info("REN={}", Nazgul.getInstance(NazgulName.REN));
+ LOGGER.info("UVATHA={}", Nazgul.getInstance(NazgulName.UVATHA));
}
}
diff --git a/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java b/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java
index 5a1dbede6..bfb068b7a 100644
--- a/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java
+++ b/multiton/src/main/java/com/iluwatar/multiton/Nazgul.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
diff --git a/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java b/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java
index 693dfc235..97d664e3c 100644
--- a/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java
+++ b/multiton/src/main/java/com/iluwatar/multiton/NazgulName.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
diff --git a/multiton/src/test/java/com/iluwatar/multiton/AppTest.java b/multiton/src/test/java/com/iluwatar/multiton/AppTest.java
index 2d927b190..370a2665b 100644
--- a/multiton/src/test/java/com/iluwatar/multiton/AppTest.java
+++ b/multiton/src/test/java/com/iluwatar/multiton/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
diff --git a/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java b/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java
index 4aae5d87d..ad10a9eb0 100644
--- a/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java
+++ b/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.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
diff --git a/mute-idiom/etc/mute-idiom.urm.puml b/mute-idiom/etc/mute-idiom.urm.puml
index c992773f5..32d036bc8 100644
--- a/mute-idiom/etc/mute-idiom.urm.puml
+++ b/mute-idiom/etc/mute-idiom.urm.puml
@@ -1,9 +1,7 @@
@startuml
package com.iluwatar.mute {
- interface CheckedRunnable {
- + run() {abstract}
- }
class App {
+ - LOGGER : Logger {static}
+ App()
- acquireResource() : Resource {static}
- closeResource(resource : Resource) {static}
@@ -12,6 +10,9 @@ package com.iluwatar.mute {
- useOfMute() {static}
- utilizeResource(resource : Resource) {static}
}
+ interface CheckedRunnable {
+ + run() {abstract}
+ }
class Mute {
- Mute()
+ loggedMute(runnable : CheckedRunnable) {static}
diff --git a/mute-idiom/pom.xml b/mute-idiom/pom.xml
index cae190e86..98cd4d12f 100644
--- a/mute-idiom/pom.xml
+++ b/mute-idiom/pom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- The MIT License Copyright (c) 2014 Ilkka Seppälä Permission is hereby
+<!-- The MIT License 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 in the Software
without restriction, including without limitation the rights to use, copy,
diff --git a/mute-idiom/src/main/java/com/iluwatar/mute/App.java b/mute-idiom/src/main/java/com/iluwatar/mute/App.java
index 8a2aca41e..c35559dcd 100644
--- a/mute-idiom/src/main/java/com/iluwatar/mute/App.java
+++ b/mute-idiom/src/main/java/com/iluwatar/mute/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
@@ -23,6 +23,9 @@
package com.iluwatar.mute;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.sql.SQLException;
@@ -46,6 +49,8 @@ import java.sql.SQLException;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point.
*
@@ -88,7 +93,7 @@ public class App {
}
private static void utilizeResource(Resource resource) throws SQLException {
- System.out.println("Utilizing acquired resource: " + resource);
+ LOGGER.info("Utilizing acquired resource: {}", resource);
}
private static Resource acquireResource() throws SQLException {
diff --git a/mute-idiom/src/main/java/com/iluwatar/mute/CheckedRunnable.java b/mute-idiom/src/main/java/com/iluwatar/mute/CheckedRunnable.java
index d1440636f..7a37ef03d 100644
--- a/mute-idiom/src/main/java/com/iluwatar/mute/CheckedRunnable.java
+++ b/mute-idiom/src/main/java/com/iluwatar/mute/CheckedRunnable.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
diff --git a/mute-idiom/src/main/java/com/iluwatar/mute/Mute.java b/mute-idiom/src/main/java/com/iluwatar/mute/Mute.java
index 64169a8f5..d5d9b8028 100644
--- a/mute-idiom/src/main/java/com/iluwatar/mute/Mute.java
+++ b/mute-idiom/src/main/java/com/iluwatar/mute/Mute.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
diff --git a/mute-idiom/src/main/java/com/iluwatar/mute/Resource.java b/mute-idiom/src/main/java/com/iluwatar/mute/Resource.java
index 6970d06bc..11bb3a6ec 100644
--- a/mute-idiom/src/main/java/com/iluwatar/mute/Resource.java
+++ b/mute-idiom/src/main/java/com/iluwatar/mute/Resource.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
diff --git a/mute-idiom/src/test/java/com/iluwatar/mute/AppTest.java b/mute-idiom/src/test/java/com/iluwatar/mute/AppTest.java
index 8075d9c85..8534ff2ad 100644
--- a/mute-idiom/src/test/java/com/iluwatar/mute/AppTest.java
+++ b/mute-idiom/src/test/java/com/iluwatar/mute/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
diff --git a/mute-idiom/src/test/java/com/iluwatar/mute/MuteTest.java b/mute-idiom/src/test/java/com/iluwatar/mute/MuteTest.java
index 58cbfe893..698395cc2 100644
--- a/mute-idiom/src/test/java/com/iluwatar/mute/MuteTest.java
+++ b/mute-idiom/src/test/java/com/iluwatar/mute/MuteTest.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
@@ -32,9 +32,13 @@ import java.io.PrintStream;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MuteTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MuteTest.class);
+
private static final String MESSAGE = "should not occur";
@Rule public ExpectedException exception = ExpectedException.none();
@@ -69,7 +73,7 @@ public class MuteTest {
private void methodNotThrowingAnyException() {
- System.out.println("Executed successfully");
+ LOGGER.info("Executed successfully");
}
private void methodThrowingException() throws Exception {
diff --git a/mutex/etc/mutex.urm.puml b/mutex/etc/mutex.urm.puml
index 68b96d668..08cf43b90 100644
--- a/mutex/etc/mutex.urm.puml
+++ b/mutex/etc/mutex.urm.puml
@@ -1,5 +1,9 @@
@startuml
package com.iluwatar.mutex {
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
class Jar {
- beans : int
- lock : Lock
@@ -17,10 +21,6 @@ package com.iluwatar.mutex {
+ getOwner() : Object
+ release()
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
}
Jar --> "-lock" Lock
Mutex ..|> Lock
diff --git a/mutex/src/main/java/com/iluwatar/mutex/App.java b/mutex/src/main/java/com/iluwatar/mutex/App.java
index f6494bd5c..e31e8f4bc 100644
--- a/mutex/src/main/java/com/iluwatar/mutex/App.java
+++ b/mutex/src/main/java/com/iluwatar/mutex/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
diff --git a/mutex/src/main/java/com/iluwatar/mutex/Jar.java b/mutex/src/main/java/com/iluwatar/mutex/Jar.java
index 4fe0a4637..17e6f4c1e 100644
--- a/mutex/src/main/java/com/iluwatar/mutex/Jar.java
+++ b/mutex/src/main/java/com/iluwatar/mutex/Jar.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
diff --git a/mutex/src/main/java/com/iluwatar/mutex/Lock.java b/mutex/src/main/java/com/iluwatar/mutex/Lock.java
index fef67010e..91c8adde7 100644
--- a/mutex/src/main/java/com/iluwatar/mutex/Lock.java
+++ b/mutex/src/main/java/com/iluwatar/mutex/Lock.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
diff --git a/mutex/src/main/java/com/iluwatar/mutex/Mutex.java b/mutex/src/main/java/com/iluwatar/mutex/Mutex.java
index 8e08534cd..b3b21d059 100644
--- a/mutex/src/main/java/com/iluwatar/mutex/Mutex.java
+++ b/mutex/src/main/java/com/iluwatar/mutex/Mutex.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
diff --git a/mutex/src/main/java/com/iluwatar/mutex/Thief.java b/mutex/src/main/java/com/iluwatar/mutex/Thief.java
index d2225876c..d8520a2a6 100644
--- a/mutex/src/main/java/com/iluwatar/mutex/Thief.java
+++ b/mutex/src/main/java/com/iluwatar/mutex/Thief.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,12 +22,17 @@
*/
package com.iluwatar.mutex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Thief is a class which continually tries to acquire a jar and take a bean
* from it. When the jar is empty the thief stops.
*/
public class Thief extends Thread {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Thief.class);
+
/**
* The name of the thief.
*/
@@ -53,10 +58,10 @@ public class Thief extends Thread {
while (jar.takeBean()) {
beans = beans + 1;
- System.out.println(name + " took a bean.");
+ LOGGER.info("{} took a bean.", name);
}
- System.out.println(name + " took " + beans + " beans.");
+ LOGGER.info("{} took {} beans.", name, beans);
}
}
diff --git a/mutex/src/test/java/com/iluwatar/mutex/AppTest.java b/mutex/src/test/java/com/iluwatar/mutex/AppTest.java
index f3a123519..dfc0de124 100644
--- a/mutex/src/test/java/com/iluwatar/mutex/AppTest.java
+++ b/mutex/src/test/java/com/iluwatar/mutex/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
diff --git a/mutex/src/test/java/com/iluwatar/mutex/JarTest.java b/mutex/src/test/java/com/iluwatar/mutex/JarTest.java
index 97101466a..b9e0c52ca 100644
--- a/mutex/src/test/java/com/iluwatar/mutex/JarTest.java
+++ b/mutex/src/test/java/com/iluwatar/mutex/JarTest.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
diff --git a/mutex/src/test/java/com/iluwatar/mutex/MutexTest.java b/mutex/src/test/java/com/iluwatar/mutex/MutexTest.java
index 8b3e82cb4..93649002f 100644
--- a/mutex/src/test/java/com/iluwatar/mutex/MutexTest.java
+++ b/mutex/src/test/java/com/iluwatar/mutex/MutexTest.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
diff --git a/naked-objects/dom/log4j.properties b/naked-objects/dom/log4j.properties
deleted file mode 100644
index ca165acc7..000000000
--- a/naked-objects/dom/log4j.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# LOG4J Configuration
-# ===================
-
-# Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-# Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
diff --git a/naked-objects/etc/naked-objects-dom.urm.puml b/naked-objects/etc/naked-objects-dom.urm.puml
index 6662a560a..462364099 100644
--- a/naked-objects/etc/naked-objects-dom.urm.puml
+++ b/naked-objects/etc/naked-objects-dom.urm.puml
@@ -1,26 +1,18 @@
@startuml
package domainapp.dom.app.homepage {
+ class HomePageService {
+ ~ container : DomainObjectContainer
+ + HomePageService()
+ + homePage() : HomePageViewModel
+ }
class HomePageViewModel {
~ simpleObjects : SimpleObjects
+ HomePageViewModel()
+ getObjects() : List<SimpleObject>
+ title() : String
}
- class HomePageService {
- ~ container : DomainObjectContainer
- + HomePageService()
- + homePage() : HomePageViewModel
- }
}
package domainapp.dom.modules.simple {
- class SimpleObjects {
- ~ container : DomainObjectContainer
- + SimpleObjects()
- + create(name : String) : SimpleObject
- + findByName(name : String) : List<SimpleObject>
- + listAll() : List<SimpleObject>
- + title() : TranslatableString
- }
class SimpleObject {
- container : DomainObjectContainer
- name : String
@@ -34,6 +26,14 @@ package domainapp.dom.modules.simple {
+ updateName(name : String) : SimpleObject
+ validateUpdateName(name : String) : TranslatableString
}
+ class SimpleObjects {
+ ~ container : DomainObjectContainer
+ + SimpleObjects()
+ + create(name : String) : SimpleObject
+ + findByName(name : String) : List<SimpleObject>
+ + listAll() : List<SimpleObject>
+ + title() : TranslatableString
+ }
}
HomePageViewModel --> "-simpleObjects" SimpleObjects
@enduml
\ No newline at end of file
diff --git a/naked-objects/etc/naked-objects-fixture.urm.puml b/naked-objects/etc/naked-objects-fixture.urm.puml
index 21e38d710..04b3b1350 100644
--- a/naked-objects/etc/naked-objects-fixture.urm.puml
+++ b/naked-objects/etc/naked-objects-fixture.urm.puml
@@ -86,7 +86,8 @@ package domainapp.fixture {
+ getSpecification() : FixtureScriptsSpecification
}
}
-DomainAppFixturesProvider --+ FixtureScripts
-DomainAppFixturesProvider --+ FixtureScriptsSpecification
+Builder ..+ FixtureScriptsSpecification
+DropDownPolicy ..+ FixtureScriptsSpecification
+MultipleExecutionStrategy ..+ FixtureScripts
HomePageViewModel --> "-simpleObjects" SimpleObjects
@enduml
\ No newline at end of file
diff --git a/naked-objects/etc/naked-objects-integtests.urm.puml b/naked-objects/etc/naked-objects-integtests.urm.puml
index 65c44410a..04b3b1350 100644
--- a/naked-objects/etc/naked-objects-integtests.urm.puml
+++ b/naked-objects/etc/naked-objects-integtests.urm.puml
@@ -1,16 +1,16 @@
@startuml
package domainapp.dom.app.homepage {
+ class HomePageService {
+ ~ container : DomainObjectContainer
+ + HomePageService()
+ + homePage() : HomePageViewModel
+ }
class HomePageViewModel {
~ simpleObjects : SimpleObjects
+ HomePageViewModel()
+ getObjects() : List<SimpleObject>
+ title() : String
}
- class HomePageService {
- ~ container : DomainObjectContainer
- + HomePageService()
- + homePage() : HomePageViewModel
- }
}
package domainapp.dom.modules.simple {
class SimpleObject {
@@ -86,7 +86,8 @@ package domainapp.fixture {
+ getSpecification() : FixtureScriptsSpecification
}
}
-DomainAppFixturesProvider --+ FixtureScripts
-DomainAppFixturesProvider --+ FixtureScriptsSpecification
+Builder ..+ FixtureScriptsSpecification
+DropDownPolicy ..+ FixtureScriptsSpecification
+MultipleExecutionStrategy ..+ FixtureScripts
HomePageViewModel --> "-simpleObjects" SimpleObjects
@enduml
\ No newline at end of file
diff --git a/naked-objects/integtests/logging.properties b/naked-objects/integtests/logging.properties
deleted file mode 100644
index b55249569..000000000
--- a/naked-objects/integtests/logging.properties
+++ /dev/null
@@ -1,111 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-#
-# Isis uses log4j is used to provide system logging
-#
-log4j.rootCategory=INFO, Console
-
-# The console appender
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.target=System.out
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=isis.log
-log4j.appender.File.append=false
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.translations-po=org.apache.log4j.FileAppender
-log4j.appender.translations-po.File=./translations.pot
-log4j.appender.translations-po.Append=false
-log4j.appender.translations-po.layout=org.apache.log4j.PatternLayout
-log4j.appender.translations-po.layout.ConversionPattern=%m%n
-
-! turn on the internal log4j debugging flag so we can see what it is doing
-#log4j.debug=true
-
-
-# DataNucleus
-# the first two log the DML and DDL (if set to DEBUG)
-log4j.logger.DataNucleus.Datastore.Native=WARN, Console
-log4j.logger.DataNucleus.Datastore.Schema=DEBUG, Console
-# the remainder can probably be left to WARN
-log4j.logger.DataNucleus.Persistence=WARN, Console
-log4j.logger.DataNucleus.Transaction=WARN, Console
-log4j.logger.DataNucleus.Connection=WARN, Console
-log4j.logger.DataNucleus.Query=WARN, Console
-log4j.logger.DataNucleus.Cache=WARN, Console
-log4j.logger.DataNucleus.MetaData=WARN, Console
-log4j.logger.DataNucleus.Datastore=WARN, Console
-log4j.logger.DataNucleus.Datastore.Persist=WARN, Console
-log4j.logger.DataNucleus.Datastore.Retrieve=WARN, Console
-log4j.logger.DataNucleus.General=WARN, Console
-log4j.logger.DataNucleus.Lifecycle=WARN, Console
-log4j.logger.DataNucleus.ValueGeneration=WARN, Console
-log4j.logger.DataNucleus.Enhancer=WARN, Console
-log4j.logger.DataNucleus.SchemaTool=ERROR, Console
-log4j.logger.DataNucleus.JDO=WARN, Console
-log4j.logger.DataNucleus.JPA=ERROR, Console
-log4j.logger.DataNucleus.JCA=WARN, Console
-log4j.logger.DataNucleus.IDE=ERROR, Console
-
-log4j.additivity.DataNucleus.Datastore.Native=false
-log4j.additivity.DataNucleus.Datastore.Schema=false
-log4j.additivity.DataNucleus.Datastore.Persistence=false
-log4j.additivity.DataNucleus.Datastore.Transaction=false
-log4j.additivity.DataNucleus.Datastore.Connection=false
-log4j.additivity.DataNucleus.Datastore.Query=false
-log4j.additivity.DataNucleus.Datastore.Cache=false
-log4j.additivity.DataNucleus.Datastore.MetaData=false
-log4j.additivity.DataNucleus.Datastore.Datastore=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Persist=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Retrieve=false
-log4j.additivity.DataNucleus.Datastore.General=false
-log4j.additivity.DataNucleus.Datastore.Lifecycle=false
-log4j.additivity.DataNucleus.Datastore.ValueGeneration=false
-log4j.additivity.DataNucleus.Datastore.Enhancer=false
-log4j.additivity.DataNucleus.Datastore.SchemaTool=false
-log4j.additivity.DataNucleus.Datastore.JDO=false
-log4j.additivity.DataNucleus.Datastore.JPA=false
-log4j.additivity.DataNucleus.Datastore.JCA=false
-log4j.additivity.DataNucleus.Datastore.IDE=false
-
-
-
-
-# if using log4jdbc-remix as JDBC driver
-#log4j.logger.jdbc.sqlonly=DEBUG, sql, Console
-#log4j.additivity.jdbc.sqlonly=false
-#log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console
-#log4j.additivity.jdbc.resultsettable=false
-
-#log4j.logger.jdbc.audit=WARN,jdbc, Console
-#log4j.additivity.jdbc.audit=false
-#log4j.logger.jdbc.resultset=WARN,jdbc
-#log4j.additivity.jdbc.resultset=false
-#log4j.logger.jdbc.sqltiming=WARN,sqltiming
-#log4j.additivity.jdbc.sqltiming=false
-#log4j.logger.jdbc.connection=FATAL,connection
-#log4j.additivity.jdbc.connection=false
-
-
-log4j.logger.org.apache.isis.core.runtime.services.i18n.po.PoWriter=INFO,translations-po
-log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PotWriter=false
diff --git a/naked-objects/webapp/ide/intellij/launch/README.txt b/naked-objects/webapp/ide/intellij/launch/README.txt
index d33eaceb4..6659454ef 100644
--- a/naked-objects/webapp/ide/intellij/launch/README.txt
+++ b/naked-objects/webapp/ide/intellij/launch/README.txt
@@ -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
diff --git a/naked-objects/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml b/naked-objects/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml
index e01c95512..9831f9a1f 100644
--- a/naked-objects/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml
+++ b/naked-objects/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml
@@ -1,7 +1,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
diff --git a/naked-objects/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml b/naked-objects/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml
index fcd68f002..06423bc48 100644
--- a/naked-objects/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml
+++ b/naked-objects/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml
@@ -1,7 +1,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
diff --git a/naked-objects/webapp/src/main/webapp/WEB-INF/logging.properties b/naked-objects/webapp/src/main/webapp/WEB-INF/logging.properties
deleted file mode 100644
index 62fd8ea5e..000000000
--- a/naked-objects/webapp/src/main/webapp/WEB-INF/logging.properties
+++ /dev/null
@@ -1,187 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-#
-# Isis uses log4j is used to provide system logging
-#
-log4j.rootCategory=INFO, Console
-#log4j.rootCategory=DEBUG, Console
-
-
-# The console appender
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.target=System.out
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-
-# The stderr appender
-log4j.appender.Stderr=org.apache.log4j.ConsoleAppender
-log4j.appender.Stderr.target=System.err
-log4j.appender.Stderr.layout=org.apache.log4j.PatternLayout
-log4j.appender.Stderr.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-
-# other appenders
-log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=isis.log
-log4j.appender.File.append=false
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.sql=org.apache.log4j.FileAppender
-log4j.appender.sql.File=./logs/sql.log
-log4j.appender.sql.Append=false
-log4j.appender.sql.layout=org.apache.log4j.PatternLayout
-log4j.appender.sql.layout.ConversionPattern=-----> %d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%n
-
-log4j.appender.sqltiming=org.apache.log4j.FileAppender
-log4j.appender.sqltiming.File=./logs/sqltiming.log
-log4j.appender.sqltiming.Append=false
-log4j.appender.sqltiming.layout=org.apache.log4j.PatternLayout
-log4j.appender.sqltiming.layout.ConversionPattern=-----> %d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%n
-
-log4j.appender.jdbc=org.apache.log4j.FileAppender
-log4j.appender.jdbc.File=./logs/jdbc.log
-log4j.appender.jdbc.Append=false
-log4j.appender.jdbc.layout=org.apache.log4j.PatternLayout
-log4j.appender.jdbc.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.appender.connection=org.apache.log4j.FileAppender
-log4j.appender.connection.File=./logs/connection.log
-log4j.appender.connection.Append=false
-log4j.appender.connection.layout=org.apache.log4j.PatternLayout
-log4j.appender.connection.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-
-
-
-! turn on the internal log4j debugging flag so we can see what it is doing
-#log4j.debug=true
-
-
-# DataNucleus
-# the first two log the DML and DDL (if set to DEBUG)
-log4j.logger.DataNucleus.Datastore.Native=WARN, Console
-log4j.logger.DataNucleus.Datastore.Schema=DEBUG, Console
-# the remainder can probably be left to WARN
-log4j.logger.DataNucleus.Persistence=WARN, Console
-log4j.logger.DataNucleus.Transaction=WARN, Console
-log4j.logger.DataNucleus.Connection=WARN, Console
-log4j.logger.DataNucleus.Query=WARN, Console
-log4j.logger.DataNucleus.Cache=WARN, Console
-log4j.logger.DataNucleus.MetaData=WARN, Console
-log4j.logger.DataNucleus.Datastore=WARN, Console
-log4j.logger.DataNucleus.Datastore.Persist=WARN, Console
-log4j.logger.DataNucleus.Datastore.Retrieve=WARN, Console
-log4j.logger.DataNucleus.General=WARN, Console
-log4j.logger.DataNucleus.Lifecycle=WARN, Console
-log4j.logger.DataNucleus.ValueGeneration=WARN, Console
-log4j.logger.DataNucleus.Enhancer=WARN, Console
-log4j.logger.DataNucleus.SchemaTool=ERROR, Console
-log4j.logger.DataNucleus.JDO=WARN, Console
-log4j.logger.DataNucleus.JPA=ERROR, Console
-log4j.logger.DataNucleus.JCA=WARN, Console
-log4j.logger.DataNucleus.IDE=ERROR, Console
-
-log4j.additivity.DataNucleus.Datastore.Native=false
-log4j.additivity.DataNucleus.Datastore.Schema=false
-log4j.additivity.DataNucleus.Datastore.Persistence=false
-log4j.additivity.DataNucleus.Datastore.Transaction=false
-log4j.additivity.DataNucleus.Datastore.Connection=false
-log4j.additivity.DataNucleus.Datastore.Query=false
-log4j.additivity.DataNucleus.Datastore.Cache=false
-log4j.additivity.DataNucleus.Datastore.MetaData=false
-log4j.additivity.DataNucleus.Datastore.Datastore=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Persist=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Retrieve=false
-log4j.additivity.DataNucleus.Datastore.General=false
-log4j.additivity.DataNucleus.Datastore.Lifecycle=false
-log4j.additivity.DataNucleus.Datastore.ValueGeneration=false
-log4j.additivity.DataNucleus.Datastore.Enhancer=false
-log4j.additivity.DataNucleus.Datastore.SchemaTool=false
-log4j.additivity.DataNucleus.Datastore.JDO=false
-log4j.additivity.DataNucleus.Datastore.JPA=false
-log4j.additivity.DataNucleus.Datastore.JCA=false
-log4j.additivity.DataNucleus.Datastore.IDE=false
-
-
-# if using log4jdbc-remix as JDBC driver
-#log4j.logger.jdbc.sqlonly=DEBUG, sql, Console
-#log4j.additivity.jdbc.sqlonly=false
-#log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console
-#log4j.additivity.jdbc.resultsettable=false
-
-#log4j.logger.jdbc.audit=WARN,jdbc, Console
-#log4j.additivity.jdbc.audit=false
-#log4j.logger.jdbc.resultset=WARN,jdbc
-#log4j.additivity.jdbc.resultset=false
-#log4j.logger.jdbc.sqltiming=WARN,sqltiming
-#log4j.additivity.jdbc.sqltiming=false
-#log4j.logger.jdbc.connection=FATAL,connection
-#log4j.additivity.jdbc.connection=false
-
-
-
-# track Isis/JDO lifecycle integration
-
-#log4j.logger.org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.FrameworkSynchronizer=DEBUG, Console
-#log4j.additivity.org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.FrameworkSynchronizer=false
-
-#log4j.logger.org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener=DEBUG,Console
-#log4j.additivity.org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener=false
-
-
-
-
-# track Isis/Wicket lifecycle integration
-
-#log4j.logger.org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis=DEBUG, Console
-#log4j.additivity.org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis=false
-
-#log4j.logger.org.apache.isis.viewer.wicket.viewer.integration.isis.IsisContextForWicket=INFO,Console
-#log4j.additivity.org.apache.isis.viewer.wicket.viewer.integration.isis.IsisContextForWicket=false
-
-
-
-
-# quieten some of the noisier classes in Isis' bootstrapping
-log4j.logger.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=WARN,Console
-log4j.additivity.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=false
-
-log4j.logger.org.apache.isis.core.metamodel.specloader.ServiceInitializer=WARN,Console
-log4j.additivity.org.apache.isis.core.metamodel.specloader.ServiceInitializer=false
-
-log4j.logger.org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration=WARN,Console
-log4j.additivity.org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration=false
-
-log4j.logger.org.apache.isis.core.commons.config.IsisConfigurationDefault=WARN,Console
-log4j.additivity.org.apache.isis.core.commons.config.IsisConfigurationDefault=false
-
-log4j.logger.org.apache.isis.core.runtime.installers.InstallerLookupDefault=WARN,Console
-log4j.additivity.org.apache.isis.core.runtime.installers.InstallerLookupDefault=false
-
-
-# quieten Shiro
-log4j.logger.org.apache.shiro.realm.AuthorizingRealm=WARN,Console
-log4j.additivity.log4j.logger.org.apache.shiro.realm.AuthorizingRealm=false
-
-
-# Application-specific logging
-log4j.logger.dom.simple.SimpleObject=DEBUG, Stderr
-log4j.additivity.dom.simple.SimpleObject=false
\ No newline at end of file
diff --git a/naked-objects/webapp/src/main/webapp/about/index.html b/naked-objects/webapp/src/main/webapp/about/index.html
index bfcc52017..80180f1cd 100644
--- a/naked-objects/webapp/src/main/webapp/about/index.html
+++ b/naked-objects/webapp/src/main/webapp/about/index.html
@@ -1,7 +1,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
diff --git a/naked-objects/webapp/src/main/webapp/scripts/application.js b/naked-objects/webapp/src/main/webapp/scripts/application.js
index 3803b6607..3611ec357 100644
--- a/naked-objects/webapp/src/main/webapp/scripts/application.js
+++ b/naked-objects/webapp/src/main/webapp/scripts/application.js
@@ -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
diff --git a/null-object/etc/null-object.urm.puml b/null-object/etc/null-object.urm.puml
index bd4f8446e..a937a2b17 100644
--- a/null-object/etc/null-object.urm.puml
+++ b/null-object/etc/null-object.urm.puml
@@ -4,7 +4,15 @@ package com.iluwatar.nullobject {
+ App()
+ main(args : String[]) {static}
}
+ interface Node {
+ + getLeft() : Node {abstract}
+ + getName() : String {abstract}
+ + getRight() : Node {abstract}
+ + getTreeSize() : int {abstract}
+ + walk() {abstract}
+ }
class NodeImpl {
+ - LOGGER : Logger {static}
- left : Node
- name : String
- right : Node
@@ -15,13 +23,6 @@ package com.iluwatar.nullobject {
+ getTreeSize() : int
+ walk()
}
- interface Node {
- + getLeft() : Node {abstract}
- + getName() : String {abstract}
- + getRight() : Node {abstract}
- + getTreeSize() : int {abstract}
- + walk() {abstract}
- }
class NullNode {
- instance : NullNode {static}
- NullNode()
diff --git a/null-object/pom.xml b/null-object/pom.xml
index 832337772..89abb6d92 100644
--- a/null-object/pom.xml
+++ b/null-object/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
diff --git a/null-object/src/main/java/com/iluwatar/nullobject/App.java b/null-object/src/main/java/com/iluwatar/nullobject/App.java
index 90a9c12c8..2a1e3d316 100644
--- a/null-object/src/main/java/com/iluwatar/nullobject/App.java
+++ b/null-object/src/main/java/com/iluwatar/nullobject/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
diff --git a/null-object/src/main/java/com/iluwatar/nullobject/Node.java b/null-object/src/main/java/com/iluwatar/nullobject/Node.java
index 36363736c..bae4f84eb 100644
--- a/null-object/src/main/java/com/iluwatar/nullobject/Node.java
+++ b/null-object/src/main/java/com/iluwatar/nullobject/Node.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
diff --git a/null-object/src/main/java/com/iluwatar/nullobject/NodeImpl.java b/null-object/src/main/java/com/iluwatar/nullobject/NodeImpl.java
index 46787ac96..f9f33c67f 100644
--- a/null-object/src/main/java/com/iluwatar/nullobject/NodeImpl.java
+++ b/null-object/src/main/java/com/iluwatar/nullobject/NodeImpl.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.nullobject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Implementation for binary tree's normal nodes.
@@ -29,6 +32,8 @@ package com.iluwatar.nullobject;
*/
public class NodeImpl implements Node {
+ private static final Logger LOGGER = LoggerFactory.getLogger(NodeImpl.class);
+
private final String name;
private final Node left;
private final Node right;
@@ -64,7 +69,7 @@ public class NodeImpl implements Node {
@Override
public void walk() {
- System.out.println(name);
+ LOGGER.info(name);
if (left.getTreeSize() > 0) {
left.walk();
}
diff --git a/null-object/src/main/java/com/iluwatar/nullobject/NullNode.java b/null-object/src/main/java/com/iluwatar/nullobject/NullNode.java
index d4ea0e429..67c553015 100644
--- a/null-object/src/main/java/com/iluwatar/nullobject/NullNode.java
+++ b/null-object/src/main/java/com/iluwatar/nullobject/NullNode.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
diff --git a/null-object/src/test/java/com/iluwatar/nullobject/AppTest.java b/null-object/src/test/java/com/iluwatar/nullobject/AppTest.java
index 170f7b977..13e92034a 100644
--- a/null-object/src/test/java/com/iluwatar/nullobject/AppTest.java
+++ b/null-object/src/test/java/com/iluwatar/nullobject/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
diff --git a/null-object/src/test/java/com/iluwatar/nullobject/NullNodeTest.java b/null-object/src/test/java/com/iluwatar/nullobject/NullNodeTest.java
index 1375b8949..778344e06 100644
--- a/null-object/src/test/java/com/iluwatar/nullobject/NullNodeTest.java
+++ b/null-object/src/test/java/com/iluwatar/nullobject/NullNodeTest.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
@@ -23,19 +23,15 @@
package com.iluwatar.nullobject;
import org.junit.Test;
-import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.*;
/**
* Date: 12/26/15 - 11:47 PM
*
* @author Jeroen Meulemeester
*/
-public class NullNodeTest extends StdOutTest {
+public class NullNodeTest {
/**
* Verify if {@link NullNode#getInstance()} actually returns the same object instance
@@ -59,7 +55,6 @@ public class NullNodeTest extends StdOutTest {
@Test
public void testWalk() throws Exception {
NullNode.getInstance().walk();
- Mockito.verifyZeroInteractions(getStdOutMock());
}
-}
\ No newline at end of file
+}
diff --git a/null-object/src/test/java/com/iluwatar/nullobject/StdOutTest.java b/null-object/src/test/java/com/iluwatar/nullobject/StdOutTest.java
deleted file mode 100644
index 0c0122132..000000000
--- a/null-object/src/test/java/com/iluwatar/nullobject/StdOutTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.nullobject;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since walking through the tree has no
- * influence on any other accessible object, except for writing to std-out using {@link
- * System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java b/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java
index 6c77cd236..6a683a60e 100644
--- a/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java
+++ b/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.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,20 +22,37 @@
*/
package com.iluwatar.nullobject;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
+import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.Assert.*;
/**
* Date: 12/26/15 - 11:44 PM
*
* @author Jeroen Meulemeester
*/
-public class TreeTest extends StdOutTest {
+public class TreeTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* During the tests, the same tree structure will be used, shown below. End points will be
@@ -79,15 +96,14 @@ public class TreeTest extends StdOutTest {
public void testWalk() {
TREE_ROOT.walk();
- final InOrder inOrder = Mockito.inOrder(getStdOutMock());
- inOrder.verify(getStdOutMock()).println("root");
- inOrder.verify(getStdOutMock()).println("level1_a");
- inOrder.verify(getStdOutMock()).println("level2_a");
- inOrder.verify(getStdOutMock()).println("level3_a");
- inOrder.verify(getStdOutMock()).println("level3_b");
- inOrder.verify(getStdOutMock()).println("level2_b");
- inOrder.verify(getStdOutMock()).println("level1_b");
- inOrder.verifyNoMoreInteractions();
+ assertTrue(appender.logContains("root"));
+ assertTrue(appender.logContains("level1_a"));
+ assertTrue(appender.logContains("level2_a"));
+ assertTrue(appender.logContains("level3_a"));
+ assertTrue(appender.logContains("level3_b"));
+ assertTrue(appender.logContains("level2_b"));
+ assertTrue(appender.logContains("level1_b"));
+ assertEquals(7, appender.getLogSize());
}
@Test
@@ -120,4 +136,26 @@ public class TreeTest extends StdOutTest {
assertSame(NullNode.getInstance(), level1.getLeft());
}
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public boolean logContains(String message) {
+ return log.stream().anyMatch(event -> event.getMessage().equals(message));
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+ }
+
}
diff --git a/object-mother/README.md b/object-mother/README.md
new file mode 100644
index 000000000..9188c8b41
--- /dev/null
+++ b/object-mother/README.md
@@ -0,0 +1,31 @@
+---
+layout: pattern
+title: Object Mother
+folder: object-mother
+permalink: /patterns/object-mother/
+pumlid:
+categories: Creational
+tags:
+ - Java
+ - Difficulty-Beginner
+---
+
+## Object Mother
+Define a factory of immutable content with separated builder and factory interfaces.
+
+
+
+## Applicability
+Use the Object Mother pattern when
+
+* You want consistent objects over several tests
+* you want to reduce code for creation of objects in tests
+* every test should run with fresh data
+
+## Credits
+
+* [Answer by David Brown](http://stackoverflow.com/questions/923319/what-is-an-objectmother) to the stackoverflow question: [What is an ObjectMother?](http://stackoverflow.com/questions/923319/what-is-an-objectmother)
+
+* [c2wiki - Object Mother](http://c2.com/cgi/wiki?ObjectMother)
+
+* [Nat Pryce - Test Data Builders: an alternative to the Object Mother pattern](http://www.natpryce.com/articles/000714.html)
\ No newline at end of file
diff --git a/object-mother/etc/object-mother.png b/object-mother/etc/object-mother.png
new file mode 100644
index 000000000..807343d9f
Binary files /dev/null and b/object-mother/etc/object-mother.png differ
diff --git a/object-mother/etc/object-mother.ucls b/object-mother/etc/object-mother.ucls
new file mode 100644
index 000000000..ef6cee5ef
--- /dev/null
+++ b/object-mother/etc/object-mother.ucls
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.11" icons="true" automaticImage="PNG" always-add-relationships="false"
+ generalizations="true" realizations="true" associations="true" dependencies="false" nesting-relationships="true"
+ router="FAN">
+ <class id="1" language="java" name="com.iluwatar.objectmother.RoyaltyObjectMother" project="object-mother"
+ file="/object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java" binary="false"
+ corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="535" y="366"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <class id="2" language="java" name="com.iluwatar.objectmother.King" project="object-mother"
+ file="/object-mother/src/main/java/com/iluwatar/objectmother/King.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="285" y="141"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <class id="3" language="java" name="com.iluwatar.objectmother.Queen" project="object-mother"
+ file="/object-mother/src/main/java/com/iluwatar/objectmother/Queen.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="783" y="143"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <interface id="4" language="java" name="com.iluwatar.objectmother.Royalty" project="object-mother"
+ file="/object-mother/src/main/java/com/iluwatar/objectmother/Royalty.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="536" y="142"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </interface>
+ <realization id="5">
+ <end type="SOURCE" refId="2"/>
+ <end type="TARGET" refId="4"/>
+ </realization>
+ <realization id="6">
+ <end type="SOURCE" refId="3"/>
+ <end type="TARGET" refId="4"/>
+ </realization>
+ <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </classifier-display>
+ <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/object-mother/etc/object-mother.urm.puml b/object-mother/etc/object-mother.urm.puml
new file mode 100644
index 000000000..9b26450f0
--- /dev/null
+++ b/object-mother/etc/object-mother.urm.puml
@@ -0,0 +1,45 @@
+@startuml
+package com.iluwatar.objectmother {
+ class RoyaltyObjectMother {
+ + RoyaltyObjectMother()
+ + createDrunkKing() : King {static}
+ + createFlirtyQueen() : Queen {static}
+ + createHappyDrunkKing() : King {static}
+ + createHappyKing() : King {static}
+ + createNotFlirtyQueen() : Queen {static}
+ + createSoberUnhappyKing() : King {static}
+ }
+ class Queen {
+ - isDrunk : boolean
+ - isFlirty : boolean
+ - isHappy : boolean
+ + Queen()
+ + getFlirted(king : King) : boolean
+ + isFlirty() : boolean
+ + makeDrunk()
+ + makeHappy()
+ + makeSober()
+ + makeUnhappy()
+ + setFlirtiness(flirtiness : boolean)
+ }
+ interface Royalty {
+ + makeDrunk() {abstract}
+ + makeHappy() {abstract}
+ + makeSober() {abstract}
+ + makeUnhappy() {abstract}
+ }
+ class King {
+ ~ isDrunk : boolean
+ ~ isHappy : boolean
+ + King()
+ + flirt(queen : Queen)
+ + isHappy() : boolean
+ + makeDrunk()
+ + makeHappy()
+ + makeSober()
+ + makeUnhappy()
+ }
+}
+Queen ..|> Royalty
+King ..|> Royalty
+@enduml
\ No newline at end of file
diff --git a/object-mother/pom.xml b/object-mother/pom.xml
new file mode 100644
index 000000000..91bdff8e2
--- /dev/null
+++ b/object-mother/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+
+ The MIT License
+ Copyright (c) 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
+ 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.
+
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.iluwatar</groupId>
+ <artifactId>java-design-patterns</artifactId>
+ <version>1.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>object-mother</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/object-mother/src/main/java/com/iluwatar/objectmother/King.java b/object-mother/src/main/java/com/iluwatar/objectmother/King.java
new file mode 100644
index 000000000..544b0bacb
--- /dev/null
+++ b/object-mother/src/main/java/com/iluwatar/objectmother/King.java
@@ -0,0 +1,66 @@
+/**
+ * The MIT License
+ * Copyright (c) 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
+ * 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.objectmother;
+
+public class King implements Royalty {
+ boolean isDrunk = false;
+ boolean isHappy = false;
+
+ @Override
+ public void makeDrunk() {
+ isDrunk = true;
+ }
+
+ @Override
+ public void makeSober() {
+ isDrunk = false;
+ }
+
+ @Override
+ public void makeHappy() {
+ isHappy = true;
+ }
+
+ @Override
+ public void makeUnhappy() {
+ isHappy = false;
+ }
+
+ public boolean isHappy() {
+ return isHappy;
+ }
+
+ /**
+ * Method to flirt to a queen.
+ * @param queen Queen which should be flirted.
+ */
+ public void flirt(Queen queen) {
+ boolean flirtStatus = queen.getFlirted(this);
+ if (flirtStatus == false) {
+ this.makeUnhappy();
+ } else {
+ this.makeHappy();
+ }
+
+ }
+}
diff --git a/object-mother/src/main/java/com/iluwatar/objectmother/Queen.java b/object-mother/src/main/java/com/iluwatar/objectmother/Queen.java
new file mode 100644
index 000000000..3e18fbf3a
--- /dev/null
+++ b/object-mother/src/main/java/com/iluwatar/objectmother/Queen.java
@@ -0,0 +1,69 @@
+/**
+ * The MIT License
+ * Copyright (c) 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
+ * 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.objectmother;
+
+public class Queen implements Royalty {
+ private boolean isDrunk = false;
+ private boolean isHappy = false;
+ private boolean isFlirty = false;
+
+ @Override
+ public void makeDrunk() {
+ isDrunk = true;
+ }
+
+ @Override
+ public void makeSober() {
+ isDrunk = false;
+ }
+
+ @Override
+ public void makeHappy() {
+ isHappy = true;
+ }
+
+ @Override
+ public void makeUnhappy() {
+ isHappy = false;
+ }
+
+ public boolean isFlirty() {
+ return isFlirty;
+ }
+
+ public void setFlirtiness(boolean flirtiness) {
+ this.isFlirty = flirtiness;
+ }
+
+ /**
+ * Method which is called when the king is flirting to a queen.
+ * @param king King who initialized the flirt.
+ * @return A value which describes if the flirt was successful or not.
+ */
+ public boolean getFlirted(King king) {
+ if (this.isFlirty && king.isHappy && !king.isDrunk) {
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/object-mother/src/main/java/com/iluwatar/objectmother/Royalty.java b/object-mother/src/main/java/com/iluwatar/objectmother/Royalty.java
new file mode 100644
index 000000000..2bebc0939
--- /dev/null
+++ b/object-mother/src/main/java/com/iluwatar/objectmother/Royalty.java
@@ -0,0 +1,33 @@
+/**
+ * The MIT License
+ * Copyright (c) 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
+ * 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.objectmother;
+
+public interface Royalty {
+ void makeDrunk();
+
+ void makeSober();
+
+ void makeHappy();
+
+ void makeUnhappy();
+}
diff --git a/object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java b/object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java
new file mode 100644
index 000000000..624a29132
--- /dev/null
+++ b/object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java
@@ -0,0 +1,83 @@
+/**
+ * The MIT License
+ * Copyright (c) 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
+ * 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.objectmother;
+
+public final class RoyaltyObjectMother {
+
+ /**
+ * Method to create a sober and unhappy king. The standard paramters are set.
+ * @return An instance of {@link com.iluwatar.objectmother.King} with the standard properties.
+ */
+ public static King createSoberUnhappyKing() {
+ return new King();
+ }
+
+ /**
+ * Method of the object mother to create a drunk king.
+ * @return A drunk {@link com.iluwatar.objectmother.King}.
+ */
+ public static King createDrunkKing() {
+ King king = new King();
+ king.makeDrunk();
+ return king;
+ }
+
+ /**
+ * Method to create a happy king.
+ * @return A happy {@link com.iluwatar.objectmother.King}.
+ */
+ public static King createHappyKing() {
+ King king = new King();
+ king.makeHappy();
+ return king;
+ }
+
+ /**
+ * Method to create a happy and drunk king.
+ * @return A drunk and happy {@link com.iluwatar.objectmother.King}.
+ */
+ public static King createHappyDrunkKing() {
+ King king = new King();
+ king.makeHappy();
+ king.makeDrunk();
+ return king;
+ }
+
+ /**
+ * Method to create a flirty queen.
+ * @return A flirty {@link com.iluwatar.objectmother.Queen}.
+ */
+ public static Queen createFlirtyQueen() {
+ Queen queen = new Queen();
+ queen.setFlirtiness(true);
+ return queen;
+ }
+
+ /**
+ * Method to create a not flirty queen.
+ * @return A not flirty {@link com.iluwatar.objectmother.Queen}.
+ */
+ public static Queen createNotFlirtyQueen() {
+ return new Queen();
+ }
+}
diff --git a/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java b/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java
new file mode 100644
index 000000000..ebe536d24
--- /dev/null
+++ b/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java
@@ -0,0 +1,89 @@
+/**
+ * The MIT License
+ * Copyright (c) 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
+ * 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.objectmother.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.iluwatar.objectmother.King;
+import com.iluwatar.objectmother.Queen;
+import com.iluwatar.objectmother.Royalty;
+import com.iluwatar.objectmother.RoyaltyObjectMother;
+
+public class RoyaltyObjectMotherTest {
+
+ @Test
+ public void unsuccessfulKingFlirt() {
+ King soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
+ Queen flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
+ soberUnhappyKing.flirt(flirtyQueen);
+ assertFalse(soberUnhappyKing.isHappy());
+ }
+
+ @Test
+ public void queenIsBlockingFlirtCauseDrunkKing() {
+ King drunkUnhappyKing = RoyaltyObjectMother.createDrunkKing();
+ Queen notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
+ drunkUnhappyKing.flirt(notFlirtyQueen);
+ assertFalse(drunkUnhappyKing.isHappy());
+ }
+
+ @Test
+ public void queenIsBlockingFlirt() {
+ King soberHappyKing = RoyaltyObjectMother.createHappyKing();
+ Queen notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
+ soberHappyKing.flirt(notFlirtyQueen);
+ assertFalse(soberHappyKing.isHappy());
+ }
+
+ @Test
+ public void successfullKingFlirt() {
+ King soberHappyKing = RoyaltyObjectMother.createHappyKing();
+ Queen flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
+ soberHappyKing.flirt(flirtyQueen);
+ assertTrue(soberHappyKing.isHappy());
+ }
+
+ @Test
+ public void testQueenType() {
+ Royalty flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
+ Royalty notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
+ assertEquals(flirtyQueen.getClass(), Queen.class);
+ assertEquals(notFlirtyQueen.getClass(), Queen.class);
+ }
+
+ @Test
+ public void testKingType() {
+ Royalty drunkKing = RoyaltyObjectMother.createDrunkKing();
+ Royalty happyDrunkKing = RoyaltyObjectMother.createHappyDrunkKing();
+ Royalty happyKing = RoyaltyObjectMother.createHappyKing();
+ Royalty soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
+ assertEquals(drunkKing.getClass(), King.class);
+ assertEquals(happyDrunkKing.getClass(), King.class);
+ assertEquals(happyKing.getClass(), King.class);
+ assertEquals(soberUnhappyKing.getClass(), King.class);
+ }
+}
diff --git a/object-pool/etc/object-pool.urm.puml b/object-pool/etc/object-pool.urm.puml
index caf0b6d7e..21ef76e0d 100644
--- a/object-pool/etc/object-pool.urm.puml
+++ b/object-pool/etc/object-pool.urm.puml
@@ -1,15 +1,9 @@
@startuml
package com.iluwatar.object.pool {
- class OliphauntPool {
- + OliphauntPool()
- # create() : Oliphaunt
- }
- class Oliphaunt {
- - counter : int {static}
- - id : int
- + Oliphaunt()
- + getId() : int
- + toString() : String
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
}
abstract class ObjectPool<T> {
- available : HashSet<T>
@@ -20,9 +14,16 @@ package com.iluwatar.object.pool {
# create() : T {abstract}
+ toString() : String
}
- class App {
- + App()
- + main(args : String[]) {static}
+ class Oliphaunt {
+ - counter : int {static}
+ - id : int
+ + Oliphaunt()
+ + getId() : int
+ + toString() : String
+ }
+ class OliphauntPool {
+ + OliphauntPool()
+ # create() : Oliphaunt
}
}
OliphauntPool --|> ObjectPool
diff --git a/object-pool/pom.xml b/object-pool/pom.xml
index 927570b66..dbd16330a 100644
--- a/object-pool/pom.xml
+++ b/object-pool/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
diff --git a/object-pool/src/main/java/com/iluwatar/object/pool/App.java b/object-pool/src/main/java/com/iluwatar/object/pool/App.java
index 66b3e3f90..2da4244b6 100644
--- a/object-pool/src/main/java/com/iluwatar/object/pool/App.java
+++ b/object-pool/src/main/java/com/iluwatar/object/pool/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.object.pool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* When it is necessary to work with a large number of objects that are particularly expensive to
@@ -44,6 +47,8 @@ package com.iluwatar.object.pool;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -51,24 +56,24 @@ public class App {
*/
public static void main(String[] args) {
OliphauntPool pool = new OliphauntPool();
- System.out.println(pool);
+ LOGGER.info(pool.toString());
Oliphaunt oliphaunt1 = pool.checkOut();
- System.out.println("Checked out " + oliphaunt1);
- System.out.println(pool);
+ LOGGER.info("Checked out {}", oliphaunt1);
+ LOGGER.info(pool.toString());
Oliphaunt oliphaunt2 = pool.checkOut();
- System.out.println("Checked out " + oliphaunt2);
+ LOGGER.info("Checked out {}", oliphaunt2);
Oliphaunt oliphaunt3 = pool.checkOut();
- System.out.println("Checked out " + oliphaunt3);
- System.out.println(pool);
- System.out.println("Checking in " + oliphaunt1);
+ LOGGER.info("Checked out {}", oliphaunt3);
+ LOGGER.info(pool.toString());
+ LOGGER.info("Checking in {}", oliphaunt1);
pool.checkIn(oliphaunt1);
- System.out.println("Checking in " + oliphaunt2);
+ LOGGER.info("Checking in {}", oliphaunt2);
pool.checkIn(oliphaunt2);
- System.out.println(pool);
+ LOGGER.info(pool.toString());
Oliphaunt oliphaunt4 = pool.checkOut();
- System.out.println("Checked out " + oliphaunt4);
+ LOGGER.info("Checked out {}", oliphaunt4);
Oliphaunt oliphaunt5 = pool.checkOut();
- System.out.println("Checked out " + oliphaunt5);
- System.out.println(pool);
+ LOGGER.info("Checked out {}", oliphaunt5);
+ LOGGER.info(pool.toString());
}
}
diff --git a/object-pool/src/main/java/com/iluwatar/object/pool/ObjectPool.java b/object-pool/src/main/java/com/iluwatar/object/pool/ObjectPool.java
index 3fcbd2c41..790641690 100644
--- a/object-pool/src/main/java/com/iluwatar/object/pool/ObjectPool.java
+++ b/object-pool/src/main/java/com/iluwatar/object/pool/ObjectPool.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
diff --git a/object-pool/src/main/java/com/iluwatar/object/pool/Oliphaunt.java b/object-pool/src/main/java/com/iluwatar/object/pool/Oliphaunt.java
index 46c1a03c9..cc705b2b3 100644
--- a/object-pool/src/main/java/com/iluwatar/object/pool/Oliphaunt.java
+++ b/object-pool/src/main/java/com/iluwatar/object/pool/Oliphaunt.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
diff --git a/object-pool/src/main/java/com/iluwatar/object/pool/OliphauntPool.java b/object-pool/src/main/java/com/iluwatar/object/pool/OliphauntPool.java
index 17b998a0e..24e65070a 100644
--- a/object-pool/src/main/java/com/iluwatar/object/pool/OliphauntPool.java
+++ b/object-pool/src/main/java/com/iluwatar/object/pool/OliphauntPool.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
diff --git a/object-pool/src/test/java/com/iluwatar/object/pool/AppTest.java b/object-pool/src/test/java/com/iluwatar/object/pool/AppTest.java
index 45aa1b253..c92399c32 100644
--- a/object-pool/src/test/java/com/iluwatar/object/pool/AppTest.java
+++ b/object-pool/src/test/java/com/iluwatar/object/pool/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
diff --git a/object-pool/src/test/java/com/iluwatar/object/pool/OliphauntPoolTest.java b/object-pool/src/test/java/com/iluwatar/object/pool/OliphauntPoolTest.java
index f855e18c4..46ed22b36 100644
--- a/object-pool/src/test/java/com/iluwatar/object/pool/OliphauntPoolTest.java
+++ b/object-pool/src/test/java/com/iluwatar/object/pool/OliphauntPoolTest.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
diff --git a/observer/etc/observer.urm.puml b/observer/etc/observer.urm.puml
index e9a8f7b9b..bea9aab53 100644
--- a/observer/etc/observer.urm.puml
+++ b/observer/etc/observer.urm.puml
@@ -1,17 +1,22 @@
@startuml
package com.iluwatar.observer {
- class Orcs {
- + Orcs()
- + update(currentWeather : WeatherType)
- }
- interface WeatherObserver {
- + update(WeatherType) {abstract}
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
+ class Hobbits {
+ - LOGGER : Logger {static}
+ + Hobbits()
+ + update(currentWeather : WeatherType)
+ }
+ class Orcs {
+ - LOGGER : Logger {static}
+ + Orcs()
+ + update(currentWeather : WeatherType)
+ }
class Weather {
+ - LOGGER : Logger {static}
- currentWeather : WeatherType
- observers : List<WeatherObserver>
+ Weather()
@@ -20,9 +25,8 @@ package com.iluwatar.observer {
+ removeObserver(obs : WeatherObserver)
+ timePasses()
}
- class Hobbits {
- + Hobbits()
- + update(currentWeather : WeatherType)
+ interface WeatherObserver {
+ + update(WeatherType) {abstract}
}
enum WeatherType {
+ COLD {static}
@@ -35,13 +39,18 @@ package com.iluwatar.observer {
}
}
package com.iluwatar.observer.generic {
+ class GHobbits {
+ - LOGGER : Logger {static}
+ + GHobbits()
+ + update(weather : GWeather, weatherType : WeatherType)
+ }
class GOrcs {
+ - LOGGER : Logger {static}
+ GOrcs()
+ update(weather : GWeather, weatherType : WeatherType)
}
- interface Race {
- }
class GWeather {
+ - LOGGER : Logger {static}
- currentWeather : WeatherType
+ GWeather()
+ timePasses()
@@ -53,21 +62,19 @@ package com.iluwatar.observer.generic {
+ notifyObservers(argument : A)
+ removeObserver(observer : O extends Observer<S, O, A>)
}
- class GHobbits {
- + GHobbits()
- + update(weather : GWeather, weatherType : WeatherType)
- }
interface Observer<S extends Observable<S, O, A>, O extends Observer, A> {
+ update(S extends Observable<S, O, A>, A) {abstract}
}
+ interface Race {
+ }
}
Weather --> "-currentWeather" WeatherType
GWeather --> "-currentWeather" WeatherType
Weather --> "-observers" WeatherObserver
-GOrcs ..|> Race
-Orcs ..|> WeatherObserver
-Race --|> Observer
-GWeather --|> Observable
-GHobbits ..|> Race
Hobbits ..|> WeatherObserver
+Orcs ..|> WeatherObserver
+GHobbits ..|> Race
+GOrcs ..|> Race
+GWeather --|> Observable
+Race --|> Observer
@enduml
\ No newline at end of file
diff --git a/observer/pom.xml b/observer/pom.xml
index 48909e1aa..ba849f4a4 100644
--- a/observer/pom.xml
+++ b/observer/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
diff --git a/observer/src/main/java/com/iluwatar/observer/App.java b/observer/src/main/java/com/iluwatar/observer/App.java
index dcced00d4..84bad3382 100644
--- a/observer/src/main/java/com/iluwatar/observer/App.java
+++ b/observer/src/main/java/com/iluwatar/observer/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
@@ -25,6 +25,8 @@ package com.iluwatar.observer;
import com.iluwatar.observer.generic.GHobbits;
import com.iluwatar.observer.generic.GOrcs;
import com.iluwatar.observer.generic.GWeather;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -41,6 +43,8 @@ import com.iluwatar.observer.generic.GWeather;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -58,7 +62,7 @@ public class App {
weather.timePasses();
// Generic observer inspired by Java Generics and Collection by Naftalin & Wadler
- System.out.println("\n--Running generic version--");
+ LOGGER.info("--Running generic version--");
GWeather gWeather = new GWeather();
gWeather.addObserver(new GOrcs());
gWeather.addObserver(new GHobbits());
diff --git a/observer/src/main/java/com/iluwatar/observer/Hobbits.java b/observer/src/main/java/com/iluwatar/observer/Hobbits.java
index ed9636bd6..5547daabb 100644
--- a/observer/src/main/java/com/iluwatar/observer/Hobbits.java
+++ b/observer/src/main/java/com/iluwatar/observer/Hobbits.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.observer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Hobbits
@@ -29,20 +32,22 @@ package com.iluwatar.observer;
*/
public class Hobbits implements WeatherObserver {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Hobbits.class);
+
@Override
public void update(WeatherType currentWeather) {
switch (currentWeather) {
case COLD:
- System.out.println("The hobbits are shivering in the cold weather.");
+ LOGGER.info("The hobbits are shivering in the cold weather.");
break;
case RAINY:
- System.out.println("The hobbits look for cover from the rain.");
+ LOGGER.info("The hobbits look for cover from the rain.");
break;
case SUNNY:
- System.out.println("The happy hobbits bade in the warm sun.");
+ LOGGER.info("The happy hobbits bade in the warm sun.");
break;
case WINDY:
- System.out.println("The hobbits hold their hats tightly in the windy weather.");
+ LOGGER.info("The hobbits hold their hats tightly in the windy weather.");
break;
default:
break;
diff --git a/observer/src/main/java/com/iluwatar/observer/Orcs.java b/observer/src/main/java/com/iluwatar/observer/Orcs.java
index ce9c09944..ce88d8bcd 100644
--- a/observer/src/main/java/com/iluwatar/observer/Orcs.java
+++ b/observer/src/main/java/com/iluwatar/observer/Orcs.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.observer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Orcs
@@ -29,20 +32,22 @@ package com.iluwatar.observer;
*/
public class Orcs implements WeatherObserver {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Orcs.class);
+
@Override
public void update(WeatherType currentWeather) {
switch (currentWeather) {
case COLD:
- System.out.println("The orcs are freezing cold.");
+ LOGGER.info("The orcs are freezing cold.");
break;
case RAINY:
- System.out.println("The orcs are dripping wet.");
+ LOGGER.info("The orcs are dripping wet.");
break;
case SUNNY:
- System.out.println("The sun hurts the orcs' eyes.");
+ LOGGER.info("The sun hurts the orcs' eyes.");
break;
case WINDY:
- System.out.println("The orc smell almost vanishes in the wind.");
+ LOGGER.info("The orc smell almost vanishes in the wind.");
break;
default:
break;
diff --git a/observer/src/main/java/com/iluwatar/observer/Weather.java b/observer/src/main/java/com/iluwatar/observer/Weather.java
index f6aad3881..3c9cb209b 100644
--- a/observer/src/main/java/com/iluwatar/observer/Weather.java
+++ b/observer/src/main/java/com/iluwatar/observer/Weather.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.observer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.List;
@@ -33,6 +36,8 @@ import java.util.List;
*/
public class Weather {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Weather.class);
+
private WeatherType currentWeather;
private List<WeatherObserver> observers;
@@ -55,7 +60,7 @@ public class Weather {
public void timePasses() {
WeatherType[] enumValues = WeatherType.values();
currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length];
- System.out.println("The weather changed to " + currentWeather + ".");
+ LOGGER.info("The weather changed to {}.", currentWeather);
notifyObservers();
}
diff --git a/observer/src/main/java/com/iluwatar/observer/WeatherObserver.java b/observer/src/main/java/com/iluwatar/observer/WeatherObserver.java
index afbf2a303..fdc89b07f 100644
--- a/observer/src/main/java/com/iluwatar/observer/WeatherObserver.java
+++ b/observer/src/main/java/com/iluwatar/observer/WeatherObserver.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
diff --git a/observer/src/main/java/com/iluwatar/observer/WeatherType.java b/observer/src/main/java/com/iluwatar/observer/WeatherType.java
index b88452160..0e66a000d 100644
--- a/observer/src/main/java/com/iluwatar/observer/WeatherType.java
+++ b/observer/src/main/java/com/iluwatar/observer/WeatherType.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
diff --git a/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java b/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java
index da84b9aab..5e0afbc81 100644
--- a/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java
+++ b/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.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
@@ -23,6 +23,8 @@
package com.iluwatar.observer.generic;
import com.iluwatar.observer.WeatherType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -30,20 +32,23 @@ import com.iluwatar.observer.WeatherType;
*
*/
public class GHobbits implements Race {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(GHobbits.class);
+
@Override
public void update(GWeather weather, WeatherType weatherType) {
switch (weatherType) {
case COLD:
- System.out.println("The hobbits are shivering in the cold weather.");
+ LOGGER.info("The hobbits are shivering in the cold weather.");
break;
case RAINY:
- System.out.println("The hobbits look for cover from the rain.");
+ LOGGER.info("The hobbits look for cover from the rain.");
break;
case SUNNY:
- System.out.println("The happy hobbits bade in the warm sun.");
+ LOGGER.info("The happy hobbits bade in the warm sun.");
break;
case WINDY:
- System.out.println("The hobbits hold their hats tightly in the windy weather.");
+ LOGGER.info("The hobbits hold their hats tightly in the windy weather.");
break;
default:
break;
diff --git a/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java b/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java
index 9f41aa6cc..734cf0e69 100644
--- a/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java
+++ b/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.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
@@ -23,6 +23,8 @@
package com.iluwatar.observer.generic;
import com.iluwatar.observer.WeatherType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -31,20 +33,22 @@ import com.iluwatar.observer.WeatherType;
*/
public class GOrcs implements Race {
+ private static final Logger LOGGER = LoggerFactory.getLogger(GOrcs.class);
+
@Override
public void update(GWeather weather, WeatherType weatherType) {
switch (weatherType) {
case COLD:
- System.out.println("The orcs are freezing cold.");
+ LOGGER.info("The orcs are freezing cold.");
break;
case RAINY:
- System.out.println("The orcs are dripping wet.");
+ LOGGER.info("The orcs are dripping wet.");
break;
case SUNNY:
- System.out.println("The sun hurts the orcs' eyes.");
+ LOGGER.info("The sun hurts the orcs' eyes.");
break;
case WINDY:
- System.out.println("The orc smell almost vanishes in the wind.");
+ LOGGER.info("The orc smell almost vanishes in the wind.");
break;
default:
break;
diff --git a/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java b/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java
index 137000760..19e72d140 100644
--- a/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java
+++ b/observer/src/main/java/com/iluwatar/observer/generic/GWeather.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
@@ -23,6 +23,8 @@
package com.iluwatar.observer.generic;
import com.iluwatar.observer.WeatherType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -31,6 +33,8 @@ import com.iluwatar.observer.WeatherType;
*/
public class GWeather extends Observable<GWeather, Race, WeatherType> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(GWeather.class);
+
private WeatherType currentWeather;
public GWeather() {
@@ -43,7 +47,7 @@ public class GWeather extends Observable<GWeather, Race, WeatherType> {
public void timePasses() {
WeatherType[] enumValues = WeatherType.values();
currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length];
- System.out.println("The weather changed to " + currentWeather + ".");
+ LOGGER.info("The weather changed to {}.", currentWeather);
notifyObservers(currentWeather);
}
}
diff --git a/observer/src/main/java/com/iluwatar/observer/generic/Observable.java b/observer/src/main/java/com/iluwatar/observer/generic/Observable.java
index a9a6bf80d..ff204437d 100644
--- a/observer/src/main/java/com/iluwatar/observer/generic/Observable.java
+++ b/observer/src/main/java/com/iluwatar/observer/generic/Observable.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
diff --git a/observer/src/main/java/com/iluwatar/observer/generic/Observer.java b/observer/src/main/java/com/iluwatar/observer/generic/Observer.java
index 170f14ce8..b427aae2c 100644
--- a/observer/src/main/java/com/iluwatar/observer/generic/Observer.java
+++ b/observer/src/main/java/com/iluwatar/observer/generic/Observer.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
diff --git a/observer/src/main/java/com/iluwatar/observer/generic/Race.java b/observer/src/main/java/com/iluwatar/observer/generic/Race.java
index 08ec22945..16f2e8e67 100644
--- a/observer/src/main/java/com/iluwatar/observer/generic/Race.java
+++ b/observer/src/main/java/com/iluwatar/observer/generic/Race.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
diff --git a/observer/src/test/java/com/iluwatar/observer/AppTest.java b/observer/src/test/java/com/iluwatar/observer/AppTest.java
index 237726463..11bbb5496 100644
--- a/observer/src/test/java/com/iluwatar/observer/AppTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/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
diff --git a/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java b/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java
index 8b670c56b..31a4fd667 100644
--- a/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/HobbitsTest.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
diff --git a/observer/src/test/java/com/iluwatar/observer/OrcsTest.java b/observer/src/test/java/com/iluwatar/observer/OrcsTest.java
index a7997eaa7..b1f0b82d7 100644
--- a/observer/src/test/java/com/iluwatar/observer/OrcsTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/OrcsTest.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
diff --git a/observer/src/test/java/com/iluwatar/observer/StdOutTest.java b/observer/src/test/java/com/iluwatar/observer/StdOutTest.java
deleted file mode 100644
index afd870ae4..000000000
--- a/observer/src/test/java/com/iluwatar/observer/StdOutTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.observer;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/27/15 - 12:16 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since changes in the weather doesn't has
- * any influence on any other accessible objects, except for writing to std-out using {@link
- * System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- protected final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java b/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java
index a06c19952..7120a31e0 100644
--- a/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.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,20 +22,33 @@
*/
package com.iluwatar.observer;
+import com.iluwatar.observer.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import java.util.function.Supplier;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/27/15 - 11:44 AM
*
* @author Jeroen Meulemeester
*/
-public abstract class WeatherObserverTest<O extends WeatherObserver> extends StdOutTest {
+public abstract class WeatherObserverTest<O extends WeatherObserver> {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* The observer instance factory
@@ -71,11 +84,11 @@ public abstract class WeatherObserverTest<O extends WeatherObserver> extends Std
@Test
public void testObserver() {
final O observer = this.factory.get();
- verifyZeroInteractions(getStdOutMock());
+ assertEquals(0, appender.getLogSize());
observer.update(this.weather);
- verify(getStdOutMock()).println(this.response);
- verifyNoMoreInteractions(getStdOutMock());
+ assertEquals(response, appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
-}
\ No newline at end of file
+}
diff --git a/observer/src/test/java/com/iluwatar/observer/WeatherTest.java b/observer/src/test/java/com/iluwatar/observer/WeatherTest.java
index 7a38e7137..88bf1c4c3 100644
--- a/observer/src/test/java/com/iluwatar/observer/WeatherTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/WeatherTest.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,9 +22,13 @@
*/
package com.iluwatar.observer;
+import com.iluwatar.observer.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -36,7 +40,19 @@ import static org.mockito.Mockito.verifyZeroInteractions;
*
* @author Jeroen Meulemeester
*/
-public class WeatherTest extends StdOutTest {
+public class WeatherTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(Weather.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* Add a {@link WeatherObserver}, verify if it gets notified of a weather change, remove the
@@ -51,14 +67,15 @@ public class WeatherTest extends StdOutTest {
verifyZeroInteractions(observer);
weather.timePasses();
- verify(getStdOutMock()).println("The weather changed to rainy.");
+ assertEquals("The weather changed to rainy.", appender.getLastMessage());
verify(observer).update(WeatherType.RAINY);
weather.removeObserver(observer);
weather.timePasses();
- verify(getStdOutMock()).println("The weather changed to windy.");
+ assertEquals("The weather changed to windy.", appender.getLastMessage());
- verifyNoMoreInteractions(observer, getStdOutMock());
+ verifyNoMoreInteractions(observer);
+ assertEquals(2, appender.getLogSize());
}
/**
@@ -70,7 +87,7 @@ public class WeatherTest extends StdOutTest {
final Weather weather = new Weather();
weather.addObserver(observer);
- final InOrder inOrder = inOrder(observer, getStdOutMock());
+ final InOrder inOrder = inOrder(observer);
final WeatherType[] weatherTypes = WeatherType.values();
for (int i = 1; i < 20; i++) {
weather.timePasses();
@@ -80,4 +97,4 @@ public class WeatherTest extends StdOutTest {
verifyNoMoreInteractions(observer);
}
-}
\ No newline at end of file
+}
diff --git a/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java b/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java
index 7668daee6..a54f15689 100644
--- a/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.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
diff --git a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java
index 758dbca8c..ab15ca884 100644
--- a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.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,25 +22,35 @@
*/
package com.iluwatar.observer.generic;
-import com.iluwatar.observer.StdOutTest;
import com.iluwatar.observer.WeatherObserver;
import com.iluwatar.observer.WeatherType;
-
+import com.iluwatar.observer.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
/**
* Date: 12/27/15 - 11:08 AM
*
* @author Jeroen Meulemeester
*/
-public class GWeatherTest extends StdOutTest {
+public class GWeatherTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(GWeather.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* Add a {@link WeatherObserver}, verify if it gets notified of a weather change, remove the
@@ -55,14 +65,15 @@ public class GWeatherTest extends StdOutTest {
verifyZeroInteractions(observer);
weather.timePasses();
- verify(getStdOutMock()).println("The weather changed to rainy.");
+ assertEquals("The weather changed to rainy.", appender.getLastMessage());
verify(observer).update(weather, WeatherType.RAINY);
weather.removeObserver(observer);
weather.timePasses();
- verify(getStdOutMock()).println("The weather changed to windy.");
+ assertEquals("The weather changed to windy.", appender.getLastMessage());
- verifyNoMoreInteractions(observer, getStdOutMock());
+ verifyNoMoreInteractions(observer);
+ assertEquals(2, appender.getLogSize());
}
/**
@@ -74,7 +85,7 @@ public class GWeatherTest extends StdOutTest {
final GWeather weather = new GWeather();
weather.addObserver(observer);
- final InOrder inOrder = inOrder(observer, getStdOutMock());
+ final InOrder inOrder = inOrder(observer);
final WeatherType[] weatherTypes = WeatherType.values();
for (int i = 1; i < 20; i++) {
weather.timePasses();
@@ -84,4 +95,4 @@ public class GWeatherTest extends StdOutTest {
verifyNoMoreInteractions(observer);
}
-}
\ No newline at end of file
+}
diff --git a/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java b/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java
index 33d8daaf5..eef89da62 100644
--- a/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.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,23 +22,34 @@
*/
package com.iluwatar.observer.generic;
-import com.iluwatar.observer.StdOutTest;
import com.iluwatar.observer.WeatherType;
-
+import com.iluwatar.observer.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import java.util.function.Supplier;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/27/15 - 11:44 AM
*
* @author Jeroen Meulemeester
*/
-public abstract class ObserverTest<O extends Observer> extends StdOutTest {
+public abstract class ObserverTest<O extends Observer> {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* The observer instance factory
@@ -74,11 +85,11 @@ public abstract class ObserverTest<O extends Observer> extends StdOutTest {
@Test
public void testObserver() {
final O observer = this.factory.get();
- verifyZeroInteractions(getStdOutMock());
+ assertEquals(0, appender.getLogSize());
observer.update(null, this.weather);
- verify(getStdOutMock()).println(this.response);
- verifyNoMoreInteractions(getStdOutMock());
+ assertEquals(this.response, appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
-}
\ No newline at end of file
+}
diff --git a/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java b/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java
index 9ac1bddea..a61a91afe 100644
--- a/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.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
diff --git a/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java b/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java
new file mode 100644
index 000000000..b0503a4a1
--- /dev/null
+++ b/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java
@@ -0,0 +1,58 @@
+/**
+ * The MIT License
+ * 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
+ * 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.observer.utils;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+}
diff --git a/page-object/pom.xml b/page-object/pom.xml
index 207d04092..0dd09bdbb 100644
--- a/page-object/pom.xml
+++ b/page-object/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
diff --git a/page-object/src/main/java/com/iluwatar/pageobject/App.java b/page-object/src/main/java/com/iluwatar/pageobject/App.java
index 235eedd25..5983a4dc3 100644
--- a/page-object/src/main/java/com/iluwatar/pageobject/App.java
+++ b/page-object/src/main/java/com/iluwatar/pageobject/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
diff --git a/page-object/src/main/resources/sample-ui/album-list.html b/page-object/src/main/resources/sample-ui/album-list.html
index e02e65cf3..7e674c60a 100644
--- a/page-object/src/main/resources/sample-ui/album-list.html
+++ b/page-object/src/main/resources/sample-ui/album-list.html
@@ -1,7 +1,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
diff --git a/page-object/src/main/resources/sample-ui/album-page.html b/page-object/src/main/resources/sample-ui/album-page.html
index 5bf843be2..44420c6d6 100644
--- a/page-object/src/main/resources/sample-ui/album-page.html
+++ b/page-object/src/main/resources/sample-ui/album-page.html
@@ -1,7 +1,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
diff --git a/page-object/src/main/resources/sample-ui/css/album-list.css b/page-object/src/main/resources/sample-ui/css/album-list.css
index 61fd0af81..744eb22dc 100644
--- a/page-object/src/main/resources/sample-ui/css/album-list.css
+++ b/page-object/src/main/resources/sample-ui/css/album-list.css
@@ -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
@@ -23,7 +23,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
diff --git a/page-object/src/main/resources/sample-ui/css/style.css b/page-object/src/main/resources/sample-ui/css/style.css
index 691bba77f..b70a481d0 100644
--- a/page-object/src/main/resources/sample-ui/css/style.css
+++ b/page-object/src/main/resources/sample-ui/css/style.css
@@ -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
@@ -23,7 +23,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
diff --git a/page-object/src/main/resources/sample-ui/login.html b/page-object/src/main/resources/sample-ui/login.html
index 1d7786057..2dd082fe5 100644
--- a/page-object/src/main/resources/sample-ui/login.html
+++ b/page-object/src/main/resources/sample-ui/login.html
@@ -1,7 +1,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
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java b/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
index b97410036..f41a79760 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.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
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java b/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
index 01461cc8d..248a0ddf8 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.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
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java b/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
index 659df0629..a0483ae40 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.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
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumListPage.java b/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumListPage.java
index fb322ff53..d212b33f3 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumListPage.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumListPage.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
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumPage.java b/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumPage.java
index 4dffb93dd..7d2318257 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumPage.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumPage.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
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/pages/LoginPage.java b/page-object/src/test/java/com/iluwatar/pageobject/pages/LoginPage.java
index d4bd0850c..b648dfdaf 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/pages/LoginPage.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/pages/LoginPage.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
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/pages/Page.java b/page-object/src/test/java/com/iluwatar/pageobject/pages/Page.java
index b0b328e7c..f292588d2 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/pages/Page.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/pages/Page.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
diff --git a/poison-pill/etc/poison-pill.urm.puml b/poison-pill/etc/poison-pill.urm.puml
index f05c40692..923449e10 100644
--- a/poison-pill/etc/poison-pill.urm.puml
+++ b/poison-pill/etc/poison-pill.urm.puml
@@ -1,7 +1,15 @@
@startuml
package com.iluwatar.poison.pill {
- interface MqPublishPoint {
- + put(Message) {abstract}
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
+ class Consumer {
+ - LOGGER : Logger {static}
+ - name : String
+ - queue : MqSubscribePoint
+ + Consumer(name : String, queue : MqSubscribePoint)
+ + consume()
}
interface Message {
+ POISON_PILL : Message {static}
@@ -11,13 +19,22 @@ package com.iluwatar.poison.pill {
+ getHeaders() : Map<Headers, String> {abstract}
+ setBody(String) {abstract}
}
- class App {
- + App()
- + main(args : String[]) {static}
+ enum Headers {
+ + DATE {static}
+ + SENDER {static}
+ + valueOf(name : String) : Headers {static}
+ + values() : Headers[] {static}
}
interface MessageQueue {
}
+ interface MqPublishPoint {
+ + put(Message) {abstract}
+ }
+ interface MqSubscribePoint {
+ + take() : Message {abstract}
+ }
class Producer {
+ - LOGGER : Logger {static}
- isStopped : boolean
- name : String
- queue : MqPublishPoint
@@ -25,21 +42,6 @@ package com.iluwatar.poison.pill {
+ send(body : String)
+ stop()
}
- class Consumer {
- - name : String
- - queue : MqSubscribePoint
- + Consumer(name : String, queue : MqSubscribePoint)
- + consume()
- }
- class SimpleMessageQueue {
- - queue : BlockingQueue<Message>
- + SimpleMessageQueue(bound : int)
- + put(msg : Message)
- + take() : Message
- }
- interface MqSubscribePoint {
- + take() : Message {abstract}
- }
class SimpleMessage {
- body : String
- headers : Map<Headers, String>
@@ -50,23 +52,20 @@ package com.iluwatar.poison.pill {
+ getHeaders() : Map<Headers, String>
+ setBody(body : String)
}
- enum Headers {
- + DATE {static}
- + SENDER {static}
- + valueOf(name : String) : Headers {static}
- + values() : Headers[] {static}
+ class SimpleMessageQueue {
+ - queue : BlockingQueue<Message>
+ + SimpleMessageQueue(bound : int)
+ + put(msg : Message)
+ + take() : Message
}
}
SimpleMessageQueue --> "-queue" Message
Headers ..+ Message
Consumer --> "-queue" MqSubscribePoint
Producer --> "-queue" MqPublishPoint
-SimpleMessage --+ Message
-Producer --+ Message
Message --> "-POISON_PILL" Message
-Consumer --+ Message
MessageQueue --|> MqPublishPoint
MessageQueue --|> MqSubscribePoint
-SimpleMessageQueue ..|> MessageQueue
SimpleMessage ..|> Message
+SimpleMessageQueue ..|> MessageQueue
@enduml
\ No newline at end of file
diff --git a/poison-pill/pom.xml b/poison-pill/pom.xml
index 432f19547..2e0d8c078 100644
--- a/poison-pill/pom.xml
+++ b/poison-pill/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
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/App.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/App.java
index 88be9b05f..c24f503dd 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/App.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/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
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java
index c811225e1..049a9cbb2 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.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
@@ -23,11 +23,15 @@
package com.iluwatar.poison.pill;
import com.iluwatar.poison.pill.Message.Headers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Class responsible for receiving and handling submitted to the queue messages
*/
public class Consumer {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(Consumer.class);
private final MqSubscribePoint queue;
private final String name;
@@ -46,19 +50,18 @@ public class Consumer {
try {
msg = queue.take();
if (Message.POISON_PILL.equals(msg)) {
- System.out.println(String.format("Consumer %s receive request to terminate.", name));
+ LOGGER.info("Consumer {} receive request to terminate.", name);
break;
}
} catch (InterruptedException e) {
// allow thread to exit
- System.err.println(e);
+ LOGGER.error("Exception caught.", e);
return;
}
String sender = msg.getHeader(Headers.SENDER);
String body = msg.getBody();
- System.out.println(String.format("Message [%s] from [%s] received by [%s]", body, sender,
- name));
+ LOGGER.info("Message [{}] from [{}] received by [{}]", body, sender, name);
}
}
}
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/Message.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/Message.java
index c2f6b57bd..cb89f5f5f 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/Message.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/Message.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
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/MessageQueue.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/MessageQueue.java
index 1f774aeff..b12b201e4 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/MessageQueue.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/MessageQueue.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
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/MqPublishPoint.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/MqPublishPoint.java
index 68dabf39c..a37904824 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/MqPublishPoint.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/MqPublishPoint.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
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/MqSubscribePoint.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/MqSubscribePoint.java
index 8bc58226e..7e3974a1a 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/MqSubscribePoint.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/MqSubscribePoint.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
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/Producer.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/Producer.java
index 15dcad40e..884292bd2 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/Producer.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/Producer.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
@@ -25,6 +25,8 @@ package com.iluwatar.poison.pill;
import java.util.Date;
import com.iluwatar.poison.pill.Message.Headers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Class responsible for producing unit of work that can be expressed as message and submitted to
@@ -32,6 +34,8 @@ import com.iluwatar.poison.pill.Message.Headers;
*/
public class Producer {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Producer.class);
+
private final MqPublishPoint queue;
private final String name;
private boolean isStopped;
@@ -62,7 +66,7 @@ public class Producer {
queue.put(msg);
} catch (InterruptedException e) {
// allow thread to exit
- System.err.println(e);
+ LOGGER.error("Exception caught.", e);
}
}
@@ -75,7 +79,7 @@ public class Producer {
queue.put(Message.POISON_PILL);
} catch (InterruptedException e) {
// allow thread to exit
- System.err.println(e);
+ LOGGER.error("Exception caught.", e);
}
}
}
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessage.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessage.java
index 3002449fd..4e665b44f 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessage.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessage.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
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java
index 6f45742e9..ac961e706 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.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
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/AppTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/AppTest.java
index 5d1494004..8c15bcf0f 100644
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/AppTest.java
+++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/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
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java
index 01a5dfaa6..17bd4f89e 100644
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java
+++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.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,19 +22,38 @@
*/
package com.iluwatar.poison.pill;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.mockito.InOrder;
+import org.slf4j.LoggerFactory;
import java.time.LocalDateTime;
+import java.util.LinkedList;
+import java.util.List;
-import static org.mockito.Mockito.inOrder;
+import static org.junit.Assert.assertTrue;
/**
* Date: 12/27/15 - 9:45 PM
*
* @author Jeroen Meulemeester
*/
-public class ConsumerTest extends StdOutTest {
+public class ConsumerTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(Consumer.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
@Test
public void testConsume() throws Exception {
@@ -52,12 +71,9 @@ public class ConsumerTest extends StdOutTest {
new Consumer("NSA", queue).consume();
- final InOrder inOrder = inOrder(getStdOutMock());
- inOrder.verify(getStdOutMock()).println("Message [Hello!] from [you] received by [NSA]");
- inOrder.verify(getStdOutMock()).println("Message [Hi!] from [me] received by [NSA]");
- inOrder.verify(getStdOutMock()).println("Consumer NSA receive request to terminate.");
- inOrder.verifyNoMoreInteractions();
-
+ assertTrue(appender.logContains("Message [Hello!] from [you] received by [NSA]"));
+ assertTrue(appender.logContains("Message [Hi!] from [me] received by [NSA]"));
+ assertTrue(appender.logContains("Consumer NSA receive request to terminate."));
}
/**
@@ -75,4 +91,22 @@ public class ConsumerTest extends StdOutTest {
return msg;
}
-}
\ No newline at end of file
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public boolean logContains(String message) {
+ return log.stream().anyMatch(event -> event.getFormattedMessage().equals(message));
+ }
+ }
+
+}
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/PoisonMessageTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/PoisonMessageTest.java
index 4593c0822..b15005695 100644
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/PoisonMessageTest.java
+++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/PoisonMessageTest.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
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java
index eec79edd1..7b5982a3d 100644
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java
+++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.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
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/SimpleMessageTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/SimpleMessageTest.java
index 0fc4ef036..2b0b3bd17 100644
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/SimpleMessageTest.java
+++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/SimpleMessageTest.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
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/StdOutTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/StdOutTest.java
deleted file mode 100644
index f1b3c4840..000000000
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/StdOutTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.poison.pill;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/pom.xml b/pom.xml
index b8440f664..52f24a500 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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
in the Software without restriction, including without limitation the rights
@@ -17,9 +17,7 @@
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.
--->
-<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">
+--><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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.iluwatar</groupId>
<artifactId>java-design-patterns</artifactId>
@@ -38,16 +36,17 @@
<jacoco.version>0.7.2.201409121644</jacoco.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<camel.version>2.16.1</camel.version>
- <log4j.version>1.2.17</log4j.version>
<guava.version>19.0</guava.version>
<systemrules.version>1.15.1</systemrules.version>
<mockito.version>1.10.19</mockito.version>
<hierarchical-junit-runner-version>4.12.1</hierarchical-junit-runner-version>
<apache-httpcomponents.version>4.5.2</apache-httpcomponents.version>
<htmlunit.version>2.22</htmlunit.version>
- <urm.version>1.4.1</urm.version>
+ <urm.version>1.4.4</urm.version>
<guice.version>4.0</guice.version>
<mongo-java-driver.version>3.3.0</mongo-java-driver.version>
+ <slf4j.version>1.7.21</slf4j.version>
+ <logback.version>1.1.7</logback.version>
</properties>
<modules>
<module>abstract-factory</module>
@@ -122,6 +121,7 @@
<module>factory-kit</module>
<module>feature-toggle</module>
<module>value-object</module>
+ <module>module</module>
<module>monad</module>
<module>mute-idiom</module>
<module>mutex</module>
@@ -132,7 +132,9 @@
<module>promise</module>
<module>page-object</module>
<module>event-asynchronous</module>
- </modules>
+ <module>queue-load-leveling</module>
+ <module>object-mother</module>
+ </modules>
<dependencyManagement>
<dependencies>
@@ -210,11 +212,6 @@
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -251,6 +248,23 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ </dependencies>
<build>
<pluginManagement>
@@ -298,7 +312,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -452,4 +466,4 @@
</plugins>
</reporting>
-</project>
+</project>
\ No newline at end of file
diff --git a/private-class-data/etc/private-class-data.urm.puml b/private-class-data/etc/private-class-data.urm.puml
index ad35c0bdd..990b53342 100644
--- a/private-class-data/etc/private-class-data.urm.puml
+++ b/private-class-data/etc/private-class-data.urm.puml
@@ -1,5 +1,25 @@
@startuml
package com.iluwatar.privateclassdata {
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
+ class ImmutableStew {
+ - LOGGER : Logger {static}
+ - data : StewData
+ + ImmutableStew(numPotatoes : int, numCarrots : int, numMeat : int, numPeppers : int)
+ + mix()
+ }
+ class Stew {
+ - LOGGER : Logger {static}
+ - numCarrots : int
+ - numMeat : int
+ - numPeppers : int
+ - numPotatoes : int
+ + Stew(numPotatoes : int, numCarrots : int, numMeat : int, numPeppers : int)
+ + mix()
+ + taste()
+ }
class StewData {
- numCarrots : int
- numMeat : int
@@ -11,24 +31,6 @@ package com.iluwatar.privateclassdata {
+ getNumPeppers() : int
+ getNumPotatoes() : int
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
- class Stew {
- - numCarrots : int
- - numMeat : int
- - numPeppers : int
- - numPotatoes : int
- + Stew(numPotatoes : int, numCarrots : int, numMeat : int, numPeppers : int)
- + mix()
- + taste()
- }
- class ImmutableStew {
- - data : StewData
- + ImmutableStew(numPotatoes : int, numCarrots : int, numMeat : int, numPeppers : int)
- + mix()
- }
}
ImmutableStew --> "-data" StewData
@enduml
\ No newline at end of file
diff --git a/private-class-data/pom.xml b/private-class-data/pom.xml
index 1dc545cb1..11fc40d4b 100644
--- a/private-class-data/pom.xml
+++ b/private-class-data/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
diff --git a/private-class-data/src/main/java/com/iluwatar/privateclassdata/App.java b/private-class-data/src/main/java/com/iluwatar/privateclassdata/App.java
index 7a58fc6f3..37ad524c8 100644
--- a/private-class-data/src/main/java/com/iluwatar/privateclassdata/App.java
+++ b/private-class-data/src/main/java/com/iluwatar/privateclassdata/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
diff --git a/private-class-data/src/main/java/com/iluwatar/privateclassdata/ImmutableStew.java b/private-class-data/src/main/java/com/iluwatar/privateclassdata/ImmutableStew.java
index b9d2ad09c..3ad4ee351 100644
--- a/private-class-data/src/main/java/com/iluwatar/privateclassdata/ImmutableStew.java
+++ b/private-class-data/src/main/java/com/iluwatar/privateclassdata/ImmutableStew.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.privateclassdata;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Immutable stew class, protected with Private Class Data pattern
@@ -29,6 +32,8 @@ package com.iluwatar.privateclassdata;
*/
public class ImmutableStew {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ImmutableStew.class);
+
private StewData data;
public ImmutableStew(int numPotatoes, int numCarrots, int numMeat, int numPeppers) {
@@ -39,8 +44,7 @@ public class ImmutableStew {
* Mix the stew
*/
public void mix() {
- System.out.println(String.format(
- "Mixing the immutable stew we find: %d potatoes, %d carrots, %d meat and %d peppers",
- data.getNumPotatoes(), data.getNumCarrots(), data.getNumMeat(), data.getNumPeppers()));
+ LOGGER.info("Mixing the immutable stew we find: {} potatoes, {} carrots, {} meat and {} peppers",
+ data.getNumPotatoes(), data.getNumCarrots(), data.getNumMeat(), data.getNumPeppers());
}
}
diff --git a/private-class-data/src/main/java/com/iluwatar/privateclassdata/Stew.java b/private-class-data/src/main/java/com/iluwatar/privateclassdata/Stew.java
index 9c9033018..b08a409c4 100644
--- a/private-class-data/src/main/java/com/iluwatar/privateclassdata/Stew.java
+++ b/private-class-data/src/main/java/com/iluwatar/privateclassdata/Stew.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.privateclassdata;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Mutable stew class
@@ -29,6 +32,8 @@ package com.iluwatar.privateclassdata;
*/
public class Stew {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Stew.class);
+
private int numPotatoes;
private int numCarrots;
private int numMeat;
@@ -48,16 +53,15 @@ public class Stew {
* Mix the stew
*/
public void mix() {
- System.out.println(String.format(
- "Mixing the stew we find: %d potatoes, %d carrots, %d meat and %d peppers", numPotatoes,
- numCarrots, numMeat, numPeppers));
+ LOGGER.info("Mixing the stew we find: {} potatoes, {} carrots, {} meat and {} peppers",
+ numPotatoes, numCarrots, numMeat, numPeppers);
}
/**
* Taste the stew
*/
public void taste() {
- System.out.println("Tasting the stew");
+ LOGGER.info("Tasting the stew");
if (numPotatoes > 0) {
numPotatoes--;
}
diff --git a/private-class-data/src/main/java/com/iluwatar/privateclassdata/StewData.java b/private-class-data/src/main/java/com/iluwatar/privateclassdata/StewData.java
index 06c0b8c39..636d3a36c 100644
--- a/private-class-data/src/main/java/com/iluwatar/privateclassdata/StewData.java
+++ b/private-class-data/src/main/java/com/iluwatar/privateclassdata/StewData.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
diff --git a/private-class-data/src/test/java/com/iluwatar/privateclassdata/AppTest.java b/private-class-data/src/test/java/com/iluwatar/privateclassdata/AppTest.java
index 2625c4906..ef80e87cb 100644
--- a/private-class-data/src/test/java/com/iluwatar/privateclassdata/AppTest.java
+++ b/private-class-data/src/test/java/com/iluwatar/privateclassdata/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
diff --git a/private-class-data/src/test/java/com/iluwatar/privateclassdata/ImmutableStewTest.java b/private-class-data/src/test/java/com/iluwatar/privateclassdata/ImmutableStewTest.java
index 58867d303..6e337e584 100644
--- a/private-class-data/src/test/java/com/iluwatar/privateclassdata/ImmutableStewTest.java
+++ b/private-class-data/src/test/java/com/iluwatar/privateclassdata/ImmutableStewTest.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,18 +22,31 @@
*/
package com.iluwatar.privateclassdata;
+import com.iluwatar.privateclassdata.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.mockito.InOrder;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.verify;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/27/15 - 10:46 PM
*
* @author Jeroen Meulemeester
*/
-public class ImmutableStewTest extends StdOutTest {
+public class ImmutableStewTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* Verify if mixing the stew doesn't change the internal state
@@ -41,15 +54,14 @@ public class ImmutableStewTest extends StdOutTest {
@Test
public void testMix() {
final Stew stew = new Stew(1, 2, 3, 4);
- final String message = "Mixing the stew we find: 1 potatoes, 2 carrots, 3 meat and 4 peppers";
+ final String expectedMessage = "Mixing the stew we find: 1 potatoes, 2 carrots, 3 meat and 4 peppers";
- final InOrder inOrder = inOrder(getStdOutMock());
for (int i = 0; i < 20; i++) {
stew.mix();
- inOrder.verify(getStdOutMock()).println(message);
+ assertEquals(expectedMessage, appender.getLastMessage());
}
- inOrder.verifyNoMoreInteractions();
+ assertEquals(20, appender.getLogSize());
}
/**
@@ -60,15 +72,12 @@ public class ImmutableStewTest extends StdOutTest {
final Stew stew = new Stew(1, 2, 3, 4);
stew.mix();
- verify(getStdOutMock())
- .println("Mixing the stew we find: 1 potatoes, 2 carrots, 3 meat and 4 peppers");
+ assertEquals("Mixing the stew we find: 1 potatoes, 2 carrots, 3 meat and 4 peppers", appender.getLastMessage());
stew.taste();
- verify(getStdOutMock()).println("Tasting the stew");
+ assertEquals("Tasting the stew", appender.getLastMessage());
stew.mix();
- verify(getStdOutMock())
- .println("Mixing the stew we find: 0 potatoes, 1 carrots, 2 meat and 3 peppers");
-
+ assertEquals("Mixing the stew we find: 0 potatoes, 1 carrots, 2 meat and 3 peppers", appender.getLastMessage());
}
-}
\ No newline at end of file
+}
diff --git a/private-class-data/src/test/java/com/iluwatar/privateclassdata/StdOutTest.java b/private-class-data/src/test/java/com/iluwatar/privateclassdata/StdOutTest.java
deleted file mode 100644
index f90551020..000000000
--- a/private-class-data/src/test/java/com/iluwatar/privateclassdata/StdOutTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.privateclassdata;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java b/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java
index a894e4ae0..6ac5b834f 100644
--- a/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java
+++ b/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.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,17 +22,31 @@
*/
package com.iluwatar.privateclassdata;
+import com.iluwatar.privateclassdata.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.mockito.InOrder;
-import static org.mockito.Mockito.inOrder;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/27/15 - 10:46 PM
*
* @author Jeroen Meulemeester
*/
-public class StewTest extends StdOutTest {
+public class StewTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* Verify if mixing the stew doesn't change the internal state
@@ -43,13 +57,12 @@ public class StewTest extends StdOutTest {
final String expectedMessage = "Mixing the immutable stew we find: 1 potatoes, "
+ "2 carrots, 3 meat and 4 peppers";
- final InOrder inOrder = inOrder(getStdOutMock());
for (int i = 0; i < 20; i++) {
stew.mix();
- inOrder.verify(getStdOutMock()).println(expectedMessage);
+ assertEquals(expectedMessage, appender.getLastMessage());
}
- inOrder.verifyNoMoreInteractions();
+ assertEquals(20, appender.getLogSize());
}
-}
\ No newline at end of file
+}
diff --git a/private-class-data/src/test/java/com/iluwatar/privateclassdata/utils/InMemoryAppender.java b/private-class-data/src/test/java/com/iluwatar/privateclassdata/utils/InMemoryAppender.java
new file mode 100644
index 000000000..37a5458b5
--- /dev/null
+++ b/private-class-data/src/test/java/com/iluwatar/privateclassdata/utils/InMemoryAppender.java
@@ -0,0 +1,53 @@
+/**
+ * The MIT License
+ * 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
+ * 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.privateclassdata.utils;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+}
diff --git a/producer-consumer/etc/producer-consumer.urm.puml b/producer-consumer/etc/producer-consumer.urm.puml
index 8b793d75b..05539a55e 100644
--- a/producer-consumer/etc/producer-consumer.urm.puml
+++ b/producer-consumer/etc/producer-consumer.urm.puml
@@ -1,6 +1,12 @@
@startuml
package com.iluwatar.producer.consumer {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
class Consumer {
+ - LOGGER : Logger {static}
- name : String
- queue : ItemQueue
+ Consumer(name : String, queue : ItemQueue)
@@ -13,9 +19,11 @@ package com.iluwatar.producer.consumer {
+ getId() : int
+ getProducer() : String
}
- class App {
- + App()
- + main(args : String[]) {static}
+ class ItemQueue {
+ - queue : BlockingQueue<Item>
+ + ItemQueue()
+ + put(item : Item)
+ + take() : Item
}
class Producer {
- itemId : int
@@ -24,12 +32,6 @@ package com.iluwatar.producer.consumer {
+ Producer(name : String, queue : ItemQueue)
+ produce()
}
- class ItemQueue {
- - queue : BlockingQueue<Item>
- + ItemQueue()
- + put(item : Item)
- + take() : Item
- }
}
Consumer --> "-queue" ItemQueue
Producer --> "-queue" ItemQueue
diff --git a/producer-consumer/pom.xml b/producer-consumer/pom.xml
index 5ac018f51..66f3de208 100644
--- a/producer-consumer/pom.xml
+++ b/producer-consumer/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
diff --git a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/App.java b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/App.java
index 42f6dfa79..8ee4340d2 100644
--- a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/App.java
+++ b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/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.producer.consumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -37,6 +40,8 @@ import java.util.concurrent.TimeUnit;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -72,7 +77,7 @@ public class App {
executorService.awaitTermination(10, TimeUnit.SECONDS);
executorService.shutdownNow();
} catch (InterruptedException e) {
- System.out.println("Error waiting for ExecutorService shutdown");
+ LOGGER.error("Error waiting for ExecutorService shutdown");
}
}
}
diff --git a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Consumer.java b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Consumer.java
index f1fa920f3..7fe79089e 100644
--- a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Consumer.java
+++ b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Consumer.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,11 +22,16 @@
*/
package com.iluwatar.producer.consumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Class responsible for consume the {@link Item} produced by {@link Producer}
*/
public class Consumer {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Consumer.class);
+
private final ItemQueue queue;
private final String name;
@@ -42,8 +47,7 @@ public class Consumer {
public void consume() throws InterruptedException {
Item item = queue.take();
- System.out.println(String.format("Consumer [%s] consume item [%s] produced by [%s]", name,
- item.getId(), item.getProducer()));
+ LOGGER.info("Consumer [{}] consume item [{}] produced by [{}]", name, item.getId(), item.getProducer());
}
}
diff --git a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Item.java b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Item.java
index 4bf66e599..2d4c5df48 100644
--- a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Item.java
+++ b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Item.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
diff --git a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/ItemQueue.java b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/ItemQueue.java
index ea925152b..b81285a63 100644
--- a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/ItemQueue.java
+++ b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/ItemQueue.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
diff --git a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Producer.java b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Producer.java
index 587614dc8..0ff27e4d2 100644
--- a/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Producer.java
+++ b/producer-consumer/src/main/java/com/iluwatar/producer/consumer/Producer.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
diff --git a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/AppTest.java b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/AppTest.java
index fcc6509a8..e7f7870f7 100644
--- a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/AppTest.java
+++ b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/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
diff --git a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java
index 2ca547a0b..4c110cad2 100644
--- a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java
+++ b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.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
@@ -23,18 +23,15 @@
package com.iluwatar.producer.consumer;
import org.junit.Test;
-import org.mockito.InOrder;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.*;
/**
* Date: 12/27/15 - 11:01 PM
*
* @author Jeroen Meulemeester
*/
-public class ConsumerTest extends StdOutTest {
+public class ConsumerTest {
private static final int ITEM_COUNT = 5;
@@ -48,14 +45,11 @@ public class ConsumerTest extends StdOutTest {
reset(queue); // Don't count the preparation above as interactions with the queue
final Consumer consumer = new Consumer("consumer", queue);
- final InOrder inOrder = inOrder(getStdOutMock());
for (int id = 0; id < ITEM_COUNT; id++) {
consumer.consume();
- inOrder.verify(getStdOutMock())
- .println("Consumer [consumer] consume item [" + id + "] produced by [producer]");
}
- inOrder.verifyNoMoreInteractions();
+ verify(queue, times(ITEM_COUNT)).take();
}
}
diff --git a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java
index 94765268b..5f756c938 100644
--- a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java
+++ b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.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
diff --git a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/StdOutTest.java b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/StdOutTest.java
deleted file mode 100644
index 1e1c41f75..000000000
--- a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/StdOutTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.producer.consumer;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/promise/etc/promise.urm.puml b/promise/etc/promise.urm.puml
index cd6e73252..9c6d09cde 100644
--- a/promise/etc/promise.urm.puml
+++ b/promise/etc/promise.urm.puml
@@ -1,5 +1,49 @@
@startuml
package com.iluwatar.promise {
+ class App {
+ - DEFAULT_URL : String {static}
+ - LOGGER : Logger {static}
+ - executor : ExecutorService
+ - stopLatch : CountDownLatch
+ - App()
+ - calculateLineCount()
+ - calculateLowestFrequencyChar()
+ - characterFrequency() : Promise<Map<Character, Integer>>
+ - countLines() : Promise<Integer>
+ - download(urlString : String) : Promise<String>
+ - lowestFrequencyChar() : Promise<Character>
+ + main(args : String[]) {static}
+ - promiseUsage()
+ - stop()
+ - taskCompleted()
+ }
+ class Promise<T> {
+ - exceptionHandler : Consumer<? super Throwable>
+ - fulfillmentAction : Runnable
+ + Promise<T>()
+ + fulfill(value : T)
+ + fulfillExceptionally(exception : Exception)
+ + fulfillInAsync(task : Callable<T>, executor : Executor) : Promise<T>
+ - handleException(exception : Exception)
+ + onError(exceptionHandler : Consumer<? super Throwable>) : Promise<T>
+ - postFulfillment()
+ + thenAccept(action : Consumer<? super T>) : Promise<Void>
+ + thenApply(func : Function<? super T, V>) : Promise<V>
+ }
+ -class ConsumeAction {
+ - action : Consumer<? super T>
+ - dest : Promise<Void>
+ - src : Promise<T>
+ - ConsumeAction(src : Promise<T>, dest : Promise<T>, action : Consumer<T>)
+ + run()
+ }
+ -class TransformAction<V> {
+ - dest : Promise<V>
+ - func : Function<? super T, V>
+ - src : Promise<T>
+ - TransformAction<V>(src : Promise<T>, dest : Promise<T>, func : Function<T, R>)
+ + run()
+ }
~class PromiseSupport<T> {
- COMPLETED : int {static}
- FAILED : int {static}
@@ -17,50 +61,8 @@ package com.iluwatar.promise {
+ isCancelled() : boolean
+ isDone() : boolean
}
- -class ConsumeAction {
- - action : Consumer<? super T>
- - dest : Promise<Void>
- - src : Promise<T>
- - ConsumeAction(src : Promise<T>, dest : Promise<T>, action : Consumer<T>)
- + run()
- }
- class Promise<T> {
- - exceptionHandler : Consumer<? super Throwable>
- - fulfillmentAction : Runnable
- + Promise<T>()
- + fulfill(value : T)
- + fulfillExceptionally(exception : Exception)
- + fulfillInAsync(task : Callable<T>, executor : Executor) : Promise<T>
- - handleException(exception : Exception)
- + onError(exceptionHandler : Consumer<? super Throwable>) : Promise<T>
- - postFulfillment()
- + thenAccept(action : Consumer<? super T>) : Promise<Void>
- + thenApply(func : Function<? super T, V>) : Promise<V>
- }
- class App {
- - DEFAULT_URL : String {static}
- - executor : ExecutorService
- - stopLatch : CountDownLatch
- - App()
- - calculateLineCount()
- - calculateLowestFrequencyChar()
- - characterFrequency() : Promise<Map<Character, Integer>>
- - countLines() : Promise<Integer>
- - download(urlString : String) : Promise<String>
- - lowestFrequencyChar() : Promise<Character>
- + main(args : String[]) {static}
- - promiseUsage()
- - stop()
- - taskCompleted()
- }
- -class TransformAction<V> {
- - dest : Promise<V>
- - func : Function<? super T, V>
- - src : Promise<T>
- - TransformAction<V>(src : Promise<T>, dest : Promise<T>, func : Function<T, R>)
- + run()
- }
class Utility {
+ - LOGGER : Logger {static}
+ Utility()
+ characterFrequency(fileLocation : String) : Map<Character, Integer> {static}
+ countLines(fileLocation : String) : Integer {static}
@@ -68,10 +70,9 @@ package com.iluwatar.promise {
+ lowestFrequencyChar(charFrequency : Map<Character, Integer>) : Character {static}
}
}
-TransformAction --+ Promise
TransformAction --> "-src" Promise
-ConsumeAction --+ Promise
+TransformAction --+ Promise
ConsumeAction --> "-src" Promise
-Utility --+ Map
+ConsumeAction --+ Promise
Promise --|> PromiseSupport
@enduml
\ No newline at end of file
diff --git a/promise/pom.xml b/promise/pom.xml
index 30a719f13..cc2d9ea42 100644
--- a/promise/pom.xml
+++ b/promise/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
diff --git a/promise/src/main/java/com/iluwatar/promise/App.java b/promise/src/main/java/com/iluwatar/promise/App.java
index 672c20bfa..df4d0cc79 100644
--- a/promise/src/main/java/com/iluwatar/promise/App.java
+++ b/promise/src/main/java/com/iluwatar/promise/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
@@ -21,6 +21,9 @@
* THE SOFTWARE.
*/
package com.iluwatar.promise;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
@@ -60,6 +63,8 @@ import java.util.concurrent.Executors;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
private static final String DEFAULT_URL = "https://raw.githubusercontent.com/iluwatar/java-design-patterns/Promise/promise/README.md";
private final ExecutorService executor;
private final CountDownLatch stopLatch;
@@ -98,7 +103,7 @@ public class App {
lowestFrequencyChar()
.thenAccept(
charFrequency -> {
- System.out.println("Char with lowest frequency is: " + charFrequency);
+ LOGGER.info("Char with lowest frequency is: {}", charFrequency);
taskCompleted();
}
);
@@ -112,7 +117,7 @@ public class App {
countLines()
.thenAccept(
count -> {
- System.out.println("Line count is: " + count);
+ LOGGER.info("Line count is: {}", count);
taskCompleted();
}
);
diff --git a/promise/src/main/java/com/iluwatar/promise/Promise.java b/promise/src/main/java/com/iluwatar/promise/Promise.java
index e7e56837b..6b321e196 100644
--- a/promise/src/main/java/com/iluwatar/promise/Promise.java
+++ b/promise/src/main/java/com/iluwatar/promise/Promise.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
diff --git a/promise/src/main/java/com/iluwatar/promise/PromiseSupport.java b/promise/src/main/java/com/iluwatar/promise/PromiseSupport.java
index 048586e23..3629b4b5d 100644
--- a/promise/src/main/java/com/iluwatar/promise/PromiseSupport.java
+++ b/promise/src/main/java/com/iluwatar/promise/PromiseSupport.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
diff --git a/promise/src/main/java/com/iluwatar/promise/Utility.java b/promise/src/main/java/com/iluwatar/promise/Utility.java
index d451600a3..525cda338 100644
--- a/promise/src/main/java/com/iluwatar/promise/Utility.java
+++ b/promise/src/main/java/com/iluwatar/promise/Utility.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.promise;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -38,6 +41,8 @@ import java.util.Map.Entry;
public class Utility {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Utility.class);
+
/**
* Calculates character frequency of the file provided.
* @param fileLocation location of the file.
@@ -104,7 +109,7 @@ public class Utility {
* @return the absolute path of the file downloaded.
*/
public static String downloadFile(String urlString) throws MalformedURLException, IOException {
- System.out.println("Downloading contents from url: " + urlString);
+ LOGGER.info("Downloading contents from url: {}", urlString);
URL url = new URL(urlString);
File file = File.createTempFile("promise_pattern", null);
try (Reader reader = new InputStreamReader(url.openStream());
@@ -114,7 +119,7 @@ public class Utility {
writer.write(line);
writer.write("\n");
}
- System.out.println("File downloaded at: " + file.getAbsolutePath());
+ LOGGER.info("File downloaded at: {}", file.getAbsolutePath());
return file.getAbsolutePath();
} catch (IOException ex) {
throw ex;
diff --git a/promise/src/test/java/com/iluwatar/promise/AppTest.java b/promise/src/test/java/com/iluwatar/promise/AppTest.java
index 1d1cb061d..f7df415e8 100644
--- a/promise/src/test/java/com/iluwatar/promise/AppTest.java
+++ b/promise/src/test/java/com/iluwatar/promise/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
diff --git a/promise/src/test/java/com/iluwatar/promise/PromiseTest.java b/promise/src/test/java/com/iluwatar/promise/PromiseTest.java
index 45c4c1d36..6e17b9794 100644
--- a/promise/src/test/java/com/iluwatar/promise/PromiseTest.java
+++ b/promise/src/test/java/com/iluwatar/promise/PromiseTest.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
diff --git a/property/etc/property.urm.puml b/property/etc/property.urm.puml
index 6ff0e5c52..f281cd873 100644
--- a/property/etc/property.urm.puml
+++ b/property/etc/property.urm.puml
@@ -1,15 +1,10 @@
@startuml
package com.iluwatar.property {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
- interface Prototype {
- + get(Stats) : Integer {abstract}
- + has(Stats) : boolean {abstract}
- + remove(Stats) {abstract}
- + set(Stats, Integer) {abstract}
- }
class Character {
- name : String
- properties : Map<Stats, Integer>
@@ -33,6 +28,12 @@ package com.iluwatar.property {
+ valueOf(name : String) : Type {static}
+ values() : Type[] {static}
}
+ interface Prototype {
+ + get(Stats) : Integer {abstract}
+ + has(Stats) : boolean {abstract}
+ + remove(Stats) {abstract}
+ + set(Stats, Integer) {abstract}
+ }
enum Stats {
+ AGILITY {static}
+ ARMOR {static}
@@ -46,9 +47,8 @@ package com.iluwatar.property {
+ values() : Stats[] {static}
}
}
-App --+ Character
Character --> "-prototype" Prototype
-Character --> "-type" Type
Type ..+ Character
+Character --> "-type" Type
Character ..|> Prototype
@enduml
\ No newline at end of file
diff --git a/property/pom.xml b/property/pom.xml
index af0c9f288..3842cfed7 100644
--- a/property/pom.xml
+++ b/property/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
diff --git a/property/src/main/java/com/iluwatar/property/App.java b/property/src/main/java/com/iluwatar/property/App.java
index e3f7cc92b..2fd35689c 100644
--- a/property/src/main/java/com/iluwatar/property/App.java
+++ b/property/src/main/java/com/iluwatar/property/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
@@ -23,6 +23,8 @@
package com.iluwatar.property;
import com.iluwatar.property.Character.Type;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -39,6 +41,8 @@ import com.iluwatar.property.Character.Type;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -67,16 +71,16 @@ public class App {
/* usage */
Character mag = new Character("Player_1", mageProto);
mag.set(Stats.ARMOR, 8);
- System.out.println(mag);
+ LOGGER.info(mag.toString());
Character warrior = new Character("Player_2", warProto);
- System.out.println(warrior);
+ LOGGER.info(warrior.toString());
Character rogue = new Character("Player_3", rogueProto);
- System.out.println(rogue);
+ LOGGER.info(rogue.toString());
Character rogueDouble = new Character("Player_4", rogue);
rogueDouble.set(Stats.ATTACK_POWER, 12);
- System.out.println(rogueDouble);
+ LOGGER.info(rogueDouble.toString());
}
}
diff --git a/property/src/main/java/com/iluwatar/property/Character.java b/property/src/main/java/com/iluwatar/property/Character.java
index 6a45d16b2..db5de2b64 100644
--- a/property/src/main/java/com/iluwatar/property/Character.java
+++ b/property/src/main/java/com/iluwatar/property/Character.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
diff --git a/property/src/main/java/com/iluwatar/property/Prototype.java b/property/src/main/java/com/iluwatar/property/Prototype.java
index e21e98384..0c03e52cd 100644
--- a/property/src/main/java/com/iluwatar/property/Prototype.java
+++ b/property/src/main/java/com/iluwatar/property/Prototype.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
diff --git a/property/src/main/java/com/iluwatar/property/Stats.java b/property/src/main/java/com/iluwatar/property/Stats.java
index 0c29c36f7..8f47924f1 100644
--- a/property/src/main/java/com/iluwatar/property/Stats.java
+++ b/property/src/main/java/com/iluwatar/property/Stats.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
diff --git a/property/src/test/java/com/iluwatar/property/AppTest.java b/property/src/test/java/com/iluwatar/property/AppTest.java
index 131742822..08e0dbba1 100644
--- a/property/src/test/java/com/iluwatar/property/AppTest.java
+++ b/property/src/test/java/com/iluwatar/property/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
diff --git a/property/src/test/java/com/iluwatar/property/CharacterTest.java b/property/src/test/java/com/iluwatar/property/CharacterTest.java
index 859ea5f86..5dc996f4d 100644
--- a/property/src/test/java/com/iluwatar/property/CharacterTest.java
+++ b/property/src/test/java/com/iluwatar/property/CharacterTest.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
diff --git a/prototype/etc/prototype.urm.puml b/prototype/etc/prototype.urm.puml
index 7ab26dd1b..801679fb7 100644
--- a/prototype/etc/prototype.urm.puml
+++ b/prototype/etc/prototype.urm.puml
@@ -1,55 +1,33 @@
@startuml
package com.iluwatar.prototype {
- class OrcWarlord {
- + OrcWarlord()
- + clone() : Warlord
- + toString() : String
- }
- class OrcBeast {
- + OrcBeast()
- + clone() : Beast
- + toString() : String
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
}
abstract class Beast {
+ Beast()
+ clone() : Beast {abstract}
}
- class ElfMage {
- + ElfMage()
- + clone() : Mage
- + toString() : String
- }
- abstract class Mage {
- + Mage()
- + clone() : Mage {abstract}
- }
- abstract class Prototype {
- + Prototype()
- + clone() : Object {abstract}
- }
- interface HeroFactory {
- + createBeast() : Beast {abstract}
- + createMage() : Mage {abstract}
- + createWarlord() : Warlord {abstract}
- }
- class ElfWarlord {
- + ElfWarlord()
- + clone() : Warlord
- + toString() : String
- }
- class OrcMage {
- + OrcMage()
- + clone() : Mage
- + toString() : String
- }
class ElfBeast {
+ ElfBeast()
+ clone() : Beast
+ toString() : String
}
- abstract class Warlord {
- + Warlord()
- + clone() : Warlord {abstract}
+ class ElfMage {
+ + ElfMage()
+ + clone() : Mage
+ + toString() : String
+ }
+ class ElfWarlord {
+ + ElfWarlord()
+ + clone() : Warlord
+ + toString() : String
+ }
+ interface HeroFactory {
+ + createBeast() : Beast {abstract}
+ + createMage() : Mage {abstract}
+ + createWarlord() : Warlord {abstract}
}
class HeroFactoryImpl {
- beast : Beast
@@ -60,22 +38,45 @@ package com.iluwatar.prototype {
+ createMage() : Mage
+ createWarlord() : Warlord
}
- class App {
- + App()
- + main(args : String[]) {static}
+ abstract class Mage {
+ + Mage()
+ + clone() : Mage {abstract}
+ }
+ class OrcBeast {
+ + OrcBeast()
+ + clone() : Beast
+ + toString() : String
+ }
+ class OrcMage {
+ + OrcMage()
+ + clone() : Mage
+ + toString() : String
+ }
+ class OrcWarlord {
+ + OrcWarlord()
+ + clone() : Warlord
+ + toString() : String
+ }
+ abstract class Prototype {
+ + Prototype()
+ + clone() : Object {abstract}
+ }
+ abstract class Warlord {
+ + Warlord()
+ + clone() : Warlord {abstract}
}
}
HeroFactoryImpl --> "-beast" Beast
HeroFactoryImpl --> "-warlord" Warlord
HeroFactoryImpl --> "-mage" Mage
-OrcWarlord --|> Warlord
-OrcBeast --|> Beast
Beast --|> Prototype
-ElfMage --|> Mage
-Mage --|> Prototype
-ElfWarlord --|> Warlord
-OrcMage --|> Mage
ElfBeast --|> Beast
-Warlord --|> Prototype
+ElfMage --|> Mage
+ElfWarlord --|> Warlord
HeroFactoryImpl ..|> HeroFactory
+Mage --|> Prototype
+OrcBeast --|> Beast
+OrcMage --|> Mage
+OrcWarlord --|> Warlord
+Warlord --|> Prototype
@enduml
\ No newline at end of file
diff --git a/prototype/pom.xml b/prototype/pom.xml
index d0c03c0b6..5093e9715 100644
--- a/prototype/pom.xml
+++ b/prototype/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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/App.java b/prototype/src/main/java/com/iluwatar/prototype/App.java
index cb04ec5f2..dfebdab17 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/App.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/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.prototype;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* The Prototype pattern is a creational design pattern in software development. It is used when the
@@ -36,6 +39,8 @@ package com.iluwatar.prototype;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -51,16 +56,16 @@ public class App {
mage = factory.createMage();
warlord = factory.createWarlord();
beast = factory.createBeast();
- System.out.println(mage);
- System.out.println(warlord);
- System.out.println(beast);
+ LOGGER.info(mage.toString());
+ LOGGER.info(warlord.toString());
+ LOGGER.info(beast.toString());
factory = new HeroFactoryImpl(new OrcMage(), new OrcWarlord(), new OrcBeast());
mage = factory.createMage();
warlord = factory.createWarlord();
beast = factory.createBeast();
- System.out.println(mage);
- System.out.println(warlord);
- System.out.println(beast);
+ LOGGER.info(mage.toString());
+ LOGGER.info(warlord.toString());
+ LOGGER.info(beast.toString());
}
}
diff --git a/prototype/src/main/java/com/iluwatar/prototype/Beast.java b/prototype/src/main/java/com/iluwatar/prototype/Beast.java
index 255f44de5..fc81ac4e6 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/Beast.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/Beast.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java b/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java
index 1fd7d00fa..11783611e 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java b/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java
index 823150ec4..5ddefcdf5 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/ElfMage.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java b/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java
index 03ff81ecf..d0dfde1db 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/HeroFactory.java b/prototype/src/main/java/com/iluwatar/prototype/HeroFactory.java
index c152ae3e8..cb11c9fe6 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/HeroFactory.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/HeroFactory.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java b/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java
index ba173d9bc..4f05bb843 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/Mage.java b/prototype/src/main/java/com/iluwatar/prototype/Mage.java
index 3151fc915..361b586b2 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/Mage.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/Mage.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java b/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java
index 8be1e0b93..212888fb4 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java b/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java
index 3aedc1ca1..c15143bbb 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/OrcMage.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java b/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java
index 1cd4e72b7..e9f7c6cd4 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/Prototype.java b/prototype/src/main/java/com/iluwatar/prototype/Prototype.java
index bf7980c4d..10d8b66eb 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/Prototype.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/Prototype.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
diff --git a/prototype/src/main/java/com/iluwatar/prototype/Warlord.java b/prototype/src/main/java/com/iluwatar/prototype/Warlord.java
index 72b2cfa80..aef8676f4 100644
--- a/prototype/src/main/java/com/iluwatar/prototype/Warlord.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/Warlord.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
diff --git a/prototype/src/test/java/com/iluwatar/prototype/AppTest.java b/prototype/src/test/java/com/iluwatar/prototype/AppTest.java
index 4b06f957c..48c70429a 100644
--- a/prototype/src/test/java/com/iluwatar/prototype/AppTest.java
+++ b/prototype/src/test/java/com/iluwatar/prototype/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
diff --git a/prototype/src/test/java/com/iluwatar/prototype/HeroFactoryImplTest.java b/prototype/src/test/java/com/iluwatar/prototype/HeroFactoryImplTest.java
index 75a234a57..bee05bc5e 100644
--- a/prototype/src/test/java/com/iluwatar/prototype/HeroFactoryImplTest.java
+++ b/prototype/src/test/java/com/iluwatar/prototype/HeroFactoryImplTest.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
diff --git a/prototype/src/test/java/com/iluwatar/prototype/PrototypeTest.java b/prototype/src/test/java/com/iluwatar/prototype/PrototypeTest.java
index 071b4dd0d..c17d08772 100644
--- a/prototype/src/test/java/com/iluwatar/prototype/PrototypeTest.java
+++ b/prototype/src/test/java/com/iluwatar/prototype/PrototypeTest.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
diff --git a/proxy/README.md b/proxy/README.md
index a3cdbf788..ca63a6594 100644
--- a/proxy/README.md
+++ b/proxy/README.md
@@ -18,24 +18,24 @@ Surrogate
Provide a surrogate or placeholder for another object to control
access to it.
-
+
## Applicability
Proxy is applicable whenever there is a need for a more
versatile or sophisticated reference to an object than a simple pointer. Here
are several common situations in which the Proxy pattern is applicable
-* a remote proxy provides a local representative for an object in a different address space.
-* a virtual proxy creates expensive objects on demand.
-* a protection proxy controls access to the original object. Protection proxies are useful when objects should have different access rights.
+* Remote proxy provides a local representative for an object in a different address space.
+* Virtual proxy creates expensive objects on demand.
+* Protection proxy controls access to the original object. Protection proxies are useful when objects should have different access rights.
## Typical Use Case
-* control access to another object
-* lazy initialization
-* implement logging
-* facilitate network connection
-* to count references to an object
+* Control access to another object
+* Lazy initialization
+* Implement logging
+* Facilitate network connection
+* Count references to an object
## Real world examples
diff --git a/proxy/etc/proxy.png b/proxy/etc/proxy.png
index 64c61f1f2..300e58dd3 100644
Binary files a/proxy/etc/proxy.png and b/proxy/etc/proxy.png differ
diff --git a/proxy/etc/proxy.ucls b/proxy/etc/proxy.ucls
index f3906b688..76b5f0160 100644
--- a/proxy/etc/proxy.ucls
+++ b/proxy/etc/proxy.ucls
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
- realizations="true" associations="true" dependencies="false" nesting-relationships="true">
+<class-diagram version="1.1.11" icons="true" automaticImage="PNG" always-add-relationships="false"
+ generalizations="true" realizations="true" associations="true" dependencies="false" nesting-relationships="true"
+ router="FAN">
<class id="1" language="java" name="com.iluwatar.proxy.WizardTowerProxy" project="proxy"
file="/proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java" binary="false" corner="BOTTOM_RIGHT">
- <position height="142" width="214" x="260" y="438"/>
+ <position height="149" width="191" x="388" y="271"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
@@ -12,26 +13,56 @@
</class>
<class id="2" language="java" name="com.iluwatar.proxy.Wizard" project="proxy"
file="/proxy/src/main/java/com/iluwatar/proxy/Wizard.java" binary="false" corner="BOTTOM_RIGHT">
- <position height="124" width="117" x="187" y="274"/>
+ <position height="113" width="102" x="619" y="271"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
- <class id="3" language="java" name="com.iluwatar.proxy.WizardTower" project="proxy"
+ <interface id="3" language="java" name="com.iluwatar.proxy.WizardTower" project="proxy"
file="/proxy/src/main/java/com/iluwatar/proxy/WizardTower.java" binary="false" corner="BOTTOM_RIGHT">
- <position height="106" width="130" x="344" y="274"/>
+ <position height="77" width="116" x="388" y="460"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </interface>
+ <class id="4" language="java" name="com.iluwatar.proxy.IvoryTower" project="proxy"
+ file="/proxy/src/main/java/com/iluwatar/proxy/IvoryTower.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="113" width="116" x="761" y="271"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
- <generalization id="4">
+ <class id="5" language="java" name="com.iluwatar.proxy.App" project="proxy"
+ file="/proxy/src/main/java/com/iluwatar/proxy/App.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="95" width="114" x="917" y="271"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <association id="6">
+ <end type="SOURCE" refId="1" navigable="false">
+ <attribute id="7" name="tower"/>
+ <multiplicity id="8" minimum="0" maximum="1"/>
+ </end>
+ <end type="TARGET" refId="3" navigable="true"/>
+ <display labels="true" multiplicity="true"/>
+ </association>
+ <realization id="9">
+ <end type="SOURCE" refId="4"/>
+ <end type="TARGET" refId="3"/>
+ </realization>
+ <realization id="10">
<end type="SOURCE" refId="1"/>
<end type="TARGET" refId="3"/>
- </generalization>
+ </realization>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
diff --git a/proxy/etc/proxy.urm.puml b/proxy/etc/proxy.urm.puml
index 1dc58087c..ffe0fa446 100644
--- a/proxy/etc/proxy.urm.puml
+++ b/proxy/etc/proxy.urm.puml
@@ -1,24 +1,32 @@
@startuml
package com.iluwatar.proxy {
- class WizardTowerProxy {
- - NUM_WIZARDS_ALLOWED : int {static}
- - numWizards : int
- + WizardTowerProxy()
- + enter(wizard : Wizard)
- }
- class WizardTower {
- + WizardTower()
- + enter(wizard : Wizard)
- }
class App {
+ App()
+ main(args : String[]) {static}
}
+ class IvoryTower {
+ - LOGGER : Logger {static}
+ + IvoryTower()
+ + enter(wizard : Wizard)
+ }
class Wizard {
- name : String
+ Wizard(name : String)
+ toString() : String
}
+ interface WizardTower {
+ + enter(Wizard) {abstract}
+ }
+ class WizardTowerProxy {
+ - LOGGER : Logger {static}
+ - NUM_WIZARDS_ALLOWED : int {static}
+ - numWizards : int
+ - tower : WizardTower
+ + WizardTowerProxy(tower : WizardTower)
+ + enter(wizard : Wizard)
+ }
}
-WizardTowerProxy --|> WizardTower
+WizardTowerProxy --> "-tower" WizardTower
+IvoryTower ..|> WizardTower
+WizardTowerProxy ..|> WizardTower
@enduml
\ No newline at end of file
diff --git a/proxy/etc/proxy_1.png b/proxy/etc/proxy_1.png
deleted file mode 100644
index ba86fa8d6..000000000
Binary files a/proxy/etc/proxy_1.png and /dev/null differ
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 7484fc47e..323521bcf 100644
--- a/proxy/pom.xml
+++ b/proxy/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
diff --git a/proxy/src/main/java/com/iluwatar/proxy/App.java b/proxy/src/main/java/com/iluwatar/proxy/App.java
index 9c27cfb01..064d643be 100644
--- a/proxy/src/main/java/com/iluwatar/proxy/App.java
+++ b/proxy/src/main/java/com/iluwatar/proxy/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
@@ -35,7 +35,7 @@ package com.iluwatar.proxy;
* functionality to the object of interest without changing the object's code.
* <p>
* In this example the proxy ({@link WizardTowerProxy}) controls access to the actual object (
- * {@link WizardTower}).
+ * {@link IvoryTower}).
*
*/
public class App {
@@ -45,12 +45,12 @@ public class App {
*/
public static void main(String[] args) {
- WizardTowerProxy tower = new WizardTowerProxy();
- tower.enter(new Wizard("Red wizard"));
- tower.enter(new Wizard("White wizard"));
- tower.enter(new Wizard("Black wizard"));
- tower.enter(new Wizard("Green wizard"));
- tower.enter(new Wizard("Brown wizard"));
+ WizardTowerProxy proxy = new WizardTowerProxy(new IvoryTower());
+ proxy.enter(new Wizard("Red wizard"));
+ proxy.enter(new Wizard("White wizard"));
+ proxy.enter(new Wizard("Black wizard"));
+ proxy.enter(new Wizard("Green wizard"));
+ proxy.enter(new Wizard("Brown wizard"));
}
}
diff --git a/proxy/src/main/java/com/iluwatar/proxy/IvoryTower.java b/proxy/src/main/java/com/iluwatar/proxy/IvoryTower.java
new file mode 100644
index 000000000..382f41c3d
--- /dev/null
+++ b/proxy/src/main/java/com/iluwatar/proxy/IvoryTower.java
@@ -0,0 +1,41 @@
+/**
+ * The MIT License
+ * 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
+ * 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.proxy;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * The object to be proxyed.
+ *
+ */
+public class IvoryTower implements WizardTower {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(IvoryTower.class);
+
+ public void enter(Wizard wizard) {
+ LOGGER.info("{} enters the tower.", wizard);
+ }
+
+}
diff --git a/proxy/src/main/java/com/iluwatar/proxy/Wizard.java b/proxy/src/main/java/com/iluwatar/proxy/Wizard.java
index 5ea2e8279..817c46c0c 100644
--- a/proxy/src/main/java/com/iluwatar/proxy/Wizard.java
+++ b/proxy/src/main/java/com/iluwatar/proxy/Wizard.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
@@ -29,7 +29,7 @@ package com.iluwatar.proxy;
*/
public class Wizard {
- private String name;
+ private final String name;
public Wizard(String name) {
this.name = name;
diff --git a/proxy/src/main/java/com/iluwatar/proxy/WizardTower.java b/proxy/src/main/java/com/iluwatar/proxy/WizardTower.java
index 573d38374..f89dbea9a 100644
--- a/proxy/src/main/java/com/iluwatar/proxy/WizardTower.java
+++ b/proxy/src/main/java/com/iluwatar/proxy/WizardTower.java
@@ -1,36 +1,31 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.proxy;
-
-/**
- *
- * The object to be proxyed.
- *
- */
-public class WizardTower {
-
- public void enter(Wizard wizard) {
- System.out.println(wizard + " enters the tower.");
- }
-
-}
+/**
+ * The MIT License
+ * 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
+ * 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.proxy;
+
+/**
+ * WizardTower interface
+ */
+public interface WizardTower {
+
+ void enter(Wizard wizard);
+}
diff --git a/proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java b/proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java
index 985184afe..728b65bf7 100644
--- a/proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java
+++ b/proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.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,24 +22,35 @@
*/
package com.iluwatar.proxy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
- * The proxy controlling access to the {@link WizardTower}.
+ * The proxy controlling access to the {@link IvoryTower}.
*
*/
-public class WizardTowerProxy extends WizardTower {
+public class WizardTowerProxy implements WizardTower {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(WizardTowerProxy.class);
private static final int NUM_WIZARDS_ALLOWED = 3;
private int numWizards;
+ private final WizardTower tower;
+
+ public WizardTowerProxy(WizardTower tower) {
+ this.tower = tower;
+ }
+
@Override
public void enter(Wizard wizard) {
if (numWizards < NUM_WIZARDS_ALLOWED) {
- super.enter(wizard);
+ tower.enter(wizard);
numWizards++;
} else {
- System.out.println(wizard + " is not allowed to enter!");
+ LOGGER.info("{} is not allowed to enter!", wizard);
}
}
}
diff --git a/proxy/src/test/java/com/iluwatar/proxy/AppTest.java b/proxy/src/test/java/com/iluwatar/proxy/AppTest.java
index e5c065bd5..d22d9c4bd 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/AppTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/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
diff --git a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerTest.java b/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java
similarity index 61%
rename from proxy/src/test/java/com/iluwatar/proxy/WizardTowerTest.java
rename to proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java
index 9996434f5..944193a0a 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.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,17 +22,32 @@
*/
package com.iluwatar.proxy;
+import com.iluwatar.proxy.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.mockito.InOrder;
-import static org.mockito.Mockito.inOrder;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
- * Date: 12/28/15 - 9:18 PM
- *
- * @author Jeroen Meulemeester
+ * Tests for {@link IvoryTower}
*/
-public class WizardTowerTest extends StdOutTest {
+public class IvoryTowerTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(IvoryTower.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
@Test
public void testEnter() throws Exception {
@@ -43,18 +58,15 @@ public class WizardTowerTest extends StdOutTest {
new Wizard("Merlin")
};
- final WizardTower tower = new WizardTower();
- for (final Wizard wizard : wizards) {
+ IvoryTower tower = new IvoryTower();
+ for (Wizard wizard : wizards) {
tower.enter(wizard);
}
- final InOrder inOrder = inOrder(getStdOutMock());
- inOrder.verify(getStdOutMock()).println("Gandalf enters the tower.");
- inOrder.verify(getStdOutMock()).println("Dumbledore enters the tower.");
- inOrder.verify(getStdOutMock()).println("Oz enters the tower.");
- inOrder.verify(getStdOutMock()).println("Merlin enters the tower.");
- inOrder.verifyNoMoreInteractions();
-
+ assertTrue(appender.logContains("Gandalf enters the tower."));
+ assertTrue(appender.logContains("Dumbledore enters the tower."));
+ assertTrue(appender.logContains("Oz enters the tower."));
+ assertTrue(appender.logContains("Merlin enters the tower."));
+ assertEquals(4, appender.getLogSize());
}
-
-}
\ No newline at end of file
+}
diff --git a/proxy/src/test/java/com/iluwatar/proxy/StdOutTest.java b/proxy/src/test/java/com/iluwatar/proxy/StdOutTest.java
deleted file mode 100644
index 48831444a..000000000
--- a/proxy/src/test/java/com/iluwatar/proxy/StdOutTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.proxy;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/proxy/src/test/java/com/iluwatar/proxy/WizardTest.java b/proxy/src/test/java/com/iluwatar/proxy/WizardTest.java
index 56ad74c8c..ce5637214 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/WizardTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/WizardTest.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
@@ -27,18 +27,15 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
- * Date: 12/28/15 - 9:02 PM
- *
- * @author Jeroen Meulemeester
+ * Tests for {@link Wizard}
*/
public class WizardTest {
@Test
public void testToString() throws Exception {
final String[] wizardNames = {"Gandalf", "Dumbledore", "Oz", "Merlin"};
- for (final String name : wizardNames) {
+ for (String name : wizardNames) {
assertEquals(name, new Wizard(name).toString());
}
}
-
}
\ No newline at end of file
diff --git a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java
index b87b7a0bc..2958376d6 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.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,17 +22,30 @@
*/
package com.iluwatar.proxy;
+import com.iluwatar.proxy.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.mockito.InOrder;
-import static org.mockito.Mockito.inOrder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
- * Date: 12/28/15 - 9:18 PM
- *
- * @author Jeroen Meulemeester
+ * Tests for {@link WizardTowerProxy}
*/
-public class WizardTowerProxyTest extends StdOutTest {
+public class WizardTowerProxyTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
@Test
public void testEnter() throws Exception {
@@ -43,18 +56,15 @@ public class WizardTowerProxyTest extends StdOutTest {
new Wizard("Merlin")
};
- final WizardTowerProxy tower = new WizardTowerProxy();
- for (final Wizard wizard : wizards) {
- tower.enter(wizard);
+ final WizardTowerProxy proxy = new WizardTowerProxy(new IvoryTower());
+ for (Wizard wizard : wizards) {
+ proxy.enter(wizard);
}
- final InOrder inOrder = inOrder(getStdOutMock());
- inOrder.verify(getStdOutMock()).println("Gandalf enters the tower.");
- inOrder.verify(getStdOutMock()).println("Dumbledore enters the tower.");
- inOrder.verify(getStdOutMock()).println("Oz enters the tower.");
- inOrder.verify(getStdOutMock()).println("Merlin is not allowed to enter!");
- inOrder.verifyNoMoreInteractions();
-
+ assertTrue(appender.logContains("Gandalf enters the tower."));
+ assertTrue(appender.logContains("Dumbledore enters the tower."));
+ assertTrue(appender.logContains("Oz enters the tower."));
+ assertTrue(appender.logContains("Merlin is not allowed to enter!"));
+ assertEquals(4, appender.getLogSize());
}
-
-}
\ No newline at end of file
+}
diff --git a/proxy/src/test/java/com/iluwatar/proxy/utils/InMemoryAppender.java b/proxy/src/test/java/com/iluwatar/proxy/utils/InMemoryAppender.java
new file mode 100644
index 000000000..b0c48167d
--- /dev/null
+++ b/proxy/src/test/java/com/iluwatar/proxy/utils/InMemoryAppender.java
@@ -0,0 +1,58 @@
+/**
+ * The MIT License
+ * 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
+ * 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.proxy.utils;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public boolean logContains(String message) {
+ return log.stream().anyMatch(event -> event.getFormattedMessage().equals(message));
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+}
diff --git a/publish-subscribe/etc/publish-subscribe.urm.puml b/publish-subscribe/etc/publish-subscribe.urm.puml
index 1272f1f6d..2e511c92d 100644
--- a/publish-subscribe/etc/publish-subscribe.urm.puml
+++ b/publish-subscribe/etc/publish-subscribe.urm.puml
@@ -1,6 +1,7 @@
@startuml
package com.iluwatar.publish.subscribe {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
diff --git a/publish-subscribe/pom.xml b/publish-subscribe/pom.xml
index de5b6068b..51b5a4903 100644
--- a/publish-subscribe/pom.xml
+++ b/publish-subscribe/pom.xml
@@ -1,7 +1,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
diff --git a/publish-subscribe/src/main/java/com/iluwatar/publish/subscribe/App.java b/publish-subscribe/src/main/java/com/iluwatar/publish/subscribe/App.java
index c4e423b04..d642846fb 100644
--- a/publish-subscribe/src/main/java/com/iluwatar/publish/subscribe/App.java
+++ b/publish-subscribe/src/main/java/com/iluwatar/publish/subscribe/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
@@ -26,6 +26,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -48,6 +50,8 @@ import org.apache.camel.impl.DefaultCamelContext;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*/
@@ -61,7 +65,7 @@ public class App {
});
ProducerTemplate template = context.createProducerTemplate();
context.start();
- context.getRoutes().stream().forEach(r -> System.out.println(r));
+ context.getRoutes().stream().forEach(r -> LOGGER.info(r.toString()));
template.sendBody("direct:origin", "Hello from origin");
context.stop();
}
diff --git a/publish-subscribe/src/main/resources/logback.xml b/publish-subscribe/src/main/resources/logback.xml
new file mode 100644
index 000000000..582af26bd
--- /dev/null
+++ b/publish-subscribe/src/main/resources/logback.xml
@@ -0,0 +1,52 @@
+<!--
+
+ The MIT License
+ 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
+ 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.
+
+-->
+<configuration>
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>publish-subscribe.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>publish-subscribe-%d.log</fileNamePattern>
+ <maxHistory>5</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="com.iluwatar" additivity="false">
+ <level value="DEBUG"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</configuration>
diff --git a/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java b/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java
index 9f387be33..216ba49f0 100644
--- a/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java
+++ b/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/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
diff --git a/queue-load-leveling/README.md b/queue-load-leveling/README.md
new file mode 100644
index 000000000..1179e5985
--- /dev/null
+++ b/queue-load-leveling/README.md
@@ -0,0 +1,34 @@
+---
+layout: pattern
+title: Queue based load leveling
+folder: queue-load-leveling
+permalink: /patterns/queue-load-leveling/
+pumlid:
+categories: Other
+tags:
+ - Java
+ - Difficulty-Intermediate
+ - Performance
+---
+
+## Intent
+Use a queue that acts as a buffer between a task and a service that it invokes in order to smooth
+intermittent heavy loads that may otherwise cause the service to fail or the task to time out.
+This pattern can help to minimize the impact of peaks in demand on availability and responsiveness
+for both the task and the service.
+
+
+
+
+## Applicability
+
+* This pattern is ideally suited to any type of application that uses services that may be subject to overloading.
+* This pattern might not be suitable if the application expects a response from the service with minimal latency.
+
+## Real world example
+
+* A Microsoft Azure web role stores data by using a separate storage service. If a large number of instances of the web role run concurrently, it is possible that the storage service could be overwhelmed and be unable to respond to requests quickly enough to prevent these requests from timing out or failing.
+
+## Credits
+
+* [Microsoft Cloud Design Patterns: Queue-Based Load Leveling Pattern](https://msdn.microsoft.com/en-us/library/dn589783.aspx)
\ No newline at end of file
diff --git a/queue-load-leveling/etc/queue-load-leveling.gif b/queue-load-leveling/etc/queue-load-leveling.gif
new file mode 100644
index 000000000..4f57c3e50
Binary files /dev/null and b/queue-load-leveling/etc/queue-load-leveling.gif differ
diff --git a/queue-load-leveling/etc/queue-load-leveling.ucls b/queue-load-leveling/etc/queue-load-leveling.ucls
new file mode 100644
index 000000000..91440e276
--- /dev/null
+++ b/queue-load-leveling/etc/queue-load-leveling.ucls
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.11" icons="true" always-add-relationships="false" generalizations="true" realizations="true"
+ associations="true" dependencies="false" nesting-relationships="true" router="FAN">
+ <class id="1" language="java" name="org.queue.load.leveling.TaskGenerator" project="queue-load-leveling"
+ file="/queue-load-leveling/src/main/java/org/queue/load/leveling/TaskGenerator.java" binary="false"
+ corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="470" y="213"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <interface id="2" language="java" name="org.queue.load.leveling.Task" project="queue-load-leveling"
+ file="/queue-load-leveling/src/main/java/org/queue/load/leveling/Task.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="426" y="389"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </interface>
+ <class id="3" language="java" name="org.queue.load.leveling.MessageQueue" project="queue-load-leveling"
+ file="/queue-load-leveling/src/main/java/org/queue/load/leveling/MessageQueue.java" binary="false"
+ corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="661" y="419"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <class id="4" language="java" name="org.queue.load.leveling.Message" project="queue-load-leveling"
+ file="/queue-load-leveling/src/main/java/org/queue/load/leveling/Message.java" binary="false" corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="594" y="657"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <class id="5" language="java" name="org.queue.load.leveling.ServiceExecutor" project="queue-load-leveling"
+ file="/queue-load-leveling/src/main/java/org/queue/load/leveling/ServiceExecutor.java" binary="false"
+ corner="BOTTOM_RIGHT">
+ <position height="-1" width="-1" x="775" y="193"/>
+ <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </display>
+ </class>
+ <realization id="6">
+ <end type="SOURCE" refId="1"/>
+ <end type="TARGET" refId="2"/>
+ </realization>
+ <association id="7">
+ <end type="SOURCE" refId="1" navigable="false">
+ <attribute id="8" name="msgQueue"/>
+ <multiplicity id="9" minimum="0" maximum="1"/>
+ </end>
+ <end type="TARGET" refId="3" navigable="true"/>
+ <display labels="true" multiplicity="true"/>
+ </association>
+ <association id="10">
+ <end type="SOURCE" refId="3" navigable="false">
+ <attribute id="11" name="blkQueue"/>
+ <multiplicity id="12" minimum="0" maximum="2147483647"/>
+ </end>
+ <end type="TARGET" refId="4" navigable="true"/>
+ <display labels="true" multiplicity="true"/>
+ </association>
+ <association id="13">
+ <end type="SOURCE" refId="5" navigable="false">
+ <attribute id="14" name="msgQueue"/>
+ <multiplicity id="15" minimum="0" maximum="1"/>
+ </end>
+ <end type="TARGET" refId="3" navigable="true"/>
+ <display labels="true" multiplicity="true"/>
+ </association>
+ <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
+ sort-features="false" accessors="true" visibility="true">
+ <attributes public="true" package="true" protected="true" private="true" static="true"/>
+ <operations public="true" package="true" protected="true" private="true" static="true"/>
+ </classifier-display>
+ <association-display labels="true" multiplicity="true"/>
+</class-diagram>
\ No newline at end of file
diff --git a/queue-load-leveling/etc/queue-load-leveling.urm.puml b/queue-load-leveling/etc/queue-load-leveling.urm.puml
new file mode 100644
index 000000000..02af47ddf
--- /dev/null
+++ b/queue-load-leveling/etc/queue-load-leveling.urm.puml
@@ -0,0 +1,2 @@
+@startuml
+@enduml
\ No newline at end of file
diff --git a/queue-load-leveling/pom.xml b/queue-load-leveling/pom.xml
new file mode 100644
index 000000000..4c3dd8cdd
--- /dev/null
+++ b/queue-load-leveling/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+
+ The MIT License
+ Copyright (c) 2014 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.
+
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.iluwatar</groupId>
+ <artifactId>java-design-patterns</artifactId>
+ <version>1.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>queue-load-leveling</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/queue-load-leveling/src/main/java/org/queue/load/leveling/App.java b/queue-load-leveling/src/main/java/org/queue/load/leveling/App.java
new file mode 100644
index 000000000..19f8939a4
--- /dev/null
+++ b/queue-load-leveling/src/main/java/org/queue/load/leveling/App.java
@@ -0,0 +1,119 @@
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * Many solutions in the cloud involve running tasks that invoke services. In this environment,
+ * if a service is subjected to intermittent heavy loads, it can cause performance or reliability issues.
+ * <p>
+ * A service could be a component that is part of the same solution as the tasks that utilize it, or it
+ * could be a third-party service providing access to frequently used resources such as a cache or a storage service.
+ * If the same service is utilized by a number of tasks running concurrently, it can be difficult to predict the
+ * volume of requests to which the service might be subjected at any given point in time.
+ * <p>
+ * We will build a queue-based-load-leveling to solve above problem.
+ * Refactor the solution and introduce a queue between the task and the service.
+ * The task and the service run asynchronously. The task posts a message containing the data required
+ * by the service to a queue. The queue acts as a buffer, storing the message until it is retrieved
+ * by the service. The service retrieves the messages from the queue and processes them.
+ * Requests from a number of tasks, which can be generated at a highly variable rate, can be passed
+ * to the service through the same message queue.
+ * <p>
+ * The queue effectively decouples the tasks from the service, and the service can handle the messages
+ * at its own pace irrespective of the volume of requests from concurrent tasks. Additionally,
+ * there is no delay to a task if the service is not available at the time it posts a message to the queue.
+ * <p>
+ * In this example we have a class {@link MessageQueue} to hold the message {@link Message} objects.
+ * All the worker threads {@link TaskGenerator} will submit the messages to the MessageQueue.
+ * The service executor class {@link ServiceExecutor} will pick up one task at a time from the Queue and
+ * execute them.
+ *
+ */
+public class App {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
+ //Executor shut down time limit.
+ private static final int SHUTDOWN_TIME = 15;
+
+ /**
+ * Program entry point
+ *
+ * @param args command line args
+ */
+ public static void main(String[] args) {
+
+ // An Executor that provides methods to manage termination and methods that can
+ // produce a Future for tracking progress of one or more asynchronous tasks.
+ ExecutorService executor = null;
+
+ try {
+ // Create a MessageQueue object.
+ MessageQueue msgQueue = new MessageQueue();
+
+ LOGGER.info("Submitting TaskGenerators and ServiceExecutor threads.");
+
+ // Create three TaskGenerator threads. Each of them will submit different number of jobs.
+ Runnable taskRunnable1 = new TaskGenerator(msgQueue, 5);
+ Runnable taskRunnable2 = new TaskGenerator(msgQueue, 1);
+ Runnable taskRunnable3 = new TaskGenerator(msgQueue, 2);
+
+ // Create e service which should process the submitted jobs.
+ Runnable srvRunnable = new ServiceExecutor(msgQueue);
+
+ // Create a ThreadPool of 2 threads and
+ // submit all Runnable task for execution to executor..
+ executor = Executors.newFixedThreadPool(2);
+ executor.submit(taskRunnable1);
+ executor.submit(taskRunnable2);
+ executor.submit(taskRunnable3);
+
+ // submitting serviceExecutor thread to the Executor service.
+ executor.submit(srvRunnable);
+
+ // Initiates an orderly shutdown.
+ LOGGER.info("Intiating shutdown. Executor will shutdown only after all the Threads are completed.");
+ executor.shutdown();
+
+ // Wait for SHUTDOWN_TIME seconds for all the threads to complete
+ // their tasks and then shut down the executor and then exit.
+ if ( !executor.awaitTermination(SHUTDOWN_TIME, TimeUnit.SECONDS) ) {
+ LOGGER.info("Executor was shut down and Exiting.");
+ executor.shutdownNow();
+ }
+ } catch (InterruptedException ie) {
+ LOGGER.error(ie.getMessage());
+ } catch (Exception e) {
+ LOGGER.error(e.getMessage());
+ }
+ }
+}
\ No newline at end of file
diff --git a/queue-load-leveling/src/main/java/org/queue/load/leveling/Message.java b/queue-load-leveling/src/main/java/org/queue/load/leveling/Message.java
new file mode 100644
index 000000000..1f4aa8249
--- /dev/null
+++ b/queue-load-leveling/src/main/java/org/queue/load/leveling/Message.java
@@ -0,0 +1,47 @@
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+
+/**
+ * Message class with only one parameter.
+ *
+*/
+public class Message {
+ private final String msg;
+
+ // Parameter constructor.
+ public Message(String msg) {
+ super();
+ this.msg = msg;
+ }
+
+ // Get Method for attribute msg.
+ public String getMsg() {
+ return msg;
+ }
+
+ @Override
+ public String toString() {
+ return msg;
+ }
+}
\ No newline at end of file
diff --git a/queue-load-leveling/src/main/java/org/queue/load/leveling/MessageQueue.java b/queue-load-leveling/src/main/java/org/queue/load/leveling/MessageQueue.java
new file mode 100644
index 000000000..797226e0a
--- /dev/null
+++ b/queue-load-leveling/src/main/java/org/queue/load/leveling/MessageQueue.java
@@ -0,0 +1,77 @@
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * MessageQueue class.
+ * In this class we will create a Blocking Queue and
+ * submit/retrieve all the messages from it.
+ */
+public class MessageQueue {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
+ private final BlockingQueue<Message> blkQueue;
+
+ // Default constructor when called creates Blocking Queue object.
+ public MessageQueue() {
+ this.blkQueue = new ArrayBlockingQueue<Message>(1024);
+ }
+
+ /**
+ * All the TaskGenerator threads will call this method to insert the
+ * Messages in to the Blocking Queue.
+ */
+ public void submitMsg(Message msg) {
+ try {
+ if (null != msg) {
+ blkQueue.add(msg);
+ }
+ } catch (Exception e) {
+ LOGGER.error(e.getMessage());
+ }
+ }
+
+ /**
+ * All the messages will be retrieved by the ServiceExecutor by
+ * calling this method and process them.
+ * Retrieves and removes the head of this queue, or returns null if this queue is empty.
+ */
+ public Message retrieveMsg() {
+ Message retrievedMsg = null;
+ try {
+ retrievedMsg = blkQueue.poll();
+ } catch (Exception e) {
+ LOGGER.error(e.getMessage());
+ }
+
+ return retrievedMsg;
+ }
+}
\ No newline at end of file
diff --git a/queue-load-leveling/src/main/java/org/queue/load/leveling/ServiceExecutor.java b/queue-load-leveling/src/main/java/org/queue/load/leveling/ServiceExecutor.java
new file mode 100644
index 000000000..02eb43b89
--- /dev/null
+++ b/queue-load-leveling/src/main/java/org/queue/load/leveling/ServiceExecutor.java
@@ -0,0 +1,67 @@
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * ServiceExecuotr class.
+ * This class will pick up Messages one by one from
+ * the Blocking Queue and process them.
+ */
+public class ServiceExecutor implements Runnable {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
+ private final MessageQueue msgQueue;
+
+ public ServiceExecutor(MessageQueue msgQueue) {
+ this.msgQueue = msgQueue;
+ }
+
+ /**
+ * The ServiceExecutor thread will retrieve each message and process it.
+ */
+ public void run() {
+ try {
+ while (true) {
+ Message msg = msgQueue.retrieveMsg();
+
+ if (null != msg) {
+ LOGGER.info(msg.toString() + " is served.");
+ } else {
+ LOGGER.info("Service Executor: Waiting for Messages to serve .. ");
+ }
+
+ Thread.sleep(1000);
+ }
+ } catch (InterruptedException ie) {
+ LOGGER.error(ie.getMessage());
+ } catch (Exception e) {
+ LOGGER.error(e.getMessage());
+ }
+ }
+}
\ No newline at end of file
diff --git a/decorator/src/main/java/com/iluwatar/decorator/Hostile.java b/queue-load-leveling/src/main/java/org/queue/load/leveling/Task.java
similarity index 84%
rename from decorator/src/main/java/com/iluwatar/decorator/Hostile.java
rename to queue-load-leveling/src/main/java/org/queue/load/leveling/Task.java
index d3414c9dd..8796f5aae 100644
--- a/decorator/src/main/java/com/iluwatar/decorator/Hostile.java
+++ b/queue-load-leveling/src/main/java/org/queue/load/leveling/Task.java
@@ -1,38 +1,30 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.decorator;
-
-/**
- *
- * Interface for the hostile enemies.
- *
- */
-public interface Hostile {
-
- void attack();
-
- int getAttackPower();
-
- void fleeBattle();
-
-}
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+/**
+ * Task Interface.
+ *
+*/
+public interface Task {
+ void submit(Message msg);
+}
diff --git a/queue-load-leveling/src/main/java/org/queue/load/leveling/TaskGenerator.java b/queue-load-leveling/src/main/java/org/queue/load/leveling/TaskGenerator.java
new file mode 100644
index 000000000..211354e53
--- /dev/null
+++ b/queue-load-leveling/src/main/java/org/queue/load/leveling/TaskGenerator.java
@@ -0,0 +1,89 @@
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * TaskGenerator class.
+ * Each TaskGenerator thread will be a Worker which submit's messages to the queue.
+ * We need to mention the message count for each of the TaskGenerator threads.
+ *
+*/
+public class TaskGenerator implements Task, Runnable {
+
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
+ // MessageQueue reference using which we will submit our messages.
+ private final MessageQueue msgQueue;
+
+ // Total message count that a TaskGenerator will submit.
+ private final int msgCount;
+
+ // Parameterized constructor.
+ public TaskGenerator(MessageQueue msgQueue, int msgCount) {
+ this.msgQueue = msgQueue;
+ this.msgCount = msgCount;
+ }
+
+ /**
+ * Submit messages to the Blocking Queue.
+ */
+ public void submit(Message msg) {
+ try {
+ this.msgQueue.submitMsg(msg);
+ } catch (Exception e) {
+ LOGGER.error(e.getMessage());
+ }
+ }
+
+ /**
+ * Each TaskGenerator thread will submit all the messages to the Queue.
+ * After every message submission TaskGenerator thread will sleep for 1 second.
+ */
+ public void run() {
+
+ int count = this.msgCount;
+
+ try {
+ while (count > 0) {
+ String statusMsg = "Message-" + count + " submitted by " + Thread.currentThread().getName();
+ this.submit(new Message(statusMsg));
+
+ LOGGER.info(statusMsg);
+
+ // reduce the message count.
+ count--;
+
+ // Make the current thread to sleep after every Message submission.
+ Thread.sleep(1000);
+ }
+ } catch (InterruptedException ie) {
+ LOGGER.error(ie.getMessage());
+ } catch (Exception e) {
+ LOGGER.error(e.getMessage());
+ }
+ }
+}
\ No newline at end of file
diff --git a/queue-load-leveling/src/test/java/org/queue/load/leveling/AppTest.java b/queue-load-leveling/src/test/java/org/queue/load/leveling/AppTest.java
new file mode 100644
index 000000000..dbf0c1269
--- /dev/null
+++ b/queue-load-leveling/src/test/java/org/queue/load/leveling/AppTest.java
@@ -0,0 +1,38 @@
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+/**
+ * Application Test
+ */
+public class AppTest {
+ @Test
+ public void test() throws IOException {
+ String[] args = {};
+ App.main(args);
+ }
+}
\ No newline at end of file
diff --git a/queue-load-leveling/src/test/java/org/queue/load/leveling/MessageQueueTest.java b/queue-load-leveling/src/test/java/org/queue/load/leveling/MessageQueueTest.java
new file mode 100644
index 000000000..2b2110a56
--- /dev/null
+++ b/queue-load-leveling/src/test/java/org/queue/load/leveling/MessageQueueTest.java
@@ -0,0 +1,48 @@
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ *
+ * Test case for submitting and retrieving messages from Blocking Queue.
+ *
+ */
+public class MessageQueueTest {
+
+ @Test
+ public void messageQueueTest() {
+
+ MessageQueue msgQueue = new MessageQueue();
+
+ // submit message
+ msgQueue.submitMsg(new Message("MessageQueue Test"));
+
+ // retrieve message
+ assertEquals(msgQueue.retrieveMsg().getMsg(), "MessageQueue Test");
+ }
+
+}
diff --git a/queue-load-leveling/src/test/java/org/queue/load/leveling/MessageTest.java b/queue-load-leveling/src/test/java/org/queue/load/leveling/MessageTest.java
new file mode 100644
index 000000000..72a0b7406
--- /dev/null
+++ b/queue-load-leveling/src/test/java/org/queue/load/leveling/MessageTest.java
@@ -0,0 +1,43 @@
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+/**
+ *
+ * Test case for creating and checking the Message.
+ *
+ */
+public class MessageTest {
+
+ @Test
+ public void messageTest() {
+
+ // Parameterized constructor test.
+ String testMsg = "Message Test";
+ Message msg = new Message(testMsg);
+ assertEquals(msg.getMsg(), testMsg);
+ }
+}
diff --git a/queue-load-leveling/src/test/java/org/queue/load/leveling/TaskGenSrvExeTest.java b/queue-load-leveling/src/test/java/org/queue/load/leveling/TaskGenSrvExeTest.java
new file mode 100644
index 000000000..d98fee30a
--- /dev/null
+++ b/queue-load-leveling/src/test/java/org/queue/load/leveling/TaskGenSrvExeTest.java
@@ -0,0 +1,50 @@
+/**
+ * The MIT License
+ * Copyright (c) 2014 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 org.queue.load.leveling;
+
+import org.junit.Test;
+
+/**
+ *
+ * Test case for submitting Message to Blocking Queue by TaskGenerator
+ * and retrieve the message by ServiceExecutor.
+ *
+ */
+public class TaskGenSrvExeTest {
+
+ @Test
+ public void taskGeneratorTest() {
+ MessageQueue msgQueue = new MessageQueue();
+
+ // Create a task generator thread with 1 job to submit.
+ Runnable taskRunnable = new TaskGenerator(msgQueue, 1);
+ Thread taskGenThr = new Thread(taskRunnable);
+ taskGenThr.start();
+
+ // Create a service executor thread.
+ Runnable srvRunnable = new ServiceExecutor(msgQueue);
+ Thread srvExeThr = new Thread(srvRunnable);
+ srvExeThr.start();
+ }
+
+}
diff --git a/reactor/etc/reactor.urm.puml b/reactor/etc/reactor.urm.puml
index ecf2f40f7..cc56eae7a 100644
--- a/reactor/etc/reactor.urm.puml
+++ b/reactor/etc/reactor.urm.puml
@@ -1,46 +1,4 @@
@startuml
-package com.iluwatar.reactor.app {
- class App {
- - channels : List<AbstractNioChannel>
- - dispatcher : Dispatcher
- - reactor : NioReactor
- + App(dispatcher : Dispatcher)
- + main(args : String[]) {static}
- + start()
- + stop()
- - tcpChannel(port : int, handler : ChannelHandler) : AbstractNioChannel
- - udpChannel(port : int, handler : ChannelHandler) : AbstractNioChannel
- }
- class LoggingHandler {
- - ACK : byte[] {static}
- + LoggingHandler()
- - doLogging(data : ByteBuffer) {static}
- + handleChannelRead(channel : AbstractNioChannel, readObject : Object, key : SelectionKey)
- - sendReply(channel : AbstractNioChannel, incomingPacket : DatagramPacket, key : SelectionKey) {static}
- - sendReply(channel : AbstractNioChannel, key : SelectionKey) {static}
- }
- ~class TcpLoggingClient {
- - clientName : String
- - serverPort : int
- + TcpLoggingClient(clientName : String, serverPort : int)
- + run()
- - sendLogRequests(writer : PrintWriter, inputStream : InputStream)
- }
- ~class UdpLoggingClient {
- - clientName : String
- - remoteAddress : InetSocketAddress
- + UdpLoggingClient(clientName : String, port : int)
- + run()
- }
- class AppClient {
- - service : ExecutorService
- + AppClient()
- - artificialDelayOf(millis : long) {static}
- + main(args : String[]) {static}
- + start()
- + stop()
- }
-}
package com.iluwatar.reactor.framework {
abstract class AbstractNioChannel {
- channel : SelectableChannel
@@ -58,17 +16,15 @@ package com.iluwatar.reactor.framework {
~ setReactor(reactor : NioReactor)
+ write(data : Object, key : SelectionKey)
}
- ~class ChangeKeyOpsCommand {
- - interestedOps : int
- - key : SelectionKey
- + ChangeKeyOpsCommand(this$0 : SelectionKey, key : int)
- + run()
- + toString() : String
- }
interface ChannelHandler {
+ handleChannelRead(AbstractNioChannel, Object, SelectionKey) {abstract}
}
+ interface Dispatcher {
+ + onChannelReadEvent(AbstractNioChannel, Object, SelectionKey) {abstract}
+ + stop() {abstract}
+ }
class NioDatagramChannel {
+ - LOGGER : Logger {static}
- port : int
+ NioDatagramChannel(port : int, handler : ChannelHandler)
+ bind()
@@ -78,30 +34,6 @@ package com.iluwatar.reactor.framework {
+ read(key : SelectionKey) : DatagramPacket
+ write(data : Object, key : SelectionKey)
}
- class ThreadPoolDispatcher {
- - executorService : ExecutorService
- + ThreadPoolDispatcher(poolSize : int)
- + onChannelReadEvent(channel : AbstractNioChannel, readObject : Object, key : SelectionKey)
- + stop()
- }
- class NioServerSocketChannel {
- - port : int
- + NioServerSocketChannel(port : int, handler : ChannelHandler)
- + bind()
- # doWrite(pendingWrite : Object, key : SelectionKey)
- + getInterestedOps() : int
- + getJavaChannel() : ServerSocketChannel
- + read(key : SelectionKey) : ByteBuffer
- }
- class SameThreadDispatcher {
- + SameThreadDispatcher()
- + onChannelReadEvent(channel : AbstractNioChannel, readObject : Object, key : SelectionKey)
- + stop()
- }
- interface Dispatcher {
- + onChannelReadEvent(AbstractNioChannel, Object, SelectionKey) {abstract}
- + stop() {abstract}
- }
class DatagramPacket {
- data : ByteBuffer
- receiver : SocketAddress
@@ -114,6 +46,7 @@ package com.iluwatar.reactor.framework {
+ setSender(sender : SocketAddress)
}
class NioReactor {
+ - LOGGER : Logger {static}
- dispatcher : Dispatcher
- pendingCommands : Queue<Runnable>
- reactorMain : ExecutorService
@@ -131,6 +64,78 @@ package com.iluwatar.reactor.framework {
+ start()
+ stop()
}
+ ~class ChangeKeyOpsCommand {
+ - interestedOps : int
+ - key : SelectionKey
+ + ChangeKeyOpsCommand(this$0 : SelectionKey, key : int)
+ + run()
+ + toString() : String
+ }
+ class NioServerSocketChannel {
+ - LOGGER : Logger {static}
+ - port : int
+ + NioServerSocketChannel(port : int, handler : ChannelHandler)
+ + bind()
+ # doWrite(pendingWrite : Object, key : SelectionKey)
+ + getInterestedOps() : int
+ + getJavaChannel() : ServerSocketChannel
+ + read(key : SelectionKey) : ByteBuffer
+ }
+ class SameThreadDispatcher {
+ + SameThreadDispatcher()
+ + onChannelReadEvent(channel : AbstractNioChannel, readObject : Object, key : SelectionKey)
+ + stop()
+ }
+ class ThreadPoolDispatcher {
+ - executorService : ExecutorService
+ + ThreadPoolDispatcher(poolSize : int)
+ + onChannelReadEvent(channel : AbstractNioChannel, readObject : Object, key : SelectionKey)
+ + stop()
+ }
+}
+package com.iluwatar.reactor.app {
+ class App {
+ - channels : List<AbstractNioChannel>
+ - dispatcher : Dispatcher
+ - reactor : NioReactor
+ + App(dispatcher : Dispatcher)
+ + main(args : String[]) {static}
+ + start()
+ + stop()
+ - tcpChannel(port : int, handler : ChannelHandler) : AbstractNioChannel
+ - udpChannel(port : int, handler : ChannelHandler) : AbstractNioChannel
+ }
+ class AppClient {
+ - LOGGER : Logger {static}
+ - service : ExecutorService
+ + AppClient()
+ - artificialDelayOf(millis : long) {static}
+ + main(args : String[]) {static}
+ + start()
+ + stop()
+ }
+ ~class TcpLoggingClient {
+ - clientName : String
+ - serverPort : int
+ + TcpLoggingClient(clientName : String, serverPort : int)
+ + run()
+ - sendLogRequests(writer : PrintWriter, inputStream : InputStream)
+ }
+ ~class UdpLoggingClient {
+ - clientName : String
+ - remoteAddress : InetSocketAddress
+ + UdpLoggingClient(clientName : String, port : int)
+ + run()
+ }
+ class LoggingHandler {
+ - ACK : byte[] {static}
+ - LOGGER : Logger {static}
+ + LoggingHandler()
+ - doLogging(data : ByteBuffer) {static}
+ + handleChannelRead(channel : AbstractNioChannel, readObject : Object, key : SelectionKey)
+ - sendReply(channel : AbstractNioChannel, incomingPacket : DatagramPacket, key : SelectionKey) {static}
+ - sendReply(channel : AbstractNioChannel, key : SelectionKey) {static}
+ }
}
AbstractNioChannel --> "-handler" ChannelHandler
UdpLoggingClient ..+ AppClient
@@ -140,12 +145,11 @@ NioReactor --> "-dispatcher" Dispatcher
App --> "-reactor" NioReactor
App --> "-channels" AbstractNioChannel
DatagramPacket ..+ NioDatagramChannel
-LoggingHandler --+ NioDatagramChannel
App --> "-dispatcher" Dispatcher
ChangeKeyOpsCommand --+ NioReactor
-NioDatagramChannel --|> AbstractNioChannel
LoggingHandler ..|> ChannelHandler
-ThreadPoolDispatcher ..|> Dispatcher
+NioDatagramChannel --|> AbstractNioChannel
NioServerSocketChannel --|> AbstractNioChannel
SameThreadDispatcher ..|> Dispatcher
+ThreadPoolDispatcher ..|> Dispatcher
@enduml
\ No newline at end of file
diff --git a/reactor/pom.xml b/reactor/pom.xml
index 5bb577c42..09a2565cc 100644
--- a/reactor/pom.xml
+++ b/reactor/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
diff --git a/reactor/src/main/java/com/iluwatar/reactor/app/App.java b/reactor/src/main/java/com/iluwatar/reactor/app/App.java
index 4228b92d3..5208dea02 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/app/App.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/app/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
diff --git a/reactor/src/main/java/com/iluwatar/reactor/app/AppClient.java b/reactor/src/main/java/com/iluwatar/reactor/app/AppClient.java
index 29c2f83fa..4db4f5e2a 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/app/AppClient.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/app/AppClient.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.reactor.app;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -41,6 +44,9 @@ import java.util.concurrent.TimeUnit;
* requests to Reactor.
*/
public class AppClient {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(AppClient.class);
+
private final ExecutorService service = Executors.newFixedThreadPool(4);
/**
@@ -126,9 +132,9 @@ public class AppClient {
byte[] data = new byte[1024];
int read = inputStream.read(data, 0, data.length);
if (read == 0) {
- System.out.println("Read zero bytes");
+ LOGGER.info("Read zero bytes");
} else {
- System.out.println(new String(data, 0, read));
+ LOGGER.info(new String(data, 0, read));
}
artificialDelayOf(100);
@@ -171,9 +177,9 @@ public class AppClient {
DatagramPacket reply = new DatagramPacket(data, data.length);
socket.receive(reply);
if (reply.getLength() == 0) {
- System.out.println("Read zero bytes");
+ LOGGER.info("Read zero bytes");
} else {
- System.out.println(new String(reply.getData(), 0, reply.getLength()));
+ LOGGER.info(new String(reply.getData(), 0, reply.getLength()));
}
artificialDelayOf(100);
diff --git a/reactor/src/main/java/com/iluwatar/reactor/app/LoggingHandler.java b/reactor/src/main/java/com/iluwatar/reactor/app/LoggingHandler.java
index ab2bcfb1a..8584702c7 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/app/LoggingHandler.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/app/LoggingHandler.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
@@ -28,6 +28,8 @@ import java.nio.channels.SelectionKey;
import com.iluwatar.reactor.framework.AbstractNioChannel;
import com.iluwatar.reactor.framework.ChannelHandler;
import com.iluwatar.reactor.framework.NioDatagramChannel.DatagramPacket;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Logging server application logic. It logs the incoming requests on standard console and returns a
@@ -35,6 +37,8 @@ import com.iluwatar.reactor.framework.NioDatagramChannel.DatagramPacket;
*/
public class LoggingHandler implements ChannelHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(LoggingHandler.class);
+
private static final byte[] ACK = "Data logged successfully".getBytes();
/**
@@ -76,6 +80,6 @@ public class LoggingHandler implements ChannelHandler {
private static void doLogging(ByteBuffer data) {
// assuming UTF-8 :(
- System.out.println(new String(data.array(), 0, data.limit()));
+ LOGGER.info(new String(data.array(), 0, data.limit()));
}
}
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/AbstractNioChannel.java b/reactor/src/main/java/com/iluwatar/reactor/framework/AbstractNioChannel.java
index ee830e3b1..aa7d703ce 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/AbstractNioChannel.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/AbstractNioChannel.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
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/ChannelHandler.java b/reactor/src/main/java/com/iluwatar/reactor/framework/ChannelHandler.java
index 86b30b0dd..6391436ce 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/ChannelHandler.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/ChannelHandler.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
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/Dispatcher.java b/reactor/src/main/java/com/iluwatar/reactor/framework/Dispatcher.java
index d9c93190a..a3fe187a3 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/Dispatcher.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/Dispatcher.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
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/NioDatagramChannel.java b/reactor/src/main/java/com/iluwatar/reactor/framework/NioDatagramChannel.java
index 4e493163f..36171cf67 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/NioDatagramChannel.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/NioDatagramChannel.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.reactor.framework;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -35,6 +38,8 @@ import java.nio.channels.SelectionKey;
*/
public class NioDatagramChannel extends AbstractNioChannel {
+ private static final Logger LOGGER = LoggerFactory.getLogger(NioDatagramChannel.class);
+
private final int port;
/**
@@ -99,7 +104,7 @@ public class NioDatagramChannel extends AbstractNioChannel {
public void bind() throws IOException {
getJavaChannel().socket().bind(new InetSocketAddress(InetAddress.getLocalHost(), port));
getJavaChannel().configureBlocking(false);
- System.out.println("Bound UDP socket at port: " + port);
+ LOGGER.info("Bound UDP socket at port: {}", port);
}
/**
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.java b/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.java
index 3d5ebf5a0..bc5b27494 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.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.reactor.framework;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
@@ -53,6 +56,8 @@ import java.util.concurrent.TimeUnit;
*/
public class NioReactor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(NioReactor.class);
+
private final Selector selector;
private final Dispatcher dispatcher;
/**
@@ -86,7 +91,7 @@ public class NioReactor {
public void start() throws IOException {
reactorMain.execute(() -> {
try {
- System.out.println("Reactor started, waiting for events...");
+ LOGGER.info("Reactor started, waiting for events...");
eventLoop();
} catch (IOException e) {
e.printStackTrace();
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/NioServerSocketChannel.java b/reactor/src/main/java/com/iluwatar/reactor/framework/NioServerSocketChannel.java
index c7d67fd13..4721d292a 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/NioServerSocketChannel.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/NioServerSocketChannel.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.reactor.framework;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -36,6 +39,8 @@ import java.nio.channels.SocketChannel;
*/
public class NioServerSocketChannel extends AbstractNioChannel {
+ private static final Logger LOGGER = LoggerFactory.getLogger(NioServerSocketChannel.class);
+
private final int port;
/**
@@ -96,7 +101,7 @@ public class NioServerSocketChannel extends AbstractNioChannel {
((ServerSocketChannel) getJavaChannel()).socket().bind(
new InetSocketAddress(InetAddress.getLocalHost(), port));
((ServerSocketChannel) getJavaChannel()).configureBlocking(false);
- System.out.println("Bound TCP socket at port: " + port);
+ LOGGER.info("Bound TCP socket at port: {}", port);
}
/**
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/SameThreadDispatcher.java b/reactor/src/main/java/com/iluwatar/reactor/framework/SameThreadDispatcher.java
index 855d8b090..3db4f1e9a 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/SameThreadDispatcher.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/SameThreadDispatcher.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
diff --git a/reactor/src/main/java/com/iluwatar/reactor/framework/ThreadPoolDispatcher.java b/reactor/src/main/java/com/iluwatar/reactor/framework/ThreadPoolDispatcher.java
index 0ca114abe..a43a974c9 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/framework/ThreadPoolDispatcher.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/framework/ThreadPoolDispatcher.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
diff --git a/reactor/src/test/java/com/iluwatar/reactor/app/ReactorTest.java b/reactor/src/test/java/com/iluwatar/reactor/app/ReactorTest.java
index 1ec70f87f..413bbc017 100644
--- a/reactor/src/test/java/com/iluwatar/reactor/app/ReactorTest.java
+++ b/reactor/src/test/java/com/iluwatar/reactor/app/ReactorTest.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
diff --git a/reader-writer-lock/etc/reader-writer-lock.urm.puml b/reader-writer-lock/etc/reader-writer-lock.urm.puml
index 1760cf3e4..c0302cd6d 100644
--- a/reader-writer-lock/etc/reader-writer-lock.urm.puml
+++ b/reader-writer-lock/etc/reader-writer-lock.urm.puml
@@ -1,5 +1,18 @@
@startuml
package com.iluwatar.reader.writer.lock {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
+ class Reader {
+ - LOGGER : Logger {static}
+ - name : String
+ - readLock : Lock
+ + Reader(name : String, readLock : Lock)
+ + read()
+ + run()
+ }
class ReaderWriterLock {
- currentReaderCount : int
- globalMutex : Set<Object>
@@ -14,19 +27,6 @@ package com.iluwatar.reader.writer.lock {
- waitUninterruptibly(o : Object) {static}
+ writeLock() : Lock
}
- -class WriteLock {
- - WriteLock()
- + lock()
- + lockInterruptibly()
- + newCondition() : Condition
- + tryLock() : boolean
- + tryLock(time : long, unit : TimeUnit) : boolean
- + unlock()
- }
- class App {
- + App()
- + main(args : String[]) {static}
- }
-class ReadLock {
- ReadLock()
+ lock()
@@ -36,20 +36,23 @@ package com.iluwatar.reader.writer.lock {
+ tryLock(time : long, unit : TimeUnit) : boolean
+ unlock()
}
+ -class WriteLock {
+ - WriteLock()
+ + lock()
+ + lockInterruptibly()
+ + newCondition() : Condition
+ + tryLock() : boolean
+ + tryLock(time : long, unit : TimeUnit) : boolean
+ + unlock()
+ }
class Writer {
+ - LOGGER : Logger {static}
- name : String
- writeLock : Lock
+ Writer(name : String, writeLock : Lock)
+ run()
+ write()
}
- class Reader {
- - name : String
- - readLock : Lock
- + Reader(name : String, readLock : Lock)
- + read()
- + run()
- }
}
ReaderWriterLock --> "-readerLock" ReadLock
ReadLock --+ ReaderWriterLock
diff --git a/reader-writer-lock/pom.xml b/reader-writer-lock/pom.xml
index f10acb8d7..1f7db8709 100644
--- a/reader-writer-lock/pom.xml
+++ b/reader-writer-lock/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
diff --git a/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/App.java b/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/App.java
index fd5d28ed5..af7b5df2c 100644
--- a/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/App.java
+++ b/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/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
@@ -23,6 +23,9 @@
package com.iluwatar.reader.writer.lock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -48,6 +51,8 @@ import java.util.stream.IntStream;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -71,7 +76,7 @@ public class App {
try {
executeService.awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- System.out.println("Error waiting for ExecutorService shutdown");
+ LOGGER.error("Error waiting for ExecutorService shutdown");
}
}
diff --git a/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/Reader.java b/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/Reader.java
index 2b837b341..006aff7d7 100644
--- a/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/Reader.java
+++ b/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/Reader.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.reader.writer.lock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.concurrent.locks.Lock;
/**
@@ -29,6 +32,8 @@ import java.util.concurrent.locks.Lock;
*/
public class Reader implements Runnable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Reader.class);
+
private Lock readLock;
private String name;
@@ -55,8 +60,8 @@ public class Reader implements Runnable {
*
*/
public void read() throws InterruptedException {
- System.out.println(name + " begin");
+ LOGGER.info("{} begin", name);
Thread.sleep(250);
- System.out.println(name + " finish");
+ LOGGER.info("{} finish", name);
}
}
diff --git a/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/ReaderWriterLock.java b/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/ReaderWriterLock.java
index f08ed805d..e7b3c4451 100644
--- a/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/ReaderWriterLock.java
+++ b/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/ReaderWriterLock.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
diff --git a/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/Writer.java b/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/Writer.java
index fc3c3bb88..c468a61f8 100644
--- a/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/Writer.java
+++ b/reader-writer-lock/src/main/java/com/iluwatar/reader/writer/lock/Writer.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.reader.writer.lock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.concurrent.locks.Lock;
/**
@@ -29,6 +32,8 @@ import java.util.concurrent.locks.Lock;
*/
public class Writer implements Runnable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Writer.class);
+
private Lock writeLock;
private String name;
@@ -55,8 +60,8 @@ public class Writer implements Runnable {
* Simulate the write operation
*/
public void write() throws InterruptedException {
- System.out.println(name + " begin");
+ LOGGER.info("{} begin", name);
Thread.sleep(250);
- System.out.println(name + " finish");
+ LOGGER.info("{} finish", name);
}
}
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/AppTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/AppTest.java
index 09c591a48..fd0cd4b27 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/AppTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/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
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java
index a2496a3c0..adc2adae2 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.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
@@ -23,21 +23,37 @@
package com.iluwatar.reader.writer.lock;
-import static org.mockito.Mockito.inOrder;
+import com.iluwatar.reader.writer.lock.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import org.junit.Test;
-import org.mockito.InOrder;
+import static org.junit.Assert.assertTrue;
/**
* @author hongshuwei@gmail.com
*/
-public class ReaderAndWriterTest extends StdOutTest {
+public class ReaderAndWriterTest {
+ private InMemoryAppender appender;
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ReaderAndWriterTest.class);
/**
* Verify reader and writer can only get the lock to read and write orderly
@@ -60,14 +76,13 @@ public class ReaderAndWriterTest extends StdOutTest {
try {
executeService.awaitTermination(10, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- System.out.println("Error waiting for ExecutorService shutdown");
+ LOGGER.error("Error waiting for ExecutorService shutdown", e);
}
- final InOrder inOrder = inOrder(getStdOutMock());
- inOrder.verify(getStdOutMock()).println("Reader 1 begin");
- inOrder.verify(getStdOutMock()).println("Reader 1 finish");
- inOrder.verify(getStdOutMock()).println("Writer 1 begin");
- inOrder.verify(getStdOutMock()).println("Writer 1 finish");
+ assertTrue(appender.logContains("Reader 1 begin"));
+ assertTrue(appender.logContains("Reader 1 finish"));
+ assertTrue(appender.logContains("Writer 1 begin"));
+ assertTrue(appender.logContains("Writer 1 finish"));
}
/**
@@ -91,14 +106,13 @@ public class ReaderAndWriterTest extends StdOutTest {
try {
executeService.awaitTermination(10, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- System.out.println("Error waiting for ExecutorService shutdown");
+ LOGGER.error("Error waiting for ExecutorService shutdown", e);
}
- final InOrder inOrder = inOrder(getStdOutMock());
- inOrder.verify(getStdOutMock()).println("Writer 1 begin");
- inOrder.verify(getStdOutMock()).println("Writer 1 finish");
- inOrder.verify(getStdOutMock()).println("Reader 1 begin");
- inOrder.verify(getStdOutMock()).println("Reader 1 finish");
+ assertTrue(appender.logContains("Writer 1 begin"));
+ assertTrue(appender.logContains("Writer 1 finish"));
+ assertTrue(appender.logContains("Reader 1 begin"));
+ assertTrue(appender.logContains("Reader 1 finish"));
}
}
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java
index 7d51e977c..c9b3eb72c 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.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,20 +22,38 @@
*/
package com.iluwatar.reader.writer.lock;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.spy;
+import com.iluwatar.reader.writer.lock.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import org.junit.Test;
-import org.mockito.InOrder;
+import static junit.framework.TestCase.assertTrue;
+import static org.mockito.Mockito.spy;
/**
* @author hongshuwei@gmail.com
*/
-public class ReaderTest extends StdOutTest {
+public class ReaderTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(Reader.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ReaderTest.class);
/**
* Verify that multiple readers can get the read lock concurrently
@@ -57,16 +75,14 @@ public class ReaderTest extends StdOutTest {
try {
executeService.awaitTermination(10, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- System.out.println("Error waiting for ExecutorService shutdown");
+ LOGGER.error("Error waiting for ExecutorService shutdown", e);
}
// Read operation will hold the read lock 250 milliseconds, so here we prove that multiple reads
// can be performed in the same time.
- final InOrder inOrder = inOrder(getStdOutMock());
- inOrder.verify(getStdOutMock()).println("Reader 1 begin");
- inOrder.verify(getStdOutMock()).println("Reader 2 begin");
- inOrder.verify(getStdOutMock()).println("Reader 1 finish");
- inOrder.verify(getStdOutMock()).println("Reader 2 finish");
-
+ assertTrue(appender.logContains("Reader 1 begin"));
+ assertTrue(appender.logContains("Reader 2 begin"));
+ assertTrue(appender.logContains("Reader 1 finish"));
+ assertTrue(appender.logContains("Reader 2 finish"));
}
}
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/StdOutTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/StdOutTest.java
deleted file mode 100644
index 7a1af09c0..000000000
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/StdOutTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.reader.writer.lock;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java
index 765c491ff..7c4b4148d 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.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,20 +22,38 @@
*/
package com.iluwatar.reader.writer.lock;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.spy;
+import com.iluwatar.reader.writer.lock.utils.InMemoryAppender;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import org.junit.Test;
-import org.mockito.InOrder;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.spy;
/**
* @author hongshuwei@gmail.com
*/
-public class WriterTest extends StdOutTest {
+public class WriterTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender(Writer.class);
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(WriterTest.class);
/**
* Verify that multiple writers will get the lock in order.
@@ -58,15 +76,14 @@ public class WriterTest extends StdOutTest {
try {
executeService.awaitTermination(10, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- System.out.println("Error waiting for ExecutorService shutdown");
+ LOGGER.error("Error waiting for ExecutorService shutdown", e);
}
// Write operation will hold the write lock 250 milliseconds, so here we verify that when two
// writer execute concurrently, the second writer can only writes only when the first one is
// finished.
- final InOrder inOrder = inOrder(getStdOutMock());
- inOrder.verify(getStdOutMock()).println("Writer 1 begin");
- inOrder.verify(getStdOutMock()).println("Writer 1 finish");
- inOrder.verify(getStdOutMock()).println("Writer 2 begin");
- inOrder.verify(getStdOutMock()).println("Writer 2 finish");
+ assertTrue(appender.logContains("Writer 1 begin"));
+ assertTrue(appender.logContains("Writer 1 finish"));
+ assertTrue(appender.logContains("Writer 2 begin"));
+ assertTrue(appender.logContains("Writer 2 finish"));
}
}
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/utils/InMemoryAppender.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/utils/InMemoryAppender.java
new file mode 100644
index 000000000..c22040418
--- /dev/null
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/utils/InMemoryAppender.java
@@ -0,0 +1,54 @@
+/**
+ * The MIT License
+ * 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
+ * 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.reader.writer.lock.utils;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender(Class clazz) {
+ ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
+ start();
+ }
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public boolean logContains(String message) {
+ return log.stream().anyMatch(event -> event.getFormattedMessage().equals(message));
+ }
+}
diff --git a/repository/etc/repository.urm.puml b/repository/etc/repository.urm.puml
index ad1759033..10768260c 100644
--- a/repository/etc/repository.urm.puml
+++ b/repository/etc/repository.urm.puml
@@ -1,27 +1,12 @@
@startuml
package com.iluwatar.repository {
- class PersonSpecifications {
- + PersonSpecifications()
- }
- class NameEqualSpec {
- + name : String
- + NameEqualSpec(name : String)
- + toPredicate(root : Root<Person>, query : CriteriaQuery<?>, cb : CriteriaBuilder) : Predicate
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
- interface PersonRepository {
- + findByName(String) : Person {abstract}
- }
- class AgeBetweenSpec {
- - from : int
- - to : int
- + AgeBetweenSpec(from : int, to : int)
- + toPredicate(root : Root<Person>, query : CriteriaQuery<?>, cb : CriteriaBuilder) : Predicate
- }
class AppConfig {
+ - LOGGER : Logger {static}
+ AppConfig()
+ dataSource() : DataSource
+ entityManagerFactory() : LocalContainerEntityManagerFactoryBean
@@ -48,9 +33,24 @@ package com.iluwatar.repository {
+ setSurname(surname : String)
+ toString() : String
}
+ interface PersonRepository {
+ + findByName(String) : Person {abstract}
+ }
+ class PersonSpecifications {
+ + PersonSpecifications()
+ }
+ class AgeBetweenSpec {
+ - from : int
+ - to : int
+ + AgeBetweenSpec(from : int, to : int)
+ + toPredicate(root : Root<Person>, query : CriteriaQuery<?>, cb : CriteriaBuilder) : Predicate
+ }
+ class NameEqualSpec {
+ + name : String
+ + NameEqualSpec(name : String)
+ + toPredicate(root : Root<Person>, query : CriteriaQuery<?>, cb : CriteriaBuilder) : Predicate
+ }
}
-App --+ PersonSpecifications
-AppConfig --+ PersonSpecifications
NameEqualSpec ..+ PersonSpecifications
AgeBetweenSpec ..+ PersonSpecifications
@enduml
\ No newline at end of file
diff --git a/repository/pom.xml b/repository/pom.xml
index 45f735b7a..9e7465293 100644
--- a/repository/pom.xml
+++ b/repository/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
diff --git a/repository/src/main/java/com/iluwatar/repository/App.java b/repository/src/main/java/com/iluwatar/repository/App.java
index 2807ae7ca..d96b4351e 100644
--- a/repository/src/main/java/com/iluwatar/repository/App.java
+++ b/repository/src/main/java/com/iluwatar/repository/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
@@ -24,6 +24,8 @@ package com.iluwatar.repository;
import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -43,6 +45,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -67,12 +71,12 @@ public class App {
repository.save(terry);
// Count Person records
- System.out.println("Count Person records: " + repository.count());
+ LOGGER.info("Count Person records: {}", repository.count());
// Print all records
List<Person> persons = (List<Person>) repository.findAll();
for (Person person : persons) {
- System.out.println(person);
+ LOGGER.info(person.toString());
}
// Update Person
@@ -80,24 +84,24 @@ public class App {
nasta.setSurname("Spotakova");
repository.save(nasta);
- System.out.println("Find by id 2: " + repository.findOne(2L));
+ LOGGER.info("Find by id 2: {}", repository.findOne(2L));
// Remove record from Person
repository.delete(2L);
// count records
- System.out.println("Count Person records: " + repository.count());
+ LOGGER.info("Count Person records: {}", repository.count());
// find by name
Person p = repository.findOne(new PersonSpecifications.NameEqualSpec("John"));
- System.out.println("Find by John is " + p);
+ LOGGER.info("Find by John is {}", p);
// find by age
persons = repository.findAll(new PersonSpecifications.AgeBetweenSpec(20, 40));
- System.out.println("Find Person with age between 20,40: ");
+ LOGGER.info("Find Person with age between 20,40: ");
for (Person person : persons) {
- System.out.println(person);
+ LOGGER.info(person.toString());
}
repository.deleteAll();
diff --git a/repository/src/main/java/com/iluwatar/repository/AppConfig.java b/repository/src/main/java/com/iluwatar/repository/AppConfig.java
index 3e7093358..c5ccb7d00 100644
--- a/repository/src/main/java/com/iluwatar/repository/AppConfig.java
+++ b/repository/src/main/java/com/iluwatar/repository/AppConfig.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
@@ -30,6 +30,8 @@ import javax.sql.DataSource;
import org.apache.commons.dbcp.BasicDataSource;
import org.hibernate.jpa.HibernatePersistenceProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -44,6 +46,8 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@EnableJpaRepositories
public class AppConfig {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AppConfig.class);
+
/**
* Creation of H2 db
*
@@ -117,12 +121,12 @@ public class AppConfig {
repository.save(terry);
// Count Person records
- System.out.println("Count Person records: " + repository.count());
+ LOGGER.info("Count Person records: {}", repository.count());
// Print all records
List<Person> persons = (List<Person>) repository.findAll();
for (Person person : persons) {
- System.out.println(person);
+ LOGGER.info(person.toString());
}
// Update Person
@@ -130,24 +134,24 @@ public class AppConfig {
nasta.setSurname("Spotakova");
repository.save(nasta);
- System.out.println("Find by id 2: " + repository.findOne(2L));
+ LOGGER.info("Find by id 2: {}", repository.findOne(2L));
// Remove record from Person
repository.delete(2L);
// count records
- System.out.println("Count Person records: " + repository.count());
+ LOGGER.info("Count Person records: {}", repository.count());
// find by name
Person p = repository.findOne(new PersonSpecifications.NameEqualSpec("John"));
- System.out.println("Find by John is " + p);
+ LOGGER.info("Find by John is {}", p);
// find by age
persons = repository.findAll(new PersonSpecifications.AgeBetweenSpec(20, 40));
- System.out.println("Find Person with age between 20,40: ");
+ LOGGER.info("Find Person with age between 20,40: ");
for (Person person : persons) {
- System.out.println(person);
+ LOGGER.info(person.toString());
}
context.close();
diff --git a/repository/src/main/java/com/iluwatar/repository/Person.java b/repository/src/main/java/com/iluwatar/repository/Person.java
index b1559cf00..d37234e43 100644
--- a/repository/src/main/java/com/iluwatar/repository/Person.java
+++ b/repository/src/main/java/com/iluwatar/repository/Person.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
diff --git a/repository/src/main/java/com/iluwatar/repository/PersonRepository.java b/repository/src/main/java/com/iluwatar/repository/PersonRepository.java
index eb9addd62..e999116ca 100644
--- a/repository/src/main/java/com/iluwatar/repository/PersonRepository.java
+++ b/repository/src/main/java/com/iluwatar/repository/PersonRepository.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
diff --git a/repository/src/main/java/com/iluwatar/repository/PersonSpecifications.java b/repository/src/main/java/com/iluwatar/repository/PersonSpecifications.java
index 81394fda3..0bab0950a 100644
--- a/repository/src/main/java/com/iluwatar/repository/PersonSpecifications.java
+++ b/repository/src/main/java/com/iluwatar/repository/PersonSpecifications.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
diff --git a/repository/src/main/resources/META-INF/persistence.xml b/repository/src/main/resources/META-INF/persistence.xml
index db4c7be13..257495cb7 100644
--- a/repository/src/main/resources/META-INF/persistence.xml
+++ b/repository/src/main/resources/META-INF/persistence.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
diff --git a/repository/src/main/resources/applicationContext.xml b/repository/src/main/resources/applicationContext.xml
index 8b4b81bb7..26d6cb3f4 100644
--- a/repository/src/main/resources/applicationContext.xml
+++ b/repository/src/main/resources/applicationContext.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
diff --git a/repository/src/main/resources/logback.xml b/repository/src/main/resources/logback.xml
new file mode 100644
index 000000000..56b6a59bb
--- /dev/null
+++ b/repository/src/main/resources/logback.xml
@@ -0,0 +1,52 @@
+<!--
+
+ The MIT License
+ 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
+ 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.
+
+-->
+<configuration>
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>repository.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>repository-%d.log</fileNamePattern>
+ <maxHistory>5</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="com.iluwatar" additivity="false">
+ <level value="DEBUG"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</configuration>
diff --git a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java
index ccd3fcc41..cb84b1ae8 100644
--- a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.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
diff --git a/repository/src/test/java/com/iluwatar/repository/AppConfigTest.java b/repository/src/test/java/com/iluwatar/repository/AppConfigTest.java
index 28623bf45..6d6a58e8d 100644
--- a/repository/src/test/java/com/iluwatar/repository/AppConfigTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/AppConfigTest.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
diff --git a/repository/src/test/java/com/iluwatar/repository/AppTest.java b/repository/src/test/java/com/iluwatar/repository/AppTest.java
index e1fc27bef..d3f05caaa 100644
--- a/repository/src/test/java/com/iluwatar/repository/AppTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/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
diff --git a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java
index 63f9f7c6d..3201c024c 100644
--- a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.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
diff --git a/resource-acquisition-is-initialization/etc/resource-acquisition-is-initialization.urm.puml b/resource-acquisition-is-initialization/etc/resource-acquisition-is-initialization.urm.puml
index 81560c7f5..11309f0a6 100644
--- a/resource-acquisition-is-initialization/etc/resource-acquisition-is-initialization.urm.puml
+++ b/resource-acquisition-is-initialization/etc/resource-acquisition-is-initialization.urm.puml
@@ -1,14 +1,17 @@
@startuml
package com.iluwatar.resource.acquisition.is.initialization {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
class SlidingDoor {
+ - LOGGER : Logger {static}
+ SlidingDoor()
+ close()
}
class TreasureChest {
+ - LOGGER : Logger {static}
+ TreasureChest()
+ close()
}
diff --git a/resource-acquisition-is-initialization/pom.xml b/resource-acquisition-is-initialization/pom.xml
index ef5de7532..327a7e960 100644
--- a/resource-acquisition-is-initialization/pom.xml
+++ b/resource-acquisition-is-initialization/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
diff --git a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/App.java b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/App.java
index 413fb0eab..75d5dff27 100644
--- a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/App.java
+++ b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/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.resource.acquisition.is.initialization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Resource Acquisition Is Initialization pattern was developed for exception safe resource
@@ -44,17 +47,19 @@ package com.iluwatar.resource.acquisition.is.initialization;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*/
public static void main(String[] args) throws Exception {
try (SlidingDoor slidingDoor = new SlidingDoor()) {
- System.out.println("Walking in.");
+ LOGGER.info("Walking in.");
}
try (TreasureChest treasureChest = new TreasureChest()) {
- System.out.println("Looting contents.");
+ LOGGER.info("Looting contents.");
}
}
}
diff --git a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/SlidingDoor.java b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/SlidingDoor.java
index 3a1a35f2d..b23c2df6d 100644
--- a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/SlidingDoor.java
+++ b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/SlidingDoor.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.resource.acquisition.is.initialization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* SlidingDoor resource
@@ -29,12 +32,14 @@ package com.iluwatar.resource.acquisition.is.initialization;
*/
public class SlidingDoor implements AutoCloseable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SlidingDoor.class);
+
public SlidingDoor() {
- System.out.println("Sliding door opens.");
+ LOGGER.info("Sliding door opens.");
}
@Override
public void close() throws Exception {
- System.out.println("Sliding door closes.");
+ LOGGER.info("Sliding door closes.");
}
}
diff --git a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/TreasureChest.java b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/TreasureChest.java
index e7b7ebab6..a2b7009a6 100644
--- a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/TreasureChest.java
+++ b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/TreasureChest.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.resource.acquisition.is.initialization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.Closeable;
import java.io.IOException;
@@ -32,12 +35,14 @@ import java.io.IOException;
*/
public class TreasureChest implements Closeable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(TreasureChest.class);
+
public TreasureChest() {
- System.out.println("Treasure chest opens.");
+ LOGGER.info("Treasure chest opens.");
}
@Override
public void close() throws IOException {
- System.out.println("Treasure chest closes.");
+ LOGGER.info("Treasure chest closes.");
}
}
diff --git a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java
index c0e6a29b7..1d7b4137a 100644
--- a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java
+++ b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/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
diff --git a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java
index 55bdaf19c..38649cd96 100644
--- a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java
+++ b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.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,28 +22,64 @@
*/
package com.iluwatar.resource.acquisition.is.initialization;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.mockito.InOrder;
+import org.slf4j.LoggerFactory;
-import static org.mockito.Mockito.inOrder;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
/**
* Date: 12/28/15 - 9:31 PM
*
* @author Jeroen Meulemeester
*/
-public class ClosableTest extends StdOutTest {
+public class ClosableTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
@Test
public void testOpenClose() throws Exception {
- final InOrder inOrder = inOrder(getStdOutMock());
try (final SlidingDoor door = new SlidingDoor(); final TreasureChest chest = new TreasureChest()) {
- inOrder.verify(getStdOutMock()).println("Sliding door opens.");
- inOrder.verify(getStdOutMock()).println("Treasure chest opens.");
+ assertTrue(appender.logContains("Sliding door opens."));
+ assertTrue(appender.logContains("Treasure chest opens."));
}
- inOrder.verify(getStdOutMock()).println("Treasure chest closes.");
- inOrder.verify(getStdOutMock()).println("Sliding door closes.");
- inOrder.verifyNoMoreInteractions();
+ assertTrue(appender.logContains("Treasure chest closes."));
+ assertTrue(appender.logContains("Sliding door closes."));
}
-}
\ No newline at end of file
+ public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public boolean logContains(String message) {
+ return log.stream().anyMatch(event -> event.getMessage().equals(message));
+ }
+ }
+
+}
diff --git a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/StdOutTest.java b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/StdOutTest.java
deleted file mode 100644
index 42cb42e6b..000000000
--- a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/StdOutTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.resource.acquisition.is.initialization;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/semaphore/etc/semaphore.urm.puml b/semaphore/etc/semaphore.urm.puml
index a94ff5a7c..c40f4e026 100644
--- a/semaphore/etc/semaphore.urm.puml
+++ b/semaphore/etc/semaphore.urm.puml
@@ -1,23 +1,29 @@
@startuml
package com.iluwatar.semaphore {
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
class Fruit {
- type : FruitType
+ Fruit(type : FruitType)
+ getType() : FruitType
+ toString() : String
}
- class App {
- + App()
- + main(args : String[]) {static}
+ enum FruitType {
+ + APPLE {static}
+ + LEMON {static}
+ + ORANGE {static}
+ + valueOf(name : String) : FruitType {static}
+ + values() : FruitType[] {static}
}
- class Semaphore {
- - counter : int
- - licenses : int
- + Semaphore(licenses : int)
- + acquire()
- + getAvailableLicenses() : int
- + getNumLicenses() : int
- + release()
+ class FruitBowl {
+ - fruit : ArrayList<Fruit>
+ + FruitBowl()
+ + countFruit() : int
+ + put(f : Fruit)
+ + take() : Fruit
+ + toString() : String
}
class FruitShop {
- available : boolean[]
@@ -32,27 +38,19 @@ package com.iluwatar.semaphore {
+ acquire() {abstract}
+ release() {abstract}
}
- class FruitBowl {
- - fruit : ArrayList<Fruit>
- + FruitBowl()
- + countFruit() : int
- + put(f : Fruit)
- + take() : Fruit
- + toString() : String
- }
- enum FruitType {
- + APPLE {static}
- + LEMON {static}
- + ORANGE {static}
- + valueOf(name : String) : FruitType {static}
- + values() : FruitType[] {static}
+ class Semaphore {
+ - counter : int
+ - licenses : int
+ + Semaphore(licenses : int)
+ + acquire()
+ + getAvailableLicenses() : int
+ + getNumLicenses() : int
+ + release()
}
}
-FruitShop --+ Fruit
Fruit --> "-type" FruitType
FruitType ..+ Fruit
-FruitBowl --+ Fruit
-FruitBowl --> "-fruit" Fruit
FruitShop --> "-semaphore" Semaphore
+FruitBowl --> "-fruit" Fruit
Semaphore ..|> Lock
@enduml
\ No newline at end of file
diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/App.java b/semaphore/src/main/java/com/iluwatar/semaphore/App.java
index 272de37b0..90b96cc6f 100644
--- a/semaphore/src/main/java/com/iluwatar/semaphore/App.java
+++ b/semaphore/src/main/java/com/iluwatar/semaphore/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
diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/Customer.java b/semaphore/src/main/java/com/iluwatar/semaphore/Customer.java
index 0a4713438..9c480cb84 100644
--- a/semaphore/src/main/java/com/iluwatar/semaphore/Customer.java
+++ b/semaphore/src/main/java/com/iluwatar/semaphore/Customer.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,12 +22,17 @@
*/
package com.iluwatar.semaphore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A Customer attempts to repeatedly take Fruit from the FruitShop by
* taking Fruit from FruitBowl instances.
*/
public class Customer extends Thread {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Customer.class);
+
/**
* Name of the Customer.
*/
@@ -63,13 +68,13 @@ public class Customer extends Thread {
Fruit fruit;
if (bowl != null && (fruit = bowl.take()) != null) {
- System.out.println(name + " took an " + fruit);
+ LOGGER.info("{} took an {}", name, fruit);
fruitBowl.put(fruit);
fruitShop.returnBowl(bowl);
}
}
-
- System.out.println(name + " took " + fruitBowl);
+
+ LOGGER.info("{} took {}", name, fruitBowl);
}
diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/Fruit.java b/semaphore/src/main/java/com/iluwatar/semaphore/Fruit.java
index 0a4224d20..fc01b8329 100644
--- a/semaphore/src/main/java/com/iluwatar/semaphore/Fruit.java
+++ b/semaphore/src/main/java/com/iluwatar/semaphore/Fruit.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
diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/FruitBowl.java b/semaphore/src/main/java/com/iluwatar/semaphore/FruitBowl.java
index ac2b87ada..4f527f01c 100644
--- a/semaphore/src/main/java/com/iluwatar/semaphore/FruitBowl.java
+++ b/semaphore/src/main/java/com/iluwatar/semaphore/FruitBowl.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
diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/FruitShop.java b/semaphore/src/main/java/com/iluwatar/semaphore/FruitShop.java
index 315b46986..63c1dfa54 100644
--- a/semaphore/src/main/java/com/iluwatar/semaphore/FruitShop.java
+++ b/semaphore/src/main/java/com/iluwatar/semaphore/FruitShop.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
diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/Lock.java b/semaphore/src/main/java/com/iluwatar/semaphore/Lock.java
index 4b651685c..d4f591754 100644
--- a/semaphore/src/main/java/com/iluwatar/semaphore/Lock.java
+++ b/semaphore/src/main/java/com/iluwatar/semaphore/Lock.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
diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/Semaphore.java b/semaphore/src/main/java/com/iluwatar/semaphore/Semaphore.java
index 2e4a54c7c..01351ad9a 100644
--- a/semaphore/src/main/java/com/iluwatar/semaphore/Semaphore.java
+++ b/semaphore/src/main/java/com/iluwatar/semaphore/Semaphore.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
diff --git a/semaphore/src/test/java/com/iluwatar/semaphore/AppTest.java b/semaphore/src/test/java/com/iluwatar/semaphore/AppTest.java
index 4b286588d..25dba2a6d 100644
--- a/semaphore/src/test/java/com/iluwatar/semaphore/AppTest.java
+++ b/semaphore/src/test/java/com/iluwatar/semaphore/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
diff --git a/semaphore/src/test/java/com/iluwatar/semaphore/FruitBowlTest.java b/semaphore/src/test/java/com/iluwatar/semaphore/FruitBowlTest.java
index be31f77ab..30a7dce44 100644
--- a/semaphore/src/test/java/com/iluwatar/semaphore/FruitBowlTest.java
+++ b/semaphore/src/test/java/com/iluwatar/semaphore/FruitBowlTest.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
diff --git a/semaphore/src/test/java/com/iluwatar/semaphore/SemaphoreTest.java b/semaphore/src/test/java/com/iluwatar/semaphore/SemaphoreTest.java
index 14587a485..b787a3301 100644
--- a/semaphore/src/test/java/com/iluwatar/semaphore/SemaphoreTest.java
+++ b/semaphore/src/test/java/com/iluwatar/semaphore/SemaphoreTest.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
diff --git a/servant/etc/servant.urm.puml b/servant/etc/servant.urm.puml
index b7391f5dd..96dee04bc 100644
--- a/servant/etc/servant.urm.puml
+++ b/servant/etc/servant.urm.puml
@@ -1,28 +1,7 @@
@startuml
package com.iluwatar.servant {
- class Servant {
- + name : String
- + Servant(name : String)
- + checkIfYouWillBeHanged(tableGuests : List<Royalty>) : boolean
- + feed(r : Royalty)
- + giveCompliments(r : Royalty)
- + giveWine(r : Royalty)
- }
- class Queen {
- - complimentReceived : boolean
- - isDrunk : boolean
- - isFlirty : boolean
- - isHappy : boolean
- - isHungry : boolean
- + Queen()
- + changeMood()
- + getDrink()
- + getFed()
- + getMood() : boolean
- + receiveCompliments()
- + setFlirtiness(f : boolean)
- }
class App {
+ - LOGGER : Logger {static}
~ jenkins : Servant {static}
~ travis : Servant {static}
+ App()
@@ -41,6 +20,20 @@ package com.iluwatar.servant {
+ getMood() : boolean
+ receiveCompliments()
}
+ class Queen {
+ - complimentReceived : boolean
+ - isDrunk : boolean
+ - isFlirty : boolean
+ - isHappy : boolean
+ - isHungry : boolean
+ + Queen()
+ + changeMood()
+ + getDrink()
+ + getFed()
+ + getMood() : boolean
+ + receiveCompliments()
+ + setFlirtiness(f : boolean)
+ }
~interface Royalty {
+ changeMood() {abstract}
+ getDrink() {abstract}
@@ -48,8 +41,16 @@ package com.iluwatar.servant {
+ getMood() : boolean {abstract}
+ receiveCompliments() {abstract}
}
+ class Servant {
+ + name : String
+ + Servant(name : String)
+ + checkIfYouWillBeHanged(tableGuests : List<Royalty>) : boolean
+ + feed(r : Royalty)
+ + giveCompliments(r : Royalty)
+ + giveWine(r : Royalty)
+ }
}
App --> "-jenkins" Servant
-Queen ..|> Royalty
King ..|> Royalty
+Queen ..|> Royalty
@enduml
\ No newline at end of file
diff --git a/servant/pom.xml b/servant/pom.xml
index 1e99bc09b..30c02d0b8 100644
--- a/servant/pom.xml
+++ b/servant/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
diff --git a/servant/src/etc/servant.xml b/servant/src/etc/servant.xml
index 7b91d0900..06227a6b0 100644
--- a/servant/src/etc/servant.xml
+++ b/servant/src/etc/servant.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
diff --git a/servant/src/main/java/com/iluwatar/servant/App.java b/servant/src/main/java/com/iluwatar/servant/App.java
index 92829441d..33a57e367 100644
--- a/servant/src/main/java/com/iluwatar/servant/App.java
+++ b/servant/src/main/java/com/iluwatar/servant/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.servant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
@@ -35,6 +38,8 @@ import java.util.ArrayList;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
static Servant jenkins = new Servant("Jenkins");
static Servant travis = new Servant("Travis");
@@ -73,9 +78,9 @@ public class App {
// check your luck
if (servant.checkIfYouWillBeHanged(guests)) {
- System.out.println(servant.name + " will live another day");
+ LOGGER.info("{} will live another day", servant.name);
} else {
- System.out.println("Poor " + servant.name + ". His days are numbered");
+ LOGGER.info("Poor {}. His days are numbered", servant.name);
}
}
}
diff --git a/servant/src/main/java/com/iluwatar/servant/King.java b/servant/src/main/java/com/iluwatar/servant/King.java
index bc3f8cdcf..31b97184b 100644
--- a/servant/src/main/java/com/iluwatar/servant/King.java
+++ b/servant/src/main/java/com/iluwatar/servant/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
diff --git a/servant/src/main/java/com/iluwatar/servant/Queen.java b/servant/src/main/java/com/iluwatar/servant/Queen.java
index 3b6203f3e..ad8ed1253 100644
--- a/servant/src/main/java/com/iluwatar/servant/Queen.java
+++ b/servant/src/main/java/com/iluwatar/servant/Queen.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
diff --git a/servant/src/main/java/com/iluwatar/servant/Royalty.java b/servant/src/main/java/com/iluwatar/servant/Royalty.java
index b628383c8..f60ccfed1 100644
--- a/servant/src/main/java/com/iluwatar/servant/Royalty.java
+++ b/servant/src/main/java/com/iluwatar/servant/Royalty.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
diff --git a/servant/src/main/java/com/iluwatar/servant/Servant.java b/servant/src/main/java/com/iluwatar/servant/Servant.java
index 56d65bde2..2774f468e 100644
--- a/servant/src/main/java/com/iluwatar/servant/Servant.java
+++ b/servant/src/main/java/com/iluwatar/servant/Servant.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
diff --git a/servant/src/test/java/com/iluwatar/servant/AppTest.java b/servant/src/test/java/com/iluwatar/servant/AppTest.java
index a9e66e783..5b8908d80 100644
--- a/servant/src/test/java/com/iluwatar/servant/AppTest.java
+++ b/servant/src/test/java/com/iluwatar/servant/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
diff --git a/servant/src/test/java/com/iluwatar/servant/KingTest.java b/servant/src/test/java/com/iluwatar/servant/KingTest.java
index c56d12b24..3ebbaf28b 100644
--- a/servant/src/test/java/com/iluwatar/servant/KingTest.java
+++ b/servant/src/test/java/com/iluwatar/servant/KingTest.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
diff --git a/servant/src/test/java/com/iluwatar/servant/QueenTest.java b/servant/src/test/java/com/iluwatar/servant/QueenTest.java
index 85b22fb42..d425886ba 100644
--- a/servant/src/test/java/com/iluwatar/servant/QueenTest.java
+++ b/servant/src/test/java/com/iluwatar/servant/QueenTest.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
diff --git a/servant/src/test/java/com/iluwatar/servant/ServantTest.java b/servant/src/test/java/com/iluwatar/servant/ServantTest.java
index e4087d86d..e2e61e899 100644
--- a/servant/src/test/java/com/iluwatar/servant/ServantTest.java
+++ b/servant/src/test/java/com/iluwatar/servant/ServantTest.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
diff --git a/service-layer/bin/pom.xml b/service-layer/bin/pom.xml
index 05ed6860d..6eadbfa0c 100644
--- a/service-layer/bin/pom.xml
+++ b/service-layer/bin/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
diff --git a/service-layer/etc/service-layer.urm.puml b/service-layer/etc/service-layer.urm.puml
index 880384b9f..ff870a5e9 100644
--- a/service-layer/etc/service-layer.urm.puml
+++ b/service-layer/etc/service-layer.urm.puml
@@ -1,6 +1,7 @@
@startuml
package com.iluwatar.servicelayer.hibernate {
class HibernateUtil {
+ - LOGGER : Logger {static}
- sessionFactory : SessionFactory {static}
- HibernateUtil()
+ dropSession() {static}
@@ -55,9 +56,6 @@ package com.iluwatar.servicelayer.magic {
}
}
package com.iluwatar.servicelayer.wizard {
- interface WizardDao {
- + findByName(String) : Wizard {abstract}
- }
class Wizard {
- id : Long
- name : String
@@ -73,27 +71,15 @@ package com.iluwatar.servicelayer.wizard {
+ setSpellbooks(spellbooks : Set<Spellbook>)
+ toString() : String
}
+ interface WizardDao {
+ + findByName(String) : Wizard {abstract}
+ }
class WizardDaoImpl {
+ WizardDaoImpl()
+ findByName(name : String) : Wizard
}
}
-package com.iluwatar.servicelayer.app {
- class App {
- + App()
- + initData() {static}
- + main(args : String[]) {static}
- + queryData() {static}
- }
-}
package com.iluwatar.servicelayer.spellbook {
- interface SpellbookDao {
- + findByName(String) : Spellbook {abstract}
- }
- class SpellbookDaoImpl {
- + SpellbookDaoImpl()
- + findByName(name : String) : Spellbook
- }
class Spellbook {
- id : Long
- name : String
@@ -112,15 +98,15 @@ package com.iluwatar.servicelayer.spellbook {
+ setWizards(wizards : Set<Wizard>)
+ toString() : String
}
+ interface SpellbookDao {
+ + findByName(String) : Spellbook {abstract}
+ }
+ class SpellbookDaoImpl {
+ + SpellbookDaoImpl()
+ + findByName(name : String) : Spellbook
+ }
}
package com.iluwatar.servicelayer.spell {
- class SpellDaoImpl {
- + SpellDaoImpl()
- + findByName(name : String) : Spell
- }
- interface SpellDao {
- + findByName(String) : Spell {abstract}
- }
class Spell {
- id : Long
- name : String
@@ -135,24 +121,40 @@ package com.iluwatar.servicelayer.spell {
+ setSpellbook(spellbook : Spellbook)
+ toString() : String
}
+ interface SpellDao {
+ + findByName(String) : Spell {abstract}
+ }
+ class SpellDaoImpl {
+ + SpellDaoImpl()
+ + findByName(name : String) : Spell
+ }
+}
+package com.iluwatar.servicelayer.app {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + initData() {static}
+ + main(args : String[]) {static}
+ + queryData() {static}
+ }
}
MagicServiceImpl --> "-wizardDao" WizardDao
MagicServiceImpl --> "-spellbookDao" SpellbookDao
MagicServiceImpl --> "-spellDao" SpellDao
Spellbook --> "-spells" Spell
Spellbook --> "-wizards" Wizard
+DaoBaseImpl ..|> Dao
+MagicServiceImpl ..|> MagicService
+Spell --|> BaseEntity
+SpellDao --|> Dao
SpellDaoImpl ..|> SpellDao
SpellDaoImpl --|> DaoBaseImpl
+Spellbook --|> BaseEntity
SpellbookDao --|> Dao
-WizardDao --|> Dao
SpellbookDaoImpl ..|> SpellbookDao
SpellbookDaoImpl --|> DaoBaseImpl
-MagicServiceImpl ..|> MagicService
-SpellDao --|> Dao
-Spell --|> BaseEntity
-Spellbook --|> BaseEntity
Wizard --|> BaseEntity
+WizardDao --|> Dao
WizardDaoImpl ..|> WizardDao
WizardDaoImpl --|> DaoBaseImpl
-DaoBaseImpl ..|> Dao
@enduml
\ No newline at end of file
diff --git a/service-layer/pom.xml b/service-layer/pom.xml
index 830ced4f6..74fd36624 100644
--- a/service-layer/pom.xml
+++ b/service-layer/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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java b/service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java
index 8282d800c..73dc1fe5c 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/app/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
@@ -35,6 +35,8 @@ import com.iluwatar.servicelayer.spellbook.SpellbookDaoImpl;
import com.iluwatar.servicelayer.wizard.Wizard;
import com.iluwatar.servicelayer.wizard.WizardDao;
import com.iluwatar.servicelayer.wizard.WizardDaoImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -57,6 +59,8 @@ import com.iluwatar.servicelayer.wizard.WizardDaoImpl;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -180,27 +184,27 @@ public class App {
public static void queryData() {
MagicService service =
new MagicServiceImpl(new WizardDaoImpl(), new SpellbookDaoImpl(), new SpellDaoImpl());
- System.out.println("Enumerating all wizards");
+ LOGGER.info("Enumerating all wizards");
for (Wizard w : service.findAllWizards()) {
- System.out.println(w.getName());
+ LOGGER.info(w.getName());
}
- System.out.println("Enumerating all spellbooks");
+ LOGGER.info("Enumerating all spellbooks");
for (Spellbook s : service.findAllSpellbooks()) {
- System.out.println(s.getName());
+ LOGGER.info(s.getName());
}
- System.out.println("Enumerating all spells");
+ LOGGER.info("Enumerating all spells");
for (Spell s : service.findAllSpells()) {
- System.out.println(s.getName());
+ LOGGER.info(s.getName());
}
- System.out.println("Find wizards with spellbook 'Book of Idores'");
+ LOGGER.info("Find wizards with spellbook 'Book of Idores'");
List<Wizard> wizardsWithSpellbook = service.findWizardsWithSpellbook("Book of Idores");
for (Wizard w : wizardsWithSpellbook) {
- System.out.println(String.format("%s has 'Book of Idores'", w.getName()));
+ LOGGER.info("{} has 'Book of Idores'", w.getName());
}
- System.out.println("Find wizards with spell 'Fireball'");
+ LOGGER.info("Find wizards with spell 'Fireball'");
List<Wizard> wizardsWithSpell = service.findWizardsWithSpell("Fireball");
for (Wizard w : wizardsWithSpell) {
- System.out.println(String.format("%s has 'Fireball'", w.getName()));
+ LOGGER.info("{} has 'Fireball'", w.getName());
}
}
}
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/common/BaseEntity.java b/service-layer/src/main/java/com/iluwatar/servicelayer/common/BaseEntity.java
index 53f5f7b0f..52c24292e 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/common/BaseEntity.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/common/BaseEntity.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/common/Dao.java b/service-layer/src/main/java/com/iluwatar/servicelayer/common/Dao.java
index 1fed0864b..eee73b14b 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/common/Dao.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/common/Dao.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/common/DaoBaseImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/common/DaoBaseImpl.java
index 88ac2597d..70feb1a00 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/common/DaoBaseImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/common/DaoBaseImpl.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java b/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java
index b30b97b65..f83abf17c 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.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
@@ -28,12 +28,16 @@ import com.iluwatar.servicelayer.wizard.Wizard;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Produces the Hibernate {@link SessionFactory}.
*/
public final class HibernateUtil {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HibernateUtil.class);
+
/**
* The cached session factory
*/
@@ -56,10 +60,10 @@ public final class HibernateUtil {
.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect")
.setProperty("hibernate.connection.url", "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1")
.setProperty("hibernate.current_session_context_class", "thread")
- .setProperty("hibernate.show_sql", "true")
+ .setProperty("hibernate.show_sql", "false")
.setProperty("hibernate.hbm2ddl.auto", "create-drop").buildSessionFactory();
} catch (Throwable ex) {
- System.err.println("Initial SessionFactory creation failed." + ex);
+ LOGGER.error("Initial SessionFactory creation failed.", ex);
throw new ExceptionInInitializerError(ex);
}
}
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java
index c88e1f538..dcbab0696 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java
index 71756d4cf..1e7ba9d56 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java
index caf1b2c91..281128145 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDao.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDao.java
index 10a35b73a..0c9ca6c0b 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDao.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDao.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDaoImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDaoImpl.java
index bd1860a6b..b280b1250 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDaoImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spell/SpellDaoImpl.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java
index 918ce4664..9a2cf89c3 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDao.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDao.java
index ddf52cd73..05e208d54 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDao.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDao.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImpl.java
index 3e2859d59..7724583ab 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImpl.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java
index 40e0b3ac7..00cdcc081 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDao.java b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDao.java
index ddf05fb04..320d1a54c 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDao.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDao.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
diff --git a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDaoImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDaoImpl.java
index 8243e3d5d..67a37e969 100644
--- a/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDaoImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDaoImpl.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
diff --git a/service-layer/src/main/resources/logback.xml b/service-layer/src/main/resources/logback.xml
new file mode 100644
index 000000000..b070def43
--- /dev/null
+++ b/service-layer/src/main/resources/logback.xml
@@ -0,0 +1,57 @@
+<!--
+
+ The MIT License
+ 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
+ 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.
+
+-->
+<configuration>
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>service-layer.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>service-layer-%d.log</fileNamePattern>
+ <maxHistory>5</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%-5p [%d{ISO8601,UTC}] %c: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="com.iluwatar" additivity="false">
+ <level value="DEBUG"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+
+ <logger name="org.hibernate" additivity="false">
+ <level value="ERROR"/>
+ <appender-ref ref="STDOUT"/>
+ </logger>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</configuration>
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java
index 3626c3339..a667252a1 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/app/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
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java
index 789ded428..79c7a0f86 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.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
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/magic/MagicServiceImplTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/magic/MagicServiceImplTest.java
index dddc46916..05ad6f887 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/magic/MagicServiceImplTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/magic/MagicServiceImplTest.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
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/spell/SpellDaoImplTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/spell/SpellDaoImplTest.java
index 892ec6d2e..b6b4917c8 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/spell/SpellDaoImplTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/spell/SpellDaoImplTest.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
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImplTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImplTest.java
index 957c07bea..fb7eca15a 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImplTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImplTest.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
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/wizard/WizardDaoImplTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/wizard/WizardDaoImplTest.java
index 8649ee0a0..64bd72c7a 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/wizard/WizardDaoImplTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/wizard/WizardDaoImplTest.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
diff --git a/service-locator/etc/service-locator.urm.puml b/service-locator/etc/service-locator.urm.puml
index 9e41e7f40..38fe7ea1b 100644
--- a/service-locator/etc/service-locator.urm.puml
+++ b/service-locator/etc/service-locator.urm.puml
@@ -1,15 +1,28 @@
@startuml
package com.iluwatar.servicelocator {
- class ServiceLocator {
- - serviceCache : ServiceCache {static}
- - ServiceLocator()
- + getService(serviceJndiName : String) : Service {static}
- }
class App {
+ App()
+ main(args : String[]) {static}
}
+ class InitContext {
+ - LOGGER : Logger {static}
+ + InitContext()
+ + lookup(serviceName : String) : Object
+ }
+ interface Service {
+ + execute() {abstract}
+ + getId() : int {abstract}
+ + getName() : String {abstract}
+ }
+ class ServiceCache {
+ - LOGGER : Logger {static}
+ - serviceCache : Map<String, Service>
+ + ServiceCache()
+ + addService(newService : Service)
+ + getService(serviceName : String) : Service
+ }
class ServiceImpl {
+ - LOGGER : Logger {static}
- id : int
- serviceName : String
+ ServiceImpl(serviceName : String)
@@ -17,20 +30,10 @@ package com.iluwatar.servicelocator {
+ getId() : int
+ getName() : String
}
- class InitContext {
- + InitContext()
- + lookup(serviceName : String) : Object
- }
- class ServiceCache {
- - serviceCache : Map<String, Service>
- + ServiceCache()
- + addService(newService : Service)
- + getService(serviceName : String) : Service
- }
- interface Service {
- + execute() {abstract}
- + getId() : int {abstract}
- + getName() : String {abstract}
+ class ServiceLocator {
+ - serviceCache : ServiceCache {static}
+ - ServiceLocator()
+ + getService(serviceJndiName : String) : Service {static}
}
}
ServiceLocator --> "-serviceCache" ServiceCache
diff --git a/service-locator/pom.xml b/service-locator/pom.xml
index 894908f92..058e1b1bc 100644
--- a/service-locator/pom.xml
+++ b/service-locator/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
diff --git a/service-locator/src/main/java/com/iluwatar/servicelocator/App.java b/service-locator/src/main/java/com/iluwatar/servicelocator/App.java
index 72612fb21..9a24d8280 100644
--- a/service-locator/src/main/java/com/iluwatar/servicelocator/App.java
+++ b/service-locator/src/main/java/com/iluwatar/servicelocator/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
diff --git a/service-locator/src/main/java/com/iluwatar/servicelocator/InitContext.java b/service-locator/src/main/java/com/iluwatar/servicelocator/InitContext.java
index 8063fc818..c72c075d6 100644
--- a/service-locator/src/main/java/com/iluwatar/servicelocator/InitContext.java
+++ b/service-locator/src/main/java/com/iluwatar/servicelocator/InitContext.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.servicelocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* For JNDI lookup of services from the web.xml. Will match name of the service name that is being
* requested and return a newly created service object with the name
@@ -30,6 +33,8 @@ package com.iluwatar.servicelocator;
*/
public class InitContext {
+ private static final Logger LOGGER = LoggerFactory.getLogger(InitContext.class);
+
/**
* Perform the lookup based on the service name. The returned object will need to be casted into a
* {@link Service}
@@ -39,10 +44,10 @@ public class InitContext {
*/
public Object lookup(String serviceName) {
if (serviceName.equals("jndi/serviceA")) {
- System.out.println("Looking up service A and creating new service for A");
+ LOGGER.info("Looking up service A and creating new service for A");
return new ServiceImpl("jndi/serviceA");
} else if (serviceName.equals("jndi/serviceB")) {
- System.out.println("Looking up service B and creating new service for B");
+ LOGGER.info("Looking up service B and creating new service for B");
return new ServiceImpl("jndi/serviceB");
} else {
return null;
diff --git a/service-locator/src/main/java/com/iluwatar/servicelocator/Service.java b/service-locator/src/main/java/com/iluwatar/servicelocator/Service.java
index 4f5890bba..006d98ba8 100644
--- a/service-locator/src/main/java/com/iluwatar/servicelocator/Service.java
+++ b/service-locator/src/main/java/com/iluwatar/servicelocator/Service.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
diff --git a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java
index 7e2169fcb..72d5725e5 100644
--- a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java
+++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.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.servicelocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.HashMap;
import java.util.Map;
@@ -35,6 +38,8 @@ import java.util.Map;
*/
public class ServiceCache {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ServiceCache.class);
+
private final Map<String, Service> serviceCache;
public ServiceCache() {
@@ -52,8 +57,8 @@ public class ServiceCache {
for (String serviceJndiName : serviceCache.keySet()) {
if (serviceJndiName.equals(serviceName)) {
cachedService = serviceCache.get(serviceJndiName);
- System.out.println("(cache call) Fetched service " + cachedService.getName() + "("
- + cachedService.getId() + ") from cache... !");
+ LOGGER.info("(cache call) Fetched service {}({}) from cache... !",
+ cachedService.getName(), cachedService.getId());
}
}
return cachedService;
diff --git a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceImpl.java b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceImpl.java
index 543fb8480..e48f4a505 100644
--- a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceImpl.java
+++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceImpl.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.servicelocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is a single service implementation of a sample service. This is the actual service that will
* process the request. The reference for this service is to be looked upon in the JNDI server that
@@ -31,6 +34,8 @@ package com.iluwatar.servicelocator;
*/
public class ServiceImpl implements Service {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ServiceImpl.class);
+
private final String serviceName;
private final int id;
@@ -57,6 +62,6 @@ public class ServiceImpl implements Service {
@Override
public void execute() {
- System.out.println("Service " + getName() + " is now executing with id " + getId());
+ LOGGER.info("Service {} is now executing with id {}", getName(), getId());
}
}
diff --git a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java
index 4d356a567..3e1b1a354 100644
--- a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java
+++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.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
diff --git a/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java b/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java
index 40e3820e9..1228898f2 100644
--- a/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java
+++ b/service-locator/src/test/java/com/iluwatar/servicelocator/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
diff --git a/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java b/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java
index b9f25ff44..5dbbcdaf7 100644
--- a/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java
+++ b/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.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
diff --git a/singleton/etc/singleton.urm.puml b/singleton/etc/singleton.urm.puml
index a13091772..f61377e17 100644
--- a/singleton/etc/singleton.urm.puml
+++ b/singleton/etc/singleton.urm.puml
@@ -1,38 +1,39 @@
@startuml
package com.iluwatar.singleton {
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
- class ThreadSafeLazyLoadedIvoryTower {
- - instance : ThreadSafeLazyLoadedIvoryTower {static}
- - ThreadSafeLazyLoadedIvoryTower()
- + getInstance() : ThreadSafeLazyLoadedIvoryTower {static}
- }
- class InitializingOnDemandHolderIdiom {
- - InitializingOnDemandHolderIdiom()
- + getInstance() : InitializingOnDemandHolderIdiom {static}
- }
- class ThreadSafeDoubleCheckLocking {
- - instance : ThreadSafeDoubleCheckLocking {static}
- - ThreadSafeDoubleCheckLocking()
- + getInstance() : ThreadSafeDoubleCheckLocking {static}
- }
- class IvoryTower {
- - INSTANCE : IvoryTower {static}
- - IvoryTower()
- + getInstance() : IvoryTower {static}
- }
- -class HelperHolder {
- - INSTANCE : InitializingOnDemandHolderIdiom {static}
- - HelperHolder()
- }
enum EnumIvoryTower {
+ INSTANCE {static}
+ toString() : String
+ valueOf(name : String) : EnumIvoryTower {static}
+ values() : EnumIvoryTower[] {static}
}
+ class InitializingOnDemandHolderIdiom {
+ - InitializingOnDemandHolderIdiom()
+ + getInstance() : InitializingOnDemandHolderIdiom {static}
+ }
+ -class HelperHolder {
+ - INSTANCE : InitializingOnDemandHolderIdiom {static}
+ - HelperHolder()
+ }
+ class IvoryTower {
+ - INSTANCE : IvoryTower {static}
+ - IvoryTower()
+ + getInstance() : IvoryTower {static}
+ }
+ class ThreadSafeDoubleCheckLocking {
+ - instance : ThreadSafeDoubleCheckLocking {static}
+ - ThreadSafeDoubleCheckLocking()
+ + getInstance() : ThreadSafeDoubleCheckLocking {static}
+ }
+ class ThreadSafeLazyLoadedIvoryTower {
+ - instance : ThreadSafeLazyLoadedIvoryTower {static}
+ - ThreadSafeLazyLoadedIvoryTower()
+ + getInstance() : ThreadSafeLazyLoadedIvoryTower {static}
+ }
}
IvoryTower --> "-INSTANCE" IvoryTower
ThreadSafeDoubleCheckLocking --> "-instance" ThreadSafeDoubleCheckLocking
diff --git a/singleton/pom.xml b/singleton/pom.xml
index 2ba9fe6d4..ebacac8cc 100644
--- a/singleton/pom.xml
+++ b/singleton/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
diff --git a/singleton/src/main/java/com/iluwatar/singleton/App.java b/singleton/src/main/java/com/iluwatar/singleton/App.java
index 4b505085a..377c56cca 100644
--- a/singleton/src/main/java/com/iluwatar/singleton/App.java
+++ b/singleton/src/main/java/com/iluwatar/singleton/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.singleton;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Singleton pattern ensures that the class can have only one existing instance per Java classloader
* instance and provides global access to it.
@@ -60,6 +63,8 @@ package com.iluwatar.singleton;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point.
*
@@ -70,35 +75,35 @@ public class App {
// eagerly initialized singleton
IvoryTower ivoryTower1 = IvoryTower.getInstance();
IvoryTower ivoryTower2 = IvoryTower.getInstance();
- System.out.println("ivoryTower1=" + ivoryTower1);
- System.out.println("ivoryTower2=" + ivoryTower2);
+ LOGGER.info("ivoryTower1={}", ivoryTower1);
+ LOGGER.info("ivoryTower2={}", ivoryTower2);
// lazily initialized singleton
ThreadSafeLazyLoadedIvoryTower threadSafeIvoryTower1 =
ThreadSafeLazyLoadedIvoryTower.getInstance();
ThreadSafeLazyLoadedIvoryTower threadSafeIvoryTower2 =
ThreadSafeLazyLoadedIvoryTower.getInstance();
- System.out.println("threadSafeIvoryTower1=" + threadSafeIvoryTower1);
- System.out.println("threadSafeIvoryTower2=" + threadSafeIvoryTower2);
+ LOGGER.info("threadSafeIvoryTower1={}", threadSafeIvoryTower1);
+ LOGGER.info("threadSafeIvoryTower2={}", threadSafeIvoryTower2);
// enum singleton
EnumIvoryTower enumIvoryTower1 = EnumIvoryTower.INSTANCE;
EnumIvoryTower enumIvoryTower2 = EnumIvoryTower.INSTANCE;
- System.out.println("enumIvoryTower1=" + enumIvoryTower1);
- System.out.println("enumIvoryTower2=" + enumIvoryTower2);
+ LOGGER.info("enumIvoryTower1={}", enumIvoryTower1);
+ LOGGER.info("enumIvoryTower2={}", enumIvoryTower2);
// double checked locking
ThreadSafeDoubleCheckLocking dcl1 = ThreadSafeDoubleCheckLocking.getInstance();
- System.out.println(dcl1);
+ LOGGER.info(dcl1.toString());
ThreadSafeDoubleCheckLocking dcl2 = ThreadSafeDoubleCheckLocking.getInstance();
- System.out.println(dcl2);
+ LOGGER.info(dcl2.toString());
// initialize on demand holder idiom
InitializingOnDemandHolderIdiom demandHolderIdiom =
InitializingOnDemandHolderIdiom.getInstance();
- System.out.println(demandHolderIdiom);
+ LOGGER.info(demandHolderIdiom.toString());
InitializingOnDemandHolderIdiom demandHolderIdiom2 =
InitializingOnDemandHolderIdiom.getInstance();
- System.out.println(demandHolderIdiom2);
+ LOGGER.info(demandHolderIdiom2.toString());
}
}
diff --git a/singleton/src/main/java/com/iluwatar/singleton/EnumIvoryTower.java b/singleton/src/main/java/com/iluwatar/singleton/EnumIvoryTower.java
index eea1cd8cb..00ddb79ac 100644
--- a/singleton/src/main/java/com/iluwatar/singleton/EnumIvoryTower.java
+++ b/singleton/src/main/java/com/iluwatar/singleton/EnumIvoryTower.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
diff --git a/singleton/src/main/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiom.java b/singleton/src/main/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiom.java
index 6536978fc..64252fb5b 100644
--- a/singleton/src/main/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiom.java
+++ b/singleton/src/main/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiom.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
diff --git a/singleton/src/main/java/com/iluwatar/singleton/IvoryTower.java b/singleton/src/main/java/com/iluwatar/singleton/IvoryTower.java
index 1dbffa00b..ed7d44705 100644
--- a/singleton/src/main/java/com/iluwatar/singleton/IvoryTower.java
+++ b/singleton/src/main/java/com/iluwatar/singleton/IvoryTower.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
diff --git a/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLocking.java b/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLocking.java
index a8fd9648a..5cfcc1bdc 100644
--- a/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLocking.java
+++ b/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLocking.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
diff --git a/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTower.java b/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTower.java
index c7c75143c..0b1b51b23 100644
--- a/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTower.java
+++ b/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTower.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
diff --git a/singleton/src/test/java/com/iluwatar/singleton/AppTest.java b/singleton/src/test/java/com/iluwatar/singleton/AppTest.java
index c2def43a0..951c5c4fd 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/AppTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/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
diff --git a/singleton/src/test/java/com/iluwatar/singleton/EnumIvoryTowerTest.java b/singleton/src/test/java/com/iluwatar/singleton/EnumIvoryTowerTest.java
index ff821c6eb..e6427a753 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/EnumIvoryTowerTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/EnumIvoryTowerTest.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
diff --git a/singleton/src/test/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiomTest.java b/singleton/src/test/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiomTest.java
index 1aacb3d08..763e21d80 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiomTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiomTest.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
diff --git a/singleton/src/test/java/com/iluwatar/singleton/IvoryTowerTest.java b/singleton/src/test/java/com/iluwatar/singleton/IvoryTowerTest.java
index 67769d87d..770df5638 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/IvoryTowerTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/IvoryTowerTest.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
diff --git a/singleton/src/test/java/com/iluwatar/singleton/SingletonTest.java b/singleton/src/test/java/com/iluwatar/singleton/SingletonTest.java
index 0d9d0aee9..e8040ee99 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/SingletonTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/SingletonTest.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
diff --git a/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLockingTest.java b/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLockingTest.java
index 61f29d9e8..1d00d9f8f 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLockingTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLockingTest.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
diff --git a/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTowerTest.java b/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTowerTest.java
index 188749d1c..59836fc23 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTowerTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTowerTest.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
diff --git a/specification/etc/specification.urm.puml b/specification/etc/specification.urm.puml
index 2f194d340..fd3cbb20e 100644
--- a/specification/etc/specification.urm.puml
+++ b/specification/etc/specification.urm.puml
@@ -12,21 +12,6 @@ package com.iluwatar.specification.creature {
+ getSize() : Size
+ toString() : String
}
- class Troll {
- + Troll()
- }
- class Octopus {
- + Octopus()
- }
- class Shark {
- + Shark()
- }
- class Goblin {
- + Goblin()
- }
- class KillerBee {
- + KillerBee()
- }
interface Creature {
+ getColor() : Color {abstract}
+ getMovement() : Movement {abstract}
@@ -36,17 +21,23 @@ package com.iluwatar.specification.creature {
class Dragon {
+ Dragon()
}
+ class Goblin {
+ + Goblin()
+ }
+ class KillerBee {
+ + KillerBee()
+ }
+ class Octopus {
+ + Octopus()
+ }
+ class Shark {
+ + Shark()
+ }
+ class Troll {
+ + Troll()
+ }
}
package com.iluwatar.specification.property {
- enum Size {
- + LARGE {static}
- + NORMAL {static}
- + SMALL {static}
- - title : String
- + toString() : String
- + valueOf(name : String) : Size {static}
- + values() : Size[] {static}
- }
enum Color {
+ DARK {static}
+ GREEN {static}
@@ -66,30 +57,40 @@ package com.iluwatar.specification.property {
+ valueOf(name : String) : Movement {static}
+ values() : Movement[] {static}
}
-}
-package com.iluwatar.specification.app {
- class App {
- + App()
- + main(args : String[]) {static}
+ enum Size {
+ + LARGE {static}
+ + NORMAL {static}
+ + SMALL {static}
+ - title : String
+ + toString() : String
+ + valueOf(name : String) : Size {static}
+ + values() : Size[] {static}
}
}
package com.iluwatar.specification.selector {
- class MovementSelector {
- - m : Movement
- + MovementSelector(m : Movement)
- + test(t : Creature) : boolean
- }
class ColorSelector {
- c : Color
+ ColorSelector(c : Color)
+ test(t : Creature) : boolean
}
+ class MovementSelector {
+ - m : Movement
+ + MovementSelector(m : Movement)
+ + test(t : Creature) : boolean
+ }
class SizeSelector {
- s : Size
+ SizeSelector(s : Size)
+ test(t : Creature) : boolean
}
}
+package com.iluwatar.specification.app {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
+}
SizeSelector --> "-s" Size
AbstractCreature --> "-color" Color
MovementSelector --> "-m" Movement
@@ -97,10 +98,10 @@ AbstractCreature --> "-movement" Movement
AbstractCreature --> "-size" Size
ColorSelector --> "-c" Color
AbstractCreature ..|> Creature
-Troll --|> AbstractCreature
-Octopus --|> AbstractCreature
-Shark --|> AbstractCreature
+Dragon --|> AbstractCreature
Goblin --|> AbstractCreature
KillerBee --|> AbstractCreature
-Dragon --|> AbstractCreature
+Octopus --|> AbstractCreature
+Shark --|> AbstractCreature
+Troll --|> AbstractCreature
@enduml
\ No newline at end of file
diff --git a/specification/pom.xml b/specification/pom.xml
index 49e56f3c1..5d9498652 100644
--- a/specification/pom.xml
+++ b/specification/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
diff --git a/specification/src/main/java/com/iluwatar/specification/app/App.java b/specification/src/main/java/com/iluwatar/specification/app/App.java
index 7cbd38470..d4289f2d8 100644
--- a/specification/src/main/java/com/iluwatar/specification/app/App.java
+++ b/specification/src/main/java/com/iluwatar/specification/app/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
@@ -37,6 +37,8 @@ import com.iluwatar.specification.property.Color;
import com.iluwatar.specification.property.Movement;
import com.iluwatar.specification.selector.ColorSelector;
import com.iluwatar.specification.selector.MovementSelector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -52,6 +54,8 @@ import com.iluwatar.specification.selector.MovementSelector;
*
*/
public class App {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
/**
* Program entry point
@@ -62,22 +66,22 @@ public class App {
Arrays.asList(new Goblin(), new Octopus(), new Dragon(), new Shark(), new Troll(),
new KillerBee());
// find all walking creatures
- System.out.println("Find all walking creatures");
+ LOGGER.info("Find all walking creatures");
List<Creature> walkingCreatures =
creatures.stream().filter(new MovementSelector(Movement.WALKING))
.collect(Collectors.toList());
- walkingCreatures.stream().forEach(System.out::println);
+ walkingCreatures.stream().forEach(c -> LOGGER.info(c.toString()));
// find all dark creatures
- System.out.println("Find all dark creatures");
+ LOGGER.info("Find all dark creatures");
List<Creature> darkCreatures =
creatures.stream().filter(new ColorSelector(Color.DARK)).collect(Collectors.toList());
- darkCreatures.stream().forEach(System.out::println);
+ darkCreatures.stream().forEach(c -> LOGGER.info(c.toString()));
// find all red and flying creatures
- System.out.println("Find all red and flying creatures");
+ LOGGER.info("Find all red and flying creatures");
List<Creature> redAndFlyingCreatures =
creatures.stream()
.filter(new ColorSelector(Color.RED).and(new MovementSelector(Movement.FLYING)))
.collect(Collectors.toList());
- redAndFlyingCreatures.stream().forEach(System.out::println);
+ redAndFlyingCreatures.stream().forEach(c -> LOGGER.info(c.toString()));
}
}
diff --git a/specification/src/main/java/com/iluwatar/specification/creature/AbstractCreature.java b/specification/src/main/java/com/iluwatar/specification/creature/AbstractCreature.java
index 8e88f13ae..f6c761ff4 100644
--- a/specification/src/main/java/com/iluwatar/specification/creature/AbstractCreature.java
+++ b/specification/src/main/java/com/iluwatar/specification/creature/AbstractCreature.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
diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Creature.java b/specification/src/main/java/com/iluwatar/specification/creature/Creature.java
index a330af4e7..eae47df6f 100644
--- a/specification/src/main/java/com/iluwatar/specification/creature/Creature.java
+++ b/specification/src/main/java/com/iluwatar/specification/creature/Creature.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
diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Dragon.java b/specification/src/main/java/com/iluwatar/specification/creature/Dragon.java
index ab07001f7..7f2f0cc51 100644
--- a/specification/src/main/java/com/iluwatar/specification/creature/Dragon.java
+++ b/specification/src/main/java/com/iluwatar/specification/creature/Dragon.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
diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Goblin.java b/specification/src/main/java/com/iluwatar/specification/creature/Goblin.java
index 1b53a7e77..21c958a77 100644
--- a/specification/src/main/java/com/iluwatar/specification/creature/Goblin.java
+++ b/specification/src/main/java/com/iluwatar/specification/creature/Goblin.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
diff --git a/specification/src/main/java/com/iluwatar/specification/creature/KillerBee.java b/specification/src/main/java/com/iluwatar/specification/creature/KillerBee.java
index 4c98e9041..e9e3ff34d 100644
--- a/specification/src/main/java/com/iluwatar/specification/creature/KillerBee.java
+++ b/specification/src/main/java/com/iluwatar/specification/creature/KillerBee.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
diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Octopus.java b/specification/src/main/java/com/iluwatar/specification/creature/Octopus.java
index d74ba357f..4cee924dc 100644
--- a/specification/src/main/java/com/iluwatar/specification/creature/Octopus.java
+++ b/specification/src/main/java/com/iluwatar/specification/creature/Octopus.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
diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Shark.java b/specification/src/main/java/com/iluwatar/specification/creature/Shark.java
index 69f4c9b38..c325ef646 100644
--- a/specification/src/main/java/com/iluwatar/specification/creature/Shark.java
+++ b/specification/src/main/java/com/iluwatar/specification/creature/Shark.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
diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Troll.java b/specification/src/main/java/com/iluwatar/specification/creature/Troll.java
index f480a0723..676049e24 100644
--- a/specification/src/main/java/com/iluwatar/specification/creature/Troll.java
+++ b/specification/src/main/java/com/iluwatar/specification/creature/Troll.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
diff --git a/specification/src/main/java/com/iluwatar/specification/property/Color.java b/specification/src/main/java/com/iluwatar/specification/property/Color.java
index 583602990..d34fbdb43 100644
--- a/specification/src/main/java/com/iluwatar/specification/property/Color.java
+++ b/specification/src/main/java/com/iluwatar/specification/property/Color.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
diff --git a/specification/src/main/java/com/iluwatar/specification/property/Movement.java b/specification/src/main/java/com/iluwatar/specification/property/Movement.java
index ae26d1a30..bafd6e358 100644
--- a/specification/src/main/java/com/iluwatar/specification/property/Movement.java
+++ b/specification/src/main/java/com/iluwatar/specification/property/Movement.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
diff --git a/specification/src/main/java/com/iluwatar/specification/property/Size.java b/specification/src/main/java/com/iluwatar/specification/property/Size.java
index 239caa586..43aa8156b 100644
--- a/specification/src/main/java/com/iluwatar/specification/property/Size.java
+++ b/specification/src/main/java/com/iluwatar/specification/property/Size.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
diff --git a/specification/src/main/java/com/iluwatar/specification/selector/ColorSelector.java b/specification/src/main/java/com/iluwatar/specification/selector/ColorSelector.java
index c1c178e23..212e46b63 100644
--- a/specification/src/main/java/com/iluwatar/specification/selector/ColorSelector.java
+++ b/specification/src/main/java/com/iluwatar/specification/selector/ColorSelector.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
diff --git a/specification/src/main/java/com/iluwatar/specification/selector/MovementSelector.java b/specification/src/main/java/com/iluwatar/specification/selector/MovementSelector.java
index 67d7abd61..8f07ff1da 100644
--- a/specification/src/main/java/com/iluwatar/specification/selector/MovementSelector.java
+++ b/specification/src/main/java/com/iluwatar/specification/selector/MovementSelector.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
diff --git a/specification/src/main/java/com/iluwatar/specification/selector/SizeSelector.java b/specification/src/main/java/com/iluwatar/specification/selector/SizeSelector.java
index 2792531d0..ce12d709a 100644
--- a/specification/src/main/java/com/iluwatar/specification/selector/SizeSelector.java
+++ b/specification/src/main/java/com/iluwatar/specification/selector/SizeSelector.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
diff --git a/specification/src/test/java/com/iluwatar/specification/app/AppTest.java b/specification/src/test/java/com/iluwatar/specification/app/AppTest.java
index 13e6c9b5d..a11101670 100644
--- a/specification/src/test/java/com/iluwatar/specification/app/AppTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/app/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
diff --git a/specification/src/test/java/com/iluwatar/specification/creature/CreatureTest.java b/specification/src/test/java/com/iluwatar/specification/creature/CreatureTest.java
index 22b27c8a0..1c969891b 100644
--- a/specification/src/test/java/com/iluwatar/specification/creature/CreatureTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/creature/CreatureTest.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
diff --git a/specification/src/test/java/com/iluwatar/specification/selector/ColorSelectorTest.java b/specification/src/test/java/com/iluwatar/specification/selector/ColorSelectorTest.java
index 0d6dfa080..52b176915 100644
--- a/specification/src/test/java/com/iluwatar/specification/selector/ColorSelectorTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/selector/ColorSelectorTest.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
diff --git a/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java b/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java
index 451c776dd..b9e86193e 100644
--- a/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.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
diff --git a/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java b/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java
index de1228f1b..f2b6b80b7 100644
--- a/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.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
diff --git a/state/etc/state.urm.puml b/state/etc/state.urm.puml
index 378c11cd1..ea9a6383a 100644
--- a/state/etc/state.urm.puml
+++ b/state/etc/state.urm.puml
@@ -1,25 +1,16 @@
@startuml
package com.iluwatar.state {
- class PeacefulState {
- - mammoth : Mammoth
- + PeacefulState(mammoth : Mammoth)
- + observe()
- + onEnterState()
- }
- interface State {
- + observe() {abstract}
- + onEnterState() {abstract}
- }
- class App {
- + App()
- + main(args : String[]) {static}
- }
class AngryState {
+ - LOGGER : Logger {static}
- mammoth : Mammoth
+ AngryState(mammoth : Mammoth)
+ observe()
+ onEnterState()
}
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
class Mammoth {
- state : State
+ Mammoth()
@@ -28,10 +19,21 @@ package com.iluwatar.state {
+ timePasses()
+ toString() : String
}
+ class PeacefulState {
+ - LOGGER : Logger {static}
+ - mammoth : Mammoth
+ + PeacefulState(mammoth : Mammoth)
+ + observe()
+ + onEnterState()
+ }
+ interface State {
+ + observe() {abstract}
+ + onEnterState() {abstract}
+ }
}
AngryState --> "-mammoth" Mammoth
PeacefulState --> "-mammoth" Mammoth
Mammoth --> "-state" State
-PeacefulState ..|> State
AngryState ..|> State
+PeacefulState ..|> State
@enduml
\ No newline at end of file
diff --git a/state/pom.xml b/state/pom.xml
index ec932532d..03f9401c7 100644
--- a/state/pom.xml
+++ b/state/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
diff --git a/state/src/main/java/com/iluwatar/state/AngryState.java b/state/src/main/java/com/iluwatar/state/AngryState.java
index c58f85ae1..31401364e 100644
--- a/state/src/main/java/com/iluwatar/state/AngryState.java
+++ b/state/src/main/java/com/iluwatar/state/AngryState.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.state;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Angry state.
@@ -29,6 +32,8 @@ package com.iluwatar.state;
*/
public class AngryState implements State {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AngryState.class);
+
private Mammoth mammoth;
public AngryState(Mammoth mammoth) {
@@ -37,12 +42,12 @@ public class AngryState implements State {
@Override
public void observe() {
- System.out.println(String.format("%s is furious!", mammoth));
+ LOGGER.info("{} is furious!", mammoth);
}
@Override
public void onEnterState() {
- System.out.println(String.format("%s gets angry!", mammoth));
+ LOGGER.info("{} gets angry!", mammoth);
}
}
diff --git a/state/src/main/java/com/iluwatar/state/App.java b/state/src/main/java/com/iluwatar/state/App.java
index 9f9d8d29a..cb717cbd3 100644
--- a/state/src/main/java/com/iluwatar/state/App.java
+++ b/state/src/main/java/com/iluwatar/state/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
diff --git a/state/src/main/java/com/iluwatar/state/Mammoth.java b/state/src/main/java/com/iluwatar/state/Mammoth.java
index ffa07ed68..5d4153f06 100644
--- a/state/src/main/java/com/iluwatar/state/Mammoth.java
+++ b/state/src/main/java/com/iluwatar/state/Mammoth.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
diff --git a/state/src/main/java/com/iluwatar/state/PeacefulState.java b/state/src/main/java/com/iluwatar/state/PeacefulState.java
index 23f4e893c..2b7f4dda8 100644
--- a/state/src/main/java/com/iluwatar/state/PeacefulState.java
+++ b/state/src/main/java/com/iluwatar/state/PeacefulState.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.state;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Peaceful state.
@@ -29,6 +32,8 @@ package com.iluwatar.state;
*/
public class PeacefulState implements State {
+ private static final Logger LOGGER = LoggerFactory.getLogger(PeacefulState.class);
+
private Mammoth mammoth;
public PeacefulState(Mammoth mammoth) {
@@ -37,12 +42,12 @@ public class PeacefulState implements State {
@Override
public void observe() {
- System.out.println(String.format("%s is calm and peaceful.", mammoth));
+ LOGGER.info("{} is calm and peaceful.", mammoth);
}
@Override
public void onEnterState() {
- System.out.println(String.format("%s calms down.", mammoth));
+ LOGGER.info("{} calms down.", mammoth);
}
}
diff --git a/state/src/main/java/com/iluwatar/state/State.java b/state/src/main/java/com/iluwatar/state/State.java
index 65c59af16..523925d28 100644
--- a/state/src/main/java/com/iluwatar/state/State.java
+++ b/state/src/main/java/com/iluwatar/state/State.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
diff --git a/state/src/test/java/com/iluwatar/state/AppTest.java b/state/src/test/java/com/iluwatar/state/AppTest.java
index 9dc3790c7..cb40d0481 100644
--- a/state/src/test/java/com/iluwatar/state/AppTest.java
+++ b/state/src/test/java/com/iluwatar/state/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
diff --git a/state/src/test/java/com/iluwatar/state/MammothTest.java b/state/src/test/java/com/iluwatar/state/MammothTest.java
index 4fe37bfd1..60f4b18f4 100644
--- a/state/src/test/java/com/iluwatar/state/MammothTest.java
+++ b/state/src/test/java/com/iluwatar/state/MammothTest.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,17 +22,19 @@
*/
package com.iluwatar.state;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
+import org.slf4j.LoggerFactory;
-import java.io.PrintStream;
+import java.util.LinkedList;
+import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.mock;
/**
* Date: 12/29/15 - 8:27 PM
@@ -41,31 +43,16 @@ import static org.mockito.Mockito.mock;
*/
public class MammothTest {
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
+ private InMemoryAppender appender;
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
@Before
public void setUp() {
- System.setOut(this.stdOutMock);
+ appender = new InMemoryAppender();
}
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
@After
public void tearDown() {
- System.setOut(this.stdOutOrig);
+ appender.stop();
}
/**
@@ -74,28 +61,27 @@ public class MammothTest {
*/
@Test
public void testTimePasses() {
- final InOrder inOrder = Mockito.inOrder(this.stdOutMock);
final Mammoth mammoth = new Mammoth();
mammoth.observe();
- inOrder.verify(this.stdOutMock).println("The mammoth is calm and peaceful.");
- inOrder.verifyNoMoreInteractions();
+ assertEquals("The mammoth is calm and peaceful.", appender.getLastMessage());
+ assertEquals(1 , appender.getLogSize());
mammoth.timePasses();
- inOrder.verify(this.stdOutMock).println("The mammoth gets angry!");
- inOrder.verifyNoMoreInteractions();
+ assertEquals("The mammoth gets angry!", appender.getLastMessage());
+ assertEquals(2 , appender.getLogSize());
mammoth.observe();
- inOrder.verify(this.stdOutMock).println("The mammoth is furious!");
- inOrder.verifyNoMoreInteractions();
+ assertEquals("The mammoth is furious!", appender.getLastMessage());
+ assertEquals(3 , appender.getLogSize());
mammoth.timePasses();
- inOrder.verify(this.stdOutMock).println("The mammoth calms down.");
- inOrder.verifyNoMoreInteractions();
+ assertEquals("The mammoth calms down.", appender.getLastMessage());
+ assertEquals(4 , appender.getLogSize());
mammoth.observe();
- inOrder.verify(this.stdOutMock).println("The mammoth is calm and peaceful.");
- inOrder.verifyNoMoreInteractions();
+ assertEquals("The mammoth is calm and peaceful.", appender.getLastMessage());
+ assertEquals(5 , appender.getLogSize());
}
@@ -109,4 +95,26 @@ public class MammothTest {
assertEquals("The mammoth", toString);
}
-}
\ No newline at end of file
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+ }
+
+}
diff --git a/step-builder/etc/step-builder.urm.puml b/step-builder/etc/step-builder.urm.puml
index 129ecbf30..09fdd05ec 100644
--- a/step-builder/etc/step-builder.urm.puml
+++ b/step-builder/etc/step-builder.urm.puml
@@ -1,44 +1,10 @@
@startuml
package com.iluwatar.stepbuilder {
- interface AbilityStep {
- + noAbilities() : BuildStep {abstract}
- + noMoreAbilities() : BuildStep {abstract}
- + withAbility(String) : AbilityStep {abstract}
- }
- interface BuildStep {
- + build() : Character {abstract}
- }
- interface NameStep {
- + name(String) : ClassStep {abstract}
- }
- -class CharacterSteps {
- - abilities : List<String>
- - fighterClass : String
- - name : String
- - spell : String
- - weapon : String
- - wizardClass : String
- - CharacterSteps()
- + build() : Character
- + fighterClass(fighterClass : String) : WeaponStep
- + name(name : String) : ClassStep
- + noAbilities() : BuildStep
- + noMoreAbilities() : BuildStep
- + noSpell() : BuildStep
- + noWeapon() : BuildStep
- + withAbility(ability : String) : AbilityStep
- + withSpell(spell : String) : AbilityStep
- + withWeapon(weapon : String) : AbilityStep
- + wizardClass(wizardClass : String) : SpellStep
- }
class App {
+ - LOGGER : Logger {static}
+ App()
+ main(args : String[]) {static}
}
- class CharacterStepBuilder {
- - CharacterStepBuilder()
- + newBuilder() : NameStep {static}
- }
class Character {
- abilities : List<String>
- fighterClass : String
@@ -61,24 +27,58 @@ package com.iluwatar.stepbuilder {
+ setWizardClass(wizardClass : String)
+ toString() : String
}
- interface SpellStep {
- + noSpell() : BuildStep {abstract}
- + withSpell(String) : AbilityStep {abstract}
+ class CharacterStepBuilder {
+ - CharacterStepBuilder()
+ + newBuilder() : NameStep {static}
+ }
+ interface AbilityStep {
+ + noAbilities() : BuildStep {abstract}
+ + noMoreAbilities() : BuildStep {abstract}
+ + withAbility(String) : AbilityStep {abstract}
+ }
+ interface BuildStep {
+ + build() : Character {abstract}
+ }
+ -class CharacterSteps {
+ - abilities : List<String>
+ - fighterClass : String
+ - name : String
+ - spell : String
+ - weapon : String
+ - wizardClass : String
+ - CharacterSteps()
+ + build() : Character
+ + fighterClass(fighterClass : String) : WeaponStep
+ + name(name : String) : ClassStep
+ + noAbilities() : BuildStep
+ + noMoreAbilities() : BuildStep
+ + noSpell() : BuildStep
+ + noWeapon() : BuildStep
+ + withAbility(ability : String) : AbilityStep
+ + withSpell(spell : String) : AbilityStep
+ + withWeapon(weapon : String) : AbilityStep
+ + wizardClass(wizardClass : String) : SpellStep
}
interface ClassStep {
+ fighterClass(String) : WeaponStep {abstract}
+ wizardClass(String) : SpellStep {abstract}
}
+ interface NameStep {
+ + name(String) : ClassStep {abstract}
+ }
+ interface SpellStep {
+ + noSpell() : BuildStep {abstract}
+ + withSpell(String) : AbilityStep {abstract}
+ }
interface WeaponStep {
+ noWeapon() : BuildStep {abstract}
+ withWeapon(String) : AbilityStep {abstract}
}
}
-App --+ CharacterStepBuilder
WeaponStep ..+ CharacterStepBuilder
-ClassStep ..+ CharacterStepBuilder
SpellStep ..+ CharacterStepBuilder
CharacterSteps ..+ CharacterStepBuilder
+ClassStep ..+ CharacterStepBuilder
AbilityStep ..+ CharacterStepBuilder
NameStep ..+ CharacterStepBuilder
BuildStep ..+ CharacterStepBuilder
diff --git a/step-builder/pom.xml b/step-builder/pom.xml
index cd53119ff..3b4cd8018 100644
--- a/step-builder/pom.xml
+++ b/step-builder/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
diff --git a/step-builder/src/main/java/com/iluwatar/stepbuilder/App.java b/step-builder/src/main/java/com/iluwatar/stepbuilder/App.java
index aeb759ba8..b5354e04a 100644
--- a/step-builder/src/main/java/com/iluwatar/stepbuilder/App.java
+++ b/step-builder/src/main/java/com/iluwatar/stepbuilder/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.stepbuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Step Builder Pattern
*
@@ -56,6 +59,8 @@ package com.iluwatar.stepbuilder;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -67,18 +72,18 @@ public class App {
CharacterStepBuilder.newBuilder().name("Amberjill").fighterClass("Paladin")
.withWeapon("Sword").noAbilities().build();
- System.out.println(warrior);
+ LOGGER.info(warrior.toString());
Character mage =
CharacterStepBuilder.newBuilder().name("Riobard").wizardClass("Sorcerer")
.withSpell("Fireball").withAbility("Fire Aura").withAbility("Teleport")
.noMoreAbilities().build();
- System.out.println(mage);
+ LOGGER.info(mage.toString());
Character thief =
CharacterStepBuilder.newBuilder().name("Desmond").fighterClass("Rogue").noWeapon().build();
- System.out.println(thief);
+ LOGGER.info(thief.toString());
}
}
diff --git a/step-builder/src/main/java/com/iluwatar/stepbuilder/Character.java b/step-builder/src/main/java/com/iluwatar/stepbuilder/Character.java
index 1e21758a3..4b29ba6c4 100644
--- a/step-builder/src/main/java/com/iluwatar/stepbuilder/Character.java
+++ b/step-builder/src/main/java/com/iluwatar/stepbuilder/Character.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
diff --git a/step-builder/src/main/java/com/iluwatar/stepbuilder/CharacterStepBuilder.java b/step-builder/src/main/java/com/iluwatar/stepbuilder/CharacterStepBuilder.java
index 35e671b4c..0cf326992 100644
--- a/step-builder/src/main/java/com/iluwatar/stepbuilder/CharacterStepBuilder.java
+++ b/step-builder/src/main/java/com/iluwatar/stepbuilder/CharacterStepBuilder.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
diff --git a/step-builder/src/test/java/com/iluwatar/stepbuilder/AppTest.java b/step-builder/src/test/java/com/iluwatar/stepbuilder/AppTest.java
index 41511d913..af1ddfb58 100644
--- a/step-builder/src/test/java/com/iluwatar/stepbuilder/AppTest.java
+++ b/step-builder/src/test/java/com/iluwatar/stepbuilder/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
diff --git a/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java b/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
index baa8f9d1d..962feeabb 100644
--- a/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
+++ b/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.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
diff --git a/strategy/etc/strategy.urm.puml b/strategy/etc/strategy.urm.puml
index db86b9ed6..8b9daabb9 100644
--- a/strategy/etc/strategy.urm.puml
+++ b/strategy/etc/strategy.urm.puml
@@ -1,5 +1,10 @@
@startuml
package com.iluwatar.strategy {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
class DragonSlayer {
- strategy : DragonSlayingStrategy
+ DragonSlayer(strategy : DragonSlayingStrategy)
@@ -9,19 +14,18 @@ package com.iluwatar.strategy {
interface DragonSlayingStrategy {
+ execute() {abstract}
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
class MeleeStrategy {
+ - LOGGER : Logger {static}
+ MeleeStrategy()
+ execute()
}
class ProjectileStrategy {
+ - LOGGER : Logger {static}
+ ProjectileStrategy()
+ execute()
}
class SpellStrategy {
+ - LOGGER : Logger {static}
+ SpellStrategy()
+ execute()
}
diff --git a/strategy/pom.xml b/strategy/pom.xml
index e57f42e08..b1a3be675 100644
--- a/strategy/pom.xml
+++ b/strategy/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
diff --git a/strategy/src/main/java/com/iluwatar/strategy/App.java b/strategy/src/main/java/com/iluwatar/strategy/App.java
index be8826fe3..00b2eeaad 100644
--- a/strategy/src/main/java/com/iluwatar/strategy/App.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/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.strategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* The Strategy pattern (also known as the policy pattern) is a software design pattern that enables
@@ -37,6 +40,8 @@ package com.iluwatar.strategy;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*
@@ -44,27 +49,27 @@ public class App {
*/
public static void main(String[] args) {
// GoF Strategy pattern
- System.out.println("Green dragon spotted ahead!");
+ LOGGER.info("Green dragon spotted ahead!");
DragonSlayer dragonSlayer = new DragonSlayer(new MeleeStrategy());
dragonSlayer.goToBattle();
- System.out.println("Red dragon emerges.");
+ LOGGER.info("Red dragon emerges.");
dragonSlayer.changeStrategy(new ProjectileStrategy());
dragonSlayer.goToBattle();
- System.out.println("Black dragon lands before you.");
+ LOGGER.info("Black dragon lands before you.");
dragonSlayer.changeStrategy(new SpellStrategy());
dragonSlayer.goToBattle();
// Java 8 Strategy pattern
- System.out.println("Green dragon spotted ahead!");
+ LOGGER.info("Green dragon spotted ahead!");
dragonSlayer = new DragonSlayer(
- () -> System.out.println("With your Excalibur you severe the dragon's head!"));
+ () -> LOGGER.info("With your Excalibur you severe the dragon's head!"));
dragonSlayer.goToBattle();
- System.out.println("Red dragon emerges.");
- dragonSlayer.changeStrategy(() -> System.out.println(
+ LOGGER.info("Red dragon emerges.");
+ dragonSlayer.changeStrategy(() -> LOGGER.info(
"You shoot the dragon with the magical crossbow and it falls dead on the ground!"));
dragonSlayer.goToBattle();
- System.out.println("Black dragon lands before you.");
- dragonSlayer.changeStrategy(() -> System.out.println(
+ LOGGER.info("Black dragon lands before you.");
+ dragonSlayer.changeStrategy(() -> LOGGER.info(
"You cast the spell of disintegration and the dragon vaporizes in a pile of dust!"));
dragonSlayer.goToBattle();
}
diff --git a/strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.java b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.java
index 93214ffbf..8c31faee0 100644
--- a/strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.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
diff --git a/strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.java
index 23e296279..28e0a19bf 100644
--- a/strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.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
diff --git a/strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.java
index d17ff9041..24c35edc7 100644
--- a/strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.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.strategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Melee strategy.
@@ -29,8 +32,10 @@ package com.iluwatar.strategy;
*/
public class MeleeStrategy implements DragonSlayingStrategy {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MeleeStrategy.class);
+
@Override
public void execute() {
- System.out.println("With your Excalibur you sever the dragon's head!");
+ LOGGER.info("With your Excalibur you sever the dragon's head!");
}
}
diff --git a/strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.java
index 7cd731167..c42badd5c 100644
--- a/strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.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.strategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Projectile strategy.
@@ -29,9 +32,10 @@ package com.iluwatar.strategy;
*/
public class ProjectileStrategy implements DragonSlayingStrategy {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ProjectileStrategy.class);
+
@Override
public void execute() {
- System.out
- .println("You shoot the dragon with the magical crossbow and it falls dead on the ground!");
+ LOGGER.info("You shoot the dragon with the magical crossbow and it falls dead on the ground!");
}
}
diff --git a/strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.java
index 6309ed31b..12c0f8323 100644
--- a/strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.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.strategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Spell strategy.
@@ -29,10 +32,11 @@ package com.iluwatar.strategy;
*/
public class SpellStrategy implements DragonSlayingStrategy {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SpellStrategy.class);
+
@Override
public void execute() {
- System.out
- .println("You cast the spell of disintegration and the dragon vaporizes in a pile of dust!");
+ LOGGER.info("You cast the spell of disintegration and the dragon vaporizes in a pile of dust!");
}
}
diff --git a/strategy/src/test/java/com/iluwatar/strategy/AppTest.java b/strategy/src/test/java/com/iluwatar/strategy/AppTest.java
index fa81ae747..59b3a22a9 100644
--- a/strategy/src/test/java/com/iluwatar/strategy/AppTest.java
+++ b/strategy/src/test/java/com/iluwatar/strategy/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
diff --git a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java
index ff7e6840a..ad8b9784f 100644
--- a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java
+++ b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.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
diff --git a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java
index 35f4c1a82..52e596e5c 100644
--- a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java
+++ b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.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,19 +22,22 @@
*/
package com.iluwatar.strategy;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.LoggerFactory;
-import java.io.PrintStream;
import java.util.Arrays;
import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/29/15 - 10:58 PM
@@ -71,20 +74,22 @@ public class DragonSlayingStrategyTest {
private final DragonSlayingStrategy strategy;
/**
- * The expected action on the std-out
+ * The expected action in the log
*/
private final String expectedResult;
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
/**
* Create a new test instance for the given strategy
@@ -97,30 +102,35 @@ public class DragonSlayingStrategyTest {
this.expectedResult = expectedResult;
}
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
/**
* Test if executing the strategy gives the correct response
*/
@Test
public void testExecute() {
this.strategy.execute();
- verify(this.stdOutMock).println(this.expectedResult);
- verifyNoMoreInteractions(this.stdOutMock);
+ assertEquals(this.expectedResult, appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
-}
\ No newline at end of file
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+ }
+}
diff --git a/template-method/etc/template-method.urm.puml b/template-method/etc/template-method.urm.puml
index c2c6045fe..a6e2dc3d2 100644
--- a/template-method/etc/template-method.urm.puml
+++ b/template-method/etc/template-method.urm.puml
@@ -1,10 +1,8 @@
@startuml
package com.iluwatar.templatemethod {
- class HitAndRunMethod {
- + HitAndRunMethod()
- # confuseTarget(target : String)
- # pickTarget() : String
- # stealTheItem(target : String)
+ class App {
+ + App()
+ + main(args : String[]) {static}
}
class HalflingThief {
- method : StealingMethod
@@ -12,7 +10,15 @@ package com.iluwatar.templatemethod {
+ changeMethod(method : StealingMethod)
+ steal()
}
+ class HitAndRunMethod {
+ - LOGGER : Logger {static}
+ + HitAndRunMethod()
+ # confuseTarget(target : String)
+ # pickTarget() : String
+ # stealTheItem(target : String)
+ }
abstract class StealingMethod {
+ - LOGGER : Logger {static}
+ StealingMethod()
# confuseTarget(String) {abstract}
# pickTarget() : String {abstract}
@@ -20,15 +26,12 @@ package com.iluwatar.templatemethod {
# stealTheItem(String) {abstract}
}
class SubtleMethod {
+ - LOGGER : Logger {static}
+ SubtleMethod()
# confuseTarget(target : String)
# pickTarget() : String
# stealTheItem(target : String)
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
}
HalflingThief --> "-method" StealingMethod
HitAndRunMethod --|> StealingMethod
diff --git a/template-method/pom.xml b/template-method/pom.xml
index 2098a801f..892c84a7c 100644
--- a/template-method/pom.xml
+++ b/template-method/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
diff --git a/template-method/src/main/java/com/iluwatar/templatemethod/App.java b/template-method/src/main/java/com/iluwatar/templatemethod/App.java
index ead9c64f4..5ad51d3e5 100644
--- a/template-method/src/main/java/com/iluwatar/templatemethod/App.java
+++ b/template-method/src/main/java/com/iluwatar/templatemethod/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
diff --git a/template-method/src/main/java/com/iluwatar/templatemethod/HalflingThief.java b/template-method/src/main/java/com/iluwatar/templatemethod/HalflingThief.java
index e776044f6..0b1fb044e 100644
--- a/template-method/src/main/java/com/iluwatar/templatemethod/HalflingThief.java
+++ b/template-method/src/main/java/com/iluwatar/templatemethod/HalflingThief.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
diff --git a/template-method/src/main/java/com/iluwatar/templatemethod/HitAndRunMethod.java b/template-method/src/main/java/com/iluwatar/templatemethod/HitAndRunMethod.java
index 7a78576a1..0b7ff9d91 100644
--- a/template-method/src/main/java/com/iluwatar/templatemethod/HitAndRunMethod.java
+++ b/template-method/src/main/java/com/iluwatar/templatemethod/HitAndRunMethod.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.templatemethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* HitAndRunMethod implementation of {@link StealingMethod}.
@@ -29,6 +32,8 @@ package com.iluwatar.templatemethod;
*/
public class HitAndRunMethod extends StealingMethod {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HitAndRunMethod.class);
+
@Override
protected String pickTarget() {
return "old goblin woman";
@@ -36,11 +41,11 @@ public class HitAndRunMethod extends StealingMethod {
@Override
protected void confuseTarget(String target) {
- System.out.println("Approach the " + target + " from behind.");
+ LOGGER.info("Approach the {} from behind.", target);
}
@Override
protected void stealTheItem(String target) {
- System.out.println("Grab the handbag and run away fast!");
+ LOGGER.info("Grab the handbag and run away fast!");
}
}
diff --git a/template-method/src/main/java/com/iluwatar/templatemethod/StealingMethod.java b/template-method/src/main/java/com/iluwatar/templatemethod/StealingMethod.java
index c8c584cdd..61aaf4ab4 100644
--- a/template-method/src/main/java/com/iluwatar/templatemethod/StealingMethod.java
+++ b/template-method/src/main/java/com/iluwatar/templatemethod/StealingMethod.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.templatemethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* StealingMethod defines skeleton for the algorithm.
@@ -29,6 +32,8 @@ package com.iluwatar.templatemethod;
*/
public abstract class StealingMethod {
+ private static final Logger LOGGER = LoggerFactory.getLogger(StealingMethod.class);
+
protected abstract String pickTarget();
protected abstract void confuseTarget(String target);
@@ -40,7 +45,7 @@ public abstract class StealingMethod {
*/
public void steal() {
String target = pickTarget();
- System.out.println("The target has been chosen as " + target + ".");
+ LOGGER.info("The target has been chosen as {}.", target);
confuseTarget(target);
stealTheItem(target);
}
diff --git a/template-method/src/main/java/com/iluwatar/templatemethod/SubtleMethod.java b/template-method/src/main/java/com/iluwatar/templatemethod/SubtleMethod.java
index 4fdb5d758..d8b16af3d 100644
--- a/template-method/src/main/java/com/iluwatar/templatemethod/SubtleMethod.java
+++ b/template-method/src/main/java/com/iluwatar/templatemethod/SubtleMethod.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.templatemethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* SubtleMethod implementation of {@link StealingMethod}.
@@ -29,6 +32,8 @@ package com.iluwatar.templatemethod;
*/
public class SubtleMethod extends StealingMethod {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SubtleMethod.class);
+
@Override
protected String pickTarget() {
return "shop keeper";
@@ -36,11 +41,11 @@ public class SubtleMethod extends StealingMethod {
@Override
protected void confuseTarget(String target) {
- System.out.println("Approach the " + target + " with tears running and hug him!");
+ LOGGER.info("Approach the {} with tears running and hug him!", target);
}
@Override
protected void stealTheItem(String target) {
- System.out.println("While in close contact grab the " + target + "'s wallet.");
+ LOGGER.info("While in close contact grab the {}'s wallet.", target);
}
}
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java
index e0baf40cb..da85062f5 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/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
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java
index 31cb078e3..6cc80446c 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.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
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/HitAndRunMethodTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/HitAndRunMethodTest.java
index 27d601ac3..3bc7b28b4 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/HitAndRunMethodTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/HitAndRunMethodTest.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
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java
index e0cb90d42..70cb23bfe 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.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,19 +22,19 @@
*/
package com.iluwatar.templatemethod;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.InOrder;
+import org.slf4j.LoggerFactory;
-import java.io.PrintStream;
+import java.util.LinkedList;
+import java.util.List;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.junit.Assert.assertTrue;
/**
* Date: 12/30/15 - 18:12 PM
@@ -43,6 +43,18 @@ import static org.mockito.Mockito.verifyZeroInteractions;
*/
public abstract class StealingMethodTest<M extends StealingMethod> {
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
+
/**
* The tested stealing method
*/
@@ -68,17 +80,6 @@ public abstract class StealingMethodTest<M extends StealingMethod> {
*/
private final String expectedStealMethod;
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
/**
* Create a new test for the given stealing method, together with the expected results
*
@@ -98,22 +99,6 @@ public abstract class StealingMethodTest<M extends StealingMethod> {
this.expectedStealMethod = expectedStealMethod;
}
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
/**
* Verify if the thief picks the correct target
*/
@@ -127,11 +112,11 @@ public abstract class StealingMethodTest<M extends StealingMethod> {
*/
@Test
public void testConfuseTarget() {
- verifyZeroInteractions(this.stdOutMock);
+ assertEquals(0, appender.getLogSize());
this.method.confuseTarget(this.expectedTarget);
- verify(this.stdOutMock).println(this.expectedConfuseMethod);
- verifyNoMoreInteractions(this.stdOutMock);
+ assertEquals(this.expectedConfuseMethod, appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
/**
@@ -139,11 +124,11 @@ public abstract class StealingMethodTest<M extends StealingMethod> {
*/
@Test
public void testStealTheItem() {
- verifyZeroInteractions(this.stdOutMock);
+ assertEquals(0, appender.getLogSize());
this.method.stealTheItem(this.expectedTarget);
- verify(this.stdOutMock).println(this.expectedStealMethod);
- verifyNoMoreInteractions(this.stdOutMock);
+ assertEquals(this.expectedStealMethod, appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
/**
@@ -151,14 +136,37 @@ public abstract class StealingMethodTest<M extends StealingMethod> {
*/
@Test
public void testSteal() {
- final InOrder inOrder = inOrder(this.stdOutMock);
-
this.method.steal();
- inOrder.verify(this.stdOutMock).println(this.expectedTargetResult);
- inOrder.verify(this.stdOutMock).println(this.expectedConfuseMethod);
- inOrder.verify(this.stdOutMock).println(this.expectedStealMethod);
- inOrder.verifyNoMoreInteractions();
+ assertTrue(appender.logContains(this.expectedTargetResult));
+ assertTrue(appender.logContains(this.expectedConfuseMethod));
+ assertTrue(appender.logContains(this.expectedStealMethod));
+ assertEquals(3, appender.getLogSize());
}
-}
\ No newline at end of file
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+
+ public boolean logContains(String message) {
+ return log.stream().anyMatch(event -> event.getFormattedMessage().equals(message));
+ }
+ }
+}
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/SubtleMethodTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/SubtleMethodTest.java
index 78c86adfc..41105c43e 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/SubtleMethodTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/SubtleMethodTest.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
diff --git a/thread-pool/etc/thread-pool.urm.puml b/thread-pool/etc/thread-pool.urm.puml
index 421ea1dce..251033c81 100644
--- a/thread-pool/etc/thread-pool.urm.puml
+++ b/thread-pool/etc/thread-pool.urm.puml
@@ -1,5 +1,20 @@
@startuml
package com.iluwatar.threadpool {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
+ class CoffeeMakingTask {
+ - TIME_PER_CUP : int {static}
+ + CoffeeMakingTask(numCups : int)
+ + toString() : String
+ }
+ class PotatoPeelingTask {
+ - TIME_PER_POTATO : int {static}
+ + PotatoPeelingTask(numPotatoes : int)
+ + toString() : String
+ }
abstract class Task {
- ID_GENERATOR : AtomicInteger {static}
- id : int
@@ -9,25 +24,12 @@ package com.iluwatar.threadpool {
+ getTimeMs() : int
+ toString() : String
}
- class CoffeeMakingTask {
- - TIME_PER_CUP : int {static}
- + CoffeeMakingTask(numCups : int)
- + toString() : String
- }
class Worker {
+ - LOGGER : Logger {static}
- task : Task
+ Worker(task : Task)
+ run()
}
- class PotatoPeelingTask {
- - TIME_PER_POTATO : int {static}
- + PotatoPeelingTask(numPotatoes : int)
- + toString() : String
- }
- class App {
- + App()
- + main(args : String[]) {static}
- }
}
Worker --> "-task" Task
CoffeeMakingTask --|> Task
diff --git a/thread-pool/pom.xml b/thread-pool/pom.xml
index e1f9a4e49..46b9f3a0d 100644
--- a/thread-pool/pom.xml
+++ b/thread-pool/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
diff --git a/thread-pool/src/main/java/com/iluwatar/threadpool/App.java b/thread-pool/src/main/java/com/iluwatar/threadpool/App.java
index 16fbca35a..0ca3e9453 100644
--- a/thread-pool/src/main/java/com/iluwatar/threadpool/App.java
+++ b/thread-pool/src/main/java/com/iluwatar/threadpool/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.threadpool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -43,6 +46,8 @@ import java.util.concurrent.Executors;
*
*/
public class App {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
/**
* Program entry point
@@ -51,7 +56,7 @@ public class App {
*/
public static void main(String[] args) {
- System.out.println("Program started");
+ LOGGER.info("Program started");
// Create a list of tasks to be executed
List<Task> tasks = new ArrayList<>();
@@ -89,6 +94,6 @@ public class App {
while (!executor.isTerminated()) {
Thread.yield();
}
- System.out.println("Program finished");
+ LOGGER.info("Program finished");
}
}
diff --git a/thread-pool/src/main/java/com/iluwatar/threadpool/CoffeeMakingTask.java b/thread-pool/src/main/java/com/iluwatar/threadpool/CoffeeMakingTask.java
index fce9ada9c..208b1ac2c 100644
--- a/thread-pool/src/main/java/com/iluwatar/threadpool/CoffeeMakingTask.java
+++ b/thread-pool/src/main/java/com/iluwatar/threadpool/CoffeeMakingTask.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
diff --git a/thread-pool/src/main/java/com/iluwatar/threadpool/PotatoPeelingTask.java b/thread-pool/src/main/java/com/iluwatar/threadpool/PotatoPeelingTask.java
index e55debe28..86c7bb00e 100644
--- a/thread-pool/src/main/java/com/iluwatar/threadpool/PotatoPeelingTask.java
+++ b/thread-pool/src/main/java/com/iluwatar/threadpool/PotatoPeelingTask.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
diff --git a/thread-pool/src/main/java/com/iluwatar/threadpool/Task.java b/thread-pool/src/main/java/com/iluwatar/threadpool/Task.java
index 623d2b78e..9ea4996d1 100644
--- a/thread-pool/src/main/java/com/iluwatar/threadpool/Task.java
+++ b/thread-pool/src/main/java/com/iluwatar/threadpool/Task.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
diff --git a/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java b/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java
index 1354cab41..578800108 100644
--- a/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java
+++ b/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.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.threadpool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* Worker implements {@link Runnable} and thus can be executed by {@link ExecutorService}
@@ -29,6 +32,8 @@ package com.iluwatar.threadpool;
*/
public class Worker implements Runnable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Worker.class);
+
private final Task task;
public Worker(final Task task) {
@@ -37,8 +42,7 @@ public class Worker implements Runnable {
@Override
public void run() {
- System.out.println(String.format("%s processing %s", Thread.currentThread().getName(),
- task.toString()));
+ LOGGER.info("{} processing {}", Thread.currentThread().getName(), task.toString());
try {
Thread.sleep(task.getTimeMs());
} catch (InterruptedException e) {
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java
index 5536d6631..2d21eec12 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/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
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/CoffeeMakingTaskTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/CoffeeMakingTaskTest.java
index 281ef16ad..00bf1e60a 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/CoffeeMakingTaskTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/CoffeeMakingTaskTest.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
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/PotatoPeelingTaskTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/PotatoPeelingTaskTest.java
index d27e6ba5d..89900fec4 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/PotatoPeelingTaskTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/PotatoPeelingTaskTest.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
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/TaskTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/TaskTest.java
index ded3e9d42..8f061575e 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/TaskTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/TaskTest.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
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java
index 24fe87548..81962ab2a 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.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
diff --git a/tolerant-reader/etc/tolerant-reader.urm.puml b/tolerant-reader/etc/tolerant-reader.urm.puml
index f203f8257..a73394a4e 100644
--- a/tolerant-reader/etc/tolerant-reader.urm.puml
+++ b/tolerant-reader/etc/tolerant-reader.urm.puml
@@ -1,5 +1,10 @@
@startuml
package com.iluwatar.tolerantreader {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
class RainbowFish {
- age : int
- lengthMeters : int
@@ -12,9 +17,11 @@ package com.iluwatar.tolerantreader {
+ getName() : String
+ getWeightTons() : int
}
- class App {
- + App()
- + main(args : String[]) {static}
+ class RainbowFishSerializer {
+ - RainbowFishSerializer()
+ + readV1(filename : String) : RainbowFish {static}
+ + writeV1(rainbowFish : RainbowFish, filename : String) {static}
+ + writeV2(rainbowFish : RainbowFishV2, filename : String) {static}
}
class RainbowFishV2 {
- angry : boolean
@@ -27,12 +34,6 @@ package com.iluwatar.tolerantreader {
+ getHungry() : boolean
+ getSleeping() : boolean
}
- class RainbowFishSerializer {
- - RainbowFishSerializer()
- + readV1(filename : String) : RainbowFish {static}
- + writeV1(rainbowFish : RainbowFish, filename : String) {static}
- + writeV2(rainbowFish : RainbowFishV2, filename : String) {static}
- }
}
RainbowFishV2 --|> RainbowFish
@enduml
\ No newline at end of file
diff --git a/tolerant-reader/pom.xml b/tolerant-reader/pom.xml
index 9668b5fb3..e1902d78d 100644
--- a/tolerant-reader/pom.xml
+++ b/tolerant-reader/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
diff --git a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/App.java b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/App.java
index 066b6e737..c24933384 100644
--- a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/App.java
+++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/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.tolerantreader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
/**
@@ -41,31 +44,33 @@ import java.io.IOException;
*/
public class App {
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* Program entry point
*/
public static void main(String[] args) throws IOException, ClassNotFoundException {
// Write V1
RainbowFish fishV1 = new RainbowFish("Zed", 10, 11, 12);
- System.out.println(String.format("fishV1 name=%s age=%d length=%d weight=%d", fishV1.getName(),
- fishV1.getAge(), fishV1.getLengthMeters(), fishV1.getWeightTons()));
+ LOGGER.info("fishV1 name={} age={} length={} weight={}", fishV1.getName(),
+ fishV1.getAge(), fishV1.getLengthMeters(), fishV1.getWeightTons());
RainbowFishSerializer.writeV1(fishV1, "fish1.out");
// Read V1
RainbowFish deserializedFishV1 = RainbowFishSerializer.readV1("fish1.out");
- System.out.println(String.format("deserializedFishV1 name=%s age=%d length=%d weight=%d",
+ LOGGER.info("deserializedFishV1 name={} age={} length={} weight={}",
deserializedFishV1.getName(), deserializedFishV1.getAge(),
- deserializedFishV1.getLengthMeters(), deserializedFishV1.getWeightTons()));
+ deserializedFishV1.getLengthMeters(), deserializedFishV1.getWeightTons());
// Write V2
RainbowFishV2 fishV2 = new RainbowFishV2("Scar", 5, 12, 15, true, true, true);
- System.out.println(String.format(
- "fishV2 name=%s age=%d length=%d weight=%d sleeping=%b hungry=%b angry=%b",
+ LOGGER.info(
+ "fishV2 name={} age={} length={} weight={} sleeping={} hungry={} angry={}",
fishV2.getName(), fishV2.getAge(), fishV2.getLengthMeters(), fishV2.getWeightTons(),
- fishV2.getHungry(), fishV2.getAngry(), fishV2.getSleeping()));
+ fishV2.getHungry(), fishV2.getAngry(), fishV2.getSleeping());
RainbowFishSerializer.writeV2(fishV2, "fish2.out");
// Read V2 with V1 method
RainbowFish deserializedFishV2 = RainbowFishSerializer.readV1("fish2.out");
- System.out.println(String.format("deserializedFishV2 name=%s age=%d length=%d weight=%d",
+ LOGGER.info("deserializedFishV2 name={} age={} length={} weight={}",
deserializedFishV2.getName(), deserializedFishV2.getAge(),
- deserializedFishV2.getLengthMeters(), deserializedFishV2.getWeightTons()));
+ deserializedFishV2.getLengthMeters(), deserializedFishV2.getWeightTons());
}
}
diff --git a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.java b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.java
index 1b1825a3e..441b8a5ef 100644
--- a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.java
+++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.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
diff --git a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java
index 948dfa6d2..d0ad5d798 100644
--- a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java
+++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.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
diff --git a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishV2.java b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishV2.java
index 55a416734..67430f57c 100644
--- a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishV2.java
+++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishV2.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
diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java
index e1a2ca5f9..f24393779 100644
--- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java
+++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/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
diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java
index 1028e7bde..a6c7fc641 100644
--- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java
+++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.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
diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java
index f9dcc5e6d..87c7a3e78 100644
--- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java
+++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.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
diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java
index 680e3c4ed..789da4f1e 100644
--- a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java
+++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.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
diff --git a/twin/etc/twin.urm.puml b/twin/etc/twin.urm.puml
index b4bd52468..e48298f18 100644
--- a/twin/etc/twin.urm.puml
+++ b/twin/etc/twin.urm.puml
@@ -1,12 +1,12 @@
@startuml
package com.iluwatar.twin {
- abstract class GameItem {
- + GameItem()
- + click() {abstract}
- + doDraw() {abstract}
- + draw()
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ - waiting() {static}
}
class BallItem {
+ - LOGGER : Logger {static}
- isSuspended : boolean
- twin : BallThread
+ BallItem()
@@ -15,10 +15,12 @@ package com.iluwatar.twin {
+ move()
+ setTwin(twin : BallThread)
}
- class App {
- + App()
- + main(args : String[]) {static}
- - waiting() {static}
+ abstract class GameItem {
+ - LOGGER : Logger {static}
+ + GameItem()
+ + click() {abstract}
+ + doDraw() {abstract}
+ + draw()
}
}
BallItem --|> GameItem
diff --git a/twin/pom.xml b/twin/pom.xml
index 56fe7bd8a..774b74fe8 100644
--- a/twin/pom.xml
+++ b/twin/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
diff --git a/twin/src/main/java/com/iluwatar/twin/App.java b/twin/src/main/java/com/iluwatar/twin/App.java
index 95998df33..f31ca4326 100644
--- a/twin/src/main/java/com/iluwatar/twin/App.java
+++ b/twin/src/main/java/com/iluwatar/twin/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
diff --git a/twin/src/main/java/com/iluwatar/twin/BallItem.java b/twin/src/main/java/com/iluwatar/twin/BallItem.java
index 0188b5731..54b8cac3a 100644
--- a/twin/src/main/java/com/iluwatar/twin/BallItem.java
+++ b/twin/src/main/java/com/iluwatar/twin/BallItem.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
@@ -23,6 +23,9 @@
package com.iluwatar.twin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This class represents a Ball which extends {@link GameItem} and implements the logic for ball
* item, like move and draw. It hold a reference of {@link BallThread} to delegate the suspend and
@@ -30,6 +33,8 @@ package com.iluwatar.twin;
*/
public class BallItem extends GameItem {
+ private static final Logger LOGGER = LoggerFactory.getLogger(BallItem.class);
+
private boolean isSuspended;
private BallThread twin;
@@ -41,11 +46,11 @@ public class BallItem extends GameItem {
@Override
public void doDraw() {
- System.out.println("doDraw");
+ LOGGER.info("doDraw");
}
public void move() {
- System.out.println("move");
+ LOGGER.info("move");
}
@Override
diff --git a/twin/src/main/java/com/iluwatar/twin/BallThread.java b/twin/src/main/java/com/iluwatar/twin/BallThread.java
index 194d85b06..f2b64e467 100644
--- a/twin/src/main/java/com/iluwatar/twin/BallThread.java
+++ b/twin/src/main/java/com/iluwatar/twin/BallThread.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
@@ -23,6 +23,9 @@
package com.iluwatar.twin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This class is a UI thread for drawing the {@link BallItem}, and provide the method for suspend
* and resume. It hold the reference of {@link BallItem} to delegate the draw task.
@@ -31,6 +34,8 @@ package com.iluwatar.twin;
public class BallThread extends Thread {
+ private static final Logger LOGGER = LoggerFactory.getLogger(BallThread.class);
+
private BallItem twin;
private volatile boolean isSuspended;
@@ -61,12 +66,12 @@ public class BallThread extends Thread {
public void suspendMe() {
isSuspended = true;
- System.out.println("Begin to suspend BallThread");
+ LOGGER.info("Begin to suspend BallThread");
}
public void resumeMe() {
isSuspended = false;
- System.out.println("Begin to resume BallThread");
+ LOGGER.info("Begin to resume BallThread");
}
public void stopMe() {
diff --git a/twin/src/main/java/com/iluwatar/twin/GameItem.java b/twin/src/main/java/com/iluwatar/twin/GameItem.java
index 08d7dcce7..46e19283f 100644
--- a/twin/src/main/java/com/iluwatar/twin/GameItem.java
+++ b/twin/src/main/java/com/iluwatar/twin/GameItem.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
@@ -24,16 +24,21 @@
package com.iluwatar.twin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* GameItem is a common class which provides some common methods for game object.
*/
public abstract class GameItem {
+ private static final Logger LOGGER = LoggerFactory.getLogger(GameItem.class);
+
/**
* Template method, do some common logic before draw
*/
public void draw() {
- System.out.println("draw");
+ LOGGER.info("draw");
doDraw();
}
diff --git a/twin/src/test/java/com/iluwatar/twin/AppTest.java b/twin/src/test/java/com/iluwatar/twin/AppTest.java
index 73a1d6322..60e02e4c4 100644
--- a/twin/src/test/java/com/iluwatar/twin/AppTest.java
+++ b/twin/src/test/java/com/iluwatar/twin/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
diff --git a/twin/src/test/java/com/iluwatar/twin/BallItemTest.java b/twin/src/test/java/com/iluwatar/twin/BallItemTest.java
index 4bb9a2111..8dfe9515c 100644
--- a/twin/src/test/java/com/iluwatar/twin/BallItemTest.java
+++ b/twin/src/test/java/com/iluwatar/twin/BallItemTest.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,20 +22,40 @@
*/
package com.iluwatar.twin;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
+import org.slf4j.LoggerFactory;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
/**
* Date: 12/30/15 - 18:44 PM
*
* @author Jeroen Meulemeester
*/
-public class BallItemTest extends StdOutTest {
+public class BallItemTest {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
@Test
public void testClick() {
@@ -63,10 +83,11 @@ public class BallItemTest extends StdOutTest {
ballItem.setTwin(ballThread);
ballItem.draw();
- verify(getStdOutMock()).println("draw");
- verify(getStdOutMock()).println("doDraw");
+ assertTrue(appender.logContains("draw"));
+ assertTrue(appender.logContains("doDraw"));
- verifyNoMoreInteractions(ballThread, getStdOutMock());
+ verifyNoMoreInteractions(ballThread);
+ assertEquals(2, appender.getLogSize());
}
@Test
@@ -76,9 +97,32 @@ public class BallItemTest extends StdOutTest {
ballItem.setTwin(ballThread);
ballItem.move();
- verify(getStdOutMock()).println("move");
+ assertTrue(appender.logContains("move"));
- verifyNoMoreInteractions(ballThread, getStdOutMock());
+ verifyNoMoreInteractions(ballThread);
+ assertEquals(1, appender.getLogSize());
}
-}
\ No newline at end of file
+ public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public boolean logContains(String message) {
+ return log.stream().anyMatch(event -> event.getMessage().equals(message));
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+ }
+
+}
diff --git a/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java b/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java
index 453109e5a..f531a2493 100644
--- a/twin/src/test/java/com/iluwatar/twin/BallThreadTest.java
+++ b/twin/src/test/java/com/iluwatar/twin/BallThreadTest.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
diff --git a/twin/src/test/java/com/iluwatar/twin/StdOutTest.java b/twin/src/test/java/com/iluwatar/twin/StdOutTest.java
deleted file mode 100644
index b3baf8abd..000000000
--- a/twin/src/test/java/com/iluwatar/twin/StdOutTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.twin;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/update-ghpages.sh b/update-ghpages.sh
index aee888ba9..d240453b0 100644
--- a/update-ghpages.sh
+++ b/update-ghpages.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# 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
diff --git a/value-object/etc/value-object.urm.puml b/value-object/etc/value-object.urm.puml
index 6c81de017..6149ead9b 100644
--- a/value-object/etc/value-object.urm.puml
+++ b/value-object/etc/value-object.urm.puml
@@ -1,5 +1,10 @@
@startuml
package com.iluwatar.value.object {
+ class App {
+ - LOGGER : Logger {static}
+ + App()
+ + main(args : String[]) {static}
+ }
class HeroStat {
- intelligence : int
- luck : int
@@ -13,9 +18,5 @@ package com.iluwatar.value.object {
+ toString() : String
+ valueOf(strength : int, intelligence : int, luck : int) : HeroStat {static}
}
- class App {
- + App()
- + main(args : String[]) {static}
- }
}
@enduml
\ No newline at end of file
diff --git a/value-object/pom.xml b/value-object/pom.xml
index 156d5b969..84bd29c6d 100644
--- a/value-object/pom.xml
+++ b/value-object/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
diff --git a/value-object/src/main/java/com/iluwatar/value/object/App.java b/value-object/src/main/java/com/iluwatar/value/object/App.java
index 1e943d054..82963ec8f 100644
--- a/value-object/src/main/java/com/iluwatar/value/object/App.java
+++ b/value-object/src/main/java/com/iluwatar/value/object/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.value.object;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A Value Object are objects which follow value semantics rather than reference semantics. This
* means value objects' equality are not based on identity. Two value objects are equal when they
@@ -38,6 +41,9 @@ package com.iluwatar.value.object;
* Colebourne's term VALJO : http://blog.joda.org/2014/03/valjos-value-java-objects.html
*/
public class App {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
/**
* This practice creates three HeroStats(Value object) and checks equality between those.
*/
@@ -46,9 +52,9 @@ public class App {
HeroStat statB = HeroStat.valueOf(10, 5, 0);
HeroStat statC = HeroStat.valueOf(5, 1, 8);
- System.out.println(statA.toString());
+ LOGGER.info(statA.toString());
- System.out.println("Is statA and statB equal : " + statA.equals(statB));
- System.out.println("Is statA and statC equal : " + statA.equals(statC));
+ LOGGER.info("Is statA and statB equal : {}", statA.equals(statB));
+ LOGGER.info("Is statA and statC equal : {}", statA.equals(statC));
}
}
diff --git a/value-object/src/main/java/com/iluwatar/value/object/HeroStat.java b/value-object/src/main/java/com/iluwatar/value/object/HeroStat.java
index 258c4d6a0..ff85e0e93 100644
--- a/value-object/src/main/java/com/iluwatar/value/object/HeroStat.java
+++ b/value-object/src/main/java/com/iluwatar/value/object/HeroStat.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
diff --git a/value-object/src/test/java/com/iluwatar/value/object/AppTest.java b/value-object/src/test/java/com/iluwatar/value/object/AppTest.java
index 85ef8b84e..cd0b1354f 100644
--- a/value-object/src/test/java/com/iluwatar/value/object/AppTest.java
+++ b/value-object/src/test/java/com/iluwatar/value/object/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
diff --git a/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java b/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java
index 4a8034b0b..b7b65b6c6 100644
--- a/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java
+++ b/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.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
diff --git a/visitor/etc/visitor.urm.puml b/visitor/etc/visitor.urm.puml
index 1f28e4e2f..36a67b415 100644
--- a/visitor/etc/visitor.urm.puml
+++ b/visitor/etc/visitor.urm.puml
@@ -1,57 +1,60 @@
@startuml
package com.iluwatar.visitor {
+ class App {
+ + App()
+ + main(args : String[]) {static}
+ }
class Commander {
+ Commander(children : Unit[])
+ accept(visitor : UnitVisitor)
+ toString() : String
}
- interface UnitVisitor {
- + visitCommander(Commander) {abstract}
- + visitSergeant(Sergeant) {abstract}
- + visitSoldier(Soldier) {abstract}
- }
class CommanderVisitor {
+ - LOGGER : Logger {static}
+ CommanderVisitor()
+ visitCommander(commander : Commander)
+ visitSergeant(sergeant : Sergeant)
+ visitSoldier(soldier : Soldier)
}
- class Soldier {
- + Soldier(children : Unit[])
- + accept(visitor : UnitVisitor)
- + toString() : String
- }
- class App {
- + App()
- + main(args : String[]) {static}
- }
- abstract class Unit {
- - children : Unit[]
- + Unit(children : Unit[])
- + accept(visitor : UnitVisitor)
- }
- class SoldierVisitor {
- + SoldierVisitor()
- + visitCommander(commander : Commander)
- + visitSergeant(sergeant : Sergeant)
- + visitSoldier(soldier : Soldier)
- }
- class SergeantVisitor {
- + SergeantVisitor()
- + visitCommander(commander : Commander)
- + visitSergeant(sergeant : Sergeant)
- + visitSoldier(soldier : Soldier)
- }
class Sergeant {
+ Sergeant(children : Unit[])
+ accept(visitor : UnitVisitor)
+ toString() : String
}
+ class SergeantVisitor {
+ - LOGGER : Logger {static}
+ + SergeantVisitor()
+ + visitCommander(commander : Commander)
+ + visitSergeant(sergeant : Sergeant)
+ + visitSoldier(soldier : Soldier)
+ }
+ class Soldier {
+ + Soldier(children : Unit[])
+ + accept(visitor : UnitVisitor)
+ + toString() : String
+ }
+ class SoldierVisitor {
+ - LOGGER : Logger {static}
+ + SoldierVisitor()
+ + visitCommander(commander : Commander)
+ + visitSergeant(sergeant : Sergeant)
+ + visitSoldier(soldier : Soldier)
+ }
+ abstract class Unit {
+ - children : Unit[]
+ + Unit(children : Unit[])
+ + accept(visitor : UnitVisitor)
+ }
+ interface UnitVisitor {
+ + visitCommander(Commander) {abstract}
+ + visitSergeant(Sergeant) {abstract}
+ + visitSoldier(Soldier) {abstract}
+ }
}
Commander --|> Unit
CommanderVisitor ..|> UnitVisitor
+Sergeant --|> Unit
+SergeantVisitor ..|> UnitVisitor
Soldier --|> Unit
SoldierVisitor ..|> UnitVisitor
-SergeantVisitor ..|> UnitVisitor
-Sergeant --|> Unit
@enduml
\ No newline at end of file
diff --git a/visitor/pom.xml b/visitor/pom.xml
index e1d3ca6a1..6e8f60063 100644
--- a/visitor/pom.xml
+++ b/visitor/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
diff --git a/visitor/src/main/java/com/iluwatar/visitor/App.java b/visitor/src/main/java/com/iluwatar/visitor/App.java
index 371756b84..4de8452e5 100644
--- a/visitor/src/main/java/com/iluwatar/visitor/App.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/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
diff --git a/visitor/src/main/java/com/iluwatar/visitor/Commander.java b/visitor/src/main/java/com/iluwatar/visitor/Commander.java
index a1969a41c..a11f04d69 100644
--- a/visitor/src/main/java/com/iluwatar/visitor/Commander.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/Commander.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
diff --git a/visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.java
index 6e54c7861..ce7cf4d44 100644
--- a/visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.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.visitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* CommanderVisitor
@@ -29,6 +32,8 @@ package com.iluwatar.visitor;
*/
public class CommanderVisitor implements UnitVisitor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CommanderVisitor.class);
+
@Override
public void visitSoldier(Soldier soldier) {
// Do nothing
@@ -41,6 +46,6 @@ public class CommanderVisitor implements UnitVisitor {
@Override
public void visitCommander(Commander commander) {
- System.out.println("Good to see you " + commander);
+ LOGGER.info("Good to see you {}", commander);
}
}
diff --git a/visitor/src/main/java/com/iluwatar/visitor/Sergeant.java b/visitor/src/main/java/com/iluwatar/visitor/Sergeant.java
index 3b0087582..266350bf2 100644
--- a/visitor/src/main/java/com/iluwatar/visitor/Sergeant.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/Sergeant.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
diff --git a/visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.java
index 4fca0a5bd..48b4e9dba 100644
--- a/visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.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.visitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* SergeantVisitor
@@ -29,6 +32,8 @@ package com.iluwatar.visitor;
*/
public class SergeantVisitor implements UnitVisitor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SergeantVisitor.class);
+
@Override
public void visitSoldier(Soldier soldier) {
// Do nothing
@@ -36,7 +41,7 @@ public class SergeantVisitor implements UnitVisitor {
@Override
public void visitSergeant(Sergeant sergeant) {
- System.out.println("Hello " + sergeant);
+ LOGGER.info("Hello {}", sergeant);
}
@Override
diff --git a/visitor/src/main/java/com/iluwatar/visitor/Soldier.java b/visitor/src/main/java/com/iluwatar/visitor/Soldier.java
index 6e82a936b..681b8961d 100644
--- a/visitor/src/main/java/com/iluwatar/visitor/Soldier.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/Soldier.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
diff --git a/visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.java
index fff24f699..10fe49b7e 100644
--- a/visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.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.visitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
* SoldierVisitor
@@ -29,9 +32,11 @@ package com.iluwatar.visitor;
*/
public class SoldierVisitor implements UnitVisitor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SoldierVisitor.class);
+
@Override
public void visitSoldier(Soldier soldier) {
- System.out.println("Greetings " + soldier);
+ LOGGER.info("Greetings {}", soldier);
}
@Override
diff --git a/visitor/src/main/java/com/iluwatar/visitor/Unit.java b/visitor/src/main/java/com/iluwatar/visitor/Unit.java
index dc8bf2a28..b904bf358 100644
--- a/visitor/src/main/java/com/iluwatar/visitor/Unit.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/Unit.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
diff --git a/visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.java
index e465a6473..ecf8bf2a5 100644
--- a/visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.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
diff --git a/visitor/src/test/java/com/iluwatar/visitor/AppTest.java b/visitor/src/test/java/com/iluwatar/visitor/AppTest.java
index 33674053e..23c9bb48f 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/AppTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/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
diff --git a/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java b/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java
index abf92765f..b0b83cf73 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.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
diff --git a/visitor/src/test/java/com/iluwatar/visitor/CommanderVisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/CommanderVisitorTest.java
index 1331d25a9..9cf1f2985 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/CommanderVisitorTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/CommanderVisitorTest.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
diff --git a/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java b/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java
index fdc93265d..9266837b4 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.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
diff --git a/visitor/src/test/java/com/iluwatar/visitor/SergeantVisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/SergeantVisitorTest.java
index dc84d0b54..717684300 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/SergeantVisitorTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/SergeantVisitorTest.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
diff --git a/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java b/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java
index 18b2f2c08..31dfa0bde 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.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
diff --git a/visitor/src/test/java/com/iluwatar/visitor/SoldierVisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/SoldierVisitorTest.java
index c56485eb4..cc15cff85 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/SoldierVisitorTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/SoldierVisitorTest.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
diff --git a/visitor/src/test/java/com/iluwatar/visitor/StdOutTest.java b/visitor/src/test/java/com/iluwatar/visitor/StdOutTest.java
deleted file mode 100644
index 075f235f5..000000000
--- a/visitor/src/test/java/com/iluwatar/visitor/StdOutTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * The MIT License
- * Copyright (c) 2014 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.visitor;
-
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.PrintStream;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Date: 12/10/15 - 8:37 PM
- *
- * @author Jeroen Meulemeester
- */
-public abstract class StdOutTest {
-
- /**
- * The mocked standard out {@link PrintStream}, required since some actions don't have any
- * influence on accessible objects, except for writing to std-out using {@link System#out}
- */
- private final PrintStream stdOutMock = mock(PrintStream.class);
-
- /**
- * Keep the original std-out so it can be restored after the test
- */
- private final PrintStream stdOutOrig = System.out;
-
- /**
- * Inject the mocked std-out {@link PrintStream} into the {@link System} class before each test
- */
- @Before
- public void setUp() {
- System.setOut(this.stdOutMock);
- }
-
- /**
- * Removed the mocked std-out {@link PrintStream} again from the {@link System} class
- */
- @After
- public void tearDown() {
- System.setOut(this.stdOutOrig);
- }
-
- /**
- * Get the mocked stdOut {@link PrintStream}
- *
- * @return The stdOut print stream mock, renewed before each test
- */
- final PrintStream getStdOutMock() {
- return this.stdOutMock;
- }
-
-}
diff --git a/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java b/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java
index cba91a7f6..98f0f66dc 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/UnitTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/UnitTest.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
diff --git a/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java
index 4a131bbf2..dbcae196f 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.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,19 +22,38 @@
*/
package com.iluwatar.visitor;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
+import org.slf4j.LoggerFactory;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Optional;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.junit.Assert.assertEquals;
/**
* Date: 12/30/15 - 18:59 PM
*
* @author Jeroen Meulemeester
*/
-public abstract class VisitorTest<V extends UnitVisitor> extends StdOutTest {
+public abstract class VisitorTest<V extends UnitVisitor> {
+
+ private InMemoryAppender appender;
+
+ @Before
+ public void setUp() {
+ appender = new InMemoryAppender();
+ }
+
+ @After
+ public void tearDown() {
+ appender.stop();
+ }
/**
* The tested visitor instance
@@ -76,27 +95,48 @@ public abstract class VisitorTest<V extends UnitVisitor> extends StdOutTest {
public void testVisitCommander() {
this.visitor.visitCommander(new Commander());
if (this.commanderResponse.isPresent()) {
- verify(getStdOutMock()).println(this.commanderResponse.get());
+ assertEquals(this.commanderResponse.get(), appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
- verifyNoMoreInteractions(getStdOutMock());
}
@Test
public void testVisitSergeant() {
this.visitor.visitSergeant(new Sergeant());
if (this.sergeantResponse.isPresent()) {
- verify(getStdOutMock()).println(this.sergeantResponse.get());
+ assertEquals(this.sergeantResponse.get(), appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
- verifyNoMoreInteractions(getStdOutMock());
}
@Test
public void testVisitSoldier() {
this.visitor.visitSoldier(new Soldier());
if (this.soldierResponse.isPresent()) {
- verify(getStdOutMock()).println(this.soldierResponse.get());
+ assertEquals(this.soldierResponse.get(), appender.getLastMessage());
+ assertEquals(1, appender.getLogSize());
}
- verifyNoMoreInteractions(getStdOutMock());
}
+ private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+ private List<ILoggingEvent> log = new LinkedList<>();
+
+ public InMemoryAppender() {
+ ((Logger) LoggerFactory.getLogger("root")).addAppender(this);
+ start();
+ }
+
+ @Override
+ protected void append(ILoggingEvent eventObject) {
+ log.add(eventObject);
+ }
+
+ public int getLogSize() {
+ return log.size();
+ }
+
+ public String getLastMessage() {
+ return log.get(log.size() - 1).getFormattedMessage();
+ }
+ }
}