From e6c74a5fb97f3c1faacda5653894eb654be72435 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 21:11:48 +0000 Subject: [PATCH 001/225] Java 11 migraiton: marker --- marker/src/main/java/App.java | 23 ++++------------------- marker/src/main/java/Guard.java | 3 +-- marker/src/main/java/Thief.java | 2 +- marker/src/test/java/AppTest.java | 3 +-- marker/src/test/java/GuardTest.java | 2 +- marker/src/test/java/ThiefTest.java | 10 ++++++---- 6 files changed, 14 insertions(+), 29 deletions(-) diff --git a/marker/src/main/java/App.java b/marker/src/main/java/App.java index 384c999dc..c7b4530c6 100644 --- a/marker/src/main/java/App.java +++ b/marker/src/main/java/App.java @@ -21,9 +21,6 @@ * THE SOFTWARE. */ -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Created by Alexis on 28-Apr-17. With Marker interface idea is to make empty interface and extend * it. Basically it is just to identify the special objects from normal objects. Like in case of @@ -46,22 +43,10 @@ public class App { * @param args command line args */ public static void main(String[] args) { - - final Logger logger = LoggerFactory.getLogger(App.class); - Guard guard = new Guard(); - Thief thief = new Thief(); - - if (guard instanceof Permission) { - guard.enter(); - } else { - logger.info("You have no permission to enter, please leave this area"); - } - - if (thief instanceof Permission) { - thief.steal(); - } else { - thief.doNothing(); - } + var guard = new Guard(); + var thief = new Thief(); + guard.enter(); + thief.doNothing(); } } diff --git a/marker/src/main/java/Guard.java b/marker/src/main/java/Guard.java index 9a57e15fd..54443603c 100644 --- a/marker/src/main/java/Guard.java +++ b/marker/src/main/java/Guard.java @@ -31,8 +31,7 @@ public class Guard implements Permission { private static final Logger LOGGER = LoggerFactory.getLogger(Guard.class); - protected static void enter() { - + protected void enter() { LOGGER.info("You can enter"); } } diff --git a/marker/src/main/java/Thief.java b/marker/src/main/java/Thief.java index 341eae377..22155ef7b 100644 --- a/marker/src/main/java/Thief.java +++ b/marker/src/main/java/Thief.java @@ -35,7 +35,7 @@ public class Thief { LOGGER.info("Steal valuable items"); } - protected static void doNothing() { + protected void doNothing() { LOGGER.info("Pretend nothing happened and just leave"); } } diff --git a/marker/src/test/java/AppTest.java b/marker/src/test/java/AppTest.java index 5d63db0ad..13295a9e5 100644 --- a/marker/src/test/java/AppTest.java +++ b/marker/src/test/java/AppTest.java @@ -30,7 +30,6 @@ public class AppTest { @Test public void test() { - String[] args = {}; - App.main(args); + App.main(new String[]{}); } } diff --git a/marker/src/test/java/GuardTest.java b/marker/src/test/java/GuardTest.java index 615d4e129..ae92c27dc 100644 --- a/marker/src/test/java/GuardTest.java +++ b/marker/src/test/java/GuardTest.java @@ -33,7 +33,7 @@ public class GuardTest { @Test public void testGuard() { - Guard guard = new Guard(); + var guard = new Guard(); assertThat(guard, instanceOf(Permission.class)); } } \ No newline at end of file diff --git a/marker/src/test/java/ThiefTest.java b/marker/src/test/java/ThiefTest.java index 2732fc78a..dc081acf8 100644 --- a/marker/src/test/java/ThiefTest.java +++ b/marker/src/test/java/ThiefTest.java @@ -21,9 +21,11 @@ * THE SOFTWARE. */ -import org.junit.jupiter.api.Test; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertFalse; +import org.junit.jupiter.api.Test; /** * Thief test @@ -31,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; public class ThiefTest { @Test public void testThief() { - Thief thief = new Thief(); - assertFalse(thief instanceof Permission); + var thief = new Thief(); + assertThat(thief, not(instanceOf(Permission.class))); } } \ No newline at end of file From 59e050b20b0da4535c3f157c47f5810c2e0f513e Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 21:36:04 +0000 Subject: [PATCH 002/225] Java 11 migraiton: master-worker-pattern --- master-worker-pattern/pom.xml | 67 ++++++++++--------- .../java/com/iluwatar/masterworker/App.java | 50 +++++++------- .../com/iluwatar/masterworker/ArrayInput.java | 29 ++++---- .../masterworker/ArrayUtilityMethods.java | 20 +++--- .../java/com/iluwatar/masterworker/Input.java | 4 +- .../masterworker/system/MasterWorker.java | 2 +- .../systemmaster/ArrayTransposeMaster.java | 43 ++++++------ .../system/systemmaster/Master.java | 33 ++++----- .../systemworkers/ArrayTransposeWorker.java | 12 ++-- .../system/systemworkers/Worker.java | 12 ++-- .../iluwatar/masterworker/ArrayInputTest.java | 41 ++++++------ .../masterworker/ArrayUtilityMethodsTest.java | 14 ++-- .../ArrayTransposeMasterWorkerTest.java | 35 +++++++--- .../ArrayTransposeWorkerTest.java | 26 +++---- 14 files changed, 200 insertions(+), 188 deletions(-) diff --git a/master-worker-pattern/pom.xml b/master-worker-pattern/pom.xml index 9924d6a5a..26f4d70bb 100644 --- a/master-worker-pattern/pom.xml +++ b/master-worker-pattern/pom.xml @@ -22,38 +22,39 @@ THE SOFTWARE. --> - - 4.0.0 - - com.iluwatar - java-design-patterns - 1.23.0-SNAPSHOT - - master-worker-pattern - - - org.junit.jupiter - junit-jupiter-engine - test - + + 4.0.0 + + com.iluwatar + java-design-patterns + 1.23.0-SNAPSHOT + + master-worker-pattern + + + org.junit.jupiter + junit-jupiter-engine + test + - - - - org.apache.maven.plugins - maven-assembly-plugin - - - - - - com.iluwatar.masterworker.App - - - - - - - - + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + + + com.iluwatar.masterworker.App + + + + + + + + diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/App.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/App.java index 547636066..592ba8c59 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/App.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/App.java @@ -34,27 +34,25 @@ import org.slf4j.LoggerFactory; /** *

The Master-Worker pattern is used when the problem at hand can be solved by - * dividing into - * multiple parts which need to go through the same computation and may need to be aggregated to get - * final result. Parallel processing is performed using a system consisting of a master and some - * number of workers, where a master divides the work among the workers, gets the result back from - * them and assimilates all the results to give final result. The only communication is between the - * master and the worker - none of the workers communicate among one another and the user only - * communicates with the master to get required job done.

+ * dividing into multiple parts which need to go through the same computation and may need to be + * aggregated to get final result. Parallel processing is performed using a system consisting of a + * master and some number of workers, where a master divides the work among the workers, gets the + * result back from them and assimilates all the results to give final result. The only + * communication is between the master and the worker - none of the workers communicate among one + * another and the user only communicates with the master to get required job done.

*

In our example, we have generic abstract classes {@link MasterWorker}, {@link Master} and - * {@link Worker} which - * have to be extended by the classes which will perform the specific job at hand (in this case - * finding transpose of matrix, done by {@link ArrayTransposeMasterWorker}, {@link - * ArrayTransposeMaster} and {@link ArrayTransposeWorker}). The Master class divides the work into - * parts to be given to the workers, collects the results from the workers and aggregates it when - * all workers have responded before returning the solution. The Worker class extends the Thread - * class to enable parallel processing, and does the work once the data has been received from the - * Master. The MasterWorker contains a reference to the Master class, gets the input from the App - * and passes it on to the Master. These 3 classes define the system which computes the result. We - * also have 2 abstract classes {@link Input} and {@link Result}, which contain the input data and - * result data respectively. The Input class also has an abstract method divideData which defines - * how the data is to be divided into segments. These classes are extended by {@link ArrayInput} and - * {@link ArrayResult}.

+ * {@link Worker} which have to be extended by the classes which will perform the specific job at + * hand (in this case finding transpose of matrix, done by {@link ArrayTransposeMasterWorker}, + * {@link ArrayTransposeMaster} and {@link ArrayTransposeWorker}). The Master class divides the work + * into parts to be given to the workers, collects the results from the workers and aggregates it + * when all workers have responded before returning the solution. The Worker class extends the + * Thread class to enable parallel processing, and does the work once the data has been received + * from the Master. The MasterWorker contains a reference to the Master class, gets the input from + * the App and passes it on to the Master. These 3 classes define the system which computes the + * result. We also have 2 abstract classes {@link Input} and {@link Result}, which contain the input + * data and result data respectively. The Input class also has an abstract method divideData which + * defines how the data is to be divided into segments. These classes are extended by {@link + * ArrayInput} and {@link ArrayResult}.

*/ public class App { @@ -68,12 +66,12 @@ public class App { */ public static void main(String[] args) { - ArrayTransposeMasterWorker mw = new ArrayTransposeMasterWorker(); - int rows = 10; - int columns = 20; - int[][] inputMatrix = ArrayUtilityMethods.createRandomIntMatrix(rows, columns); - ArrayInput input = new ArrayInput(inputMatrix); - ArrayResult result = (ArrayResult) mw.getResult(input); + var mw = new ArrayTransposeMasterWorker(); + var rows = 10; + var columns = 20; + var inputMatrix = ArrayUtilityMethods.createRandomIntMatrix(rows, columns); + var input = new ArrayInput(inputMatrix); + var result = (ArrayResult) mw.getResult(input); if (result != null) { ArrayUtilityMethods.printMatrix(inputMatrix); ArrayUtilityMethods.printMatrix(result.data); diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/ArrayInput.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/ArrayInput.java index cd03a0a21..c8e68f958 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/ArrayInput.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/ArrayInput.java @@ -25,6 +25,7 @@ package com.iluwatar.masterworker; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; /** * Class ArrayInput extends abstract class {@link Input} and contains data of type int[][]. @@ -37,12 +38,12 @@ public class ArrayInput extends Input { } static int[] makeDivisions(int[][] data, int num) { - int initialDivision = data.length / num; //equally dividing - int[] divisions = new int[num]; + var initialDivision = data.length / num; //equally dividing + var divisions = new int[num]; Arrays.fill(divisions, initialDivision); if (initialDivision * num != data.length) { - int extra = data.length - initialDivision * num; - int l = 0; + var extra = data.length - initialDivision * num; + var l = 0; //equally dividing extra among all parts while (extra > 0) { divisions[l] = divisions[l] + 1; @@ -58,22 +59,20 @@ public class ArrayInput extends Input { } @Override - public ArrayList divideData(int num) { + public List> divideData(int num) { if (this.data == null) { return null; } else { - int[] divisions = makeDivisions(this.data, num); - ArrayList result = new ArrayList(num); - int rowsDone = 0; //number of rows divided so far - for (int i = 0; i < num; i++) { - int rows = divisions[i]; + var divisions = makeDivisions(this.data, num); + var result = new ArrayList>(num); + var rowsDone = 0; //number of rows divided so far + for (var i = 0; i < num; i++) { + var rows = divisions[i]; if (rows != 0) { - int[][] divided = new int[rows][this.data[0].length]; - for (int j = 0; j < rows; j++) { - divided[j] = this.data[rowsDone + j]; - } + var divided = new int[rows][this.data[0].length]; + System.arraycopy(this.data, rowsDone, divided, 0, rows); rowsDone += rows; - ArrayInput dividedInput = new ArrayInput(divided); + var dividedInput = new ArrayInput(divided); result.add(dividedInput); } else { break; //rest of divisions will also be 0 diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/ArrayUtilityMethods.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/ArrayUtilityMethods.java index 525bed003..5e695e5da 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/ArrayUtilityMethods.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/ArrayUtilityMethods.java @@ -47,8 +47,8 @@ public class ArrayUtilityMethods { if (a1.length != a2.length) { return false; } else { - boolean answer = false; - for (int i = 0; i < a1.length; i++) { + var answer = false; + for (var i = 0; i < a1.length; i++) { if (a1[i] == a2[i]) { answer = true; } else { @@ -69,8 +69,8 @@ public class ArrayUtilityMethods { if (m1.length != m2.length) { return false; } else { - boolean answer = false; - for (int i = 0; i < m1.length; i++) { + var answer = false; + for (var i = 0; i < m1.length; i++) { if (arraysSame(m1[i], m2[i])) { answer = true; } else { @@ -88,9 +88,9 @@ public class ArrayUtilityMethods { * @return it (int[][]). */ public static int[][] createRandomIntMatrix(int rows, int columns) { - int[][] matrix = new int[rows][columns]; - for (int i = 0; i < rows; i++) { - for (int j = 0; j < columns; j++) { + var matrix = new int[rows][columns]; + for (var i = 0; i < rows; i++) { + for (var j = 0; j < columns; j++) { //filling cells in matrix matrix[i][j] = RANDOM.nextInt(10); } @@ -104,9 +104,9 @@ public class ArrayUtilityMethods { public static void printMatrix(int[][] matrix) { //prints out int[][] - for (int i = 0; i < matrix.length; i++) { - for (int j = 0; j < matrix[0].length; j++) { - LOGGER.info(matrix[i][j] + " "); + for (var ints : matrix) { + for (var j = 0; j < matrix[0].length; j++) { + LOGGER.info(ints[j] + " "); } LOGGER.info(""); } diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/Input.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/Input.java index 6a957ae80..8d832f6c7 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/Input.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/Input.java @@ -23,7 +23,7 @@ package com.iluwatar.masterworker; -import java.util.ArrayList; +import java.util.List; /** * The abstract Input class, having 1 public field which contains input data, and abstract method @@ -40,5 +40,5 @@ public abstract class Input { this.data = data; } - public abstract ArrayList divideData(int num); + public abstract List> divideData(int num); } diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/MasterWorker.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/MasterWorker.java index 2b16cbf76..817fd65d3 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/MasterWorker.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/MasterWorker.java @@ -40,7 +40,7 @@ public abstract class MasterWorker { abstract Master setMaster(int numOfWorkers); - public Result getResult(Input input) { + public Result getResult(Input input) { this.master.doWork(input); return this.master.getFinalResult(); } diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/ArrayTransposeMaster.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/ArrayTransposeMaster.java index ffa64572c..9bfbf200e 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/ArrayTransposeMaster.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/ArrayTransposeMaster.java @@ -27,7 +27,8 @@ import com.iluwatar.masterworker.ArrayResult; import com.iluwatar.masterworker.system.systemworkers.ArrayTransposeWorker; import com.iluwatar.masterworker.system.systemworkers.Worker; import java.util.ArrayList; -import java.util.Enumeration; +import java.util.stream.Collectors; +import java.util.stream.IntStream; /** * Class ArrayTransposeMaster extends abstract class {@link Master} and contains definition of @@ -41,35 +42,33 @@ public class ArrayTransposeMaster extends Master { @Override ArrayList setWorkers(int num) { - ArrayList ws = new ArrayList(num); - for (int i = 0; i < num; i++) { - ws.add(new ArrayTransposeWorker(this, i + 1)); - //i+1 will be id - } - return ws; + //i+1 will be id + return IntStream.range(0, num) + .mapToObj(i -> new ArrayTransposeWorker(this, i + 1)) + .collect(Collectors.toCollection(() -> new ArrayList<>(num))); } @Override ArrayResult aggregateData() { // number of rows in final result is number of rows in any of obtained results from workers - int rows = ((ArrayResult) this.getAllResultData() - .get(this.getAllResultData().keys().nextElement())).data.length; - int columns = - 0; //number of columns is sum of number of columns in all results obtained from workers - for (Enumeration e = this.getAllResultData().keys(); e.hasMoreElements(); ) { - columns += ((ArrayResult) this.getAllResultData().get(e.nextElement())).data[0].length; + var allResultData = this.getAllResultData(); + var rows = ((ArrayResult) allResultData.elements().nextElement()).data.length; + var elements = allResultData.elements(); + var columns = 0; // columns = sum of number of columns in all results obtained from workers + while (elements.hasMoreElements()) { + columns += ((ArrayResult) elements.nextElement()).data[0].length; } - int[][] resultData = new int[rows][columns]; - int columnsDone = 0; //columns aggregated so far - for (int i = 0; i < this.getExpectedNumResults(); i++) { + var resultData = new int[rows][columns]; + var columnsDone = 0; //columns aggregated so far + var workers = this.getWorkers(); + for (var i = 0; i < this.getExpectedNumResults(); i++) { //result obtained from ith worker - int[][] work = - ((ArrayResult) this.getAllResultData().get(this.getWorkers().get(i).getWorkerId())).data; - for (int m = 0; m < work.length; m++) { + var worker = workers.get(i); + var workerId = worker.getWorkerId(); + var work = ((ArrayResult) allResultData.get(workerId)).data; + for (var m = 0; m < work.length; m++) { //m = row number, n = columns number - for (int n = 0; n < work[0].length; n++) { - resultData[m][columnsDone + n] = work[m][n]; - } + System.arraycopy(work[m], 0, resultData[m], columnsDone, work[0].length); } columnsDone += work[0].length; } diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java index 2466df256..6b20211f5 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java @@ -26,8 +26,9 @@ package com.iluwatar.masterworker.system.systemmaster; import com.iluwatar.masterworker.Input; import com.iluwatar.masterworker.Result; import com.iluwatar.masterworker.system.systemworkers.Worker; -import java.util.ArrayList; +import java.util.Dictionary; import java.util.Hashtable; +import java.util.List; /** * The abstract Master class which contains private fields numOfWorkers (number of workers), workers @@ -38,24 +39,24 @@ import java.util.Hashtable; public abstract class Master { private final int numOfWorkers; - private final ArrayList workers; + private final List workers; + private final Dictionary> allResultData; private int expectedNumResults; - private Hashtable allResultData; - private Result finalResult; + private Result finalResult; Master(int numOfWorkers) { this.numOfWorkers = numOfWorkers; this.workers = setWorkers(numOfWorkers); this.expectedNumResults = 0; - this.allResultData = new Hashtable(numOfWorkers); + this.allResultData = new Hashtable<>(numOfWorkers); this.finalResult = null; } - public Result getFinalResult() { + public Result getFinalResult() { return this.finalResult; } - Hashtable getAllResultData() { + Dictionary> getAllResultData() { return this.allResultData; } @@ -63,21 +64,21 @@ public abstract class Master { return this.expectedNumResults; } - ArrayList getWorkers() { + List getWorkers() { return this.workers; } - abstract ArrayList setWorkers(int num); + abstract List setWorkers(int num); - public void doWork(Input input) { + public void doWork(Input input) { divideWork(input); } - private void divideWork(Input input) { - ArrayList dividedInput = input.divideData(numOfWorkers); + private void divideWork(Input input) { + List> dividedInput = input.divideData(numOfWorkers); if (dividedInput != null) { this.expectedNumResults = dividedInput.size(); - for (int i = 0; i < this.expectedNumResults; i++) { + for (var i = 0; i < this.expectedNumResults; i++) { //ith division given to ith worker in this.workers this.workers.get(i).setReceivedData(this, dividedInput.get(i)); this.workers.get(i).run(); @@ -85,12 +86,12 @@ public abstract class Master { } } - public void receiveData(Result data, Worker w) { + public void receiveData(Result data, Worker w) { //check if can receive..if yes: collectResult(data, w.getWorkerId()); } - private void collectResult(Result data, int workerId) { + private void collectResult(Result data, int workerId) { this.allResultData.put(workerId, data); if (this.allResultData.size() == this.expectedNumResults) { //all data received @@ -98,5 +99,5 @@ public abstract class Master { } } - abstract Result aggregateData(); + abstract Result aggregateData(); } diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemworkers/ArrayTransposeWorker.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemworkers/ArrayTransposeWorker.java index 37d8ba005..3f2da0a0a 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemworkers/ArrayTransposeWorker.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemworkers/ArrayTransposeWorker.java @@ -41,12 +41,12 @@ public class ArrayTransposeWorker extends Worker { @Override ArrayResult executeOperation() { //number of rows in result matrix is equal to number of columns in input matrix and vice versa - ArrayInput arrayInput = (ArrayInput) this.getReceivedData(); - final int rows = arrayInput.data[0].length; - final int cols = arrayInput.data.length; - int[][] resultData = new int[rows][cols]; - for (int i = 0; i < cols; i++) { - for (int j = 0; j < rows; j++) { + var arrayInput = (ArrayInput) this.getReceivedData(); + final var rows = arrayInput.data[0].length; + final var cols = arrayInput.data.length; + var resultData = new int[rows][cols]; + for (var i = 0; i < cols; i++) { + for (var j = 0; j < rows; j++) { //flipping element positions along diagonal resultData[j][i] = arrayInput.data[i][j]; } diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemworkers/Worker.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemworkers/Worker.java index bfe226ee0..526299645 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemworkers/Worker.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemworkers/Worker.java @@ -35,7 +35,7 @@ import com.iluwatar.masterworker.system.systemmaster.Master; public abstract class Worker extends Thread { private final Master master; private final int workerId; - private Input receivedData; + private Input receivedData; Worker(Master master, int id) { this.master = master; @@ -47,23 +47,23 @@ public abstract class Worker extends Thread { return this.workerId; } - Input getReceivedData() { + Input getReceivedData() { return this.receivedData; } - public void setReceivedData(Master m, Input i) { + public void setReceivedData(Master m, Input i) { //check if ready to receive..if yes: this.receivedData = i; } - abstract Result executeOperation(); + abstract Result executeOperation(); - private void sendToMaster(Result data) { + private void sendToMaster(Result data) { this.master.receiveData(data, this); } public void run() { //from Thread class - Result work = executeOperation(); + var work = executeOperation(); sendToMaster(work); } } diff --git a/master-worker-pattern/src/test/java/com/iluwatar/masterworker/ArrayInputTest.java b/master-worker-pattern/src/test/java/com/iluwatar/masterworker/ArrayInputTest.java index b5820e2af..1d3c7f0bc 100644 --- a/master-worker-pattern/src/test/java/com/iluwatar/masterworker/ArrayInputTest.java +++ b/master-worker-pattern/src/test/java/com/iluwatar/masterworker/ArrayInputTest.java @@ -23,38 +23,39 @@ package com.iluwatar.masterworker; -import static org.junit.jupiter.api.Assertions.*; -import java.util.ArrayList; +import static com.iluwatar.masterworker.ArrayUtilityMethods.matricesSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Random; import org.junit.jupiter.api.Test; /** -* Testing divideData method in {@link ArrayInput} class. -*/ + * Testing divideData method in {@link ArrayInput} class. + */ class ArrayInputTest { @Test void divideDataTest() { - int rows = 10; - int columns = 10; - int[][] inputMatrix = new int[rows][columns]; - Random rand = new Random(); - for (int i = 0; i < rows; i++) { - for (int j = 0; j < columns; j++) { + var rows = 10; + var columns = 10; + var inputMatrix = new int[rows][columns]; + var rand = new Random(); + for (var i = 0; i < rows; i++) { + for (var j = 0; j < columns; j++) { inputMatrix[i][j] = rand.nextInt(10); } } - ArrayInput i = new ArrayInput(inputMatrix); - ArrayList table = i.divideData(4); - int[][] division1 = new int[][] {inputMatrix[0], inputMatrix[1], inputMatrix[2]}; - int[][] division2 = new int[][] {inputMatrix[3], inputMatrix[4], inputMatrix[5]}; - int[][] division3 = new int[][] {inputMatrix[6], inputMatrix[7]}; - int[][] division4 = new int[][] {inputMatrix[8], inputMatrix[9]}; - assertTrue(ArrayUtilityMethods.matricesSame((int[][]) table.get(0).data, division1) - && ArrayUtilityMethods.matricesSame((int[][]) table.get(1).data, division2) - && ArrayUtilityMethods.matricesSame((int[][]) table.get(2).data, division3) - && ArrayUtilityMethods.matricesSame((int[][]) table.get(3).data, division4)); + var i = new ArrayInput(inputMatrix); + var table = i.divideData(4); + var division1 = new int[][]{inputMatrix[0], inputMatrix[1], inputMatrix[2]}; + var division2 = new int[][]{inputMatrix[3], inputMatrix[4], inputMatrix[5]}; + var division3 = new int[][]{inputMatrix[6], inputMatrix[7]}; + var division4 = new int[][]{inputMatrix[8], inputMatrix[9]}; + assertTrue(matricesSame(table.get(0).data, division1) + && matricesSame(table.get(1).data, division2) + && matricesSame(table.get(2).data, division3) + && matricesSame(table.get(3).data, division4)); } } diff --git a/master-worker-pattern/src/test/java/com/iluwatar/masterworker/ArrayUtilityMethodsTest.java b/master-worker-pattern/src/test/java/com/iluwatar/masterworker/ArrayUtilityMethodsTest.java index aae784b52..d25276572 100644 --- a/master-worker-pattern/src/test/java/com/iluwatar/masterworker/ArrayUtilityMethodsTest.java +++ b/master-worker-pattern/src/test/java/com/iluwatar/masterworker/ArrayUtilityMethodsTest.java @@ -23,27 +23,27 @@ package com.iluwatar.masterworker; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; /** -* Testing utility methods in {@link ArrayUtilityMethods} class. -*/ + * Testing utility methods in {@link ArrayUtilityMethods} class. + */ class ArrayUtilityMethodsTest { @Test void arraysSameTest() { - int[] arr1 = new int[] {1,4,2,6}; - int[] arr2 = new int[] {1,4,2,6}; + var arr1 = new int[]{1, 4, 2, 6}; + var arr2 = new int[]{1, 4, 2, 6}; assertTrue(ArrayUtilityMethods.arraysSame(arr1, arr2)); } @Test void matricesSameTest() { - int[][] matrix1 = new int[][] {{1,4,2,6},{5,8,6,7}}; - int[][] matrix2 = new int[][] {{1,4,2,6},{5,8,6,7}}; + var matrix1 = new int[][]{{1, 4, 2, 6}, {5, 8, 6, 7}}; + var matrix2 = new int[][]{{1, 4, 2, 6}, {5, 8, 6, 7}}; assertTrue(ArrayUtilityMethods.matricesSame(matrix1, matrix2)); } diff --git a/master-worker-pattern/src/test/java/com/iluwatar/masterworker/system/ArrayTransposeMasterWorkerTest.java b/master-worker-pattern/src/test/java/com/iluwatar/masterworker/system/ArrayTransposeMasterWorkerTest.java index b80d7881f..79838ed35 100644 --- a/master-worker-pattern/src/test/java/com/iluwatar/masterworker/system/ArrayTransposeMasterWorkerTest.java +++ b/master-worker-pattern/src/test/java/com/iluwatar/masterworker/system/ArrayTransposeMasterWorkerTest.java @@ -23,25 +23,38 @@ package com.iluwatar.masterworker.system; -import static org.junit.jupiter.api.Assertions.*; -import org.junit.jupiter.api.Test; -import com.iluwatar.masterworker.ArrayUtilityMethods; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.iluwatar.masterworker.ArrayInput; import com.iluwatar.masterworker.ArrayResult; +import com.iluwatar.masterworker.ArrayUtilityMethods; +import org.junit.jupiter.api.Test; /** -* Testing getResult method in {@link ArrayTransposeMasterWorker} class. -*/ + * Testing getResult method in {@link ArrayTransposeMasterWorker} class. + */ class ArrayTransposeMasterWorkerTest { @Test void getResultTest() { - ArrayTransposeMasterWorker atmw = new ArrayTransposeMasterWorker(); - int[][] matrix = new int[][] {{1,2,3,4,5}, {1,2,3,4,5}, {1,2,3,4,5}, {1,2,3,4,5}, {1,2,3,4,5}}; - int[][] matrixTranspose = new int[][] {{1,1,1,1,1}, {2,2,2,2,2}, {3,3,3,3,3}, {4,4,4,4,4}, {5,5,5,5,5}}; - ArrayInput i = new ArrayInput(matrix); - ArrayResult r = (ArrayResult) atmw.getResult(i); + var atmw = new ArrayTransposeMasterWorker(); + var matrix = new int[][]{ + {1, 2, 3, 4, 5}, + {1, 2, 3, 4, 5}, + {1, 2, 3, 4, 5}, + {1, 2, 3, 4, 5}, + {1, 2, 3, 4, 5} + }; + var matrixTranspose = new int[][]{ + {1, 1, 1, 1, 1}, + {2, 2, 2, 2, 2}, + {3, 3, 3, 3, 3}, + {4, 4, 4, 4, 4}, + {5, 5, 5, 5, 5} + }; + var i = new ArrayInput(matrix); + var r = (ArrayResult) atmw.getResult(i); assertTrue(ArrayUtilityMethods.matricesSame(r.data, matrixTranspose)); - } + } } diff --git a/master-worker-pattern/src/test/java/com/iluwatar/masterworker/system/systemworkers/ArrayTransposeWorkerTest.java b/master-worker-pattern/src/test/java/com/iluwatar/masterworker/system/systemworkers/ArrayTransposeWorkerTest.java index 3e5f581b9..c4b210643 100644 --- a/master-worker-pattern/src/test/java/com/iluwatar/masterworker/system/systemworkers/ArrayTransposeWorkerTest.java +++ b/master-worker-pattern/src/test/java/com/iluwatar/masterworker/system/systemworkers/ArrayTransposeWorkerTest.java @@ -23,29 +23,29 @@ package com.iluwatar.masterworker.system.systemworkers; -import static org.junit.jupiter.api.Assertions.*; -import org.junit.jupiter.api.Test; -import com.iluwatar.masterworker.ArrayUtilityMethods; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.iluwatar.masterworker.ArrayInput; -import com.iluwatar.masterworker.ArrayResult; +import com.iluwatar.masterworker.ArrayUtilityMethods; import com.iluwatar.masterworker.system.systemmaster.ArrayTransposeMaster; +import org.junit.jupiter.api.Test; /** -* Testing executeOperation method in {@link ArrayTransposeWorker} class. -*/ + * Testing executeOperation method in {@link ArrayTransposeWorker} class. + */ class ArrayTransposeWorkerTest { @Test void executeOperationTest() { - ArrayTransposeMaster atm = new ArrayTransposeMaster(1); - ArrayTransposeWorker atw = new ArrayTransposeWorker(atm, 1); - int[][] matrix = new int[][] {{2,4}, {3,5}}; - int[][] matrixTranspose = new int[][] {{2,3}, {4,5}}; - ArrayInput i = new ArrayInput(matrix); + var atm = new ArrayTransposeMaster(1); + var atw = new ArrayTransposeWorker(atm, 1); + var matrix = new int[][]{{2, 4}, {3, 5}}; + var matrixTranspose = new int[][]{{2, 3}, {4, 5}}; + var i = new ArrayInput(matrix); atw.setReceivedData(atm, i); - ArrayResult r = atw.executeOperation(); + var r = atw.executeOperation(); assertTrue(ArrayUtilityMethods.matricesSame(r.data, matrixTranspose)); } - + } From 93e5570778e8b9acd5ebe8d29727a8ac96e1eab8 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 22:19:11 +0000 Subject: [PATCH 003/225] Java 11 migraiton: mediator pattern --- .../java/com/iluwatar/mediator/Action.java | 4 +- .../main/java/com/iluwatar/mediator/App.java | 8 +-- .../java/com/iluwatar/mediator/PartyImpl.java | 2 +- .../java/com/iluwatar/mediator/AppTest.java | 5 +- .../com/iluwatar/mediator/PartyImplTest.java | 7 +-- .../iluwatar/mediator/PartyMemberTest.java | 62 +++++++++---------- 6 files changed, 42 insertions(+), 46 deletions(-) diff --git a/mediator/src/main/java/com/iluwatar/mediator/Action.java b/mediator/src/main/java/com/iluwatar/mediator/Action.java index 66e1f42c4..1d93a384b 100644 --- a/mediator/src/main/java/com/iluwatar/mediator/Action.java +++ b/mediator/src/main/java/com/iluwatar/mediator/Action.java @@ -34,8 +34,8 @@ public enum Action { ENEMY("spotted enemies", "runs for cover"), NONE("", ""); - private String title; - private String description; + private final String title; + private final String description; Action(String title, String description) { this.title = title; diff --git a/mediator/src/main/java/com/iluwatar/mediator/App.java b/mediator/src/main/java/com/iluwatar/mediator/App.java index 9dbedb4ab..0e9021c0d 100644 --- a/mediator/src/main/java/com/iluwatar/mediator/App.java +++ b/mediator/src/main/java/com/iluwatar/mediator/App.java @@ -55,10 +55,10 @@ public class App { // create party and members Party party = new PartyImpl(); - Hobbit hobbit = new Hobbit(); - Wizard wizard = new Wizard(); - Rogue rogue = new Rogue(); - Hunter hunter = new Hunter(); + var hobbit = new Hobbit(); + var wizard = new Wizard(); + var rogue = new Rogue(); + var hunter = new Hunter(); // add party members party.addMember(hobbit); diff --git a/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java index 6384a2187..f842a0f39 100644 --- a/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java +++ b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java @@ -39,7 +39,7 @@ public class PartyImpl implements Party { @Override public void act(PartyMember actor, Action action) { - for (PartyMember member : members) { + for (var member : members) { if (!member.equals(actor)) { member.partyAction(action); } diff --git a/mediator/src/test/java/com/iluwatar/mediator/AppTest.java b/mediator/src/test/java/com/iluwatar/mediator/AppTest.java index 3a55d51d8..23f2a72f2 100644 --- a/mediator/src/test/java/com/iluwatar/mediator/AppTest.java +++ b/mediator/src/test/java/com/iluwatar/mediator/AppTest.java @@ -26,15 +26,12 @@ package com.iluwatar.mediator; import org.junit.jupiter.api.Test; /** - * * Application test - * */ public class AppTest { @Test public void test() { - String[] args = {}; - App.main(args); + App.main(new String[]{}); } } diff --git a/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java b/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java index 5d2446545..d25562f84 100644 --- a/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java +++ b/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java @@ -43,10 +43,10 @@ public class PartyImplTest { */ @Test public void testPartyAction() { - final PartyMember partyMember1 = mock(PartyMember.class); - final PartyMember partyMember2 = mock(PartyMember.class); + final var partyMember1 = mock(PartyMember.class); + final var partyMember2 = mock(PartyMember.class); - final PartyImpl party = new PartyImpl(); + final var party = new PartyImpl(); party.addMember(partyMember1); party.addMember(partyMember2); @@ -58,7 +58,6 @@ public class PartyImplTest { verify(partyMember2).partyAction(Action.GOLD); verifyNoMoreInteractions(partyMember1, partyMember2); - } } diff --git a/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java b/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java index 951f8e166..a0e722cfd 100644 --- a/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java +++ b/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java @@ -23,24 +23,24 @@ 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.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.function.Supplier; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.AppenderBase; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Supplier; +import java.util.stream.Stream; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.LoggerFactory; + /** * Date: 12/19/15 - 10:13 PM * @@ -48,12 +48,12 @@ import static org.mockito.Mockito.verify; */ public class PartyMemberTest { - static Collection[]> dataProvider() { - return List.of( - new Supplier[]{Hobbit::new}, - new Supplier[]{Hunter::new}, - new Supplier[]{Rogue::new}, - new Supplier[]{Wizard::new} + static Stream dataProvider() { + return Stream.of( + Arguments.of((Supplier) Hobbit::new), + Arguments.of((Supplier) Hunter::new), + Arguments.of((Supplier) Rogue::new), + Arguments.of((Supplier) Wizard::new) ); } @@ -75,9 +75,9 @@ public class PartyMemberTest { @ParameterizedTest @MethodSource("dataProvider") public void testPartyAction(Supplier memberSupplier) { - final PartyMember member = memberSupplier.get(); + final var member = memberSupplier.get(); - for (final Action action : Action.values()) { + for (final var action : Action.values()) { member.partyAction(action); assertEquals(member.toString() + " " + action.getDescription(), appender.getLastMessage()); } @@ -91,16 +91,16 @@ public class PartyMemberTest { @ParameterizedTest @MethodSource("dataProvider") public void testAct(Supplier memberSupplier) { - final PartyMember member = memberSupplier.get(); + final var member = memberSupplier.get(); member.act(Action.GOLD); assertEquals(0, appender.getLogSize()); - final Party party = mock(Party.class); + final var party = mock(Party.class); member.joinedParty(party); assertEquals(member.toString() + " joins the party", appender.getLastMessage()); - for (final Action action : Action.values()) { + for (final var action : Action.values()) { member.act(action); assertEquals(member.toString() + " " + action.toString(), appender.getLastMessage()); verify(party).act(member, action); @@ -114,16 +114,16 @@ public class PartyMemberTest { */ @ParameterizedTest @MethodSource("dataProvider") - public void testToString(Supplier memberSupplier) throws Exception { - final PartyMember member = memberSupplier.get(); - final Class memberClass = member.getClass(); + public void testToString(Supplier memberSupplier) { + final var member = memberSupplier.get(); + final var memberClass = member.getClass(); assertEquals(memberClass.getSimpleName(), member.toString()); } - private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private static class InMemoryAppender extends AppenderBase { + private final List log = new LinkedList<>(); - public InMemoryAppender(Class clazz) { + public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); start(); } From a00622c656be2593ec632bdc08573fdc4ed5364d Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 22:21:48 +0000 Subject: [PATCH 004/225] Java 11 migraiton: memento --- .../src/main/java/com/iluwatar/memento/App.java | 4 ++-- .../src/main/java/com/iluwatar/memento/Star.java | 4 ++-- .../main/java/com/iluwatar/memento/StarType.java | 2 +- .../test/java/com/iluwatar/memento/AppTest.java | 5 +---- .../test/java/com/iluwatar/memento/StarTest.java | 14 +++++++------- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/memento/src/main/java/com/iluwatar/memento/App.java b/memento/src/main/java/com/iluwatar/memento/App.java index af57d8d4a..77cc0f214 100644 --- a/memento/src/main/java/com/iluwatar/memento/App.java +++ b/memento/src/main/java/com/iluwatar/memento/App.java @@ -52,9 +52,9 @@ public class App { * Program entry point. */ public static void main(String[] args) { - Stack states = new Stack<>(); + var states = new Stack(); - Star star = new Star(StarType.SUN, 10000000, 500000); + var star = new Star(StarType.SUN, 10000000, 500000); LOGGER.info(star.toString()); states.add(star.getMemento()); star.timePasses(); diff --git a/memento/src/main/java/com/iluwatar/memento/Star.java b/memento/src/main/java/com/iluwatar/memento/Star.java index ebeea28f2..aac58b817 100644 --- a/memento/src/main/java/com/iluwatar/memento/Star.java +++ b/memento/src/main/java/com/iluwatar/memento/Star.java @@ -71,7 +71,7 @@ public class Star { StarMemento getMemento() { - StarMementoInternal state = new StarMementoInternal(); + var state = new StarMementoInternal(); state.setAgeYears(ageYears); state.setMassTons(massTons); state.setType(type); @@ -81,7 +81,7 @@ public class Star { void setMemento(StarMemento memento) { - StarMementoInternal state = (StarMementoInternal) memento; + var state = (StarMementoInternal) memento; this.type = state.getType(); this.ageYears = state.getAgeYears(); this.massTons = state.getMassTons(); diff --git a/memento/src/main/java/com/iluwatar/memento/StarType.java b/memento/src/main/java/com/iluwatar/memento/StarType.java index 507cd506b..339f05f9f 100644 --- a/memento/src/main/java/com/iluwatar/memento/StarType.java +++ b/memento/src/main/java/com/iluwatar/memento/StarType.java @@ -31,7 +31,7 @@ public enum StarType { SUN("sun"), RED_GIANT("red giant"), WHITE_DWARF("white dwarf"), SUPERNOVA("supernova"), DEAD( "dead star"), UNDEFINED(""); - private String title; + private final String title; StarType(String title) { this.title = title; diff --git a/memento/src/test/java/com/iluwatar/memento/AppTest.java b/memento/src/test/java/com/iluwatar/memento/AppTest.java index 074de2c41..e0448c289 100644 --- a/memento/src/test/java/com/iluwatar/memento/AppTest.java +++ b/memento/src/test/java/com/iluwatar/memento/AppTest.java @@ -26,15 +26,12 @@ package com.iluwatar.memento; import org.junit.jupiter.api.Test; /** - * * Application test - * */ public class AppTest { @Test public void test() { - String[] args = {}; - App.main(args); + App.main(new String[]{}); } } diff --git a/memento/src/test/java/com/iluwatar/memento/StarTest.java b/memento/src/test/java/com/iluwatar/memento/StarTest.java index 40adb99e1..aab59e9c3 100644 --- a/memento/src/test/java/com/iluwatar/memento/StarTest.java +++ b/memento/src/test/java/com/iluwatar/memento/StarTest.java @@ -23,10 +23,10 @@ package com.iluwatar.memento; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + /** * Date: 12/20/15 - 10:08 AM * @@ -39,7 +39,7 @@ public class StarTest { */ @Test public void testTimePasses() { - final Star star = new Star(StarType.SUN, 1, 2); + final var star = new Star(StarType.SUN, 1, 2); assertEquals("sun age: 1 years mass: 2 tons", star.toString()); star.timePasses(); @@ -66,16 +66,16 @@ public class StarTest { */ @Test public void testSetMemento() { - final Star star = new Star(StarType.SUN, 1, 2); - final StarMemento firstMemento = star.getMemento(); + final var star = new Star(StarType.SUN, 1, 2); + final var firstMemento = star.getMemento(); assertEquals("sun age: 1 years mass: 2 tons", star.toString()); star.timePasses(); - final StarMemento secondMemento = star.getMemento(); + final var secondMemento = star.getMemento(); assertEquals("red giant age: 2 years mass: 16 tons", star.toString()); star.timePasses(); - final StarMemento thirdMemento = star.getMemento(); + final var thirdMemento = star.getMemento(); assertEquals("white dwarf age: 4 years mass: 128 tons", star.toString()); star.timePasses(); From edcb520d087bb12a5d04bc07810da33069bdea38 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 22:30:18 +0000 Subject: [PATCH 005/225] Java 11 migraiton: model-view-controller --- .../iluwatar/model/view/controller/App.java | 6 +-- .../model/view/controller/Fatigue.java | 2 +- .../view/controller/GiantController.java | 7 +++- .../model/view/controller/Health.java | 2 +- .../model/view/controller/Nourishment.java | 2 +- .../model/view/controller/AppTest.java | 5 +-- .../view/controller/GiantControllerTest.java | 37 ++++++++++--------- .../model/view/controller/GiantModelTest.java | 25 +++++++------ .../model/view/controller/GiantViewTest.java | 11 +++--- 9 files changed, 51 insertions(+), 46 deletions(-) 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 4607f009d..cabc4d96f 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 @@ -47,9 +47,9 @@ public class App { */ public static void main(String[] args) { // create model, view and controller - GiantModel giant = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED); - GiantView view = new GiantView(); - GiantController controller = new GiantController(giant, view); + var giant = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED); + var view = new GiantView(); + var controller = new GiantController(giant, view); // initial display controller.updateView(); // controller receives some interactions that affect the giant 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 b1663df1f..2b7ca3999 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 @@ -30,7 +30,7 @@ public enum Fatigue { ALERT("alert"), TIRED("tired"), SLEEPING("sleeping"); - private String title; + private final String title; Fatigue(String title) { this.title = title; 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 e66608117..f96113574 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 @@ -28,14 +28,15 @@ package com.iluwatar.model.view.controller; */ public class GiantController { - private GiantModel giant; - private GiantView view; + private final GiantModel giant; + private final GiantView view; public GiantController(GiantModel giant, GiantView view) { this.giant = giant; this.view = view; } + @SuppressWarnings("UnusedReturnValue") public Health getHealth() { return giant.getHealth(); } @@ -44,6 +45,7 @@ public class GiantController { this.giant.setHealth(health); } + @SuppressWarnings("UnusedReturnValue") public Fatigue getFatigue() { return giant.getFatigue(); } @@ -52,6 +54,7 @@ public class GiantController { this.giant.setFatigue(fatigue); } + @SuppressWarnings("UnusedReturnValue") public Nourishment getNourishment() { return giant.getNourishment(); } 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 30b3b2b90..a8346b9c7 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 @@ -30,7 +30,7 @@ public enum Health { HEALTHY("healthy"), WOUNDED("wounded"), DEAD("dead"); - private String title; + private final String title; Health(String title) { this.title = title; 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 3ced564cc..c61d2de79 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 @@ -30,7 +30,7 @@ public enum Nourishment { SATURATED("saturated"), HUNGRY("hungry"), STARVING("starving"); - private String title; + private final String title; Nourishment(String title) { this.title = title; 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 e6d2d9a0b..69dc19f1c 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 @@ -26,15 +26,12 @@ package com.iluwatar.model.view.controller; import org.junit.jupiter.api.Test; /** - * * Application test - * */ public class AppTest { @Test public void test() { - String[] args = {}; - App.main(args); + App.main(new String[]{}); } } 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 a2f42a80d..d106d0944 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 @@ -23,13 +23,13 @@ package com.iluwatar.model.view.controller; -import org.junit.jupiter.api.Test; - 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 org.junit.jupiter.api.Test; + /** * Date: 12/20/15 - 2:19 PM * @@ -42,19 +42,20 @@ public class GiantControllerTest { */ @Test public void testSetHealth() { - final GiantModel model = mock(GiantModel.class); - final GiantView view = mock(GiantView.class); - final GiantController controller = new GiantController(model, view); + final var model = mock(GiantModel.class); + final var view = mock(GiantView.class); + final var controller = new GiantController(model, view); verifyZeroInteractions(model, view); - for (final Health health : Health.values()) { + for (final var health : Health.values()) { controller.setHealth(health); verify(model).setHealth(health); verifyZeroInteractions(view); } controller.getHealth(); + //noinspection ResultOfMethodCallIgnored verify(model).getHealth(); verifyNoMoreInteractions(model, view); @@ -65,19 +66,20 @@ public class GiantControllerTest { */ @Test public void testSetFatigue() { - final GiantModel model = mock(GiantModel.class); - final GiantView view = mock(GiantView.class); - final GiantController controller = new GiantController(model, view); + final var model = mock(GiantModel.class); + final var view = mock(GiantView.class); + final var controller = new GiantController(model, view); verifyZeroInteractions(model, view); - for (final Fatigue fatigue : Fatigue.values()) { + for (final var fatigue : Fatigue.values()) { controller.setFatigue(fatigue); verify(model).setFatigue(fatigue); verifyZeroInteractions(view); } controller.getFatigue(); + //noinspection ResultOfMethodCallIgnored verify(model).getFatigue(); verifyNoMoreInteractions(model, view); @@ -88,19 +90,20 @@ public class GiantControllerTest { */ @Test public void testSetNourishment() { - final GiantModel model = mock(GiantModel.class); - final GiantView view = mock(GiantView.class); - final GiantController controller = new GiantController(model, view); + final var model = mock(GiantModel.class); + final var view = mock(GiantView.class); + final var controller = new GiantController(model, view); verifyZeroInteractions(model, view); - for (final Nourishment nourishment : Nourishment.values()) { + for (final var nourishment : Nourishment.values()) { controller.setNourishment(nourishment); verify(model).setNourishment(nourishment); verifyZeroInteractions(view); } controller.getNourishment(); + //noinspection ResultOfMethodCallIgnored verify(model).getNourishment(); verifyNoMoreInteractions(model, view); @@ -108,9 +111,9 @@ public class GiantControllerTest { @Test public void testUpdateView() { - final GiantModel model = mock(GiantModel.class); - final GiantView view = mock(GiantView.class); - final GiantController controller = new GiantController(model, view); + final var model = mock(GiantModel.class); + final var view = mock(GiantView.class); + final var controller = new GiantController(model, view); verifyZeroInteractions(model, view); 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 a566010cd..c1a86b750 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 @@ -23,10 +23,10 @@ package com.iluwatar.model.view.controller; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + /** * Date: 12/20/15 - 2:10 PM * @@ -39,12 +39,13 @@ public class GiantModelTest { */ @Test public void testSetHealth() { - final GiantModel model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED); + final var model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.HUNGRY); assertEquals(Health.HEALTHY, model.getHealth()); - for (final Health health : Health.values()) { + for (final var health : Health.values()) { model.setHealth(health); assertEquals(health, model.getHealth()); - assertEquals("The giant looks " + health.toString() + ", alert and saturated.", model.toString()); + assertEquals("The giant looks " + health.toString() + ", alert and saturated.", model + .toString()); } } @@ -53,12 +54,13 @@ public class GiantModelTest { */ @Test public void testSetFatigue() { - final GiantModel model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED); + final var model = new GiantModel(Health.WOUNDED, Fatigue.ALERT, Nourishment.SATURATED); assertEquals(Fatigue.ALERT, model.getFatigue()); - for (final Fatigue fatigue : Fatigue.values()) { + for (final var fatigue : Fatigue.values()) { model.setFatigue(fatigue); assertEquals(fatigue, model.getFatigue()); - assertEquals("The giant looks healthy, " + fatigue.toString() + " and saturated.", model.toString()); + assertEquals("The giant looks healthy, " + fatigue.toString() + " and saturated.", model + .toString()); } } @@ -67,12 +69,13 @@ public class GiantModelTest { */ @Test public void testSetNourishment() { - final GiantModel model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED); + final var model = new GiantModel(Health.HEALTHY, Fatigue.TIRED, Nourishment.SATURATED); assertEquals(Nourishment.SATURATED, model.getNourishment()); - for (final Nourishment nourishment : Nourishment.values()) { + for (final var nourishment : Nourishment.values()) { model.setNourishment(nourishment); assertEquals(nourishment, model.getNourishment()); - assertEquals("The giant looks healthy, alert and " + nourishment.toString() + ".", model.toString()); + assertEquals("The giant looks healthy, alert and " + nourishment.toString() + ".", model + .toString()); } } 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 a3e33f9dd..c6314c1dd 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 @@ -31,7 +31,6 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; import java.util.LinkedList; import java.util.List; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -62,9 +61,9 @@ public class GiantViewTest { */ @Test public void testDisplayGiant() { - final GiantView view = new GiantView(); + final var view = new GiantView(); - final GiantModel model = mock(GiantModel.class); + final var model = mock(GiantModel.class); view.displayGiant(model); assertEquals(model.toString(), appender.getLastMessage()); @@ -74,10 +73,10 @@ public class GiantViewTest { /** * Logging Appender Implementation */ - public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + public static class InMemoryAppender extends AppenderBase { + private final List log = new LinkedList<>(); - public InMemoryAppender(Class clazz) { + public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); start(); } From 99c70af16aecd2f9bb57ff3e484c38188ecd9e62 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 22:35:33 +0000 Subject: [PATCH 006/225] Java 11 migraiton: model-view-presenter --- .../iluwatar/model/view/presenter/App.java | 6 +-- .../model/view/presenter/FileLoader.java | 16 +++---- .../view/presenter/FileSelectorJFrame.java | 45 +++++++------------ .../view/presenter/FileSelectorPresenter.java | 4 +- .../model/view/presenter/AppTest.java | 5 +-- .../model/view/presenter/FileLoaderTest.java | 8 ++-- .../presenter/FileSelectorPresenterTest.java | 8 ++-- 7 files changed, 34 insertions(+), 58 deletions(-) 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 43984e847..ac3b83927 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 @@ -44,9 +44,9 @@ public class App { * @param args command line args */ public static void main(String[] args) { - FileLoader loader = new FileLoader(); - FileSelectorJFrame frame = new FileSelectorJFrame(); - FileSelectorPresenter presenter = new FileSelectorPresenter(frame); + var loader = new FileLoader(); + var frame = new FileSelectorJFrame(); + var presenter = new FileSelectorPresenter(frame); presenter.setLoader(loader); presenter.start(); } 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 9c01b2044..7dd5dd215 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 @@ -27,6 +27,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.Serializable; +import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,18 +60,11 @@ public class FileLoader implements Serializable { * Loads the data of the file specified. */ public String loadData() { - String dataFileName = this.fileName; - try (BufferedReader br = new BufferedReader(new FileReader(new File(dataFileName)))) { - StringBuilder sb = new StringBuilder(); - String line; - - while ((line = br.readLine()) != null) { - sb.append(line).append('\n'); - } - + var dataFileName = this.fileName; + try (var br = new BufferedReader(new FileReader(new File(dataFileName)))) { + var result = br.lines().collect(Collectors.joining("\n")); this.loaded = true; - - return sb.toString(); + return result; } catch (Exception e) { LOGGER.error("File {} does not exist", dataFileName); } 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 77523ccaa..1d59b5d8c 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 @@ -48,37 +48,22 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti /** * The "OK" button for loading the file. */ - private JButton ok; + private final JButton ok; /** * The cancel button. */ - private JButton cancel; - - /** - * The information label. - */ - private JLabel info; - - /** - * The contents label. - */ - private JLabel contents; + private final JButton cancel; /** * The text field for giving the name of the file that we want to open. */ - private JTextField input; + private final JTextField input; /** * A text area that will keep the contents of the file opened. */ - private JTextArea area; - - /** - * The panel that will hold our widgets. - */ - private JPanel panel; + private final JTextArea area; /** * The Presenter component that the frame will interact with. @@ -102,7 +87,7 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti /* * Add the panel. */ - this.panel = new JPanel(); + var panel = new JPanel(); panel.setLayout(null); this.add(panel); panel.setBounds(0, 0, 500, 200); @@ -111,32 +96,32 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti /* * Add the info label. */ - this.info = new JLabel("File Name :"); - this.panel.add(info); + var info = new JLabel("File Name :"); + panel.add(info); info.setBounds(30, 10, 100, 30); /* * Add the contents label. */ - this.contents = new JLabel("File contents :"); - this.panel.add(contents); - this.contents.setBounds(30, 100, 120, 30); + var contents = new JLabel("File contents :"); + panel.add(contents); + contents.setBounds(30, 100, 120, 30); /* * Add the text field. */ this.input = new JTextField(100); - this.panel.add(input); + panel.add(input); this.input.setBounds(150, 15, 200, 20); /* * Add the text area. */ this.area = new JTextArea(100, 100); - JScrollPane pane = new JScrollPane(area); + var pane = new JScrollPane(area); pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); - this.panel.add(pane); + panel.add(pane); this.area.setEditable(false); pane.setBounds(150, 100, 250, 80); @@ -144,7 +129,7 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti * Add the OK button. */ this.ok = new JButton("OK"); - this.panel.add(ok); + panel.add(ok); this.ok.setBounds(250, 50, 100, 25); this.ok.addActionListener(this); @@ -152,7 +137,7 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti * Add the cancel button. */ this.cancel = new JButton("Cancel"); - this.panel.add(this.cancel); + panel.add(this.cancel); this.cancel.setBounds(380, 50, 100, 25); this.cancel.addActionListener(this); 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 35e1c0076..5cd6580d9 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 @@ -41,7 +41,7 @@ public class FileSelectorPresenter implements Serializable { /** * The View component that the presenter interacts with. */ - private FileSelectorView view; + private final FileSelectorView view; /** * The Model component that the presenter interacts with. @@ -91,7 +91,7 @@ public class FileSelectorPresenter implements Serializable { } if (loader.fileExists()) { - String data = loader.loadData(); + var data = loader.loadData(); view.displayData(data); } else { view.showMessage("The file specified does not exist."); 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 00e35ae1b..4db990a2d 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 @@ -26,16 +26,13 @@ package com.iluwatar.model.view.presenter; import org.junit.jupiter.api.Test; /** - * * Application test - * */ public class AppTest { @Test public void test() { - String[] args = {}; - App.main(args); + App.main(new String[]{}); } } 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 a63ca5ae8..3787cd20b 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 @@ -23,10 +23,10 @@ package com.iluwatar.model.view.presenter; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertNull; +import org.junit.jupiter.api.Test; + /** * Date: 12/21/15 - 12:12 PM * @@ -35,8 +35,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; public class FileLoaderTest { @Test - public void testLoadData() throws Exception { - final FileLoader fileLoader = new FileLoader(); + public void testLoadData() { + final var fileLoader = new FileLoader(); fileLoader.setFileName("non-existing-file"); assertNull(fileLoader.loadData()); } 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 fdc19398d..238d3a135 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 @@ -23,14 +23,14 @@ package com.iluwatar.model.view.presenter; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + /** * This test case is responsible for testing our application by taking advantage of the * Model-View-Controller architectural pattern. @@ -79,7 +79,7 @@ public class FileSelectorPresenterTest { */ @Test public void updateFileNameToLoader() { - String expectedFile = "Stamatis"; + var expectedFile = "Stamatis"; stub.setFileName(expectedFile); presenter.start(); From f1b27ef5c78eb379ca5f2ef539cca8c533ddc0a8 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 22:38:00 +0000 Subject: [PATCH 007/225] Java 11 migraiton: module --- module/pom.xml | 69 ++++++++++--------- .../main/java/com/iluwatar/module/App.java | 6 +- .../java/com/iluwatar/module/AppTest.java | 6 +- .../iluwatar/module/FileLoggerModuleTest.java | 41 ++++++----- 4 files changed, 59 insertions(+), 63 deletions(-) diff --git a/module/pom.xml b/module/pom.xml index 25ad707eb..5d9a6d529 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -23,38 +23,39 @@ THE SOFTWARE. --> - - 4.0.0 - - com.iluwatar - java-design-patterns - 1.23.0-SNAPSHOT - - module - - - org.junit.jupiter - junit-jupiter-engine - test - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - - - - com.iluwatar.module.App - - - - - - - - + + 4.0.0 + + com.iluwatar + java-design-patterns + 1.23.0-SNAPSHOT + + module + + + org.junit.jupiter + junit-jupiter-engine + test + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + + + com.iluwatar.module.App + + + + + + + + diff --git a/module/src/main/java/com/iluwatar/module/App.java b/module/src/main/java/com/iluwatar/module/App.java index 1b6cbbd23..77034d76b 100644 --- a/module/src/main/java/com/iluwatar/module/App.java +++ b/module/src/main/java/com/iluwatar/module/App.java @@ -65,10 +65,8 @@ public class App { /** * Following method is main executor. - * - * @param args for providing default program arguments */ - public static void execute(final String... args) { + public static void execute() { /* Send logs on file system */ fileLoggerModule.printString("Message"); @@ -88,7 +86,7 @@ public class App { */ public static void main(final String... args) throws FileNotFoundException { prepare(); - execute(args); + execute(); unprepare(); } } diff --git a/module/src/test/java/com/iluwatar/module/AppTest.java b/module/src/test/java/com/iluwatar/module/AppTest.java index 88fa4c68c..8dcfd565e 100644 --- a/module/src/test/java/com/iluwatar/module/AppTest.java +++ b/module/src/test/java/com/iluwatar/module/AppTest.java @@ -23,9 +23,8 @@ package com.iluwatar.module; -import org.junit.jupiter.api.Test; - import java.io.FileNotFoundException; +import org.junit.jupiter.api.Test; /** * Tests that Module example runs without errors. @@ -34,7 +33,6 @@ public final class AppTest { @Test public void test() throws FileNotFoundException { - final String[] args = {}; - App.main(args); + App.main(); } } diff --git a/module/src/test/java/com/iluwatar/module/FileLoggerModuleTest.java b/module/src/test/java/com/iluwatar/module/FileLoggerModuleTest.java index e88b466f2..6497aa89d 100644 --- a/module/src/test/java/com/iluwatar/module/FileLoggerModuleTest.java +++ b/module/src/test/java/com/iluwatar/module/FileLoggerModuleTest.java @@ -23,17 +23,16 @@ package com.iluwatar.module; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The Module pattern can be considered a Creational pattern and a Structural pattern. It manages @@ -58,14 +57,14 @@ public final class FileLoggerModuleTest { /** * 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(); + final var fileLoggerModule = FileLoggerModule.getSingleton(); /* Prepare the essential sub modules, to perform the sequence of jobs */ fileLoggerModule.prepare(); @@ -82,14 +81,14 @@ public final class FileLoggerModuleTest { /** * 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(); + /* Get singleton instance of File Logger Module */ + final var fileLoggerModule = FileLoggerModule.getSingleton(); /* Prepare the essential sub modules, to perform the sequence of jobs */ fileLoggerModule.prepare(); @@ -103,15 +102,15 @@ public final class FileLoggerModuleTest { /** * 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) + * error.txt) */ @Test public void testFileErrorMessage() throws FileNotFoundException { /* Get singletong instance of File Logger Module */ - final FileLoggerModule fileLoggerModule = FileLoggerModule.getSingleton(); + final var fileLoggerModule = FileLoggerModule.getSingleton(); /* Prepare the essential sub modules, to perform the sequence of jobs */ fileLoggerModule.prepare(); @@ -122,21 +121,21 @@ public final class FileLoggerModuleTest { /* Test if 'Message' is printed in file */ assertEquals(ERROR, readFirstLine(ERROR_FILE)); - /* Unprepare to cleanup the modules */ + /* Un-prepare 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) + * error.txt) */ @Test public void testNoFileErrorMessage() throws FileNotFoundException { /* Get singletong instance of File Logger Module */ - final FileLoggerModule fileLoggerModule = FileLoggerModule.getSingleton(); + final var fileLoggerModule = FileLoggerModule.getSingleton(); /* Prepare the essential sub modules, to perform the sequence of jobs */ fileLoggerModule.prepare(); @@ -150,14 +149,14 @@ public final class FileLoggerModuleTest { /** * 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) { + private static String readFirstLine(final String file) { String firstLine = null; - try (BufferedReader bufferedReader = new BufferedReader(new FileReader(file))) { + try (var bufferedReader = new BufferedReader(new FileReader(file))) { while (bufferedReader.ready()) { From a142c06048117a6352994eeb3995b6d37e9a3b97 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 22:45:54 +0000 Subject: [PATCH 008/225] Java 11 migraiton: monad --- .../src/main/java/com/iluwatar/monad/App.java | 9 ++--- .../main/java/com/iluwatar/monad/User.java | 8 ++-- .../java/com/iluwatar/monad/Validator.java | 19 +++++---- .../test/java/com/iluwatar/monad/AppTest.java | 3 +- .../java/com/iluwatar/monad/MonadTest.java | 39 +++++++++++-------- 5 files changed, 42 insertions(+), 36 deletions(-) diff --git a/monad/src/main/java/com/iluwatar/monad/App.java b/monad/src/main/java/com/iluwatar/monad/App.java index ccb42edd0..bb3315064 100644 --- a/monad/src/main/java/com/iluwatar/monad/App.java +++ b/monad/src/main/java/com/iluwatar/monad/App.java @@ -41,9 +41,8 @@ import org.slf4j.LoggerFactory; * instance of a plain object with {@link Validator#of(Object)} and validates it {@link * Validator#validate(Function, Predicate, String)} against given predicates. * - *

As a validation result {@link Validator#get()} it either returns valid object {@link - * Validator#t} or throws a list of exceptions {@link Validator#exceptions} collected during - * validation. + *

As a validation result {@link Validator#get()} either returns valid object + * or throws {@link IllegalStateException} with list of exceptions collected during validation. */ public class App { @@ -55,10 +54,10 @@ public class App { * @param args command line args */ public static void main(String[] args) { - User user = new User("user", 24, Sex.FEMALE, "foobar.com"); + var user = new User("user", 24, Sex.FEMALE, "foobar.com"); 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::getEmail, email -> !email.contains("@"), "email doesn't contains '@'") .validate(User::getAge, age -> age > 20 && age < 30, "age isn't between...").get() .toString()); } diff --git a/monad/src/main/java/com/iluwatar/monad/User.java b/monad/src/main/java/com/iluwatar/monad/User.java index 77766d1aa..f67009bc3 100644 --- a/monad/src/main/java/com/iluwatar/monad/User.java +++ b/monad/src/main/java/com/iluwatar/monad/User.java @@ -28,10 +28,10 @@ package com.iluwatar.monad; */ public class User { - private String name; - private int age; - private Sex sex; - private String email; + private final String name; + private final int age; + private final Sex sex; + private final String email; /** * Constructor. diff --git a/monad/src/main/java/com/iluwatar/monad/Validator.java b/monad/src/main/java/com/iluwatar/monad/Validator.java index 2d1f1bdab..47acc8a42 100644 --- a/monad/src/main/java/com/iluwatar/monad/Validator.java +++ b/monad/src/main/java/com/iluwatar/monad/Validator.java @@ -85,18 +85,21 @@ public class Validator { } /** - * Extension for the {@link Validator#validate(Function, Predicate, String)} method, dedicated for - * objects, that need to be projected before requested validation. + * Extension for the {@link Validator#validate(Predicate, String)} method, dedicated for objects, + * that need to be projected before requested validation. * * @param projection function that gets an objects, and returns projection representing element to * be validated. - * @param validation see {@link Validator#validate(Function, Predicate, String)} - * @param message see {@link Validator#validate(Function, Predicate, String)} - * @param see {@link Validator#validate(Function, Predicate, String)} + * @param validation see {@link Validator#validate(Predicate, String)} + * @param message see {@link Validator#validate(Predicate, String)} + * @param see {@link Validator#validate(Predicate, String)} * @return this */ - public Validator validate(Function projection, Predicate validation, - String message) { + public Validator validate( + Function projection, + Predicate validation, + String message + ) { return validate(projection.andThen(validation::test)::apply, message); } @@ -110,7 +113,7 @@ public class Validator { if (exceptions.isEmpty()) { return obj; } - IllegalStateException e = new IllegalStateException(); + var e = new IllegalStateException(); exceptions.forEach(e::addSuppressed); throw e; } diff --git a/monad/src/test/java/com/iluwatar/monad/AppTest.java b/monad/src/test/java/com/iluwatar/monad/AppTest.java index f4d89a7cd..d56270173 100644 --- a/monad/src/test/java/com/iluwatar/monad/AppTest.java +++ b/monad/src/test/java/com/iluwatar/monad/AppTest.java @@ -32,8 +32,7 @@ public class AppTest { @Test public void testMain() { - String[] args = {}; - App.main(args); + App.main(new String[]{}); } } diff --git a/monad/src/test/java/com/iluwatar/monad/MonadTest.java b/monad/src/test/java/com/iluwatar/monad/MonadTest.java index d1bdd7487..afd5b50f8 100644 --- a/monad/src/test/java/com/iluwatar/monad/MonadTest.java +++ b/monad/src/test/java/com/iluwatar/monad/MonadTest.java @@ -23,13 +23,12 @@ package com.iluwatar.monad; -import org.junit.jupiter.api.Test; - -import java.util.Objects; - import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; +import java.util.Objects; +import org.junit.jupiter.api.Test; + /** * Test for Monad Pattern */ @@ -37,27 +36,33 @@ public class MonadTest { @Test public void testForInvalidName() { - User tom = new User(null, 21, Sex.MALE, "tom@foo.bar"); - assertThrows(IllegalStateException.class, () -> { - Validator.of(tom).validate(User::getName, Objects::nonNull, "name cannot be null").get(); - }); + var tom = new User(null, 21, Sex.MALE, "tom@foo.bar"); + assertThrows( + IllegalStateException.class, + () -> Validator.of(tom) + .validate(User::getName, Objects::nonNull, "name cannot be null") + .get() + ); } @Test public void testForInvalidAge() { - User john = new User("John", 17, Sex.MALE, "john@qwe.bar"); - assertThrows(IllegalStateException.class, () -> { - Validator.of(john).validate(User::getName, Objects::nonNull, "name cannot be null") - .validate(User::getAge, age -> age > 21, "user is underaged") - .get(); - }); + var john = new User("John", 17, Sex.MALE, "john@qwe.bar"); + assertThrows( + IllegalStateException.class, + () -> Validator.of(john) + .validate(User::getName, Objects::nonNull, "name cannot be null") + .validate(User::getAge, age -> age > 21, "user is underage") + .get() + ); } @Test public void testForValid() { - User sarah = new User("Sarah", 42, Sex.FEMALE, "sarah@det.org"); - User validated = Validator.of(sarah).validate(User::getName, Objects::nonNull, "name cannot be null") - .validate(User::getAge, age -> age > 21, "user is underaged") + var sarah = new User("Sarah", 42, Sex.FEMALE, "sarah@det.org"); + var validated = Validator.of(sarah) + .validate(User::getName, Objects::nonNull, "name cannot be null") + .validate(User::getAge, age -> age > 21, "user is underage") .validate(User::getSex, sex -> sex == Sex.FEMALE, "user is not female") .validate(User::getEmail, email -> email.contains("@"), "email does not contain @ sign") .get(); From 109d33c710fbb1db43bf2ecf6354682041f141b5 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 22:49:00 +0000 Subject: [PATCH 009/225] Java 11 migraiton: monostate --- .../src/main/java/com/iluwatar/monostate/App.java | 6 +++--- .../java/com/iluwatar/monostate/LoadBalancer.java | 6 +++--- .../test/java/com/iluwatar/monostate/AppTest.java | 3 +-- .../com/iluwatar/monostate/LoadBalancerTest.java | 12 ++++++------ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/monostate/src/main/java/com/iluwatar/monostate/App.java b/monostate/src/main/java/com/iluwatar/monostate/App.java index 64cb38461..9f5b2c173 100644 --- a/monostate/src/main/java/com/iluwatar/monostate/App.java +++ b/monostate/src/main/java/com/iluwatar/monostate/App.java @@ -30,7 +30,7 @@ package com.iluwatar.monostate; * *

In the following example, The {@link LoadBalancer} class represents the app's logic. It * contains a series of Servers, which can handle requests of type {@link Request}. Two instances of - * LoadBalacer are created. When a request is made to a server via the first LoadBalancer the state + * LoadBalancer are created. When a request is made to a server via the first LoadBalancer the state * change in the first load balancer affects the second. So if the first LoadBalancer selects the * Server 1, the second LoadBalancer on a new request will select the Second server. If a third * LoadBalancer is created and a new request is made to it, then it will select the third server as @@ -43,8 +43,8 @@ public class App { * @param args command line args */ public static void main(String[] args) { - LoadBalancer loadBalancer1 = new LoadBalancer(); - LoadBalancer loadBalancer2 = new LoadBalancer(); + var loadBalancer1 = new LoadBalancer(); + var loadBalancer2 = new LoadBalancer(); loadBalancer1.serverRequest(new Request("Hello")); loadBalancer2.serverRequest(new Request("Hello World")); } diff --git a/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java b/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java index 8546ae177..7a784f514 100644 --- a/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java +++ b/monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java @@ -38,8 +38,8 @@ public class LoadBalancer { private static int lastServedId; static { - int id = 0; - for (int port : new int[]{8080, 8081, 8082, 8083, 8084}) { + var id = 0; + for (var port : new int[]{8080, 8081, 8082, 8083, 8084}) { SERVERS.add(new Server("localhost", port, ++id)); } } @@ -69,7 +69,7 @@ public class LoadBalancer { if (lastServedId >= SERVERS.size()) { lastServedId = 0; } - Server server = SERVERS.get(lastServedId++); + var server = SERVERS.get(lastServedId++); server.serve(request); } diff --git a/monostate/src/test/java/com/iluwatar/monostate/AppTest.java b/monostate/src/test/java/com/iluwatar/monostate/AppTest.java index c914f136e..d17a56bb9 100644 --- a/monostate/src/test/java/com/iluwatar/monostate/AppTest.java +++ b/monostate/src/test/java/com/iluwatar/monostate/AppTest.java @@ -32,8 +32,7 @@ public class AppTest { @Test public void testMain() { - String[] args = {}; - App.main(args); + App.main(new String[]{}); } } diff --git a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java index 736bf6ea6..d62c029e2 100644 --- a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java +++ b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java @@ -44,8 +44,8 @@ public class LoadBalancerTest { @Test public void testSameStateAmongstAllInstances() { - final LoadBalancer firstBalancer = new LoadBalancer(); - final LoadBalancer secondBalancer = new LoadBalancer(); + final var firstBalancer = new LoadBalancer(); + final var secondBalancer = new LoadBalancer(); firstBalancer.addServer(new Server("localhost", 8085, 6)); // Both should have the same number of servers. assertEquals(firstBalancer.getNoOfServers(), secondBalancer.getNoOfServers()); @@ -55,18 +55,18 @@ public class LoadBalancerTest { @Test public void testServe() { - final Server server = mock(Server.class); + final var server = mock(Server.class); when(server.getHost()).thenReturn("testhost"); when(server.getPort()).thenReturn(1234); doNothing().when(server).serve(any(Request.class)); - final LoadBalancer loadBalancer = new LoadBalancer(); + final var loadBalancer = new LoadBalancer(); loadBalancer.addServer(server); verifyZeroInteractions(server); - final Request request = new Request("test"); - for (int i = 0; i < loadBalancer.getNoOfServers() * 2; i++) { + final var request = new Request("test"); + for (var i = 0; i < loadBalancer.getNoOfServers() * 2; i++) { loadBalancer.serverRequest(request); } From 9b105d770df2ca56ffd725e88fdbf17666e7cd1b Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 22:51:37 +0000 Subject: [PATCH 010/225] Java 11 migraiton: multiton --- .../src/main/java/com/iluwatar/multiton/Nazgul.java | 2 +- .../main/java/com/iluwatar/multiton/NazgulEnum.java | 12 +++++++++--- .../main/java/com/iluwatar/multiton/NazgulName.java | 12 +++++++++--- .../src/test/java/com/iluwatar/multiton/AppTest.java | 5 +---- .../java/com/iluwatar/multiton/NazgulEnumTest.java | 8 ++++---- .../test/java/com/iluwatar/multiton/NazgulTest.java | 4 ++-- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java b/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java index f55f85aca..bd1fc70ef 100644 --- a/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java +++ b/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java @@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public final class Nazgul { - private static Map nazguls; + private static final Map nazguls; private NazgulName name; diff --git a/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java b/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java index 5b5c48d66..bb1454b9f 100644 --- a/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java +++ b/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java @@ -27,7 +27,13 @@ package com.iluwatar.multiton; * enum based multiton implementation. */ public enum NazgulEnum { - - KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA; - + KHAMUL, + MURAZOR, + DWAR, + JI_INDUR, + AKHORAHIL, + HOARMURATH, + ADUNAPHEL, + REN, + UVATHA } diff --git a/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java b/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java index c7865dceb..cce19c6ff 100644 --- a/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java +++ b/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java @@ -27,7 +27,13 @@ package com.iluwatar.multiton; * Each Nazgul has different {@link NazgulName}. */ public enum NazgulName { - - KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA; - + KHAMUL, + MURAZOR, + DWAR, + JI_INDUR, + AKHORAHIL, + HOARMURATH, + ADUNAPHEL, + REN, + UVATHA } diff --git a/multiton/src/test/java/com/iluwatar/multiton/AppTest.java b/multiton/src/test/java/com/iluwatar/multiton/AppTest.java index f577b7f07..0496ebdaf 100644 --- a/multiton/src/test/java/com/iluwatar/multiton/AppTest.java +++ b/multiton/src/test/java/com/iluwatar/multiton/AppTest.java @@ -26,15 +26,12 @@ package com.iluwatar.multiton; import org.junit.jupiter.api.Test; /** - * * Application test - * */ public class AppTest { @Test public void test() { - String[] args = {}; - App.main(args); + App.main(new String[]{}); } } diff --git a/multiton/src/test/java/com/iluwatar/multiton/NazgulEnumTest.java b/multiton/src/test/java/com/iluwatar/multiton/NazgulEnumTest.java index 6668874f4..4d107a181 100644 --- a/multiton/src/test/java/com/iluwatar/multiton/NazgulEnumTest.java +++ b/multiton/src/test/java/com/iluwatar/multiton/NazgulEnumTest.java @@ -39,10 +39,10 @@ class NazgulEnumTest { */ @Test public void testTheSameObjectIsReturnedWithMultipleCalls() { - for (int i = 0; i < NazgulEnum.values().length; i++) { - NazgulEnum instance1 = NazgulEnum.values()[i]; - NazgulEnum instance2 = NazgulEnum.values()[i]; - NazgulEnum instance3 = NazgulEnum.values()[i]; + for (var i = 0; i < NazgulEnum.values().length; i++) { + var instance1 = NazgulEnum.values()[i]; + var instance2 = NazgulEnum.values()[i]; + var instance3 = NazgulEnum.values()[i]; assertSame(instance1, instance2); assertSame(instance1, instance3); assertSame(instance2, instance3); diff --git a/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java b/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java index 0429f8e29..f900659a8 100644 --- a/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java +++ b/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java @@ -41,8 +41,8 @@ public class NazgulTest { */ @Test public void testGetInstance() { - for (final NazgulName name : NazgulName.values()) { - final Nazgul nazgul = Nazgul.getInstance(name); + for (final var name : NazgulName.values()) { + final var nazgul = Nazgul.getInstance(name); assertNotNull(nazgul); assertSame(nazgul, Nazgul.getInstance(name)); assertEquals(name, nazgul.getName()); From 2fa938c02d64edff93757f631fa36fd445624113 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 22:58:50 +0000 Subject: [PATCH 011/225] Java 11 migraiton: mute-idiom --- .../src/main/java/com/iluwatar/mute/App.java | 23 +++++++++---------- .../test/java/com/iluwatar/mute/AppTest.java | 5 ++-- .../test/java/com/iluwatar/mute/MuteTest.java | 18 ++++++--------- 3 files changed, 20 insertions(+), 26 deletions(-) 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 d4f140bf0..eca345014 100644 --- a/mute-idiom/src/main/java/com/iluwatar/mute/App.java +++ b/mute-idiom/src/main/java/com/iluwatar/mute/App.java @@ -25,7 +25,7 @@ package com.iluwatar.mute; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.sql.SQLException; +import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,9 +52,8 @@ public class App { * Program entry point. * * @param args command line args. - * @throws Exception if any exception occurs */ - public static void main(String[] args) throws Exception { + public static void main(String[] args) { useOfLoggedMute(); @@ -68,17 +67,17 @@ public class App { * exception occurs. */ private static void useOfMute() { - ByteArrayOutputStream out = new ByteArrayOutputStream(); + var out = new ByteArrayOutputStream(); Mute.mute(() -> out.write("Hello".getBytes())); } - private static void useOfLoggedMute() throws SQLException { - Resource resource = null; + private static void useOfLoggedMute() { + Optional resource = Optional.empty(); try { - resource = acquireResource(); - utilizeResource(resource); + resource = Optional.of(acquireResource()); + utilizeResource(resource.get()); } finally { - closeResource(resource); + resource.ifPresent(App::closeResource); } } @@ -86,14 +85,14 @@ public class App { * All we can do while failed close of a resource is to log it. */ private static void closeResource(Resource resource) { - Mute.loggedMute(() -> resource.close()); + Mute.loggedMute(resource::close); } - private static void utilizeResource(Resource resource) throws SQLException { + private static void utilizeResource(Resource resource) { LOGGER.info("Utilizing acquired resource: {}", resource); } - private static Resource acquireResource() throws SQLException { + private static Resource acquireResource() { return new Resource() { @Override 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 5ca525a9d..5883812c7 100644 --- a/mute-idiom/src/test/java/com/iluwatar/mute/AppTest.java +++ b/mute-idiom/src/test/java/com/iluwatar/mute/AppTest.java @@ -27,12 +27,11 @@ import org.junit.jupiter.api.Test; /** * Tests that Mute idiom example runs without errors. - * */ public class AppTest { @Test - public void test() throws Exception { - App.main(null); + public void test() { + App.main(new String[]{}); } } 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 f2743113b..33d104ffc 100644 --- a/mute-idiom/src/test/java/com/iluwatar/mute/MuteTest.java +++ b/mute-idiom/src/test/java/com/iluwatar/mute/MuteTest.java @@ -23,17 +23,15 @@ package com.iluwatar.mute; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Test for the mute-idiom pattern */ @@ -50,9 +48,7 @@ public class MuteTest { @Test public void muteShouldRethrowUnexpectedExceptionAsAssertionError() { - assertThrows(AssertionError.class, () -> { - Mute.mute(this::methodThrowingException); - }); + assertThrows(AssertionError.class, () -> Mute.mute(this::methodThrowingException)); } @Test @@ -62,7 +58,7 @@ public class MuteTest { @Test public void loggedMuteShouldLogExceptionTraceBeforeSwallowingIt() { - ByteArrayOutputStream stream = new ByteArrayOutputStream(); + var stream = new ByteArrayOutputStream(); System.setErr(new PrintStream(stream)); Mute.loggedMute(this::methodThrowingException); From d733122e7ac0ee6d169acae38734d6c0a95d6a03 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sun, 12 Apr 2020 23:00:49 +0000 Subject: [PATCH 012/225] Java 11 migraiton: mutex --- mutex/src/main/java/com/iluwatar/mutex/App.java | 8 ++++---- mutex/src/main/java/com/iluwatar/mutex/Jar.java | 2 +- .../src/main/java/com/iluwatar/mutex/Thief.java | 2 +- .../test/java/com/iluwatar/mutex/AppTest.java | 7 ++----- .../test/java/com/iluwatar/mutex/JarTest.java | 17 ++++++++--------- .../test/java/com/iluwatar/mutex/MutexTest.java | 6 +++--- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/mutex/src/main/java/com/iluwatar/mutex/App.java b/mutex/src/main/java/com/iluwatar/mutex/App.java index e4a952ef9..c50acc65a 100644 --- a/mutex/src/main/java/com/iluwatar/mutex/App.java +++ b/mutex/src/main/java/com/iluwatar/mutex/App.java @@ -38,10 +38,10 @@ public class App { * main method. */ public static void main(String[] args) { - Mutex mutex = new Mutex(); - Jar jar = new Jar(1000, mutex); - Thief peter = new Thief("Peter", jar); - Thief john = new Thief("John", jar); + var mutex = new Mutex(); + var jar = new Jar(1000, mutex); + var peter = new Thief("Peter", jar); + var john = new Thief("John", jar); peter.start(); john.start(); } diff --git a/mutex/src/main/java/com/iluwatar/mutex/Jar.java b/mutex/src/main/java/com/iluwatar/mutex/Jar.java index f68b266ad..4a0861e1a 100644 --- a/mutex/src/main/java/com/iluwatar/mutex/Jar.java +++ b/mutex/src/main/java/com/iluwatar/mutex/Jar.java @@ -48,7 +48,7 @@ public class Jar { * Method for a thief to take a bean. */ public boolean takeBean() { - boolean success = false; + var success = false; try { lock.acquire(); success = beans > 0; diff --git a/mutex/src/main/java/com/iluwatar/mutex/Thief.java b/mutex/src/main/java/com/iluwatar/mutex/Thief.java index 29caba540..a9a715970 100644 --- a/mutex/src/main/java/com/iluwatar/mutex/Thief.java +++ b/mutex/src/main/java/com/iluwatar/mutex/Thief.java @@ -54,7 +54,7 @@ public class Thief extends Thread { */ @Override public void run() { - int beans = 0; + var beans = 0; while (jar.takeBean()) { beans = beans + 1; diff --git a/mutex/src/test/java/com/iluwatar/mutex/AppTest.java b/mutex/src/test/java/com/iluwatar/mutex/AppTest.java index 1793bf90b..0bee249a6 100644 --- a/mutex/src/test/java/com/iluwatar/mutex/AppTest.java +++ b/mutex/src/test/java/com/iluwatar/mutex/AppTest.java @@ -25,15 +25,12 @@ package com.iluwatar.mutex; import org.junit.jupiter.api.Test; -import java.io.IOException; - /** * Application Test Entrypoint */ public class AppTest { @Test - public void test() throws IOException { - String[] args = {}; - App.main(args); + public void test() { + App.main(new String[]{}); } } diff --git a/mutex/src/test/java/com/iluwatar/mutex/JarTest.java b/mutex/src/test/java/com/iluwatar/mutex/JarTest.java index e0a316072..786f96e44 100644 --- a/mutex/src/test/java/com/iluwatar/mutex/JarTest.java +++ b/mutex/src/test/java/com/iluwatar/mutex/JarTest.java @@ -23,10 +23,11 @@ package com.iluwatar.mutex; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.stream.IntStream; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Test case for taking beans from a Jar @@ -35,12 +36,10 @@ public class JarTest { @Test public void testTakeBeans() { - Mutex mutex = new Mutex(); - Jar jar = new Jar(10, mutex); - for (int i = 0; i < 10; i++) { - assertTrue(jar.takeBean()); - } + var mutex = new Mutex(); + var jar = new Jar(10, mutex); + IntStream.range(0, 10).mapToObj(i -> jar.takeBean()).forEach(Assertions::assertTrue); assertFalse(jar.takeBean()); } -} \ No newline at end of file +} diff --git a/mutex/src/test/java/com/iluwatar/mutex/MutexTest.java b/mutex/src/test/java/com/iluwatar/mutex/MutexTest.java index 2e3184c51..d6d0cc1d7 100644 --- a/mutex/src/test/java/com/iluwatar/mutex/MutexTest.java +++ b/mutex/src/test/java/com/iluwatar/mutex/MutexTest.java @@ -23,12 +23,12 @@ package com.iluwatar.mutex; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Test; + /** * Test case for acquiring and releasing a Mutex */ @@ -36,7 +36,7 @@ public class MutexTest { @Test public void acquireReleaseTest() { - Mutex mutex = new Mutex(); + var mutex = new Mutex(); assertNull(mutex.getOwner()); try { mutex.acquire(); From daf53225d8977f2a8998e54e4d5001a3d15a8a03 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Fri, 1 May 2020 08:04:45 +0000 Subject: [PATCH 013/225] Resolves CR comments --- marker/src/main/java/App.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/marker/src/main/java/App.java b/marker/src/main/java/App.java index c7b4530c6..8a08a8f70 100644 --- a/marker/src/main/java/App.java +++ b/marker/src/main/java/App.java @@ -21,6 +21,9 @@ * THE SOFTWARE. */ +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Created by Alexis on 28-Apr-17. With Marker interface idea is to make empty interface and extend * it. Basically it is just to identify the special objects from normal objects. Like in case of @@ -43,10 +46,23 @@ public class App { * @param args command line args */ public static void main(String[] args) { + final Logger logger = LoggerFactory.getLogger(App.class); var guard = new Guard(); var thief = new Thief(); - guard.enter(); - thief.doNothing(); + + //noinspection ConstantConditions + if (guard instanceof Permission) { + guard.enter(); + } else { + logger.info("You have no permission to enter, please leave this area"); + } + + //noinspection ConstantConditions + if (thief instanceof Permission) { + thief.doNothing(); + } else { + thief.doNothing(); + } } } From 9a81ddb7d8680c9bfb1e9cfbf4a9eeb8c976c939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 19 Jul 2020 17:14:02 +0300 Subject: [PATCH 014/225] #590 add explanation for Observer --- observer/README.md | 146 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 3 deletions(-) diff --git a/observer/README.md b/observer/README.md index 034a90e7d..5d76ab61f 100644 --- a/observer/README.md +++ b/observer/README.md @@ -13,9 +13,149 @@ tags: Dependents, Publish-Subscribe ## Intent -Define a one-to-many dependency between objects so that when one -object changes state, all its dependents are notified and updated -automatically. +Define a one-to-many dependency between objects so that when one object changes state, all its dependents are notified +and updated automatically. + +## Explanation + +Real world example + +> In a land far away lives the races of hobbits and orcs. Both of them are mostly outdoors so they closely follow the changes in weather. One could say that they are constantly observing the weather. + +In plain words + +> Register as an observer to receive state changes in the object. + +Wikipedia says + +> The observer pattern is a software design pattern in which an object, called the subject, maintains a list of its dependents, called observers, and notifies them automatically of any state changes, usually by calling one of their methods. + +**Programmatic Example** + +Let's first introduce the weather observer interface and our races, orcs and hobbits. + +```java +public interface WeatherObserver { + + void update(WeatherType currentWeather); +} + +public class Orcs implements WeatherObserver { + + private static final Logger LOGGER = LoggerFactory.getLogger(Orcs.class); + + @Override + public void update(WeatherType currentWeather) { + switch (currentWeather) { + case COLD: + LOGGER.info("The orcs are freezing cold."); + break; + case RAINY: + LOGGER.info("The orcs are dripping wet."); + break; + case SUNNY: + LOGGER.info("The sun hurts the orcs' eyes."); + break; + case WINDY: + LOGGER.info("The orc smell almost vanishes in the wind."); + break; + default: + break; + } + } +} + +public class Hobbits implements WeatherObserver { + + private static final Logger LOGGER = LoggerFactory.getLogger(Hobbits.class); + + @Override + public void update(WeatherType currentWeather) { + switch (currentWeather) { + case COLD: + LOGGER.info("The hobbits are shivering in the cold weather."); + break; + case RAINY: + LOGGER.info("The hobbits look for cover from the rain."); + break; + case SUNNY: + LOGGER.info("The happy hobbits bade in the warm sun."); + break; + case WINDY: + LOGGER.info("The hobbits hold their hats tightly in the windy weather."); + break; + default: + break; + } + } +} +``` + +Then here's the weather that is constantly changing. + +```java +public class Weather { + + private static final Logger LOGGER = LoggerFactory.getLogger(Weather.class); + + private WeatherType currentWeather; + private List observers; + + public Weather() { + observers = new ArrayList<>(); + currentWeather = WeatherType.SUNNY; + } + + public void addObserver(WeatherObserver obs) { + observers.add(obs); + } + + public void removeObserver(WeatherObserver obs) { + observers.remove(obs); + } + + /** + * Makes time pass for weather. + */ + public void timePasses() { + var enumValues = WeatherType.values(); + currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length]; + LOGGER.info("The weather changed to {}.", currentWeather); + notifyObservers(); + } + + private void notifyObservers() { + for (var obs : observers) { + obs.update(currentWeather); + } + } +} +``` + +Here's the full example in action. + +```java + var weather = new Weather(); + weather.addObserver(new Orcs()); + weather.addObserver(new Hobbits()); + + weather.timePasses(); + // The weather changed to rainy. + // The orcs are dripping wet. + // The hobbits look for cover from the rain. + weather.timePasses(); + // The weather changed to windy. + // The orc smell almost vanishes in the wind. + // The hobbits hold their hats tightly in the windy weather. + weather.timePasses(); + // The weather changed to cold. + // The orcs are freezing cold. + // The hobbits are shivering in the cold weather. + weather.timePasses(); + // The weather changed to sunny. + //The sun hurts the orcs' eyes. + // The happy hobbits bade in the warm sun. +``` ## Class diagram ![alt text](./etc/observer.png "Observer") From d2724e8091d3d12b451dabfac2411eebf0df0fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 19 Jul 2020 17:34:58 +0300 Subject: [PATCH 015/225] #590 add explanation for Strategy --- strategy/README.md | 103 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 3 deletions(-) diff --git a/strategy/README.md b/strategy/README.md index c78753535..21ac1c94b 100644 --- a/strategy/README.md +++ b/strategy/README.md @@ -12,9 +12,106 @@ tags: Policy ## Intent -Define a family of algorithms, encapsulate each one, and make them -interchangeable. Strategy lets the algorithm vary independently from clients -that use it. +Define a family of algorithms, encapsulate each one, and make them interchangeable. Strategy lets the algorithm vary +independently from clients that use it. + +## Explanation + +Real world example + +> Slaying dragons is a dangerous profession. With experience it becomes easier. Veteran dragonslayers have developed different fighting strategies against different types of dragons. + +In plain words + +> Strategy pattern allows choosing the best suited algorithm at runtime. + +Wikipedia says + +> In computer programming, the strategy pattern (also known as the policy pattern) is a behavioral software design pattern that enables selecting an algorithm at runtime. + +**Programmatic Example** + +Let's first introduce the dragon slaying strategy interface and its implementations. + +```java +@FunctionalInterface +public interface DragonSlayingStrategy { + + void execute(); +} + +public class MeleeStrategy implements DragonSlayingStrategy { + + private static final Logger LOGGER = LoggerFactory.getLogger(MeleeStrategy.class); + + @Override + public void execute() { + LOGGER.info("With your Excalibur you sever the dragon's head!"); + } +} + +public class ProjectileStrategy implements DragonSlayingStrategy { + + private static final Logger LOGGER = LoggerFactory.getLogger(ProjectileStrategy.class); + + @Override + public void execute() { + LOGGER.info("You shoot the dragon with the magical crossbow and it falls dead on the ground!"); + } +} + +public class SpellStrategy implements DragonSlayingStrategy { + + private static final Logger LOGGER = LoggerFactory.getLogger(SpellStrategy.class); + + @Override + public void execute() { + LOGGER.info("You cast the spell of disintegration and the dragon vaporizes in a pile of dust!"); + } +} +``` + +And here is the mighty dragonslayer who is able to pick his fighting strategy based on the opponent. + +```java +public class DragonSlayer { + + private DragonSlayingStrategy strategy; + + public DragonSlayer(DragonSlayingStrategy strategy) { + this.strategy = strategy; + } + + public void changeStrategy(DragonSlayingStrategy strategy) { + this.strategy = strategy; + } + + public void goToBattle() { + strategy.execute(); + } +} +``` + +Finally here's dragonslayer in action. + +```java + LOGGER.info("Green dragon spotted ahead!"); + var dragonSlayer = new DragonSlayer(new MeleeStrategy()); + dragonSlayer.goToBattle(); + LOGGER.info("Red dragon emerges."); + dragonSlayer.changeStrategy(new ProjectileStrategy()); + dragonSlayer.goToBattle(); + LOGGER.info("Black dragon lands before you."); + dragonSlayer.changeStrategy(new SpellStrategy()); + dragonSlayer.goToBattle(); + + // Green dragon spotted ahead! + // With your Excalibur you sever the dragon's head! + // Red dragon emerges. + // You shoot the dragon with the magical crossbow and it falls dead on the ground! + // Black dragon lands before you. + // You cast the spell of disintegration and the dragon vaporizes in a pile of dust! +``` ## Class diagram ![alt text](./etc/strategy_1.png "Strategy") From 4d95d38b8d3a2c1b7b9d60bbf338635ecfed4164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 19 Jul 2020 19:37:40 +0300 Subject: [PATCH 016/225] #590 explanation for Multiton --- multiton/README.md | 84 ++++++++++++++++++++++++++++++++++++++++++++-- observer/README.md | 2 +- 2 files changed, 83 insertions(+), 3 deletions(-) diff --git a/multiton/README.md b/multiton/README.md index 4387cf7ac..ec1429a8f 100644 --- a/multiton/README.md +++ b/multiton/README.md @@ -12,8 +12,88 @@ tags: Registry ## Intent -Ensure a class only has limited number of instances, and provide a -global point of access to them. +Ensure a class only has limited number of instances and provide a global point of access to them. + +## Explanation + +Real world example + +> The Nazgûl, also called ringwraiths or the Nine Riders, are Sauron's most terrible servants. By definition there's always nine of them. + +In plain words + +> Multiton pattern ensures there's predefined amount of instances available globally. + +Wikipedia says + +> In software engineering, the multiton pattern is a design pattern which generalizes the singleton pattern. Whereas the singleton allows only one instance of a class to be created, the multiton pattern allows for the controlled creation of multiple instances, which it manages through the use of a map. + +**Programmatic Example** + +Nazgul is the multiton class. + +```java +public enum NazgulName { + + KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA; +} + +public final class Nazgul { + + private static Map nazguls; + + private NazgulName name; + + static { + nazguls = new ConcurrentHashMap<>(); + nazguls.put(NazgulName.KHAMUL, new Nazgul(NazgulName.KHAMUL)); + nazguls.put(NazgulName.MURAZOR, new Nazgul(NazgulName.MURAZOR)); + nazguls.put(NazgulName.DWAR, new Nazgul(NazgulName.DWAR)); + nazguls.put(NazgulName.JI_INDUR, new Nazgul(NazgulName.JI_INDUR)); + nazguls.put(NazgulName.AKHORAHIL, new Nazgul(NazgulName.AKHORAHIL)); + nazguls.put(NazgulName.HOARMURATH, new Nazgul(NazgulName.HOARMURATH)); + nazguls.put(NazgulName.ADUNAPHEL, new Nazgul(NazgulName.ADUNAPHEL)); + nazguls.put(NazgulName.REN, new Nazgul(NazgulName.REN)); + nazguls.put(NazgulName.UVATHA, new Nazgul(NazgulName.UVATHA)); + } + + private Nazgul(NazgulName name) { + this.name = name; + } + + public static Nazgul getInstance(NazgulName name) { + return nazguls.get(name); + } + + public NazgulName getName() { + return name; + } +} +``` + +And here's how we access the Nazgul instances. + +```java + 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)); + + // KHAMUL=com.iluwatar.multiton.Nazgul@2b214b94 + // MURAZOR=com.iluwatar.multiton.Nazgul@17814b1c + // DWAR=com.iluwatar.multiton.Nazgul@7ac9af2a + // JI_INDUR=com.iluwatar.multiton.Nazgul@7bb004b8 + // AKHORAHIL=com.iluwatar.multiton.Nazgul@78e89bfe + // HOARMURATH=com.iluwatar.multiton.Nazgul@652ce654 + // ADUNAPHEL=com.iluwatar.multiton.Nazgul@522ba524 + // REN=com.iluwatar.multiton.Nazgul@29c5ee1d + // UVATHA=com.iluwatar.multiton.Nazgul@15cea7b0 +``` ## Class diagram ![alt text](./etc/multiton.png "Multiton") diff --git a/observer/README.md b/observer/README.md index 5d76ab61f..edc72ae24 100644 --- a/observer/README.md +++ b/observer/README.md @@ -153,7 +153,7 @@ Here's the full example in action. // The hobbits are shivering in the cold weather. weather.timePasses(); // The weather changed to sunny. - //The sun hurts the orcs' eyes. + // The sun hurts the orcs' eyes. // The happy hobbits bade in the warm sun. ``` From e34de39ae72f6e3a2ff0f1b2be743e4a4cb1831c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 19 Jul 2020 19:53:31 +0300 Subject: [PATCH 017/225] #590 explanation for Null Object --- null-object/README.md | 137 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/null-object/README.md b/null-object/README.md index 184e903a0..0fce86f0e 100644 --- a/null-object/README.md +++ b/null-object/README.md @@ -18,6 +18,143 @@ implements the expected interface, but whose method body is empty. The advantage of this approach over a working default implementation is that a Null Object is very predictable and has no side effects: it does nothing. +## Explanation + +Real world example + +> We are building a binary tree from nodes. There are ordinary nodes and "empty" nodes. Traversing the tree normally should not cause errors, so we use null object pattern where necessary. + +In plain words + +> Null Object pattern handles "empty" objects gracefully. + +Wikipedia says + +> In object-oriented computer programming, a null object is an object with no referenced value or with defined neutral ("null") behavior. The null object design pattern describes the uses of such objects and their behavior (or lack thereof). + +**Programmatic Example** + +Here's the definitions for node interface and its implementations. + +```java +public interface Node { + + String getName(); + + int getTreeSize(); + + Node getLeft(); + + Node getRight(); + + void walk(); +} + +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; + + /** + * Constructor. + */ + public NodeImpl(String name, Node left, Node right) { + this.name = name; + this.left = left; + this.right = right; + } + + @Override + public int getTreeSize() { + return 1 + left.getTreeSize() + right.getTreeSize(); + } + + @Override + public Node getLeft() { + return left; + } + + @Override + public Node getRight() { + return right; + } + + @Override + public String getName() { + return name; + } + + @Override + public void walk() { + LOGGER.info(name); + if (left.getTreeSize() > 0) { + left.walk(); + } + if (right.getTreeSize() > 0) { + right.walk(); + } + } +} + +public final class NullNode implements Node { + + private static NullNode instance = new NullNode(); + + private NullNode() { + } + + public static NullNode getInstance() { + return instance; + } + + @Override + public int getTreeSize() { + return 0; + } + + @Override + public Node getLeft() { + return null; + } + + @Override + public Node getRight() { + return null; + } + + @Override + public String getName() { + return null; + } + + @Override + public void walk() { + // Do nothing + } +} + +``` + +Then we can construct and traverse the binary tree without errors as follows. + +```java + Node root = + new NodeImpl("1", new NodeImpl("11", new NodeImpl("111", NullNode.getInstance(), + NullNode.getInstance()), NullNode.getInstance()), new NodeImpl("12", + NullNode.getInstance(), new NodeImpl("122", NullNode.getInstance(), + NullNode.getInstance()))); + root.walk(); + + // 1 + // 11 + // 111 + // 12 + // 122 +``` + ## Class diagram ![alt text](./etc/null-object.png "Null Object") From a18c0f76ea07ca5fb4f7dc94e3a6b2537919ca02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 19 Jul 2020 20:23:12 +0300 Subject: [PATCH 018/225] #590 add explanation for Poison Pill --- poison-pill/README.md | 246 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 2 deletions(-) diff --git a/poison-pill/README.md b/poison-pill/README.md index 7fd152891..823bb7df8 100644 --- a/poison-pill/README.md +++ b/poison-pill/README.md @@ -10,8 +10,250 @@ tags: --- ## Intent -Poison Pill is known predefined data item that allows to provide -graceful shutdown for separate distributed consumption process. +Poison Pill is known predefined data item that allows to provide graceful shutdown for separate distributed consumption +process. + +## Explanation + +Real world example + +> Let's think about a message queue with one producer and one consumer. The producer keeps pushing new messages in the queue and the consumer keeps reading them. Finally when it's time to gracefully shut down the producer sends the poison pill message. + +In plain words + +> Poison Pill is a known message structure that ends the message exchange. + +**Programmatic Example** + +Let's define the message structure first. + +```java +public interface Message { + + Message POISON_PILL = new Message() { + + @Override + public void addHeader(Headers header, String value) { + throw poison(); + } + + @Override + public String getHeader(Headers header) { + throw poison(); + } + + @Override + public Map getHeaders() { + throw poison(); + } + + @Override + public void setBody(String body) { + throw poison(); + } + + @Override + public String getBody() { + throw poison(); + } + + private RuntimeException poison() { + return new UnsupportedOperationException("Poison"); + } + + }; + + enum Headers { + DATE, SENDER + } + + void addHeader(Headers header, String value); + + String getHeader(Headers header); + + Map getHeaders(); + + void setBody(String body); + + String getBody(); +} + +public class SimpleMessage implements Message { + + private Map headers = new HashMap<>(); + private String body; + + @Override + public void addHeader(Headers header, String value) { + headers.put(header, value); + } + + @Override + public String getHeader(Headers header) { + return headers.get(header); + } + + @Override + public Map getHeaders() { + return Collections.unmodifiableMap(headers); + } + + @Override + public void setBody(String body) { + this.body = body; + } + + @Override + public String getBody() { + return body; + } +} +``` + +Next we define the types related to the message queue. + +```java +public interface MqPublishPoint { + + void put(Message msg) throws InterruptedException; +} + +public interface MqSubscribePoint { + + Message take() throws InterruptedException; +} + +public interface MessageQueue extends MqPublishPoint, MqSubscribePoint { +} + +public class SimpleMessageQueue implements MessageQueue { + + private final BlockingQueue queue; + + public SimpleMessageQueue(int bound) { + queue = new ArrayBlockingQueue<>(bound); + } + + @Override + public void put(Message msg) throws InterruptedException { + queue.put(msg); + } + + @Override + public Message take() throws InterruptedException { + return queue.take(); + } +} +``` + +Now we need to create the message producer and consumer. + +```java +public class Producer { + + private static final Logger LOGGER = LoggerFactory.getLogger(Producer.class); + + private final MqPublishPoint queue; + private final String name; + private boolean isStopped; + + /** + * Constructor. + */ + public Producer(String name, MqPublishPoint queue) { + this.name = name; + this.queue = queue; + this.isStopped = false; + } + + /** + * Send message to queue. + */ + public void send(String body) { + if (isStopped) { + throw new IllegalStateException(String.format( + "Producer %s was stopped and fail to deliver requested message [%s].", body, name)); + } + var msg = new SimpleMessage(); + msg.addHeader(Headers.DATE, new Date().toString()); + msg.addHeader(Headers.SENDER, name); + msg.setBody(body); + + try { + queue.put(msg); + } catch (InterruptedException e) { + // allow thread to exit + LOGGER.error("Exception caught.", e); + } + } + + /** + * Stop system by sending poison pill. + */ + public void stop() { + isStopped = true; + try { + queue.put(Message.POISON_PILL); + } catch (InterruptedException e) { + // allow thread to exit + LOGGER.error("Exception caught.", e); + } + } +} + +public class Consumer { + + private static final Logger LOGGER = LoggerFactory.getLogger(Consumer.class); + + private final MqSubscribePoint queue; + private final String name; + + public Consumer(String name, MqSubscribePoint queue) { + this.name = name; + this.queue = queue; + } + + /** + * Consume message. + */ + public void consume() { + while (true) { + try { + var msg = queue.take(); + if (Message.POISON_PILL.equals(msg)) { + LOGGER.info("Consumer {} receive request to terminate.", name); + break; + } + var sender = msg.getHeader(Headers.SENDER); + var body = msg.getBody(); + LOGGER.info("Message [{}] from [{}] received by [{}]", body, sender, name); + } catch (InterruptedException e) { + // allow thread to exit + LOGGER.error("Exception caught.", e); + return; + } + } + } +} +``` + +Finally we are ready to present the whole example in action. + +```java + var queue = new SimpleMessageQueue(10000); + + final var producer = new Producer("PRODUCER_1", queue); + final var consumer = new Consumer("CONSUMER_1", queue); + + new Thread(consumer::consume).start(); + + new Thread(() -> { + producer.send("hand shake"); + producer.send("some very important information"); + producer.send("bye!"); + producer.stop(); + }).start(); +``` ## Class diagram ![alt text](./etc/poison-pill.png "Poison Pill") From 467f647ca266306d72f35749c661d0867efd1dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 20 Jul 2020 17:31:58 +0300 Subject: [PATCH 019/225] #590 add explanation for Repository --- repository/README.md | 236 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 231 insertions(+), 5 deletions(-) diff --git a/repository/README.md b/repository/README.md index 7b5258ea5..09a9a2bba 100644 --- a/repository/README.md +++ b/repository/README.md @@ -9,11 +9,236 @@ tags: --- ## Intent -Repository layer is added between the domain and data mapping -layers to isolate domain objects from details of the database access code and -to minimize scattering and duplication of query code. The Repository pattern is -especially useful in systems where number of domain classes is large or heavy -querying is utilized. +Repository layer is added between the domain and data mapping layers to isolate domain objects from details of the +database access code and to minimize scattering and duplication of query code. The Repository pattern is especially +useful in systems where number of domain classes is large or heavy querying is utilized. + +## Explanation +Real world example + +> Let's say we need a persistent data store for persons. Adding new persons and searching for them according to different criteria must be easy. + +In plain words + +> Repository architectural pattern creates a uniform layer of data repositories that can be used for CRUD operations. + +[Microsoft documentation](https://docs.microsoft.com/en-us/dotnet/architecture/microservices/microservice-ddd-cqrs-patterns/infrastructure-persistence-layer-design) says + +> Repositories are classes or components that encapsulate the logic required to access data sources. They centralize common data access functionality, providing better maintainability and decoupling the infrastructure or technology used to access databases from the domain model layer. + +**Programmatic Example** + +Let's first look at the person class that we need to persist. + +```java +@Entity +public class Person { + + @Id + @GeneratedValue + private Long id; + private String name; + private String surname; + + private int age; + + public Person() { + } + + /** + * Constructor. + */ + public Person(String name, String surname, int age) { + this.name = name; + this.surname = surname; + this.age = age; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSurname() { + return surname; + } + + public void setSurname(String surname) { + this.surname = surname; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + @Override + public String toString() { + return "Person [id=" + id + ", name=" + name + ", surname=" + surname + ", age=" + age + "]"; + } + + @Override + public int hashCode() { + final var prime = 31; + var result = 1; + result = prime * result + age; + result = prime * result + (id == null ? 0 : id.hashCode()); + result = prime * result + (name == null ? 0 : name.hashCode()); + result = prime * result + (surname == null ? 0 : surname.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + var other = (Person) obj; + if (age != other.age) { + return false; + } + if (id == null) { + if (other.id != null) { + return false; + } + } else if (!id.equals(other.id)) { + return false; + } + if (name == null) { + if (other.name != null) { + return false; + } + } else if (!name.equals(other.name)) { + return false; + } + if (surname == null) { + return other.surname == null; + } + return surname.equals(other.surname); + } +} +``` + +We are using Spring Data to create the repository so it becomes really simple. + +```java +@Repository +public interface PersonRepository + extends CrudRepository, JpaSpecificationExecutor { + + Person findByName(String name); +} +``` + +Additionally we define a helper class for specification queries. + +```java +public class PersonSpecifications { + + public static class AgeBetweenSpec implements Specification { + + private int from; + + private int to; + + public AgeBetweenSpec(int from, int to) { + this.from = from; + this.to = to; + } + + @Override + public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder cb) { + return cb.between(root.get("age"), from, to); + } + + } + + public static class NameEqualSpec implements Specification { + + public String name; + + public NameEqualSpec(String name) { + this.name = name; + } + + public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder cb) { + return cb.equal(root.get("name"), this.name); + } + } + +} +``` + +And here's the repository in action. + +```java + var peter = new Person("Peter", "Sagan", 17); + var nasta = new Person("Nasta", "Kuzminova", 25); + var john = new Person("John", "lawrence", 35); + var terry = new Person("Terry", "Law", 36); + + repository.save(peter); + repository.save(nasta); + repository.save(john); + repository.save(terry); + + LOGGER.info("Count Person records: {}", repository.count()); + + var persons = (List) repository.findAll(); + persons.stream().map(Person::toString).forEach(LOGGER::info); + + nasta.setName("Barbora"); + nasta.setSurname("Spotakova"); + repository.save(nasta); + + repository.findById(2L).ifPresent(p -> LOGGER.info("Find by id 2: {}", p)); + repository.deleteById(2L); + + LOGGER.info("Count Person records: {}", repository.count()); + + repository + .findOne(new PersonSpecifications.NameEqualSpec("John")) + .ifPresent(p -> LOGGER.info("Find by John is {}", p)); + + persons = repository.findAll(new PersonSpecifications.AgeBetweenSpec(20, 40)); + + LOGGER.info("Find Person with age between 20,40: "); + persons.stream().map(Person::toString).forEach(LOGGER::info); + + repository.deleteAll(); + + // Count Person records: 4 + // Person [id=1, name=Peter, surname=Sagan, age=17] + // Person [id=2, name=Nasta, surname=Kuzminova, age=25] + // Person [id=3, name=John, surname=lawrence, age=35] + // Person [id=4, name=Terry, surname=Law, age=36] + // Find by id 2: Person [id=2, name=Barbora, surname=Spotakova, age=25] + // Count Person records: 3 + // Find by John is Person [id=3, name=John, surname=lawrence, age=35] + // Find Person with age between 20,40: + // Person [id=3, name=John, surname=lawrence, age=35] + // Person [id=4, name=Terry, surname=Law, age=36] +``` ## Class diagram ![alt text](./etc/repository.png "Repository") @@ -36,3 +261,4 @@ Use the Repository pattern when * [Advanced Spring Data JPA - Specifications and Querydsl](https://spring.io/blog/2011/04/26/advanced-spring-data-jpa-specifications-and-querydsl/) * [Repository Pattern Benefits and Spring Implementation](https://stackoverflow.com/questions/40068965/repository-pattern-benefits-and-spring-implementation) * [Patterns of Enterprise Application Architecture](https://www.amazon.com/gp/product/0321127420/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0321127420&linkCode=as2&tag=javadesignpat-20&linkId=d9f7d37b032ca6e96253562d075fcc4a) +* [Design patterns that I often avoid: Repository pattern](https://www.infoworld.com/article/3117713/design-patterns-that-i-often-avoid-repository-pattern.html) From b907a2a9bc41be02e5f375c5bf06055940cdcb60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 20 Jul 2020 17:52:44 +0300 Subject: [PATCH 020/225] #590 add explanation for Memento --- memento/README.md | 173 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 171 insertions(+), 2 deletions(-) diff --git a/memento/README.md b/memento/README.md index 1bf6e442b..8011dfc49 100644 --- a/memento/README.md +++ b/memento/README.md @@ -12,8 +12,177 @@ tags: Token ## Intent -Without violating encapsulation, capture and externalize an -object's internal state so that the object can be restored to this state later. +Without violating encapsulation, capture and externalize an object's internal state so that the object can be restored +to this state later. + +## Explanation +Real world example + +> We are working on astrology application where we need to analyze star properties over time. We are creating snapshots of star state using Memento pattern. + +In plain words + +> Memento pattern captures object internal state making it easy to store and restore objects in any point of time. + +Wikipedia says + +> The memento pattern is a software design pattern that provides the ability to restore an object to its previous state (undo via rollback). + +**Programmatic Example** + +Let's first define the types of stars we are capable to handle. + +```java +public enum StarType { + + SUN("sun"), RED_GIANT("red giant"), WHITE_DWARF("white dwarf"), SUPERNOVA("supernova"), DEAD( + "dead star"), UNDEFINED(""); + + private String title; + + StarType(String title) { + this.title = title; + } + + @Override + public String toString() { + return title; + } +} +``` + +Next let's jump straight to the essentials. Here's the star class along with the mementos that we need manipulate. + +```java +public interface StarMemento { +} + +public class Star { + + private StarType type; + private int ageYears; + private int massTons; + + public Star(StarType startType, int startAge, int startMass) { + this.type = startType; + this.ageYears = startAge; + this.massTons = startMass; + } + + public void timePasses() { + ageYears *= 2; + massTons *= 8; + switch (type) { + case RED_GIANT: + type = StarType.WHITE_DWARF; + break; + case SUN: + type = StarType.RED_GIANT; + break; + case SUPERNOVA: + type = StarType.DEAD; + break; + case WHITE_DWARF: + type = StarType.SUPERNOVA; + break; + case DEAD: + ageYears *= 2; + massTons = 0; + break; + default: + break; + } + } + + StarMemento getMemento() { + + StarMementoInternal state = new StarMementoInternal(); + state.setAgeYears(ageYears); + state.setMassTons(massTons); + state.setType(type); + return state; + } + + void setMemento(StarMemento memento) { + + StarMementoInternal state = (StarMementoInternal) memento; + this.type = state.getType(); + this.ageYears = state.getAgeYears(); + this.massTons = state.getMassTons(); + } + + @Override + public String toString() { + return String.format("%s age: %d years mass: %d tons", type.toString(), ageYears, massTons); + } + + private static class StarMementoInternal implements StarMemento { + + private StarType type; + private int ageYears; + private int massTons; + + public StarType getType() { + return type; + } + + public void setType(StarType type) { + this.type = type; + } + + public int getAgeYears() { + return ageYears; + } + + public void setAgeYears(int ageYears) { + this.ageYears = ageYears; + } + + public int getMassTons() { + return massTons; + } + + public void setMassTons(int massTons) { + this.massTons = massTons; + } + } +} +``` + +And finally here's how we use the mementos to store and restore star states. + +```java + Stack states = new Stack<>(); + Star star = new Star(StarType.SUN, 10000000, 500000); + LOGGER.info(star.toString()); + states.add(star.getMemento()); + star.timePasses(); + LOGGER.info(star.toString()); + states.add(star.getMemento()); + star.timePasses(); + LOGGER.info(star.toString()); + states.add(star.getMemento()); + star.timePasses(); + LOGGER.info(star.toString()); + states.add(star.getMemento()); + star.timePasses(); + LOGGER.info(star.toString()); + while (states.size() > 0) { + star.setMemento(states.pop()); + LOGGER.info(star.toString()); + } + + // sun age: 10000000 years mass: 500000 tons + // red giant age: 20000000 years mass: 4000000 tons + // white dwarf age: 40000000 years mass: 32000000 tons + // supernova age: 80000000 years mass: 256000000 tons + // dead star age: 160000000 years mass: 2048000000 tons + // supernova age: 80000000 years mass: 256000000 tons + // white dwarf age: 40000000 years mass: 32000000 tons + // red giant age: 20000000 years mass: 4000000 tons + // sun age: 10000000 years mass: 500000 tons +``` + ## Class diagram ![alt text](./etc/memento.png "Memento") From ab4e53a468fe1de6dc0ad731e2308ad80d37465c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 20 Jul 2020 20:06:39 +0300 Subject: [PATCH 021/225] #590 add explanation for State --- state/README.md | 122 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 120 insertions(+), 2 deletions(-) diff --git a/state/README.md b/state/README.md index 4f61d3025..7be4d3351 100644 --- a/state/README.md +++ b/state/README.md @@ -12,8 +12,126 @@ tags: Objects for States ## Intent -Allow an object to alter its behavior when its internal state -changes. The object will appear to change its class. +Allow an object to alter its behavior when its internal state changes. The object will appear to change its class. + +## Explanation +Real world example + +> When observing a mammoth in its natural habitat it seems to change its behavior based on the situation. It may first appear calm but over time when it detects a threat it gets angry and dangerous to its surroundings. + +In plain words + +> State pattern allows an object to change its behavior. + +Wikipedia says + +> The state pattern is a behavioral software design pattern that allows an object to alter its behavior when its internal state changes. This pattern is close to the concept of finite-state machines. The state pattern can be interpreted as a strategy pattern, which is able to switch a strategy through invocations of methods defined in the pattern's interface. + +**Programmatic Example** + +Here is the state interface and its concrete implementations. + +```java +public interface State { + + void onEnterState(); + + void observe(); +} + +public class PeacefulState implements State { + + private static final Logger LOGGER = LoggerFactory.getLogger(PeacefulState.class); + + private Mammoth mammoth; + + public PeacefulState(Mammoth mammoth) { + this.mammoth = mammoth; + } + + @Override + public void observe() { + LOGGER.info("{} is calm and peaceful.", mammoth); + } + + @Override + public void onEnterState() { + LOGGER.info("{} calms down.", mammoth); + } +} + +public class AngryState implements State { + + private static final Logger LOGGER = LoggerFactory.getLogger(AngryState.class); + + private Mammoth mammoth; + + public AngryState(Mammoth mammoth) { + this.mammoth = mammoth; + } + + @Override + public void observe() { + LOGGER.info("{} is furious!", mammoth); + } + + @Override + public void onEnterState() { + LOGGER.info("{} gets angry!", mammoth); + } +} +``` + +And here is the mammoth containing the state. + +```java +public class Mammoth { + + private State state; + + public Mammoth() { + state = new PeacefulState(this); + } + + public void timePasses() { + if (state.getClass().equals(PeacefulState.class)) { + changeStateTo(new AngryState(this)); + } else { + changeStateTo(new PeacefulState(this)); + } + } + + private void changeStateTo(State newState) { + this.state = newState; + this.state.onEnterState(); + } + + @Override + public String toString() { + return "The mammoth"; + } + + public void observe() { + this.state.observe(); + } +} +``` + +And here is the full example how the mammoth behaves over time. + +```java + var mammoth = new Mammoth(); + mammoth.observe(); + mammoth.timePasses(); + mammoth.observe(); + mammoth.timePasses(); + mammoth.observe(); + + // The mammoth gets angry! + // The mammoth is furious! + // The mammoth calms down. + // The mammoth is calm and peaceful. +``` ## Class diagram ![alt text](./etc/state_1.png "State") From 172964e75c1c299e19b38b9058db77aabcd5f1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 20 Jul 2020 20:23:39 +0300 Subject: [PATCH 022/225] #590 explanation for Template Method --- template-method/README.md | 112 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 108 insertions(+), 4 deletions(-) diff --git a/template-method/README.md b/template-method/README.md index e87cfd6de..695644488 100644 --- a/template-method/README.md +++ b/template-method/README.md @@ -9,11 +9,115 @@ tags: --- ## Intent -Define the skeleton of an algorithm in an operation, deferring some -steps to subclasses. Template method lets subclasses redefine certain steps of -an algorithm without changing the algorithm's structure. +Define the skeleton of an algorithm in an operation, deferring some steps to subclasses. Template method lets +subclasses redefine certain steps of an algorithm without changing the algorithm's structure. -To make sure that subclasses don’t override the template method, the template method should be declared `final`. +## Explanation +Real world example + +> The general steps in stealing an item are the same. First you pick the target, next you confuse him somehow and finally you steal the item. However there are many ways to implement these steps. + +In plain words + +> Template Method pattern outlines the general steps in the parent class and lets the concrete child implementations define the details. + +Wikipedia says + +> In object-oriented programming, the template method is one of the behavioral design patterns identified by Gamma et al. in the book Design Patterns. The template method is a method in a superclass, usually an abstract superclass, and defines the skeleton of an operation in terms of a number of high-level steps. These steps are themselves implemented by additional helper methods in the same class as the template method. + +**Programmatic Example** + +Let's first introduce the template method class along with its concrete implementations. + +```java +public abstract class StealingMethod { + + private static final Logger LOGGER = LoggerFactory.getLogger(StealingMethod.class); + + protected abstract String pickTarget(); + + protected abstract void confuseTarget(String target); + + protected abstract void stealTheItem(String target); + + public void steal() { + var target = pickTarget(); + LOGGER.info("The target has been chosen as {}.", target); + confuseTarget(target); + stealTheItem(target); + } +} + +public class SubtleMethod extends StealingMethod { + + private static final Logger LOGGER = LoggerFactory.getLogger(SubtleMethod.class); + + @Override + protected String pickTarget() { + return "shop keeper"; + } + + @Override + protected void confuseTarget(String target) { + LOGGER.info("Approach the {} with tears running and hug him!", target); + } + + @Override + protected void stealTheItem(String target) { + LOGGER.info("While in close contact grab the {}'s wallet.", target); + } +} + +public class HitAndRunMethod extends StealingMethod { + + private static final Logger LOGGER = LoggerFactory.getLogger(HitAndRunMethod.class); + + @Override + protected String pickTarget() { + return "old goblin woman"; + } + + @Override + protected void confuseTarget(String target) { + LOGGER.info("Approach the {} from behind.", target); + } + + @Override + protected void stealTheItem(String target) { + LOGGER.info("Grab the handbag and run away fast!"); + } +} +``` + +Here's the halfling thief class containing the template method. + +```java +public class HalflingThief { + + private StealingMethod method; + + public HalflingThief(StealingMethod method) { + this.method = method; + } + + public void steal() { + method.steal(); + } + + public void changeMethod(StealingMethod method) { + this.method = method; + } +} +``` + +And finally we show how the halfling thief utilizes the different stealing methods. + +```java + var thief = new HalflingThief(new HitAndRunMethod()); + thief.steal(); + thief.changeMethod(new SubtleMethod()); + thief.steal(); +``` ## Class diagram ![alt text](./etc/template-method_1.png "Template Method") From 6c2114330396b579efedfec610362bf1a50014d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Tue, 21 Jul 2020 20:04:06 +0300 Subject: [PATCH 023/225] #590 add explanation for Dependency Injection --- dependency-injection/README.md | 89 +++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 8 deletions(-) diff --git a/dependency-injection/README.md b/dependency-injection/README.md index 90edd4061..abf647b50 100644 --- a/dependency-injection/README.md +++ b/dependency-injection/README.md @@ -9,12 +9,78 @@ tags: --- ## Intent -Dependency Injection is a software design pattern in which one or -more dependencies (or services) are injected, or passed by reference, into a -dependent object (or client) and are made part of the client's state. The -pattern separates the creation of a client's dependencies from its own -behavior, which allows program designs to be loosely coupled and to follow the -inversion of control and single responsibility principles. +Dependency Injection is a software design pattern in which one or more dependencies (or services) are injected, or +passed by reference, into a dependent object (or client) and are made part of the client's state. The pattern separates +the creation of a client's dependencies from its own behavior, which allows program designs to be loosely coupled and +to follow the inversion of control and single responsibility principles. + +## Explanation +Real world example + +> The old wizard likes to fill his pipe and smoke tobacco once in a while. However, he doesn't want to depend on a single tobacco brand only but likes to be able to enjoy them all interchangeably. + +In plain words + +> Dependency Injection separates creation of client's dependencies from its own behavior. + +Wikipedia says + +> In software engineering, dependency injection is a technique in which an object receives other objects that it depends on. These other objects are called dependencies. + +**Programmatic Example** + +Let's first introduce the tobacco brands. + +```java +public abstract class Tobacco { + + private static final Logger LOGGER = LoggerFactory.getLogger(Tobacco.class); + + public void smoke(Wizard wizard) { + LOGGER.info("{} smoking {}", wizard.getClass().getSimpleName(), + this.getClass().getSimpleName()); + } +} + +public class SecondBreakfastTobacco extends Tobacco { +} + +public class RivendellTobacco extends Tobacco { +} + +public class OldTobyTobacco extends Tobacco { +} +``` + +Next here's the wizard class hierarchy. + +```java +public interface Wizard { + + void smoke(); +} + +public class AdvancedWizard implements Wizard { + + private Tobacco tobacco; + + public AdvancedWizard(Tobacco tobacco) { + this.tobacco = tobacco; + } + + @Override + public void smoke() { + tobacco.smoke(this); + } +} +``` + +And lastly we can show how easy it is to give the old wizard any brand of tobacco. + +```java + var advancedWizard = new AdvancedWizard(new SecondBreakfastTobacco()); + advancedWizard.smoke(); +``` ## Class diagram ![alt text](./etc/dependency-injection.png "Dependency Injection") @@ -22,5 +88,12 @@ inversion of control and single responsibility principles. ## Applicability Use the Dependency Injection pattern when -* when you need to remove knowledge of concrete implementation from object -* to enable unit testing of classes in isolation using mock objects or stubs +* When you need to remove knowledge of concrete implementation from object +* To enable unit testing of classes in isolation using mock objects or stubs + +## Credits + +* [Dependency Injection Principles, Practices, and Patterns](https://www.amazon.com/gp/product/161729473X/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=161729473X&linkId=57079257a5c7d33755493802f3b884bd) +* [Clean Code: A Handbook of Agile Software Craftsmanship](https://www.amazon.com/gp/product/0132350882/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0132350882&linkCode=as2&tag=javadesignpat-20&linkId=2c390d89cc9e61c01b9e7005c7842871) +* [Java 9 Dependency Injection: Write loosely coupled code with Spring 5 and Guice](https://www.amazon.com/gp/product/1788296257/ref=as_li_tl?ie=UTF8&tag=javadesignpat-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=1788296257&linkId=4e9137a3bf722a8b5b156cce1eec0fc1) +* [Google Guice Tutorial: Open source Java based dependency injection framework](https://www.amazon.com/gp/product/B083P7DZ8M/ref=as_li_tl?ie=UTF8&tag=javadesignpat-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=B083P7DZ8M&linkId=04f0f902c877921e45215b624a124bfe) From 082d63a1b3186bc9dcd60fd2fa0b0f66d90dcf49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Tue, 21 Jul 2020 22:57:11 +0300 Subject: [PATCH 024/225] #590 add explanation for Tolerant Reader --- tolerant-reader/README.md | 188 +++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 4 deletions(-) diff --git a/tolerant-reader/README.md b/tolerant-reader/README.md index c60e75707..a62e5f4cd 100644 --- a/tolerant-reader/README.md +++ b/tolerant-reader/README.md @@ -9,10 +9,189 @@ tags: --- ## Intent -Tolerant Reader is an integration pattern that helps creating -robust communication systems. The idea is to be as tolerant as possible when -reading data from another service. This way, when the communication schema -changes, the readers must not break. +Tolerant Reader is an integration pattern that helps creating robust communication systems. The idea is to be as +tolerant as possible when reading data from another service. This way, when the communication schema changes, the +readers must not break. + +## Explanation +Real world example + +> We are persisting rainbowfish objects to file and later on they need to be restored. What makes it problematic is that rainbowfish data structure is versioned and evolves over time. New version of rainbowfish needs to be able to restore old versions as well. + +In plain words + +> Tolerant Reader pattern is used to create robust communication mechanisms between services. + +[Robustness Principle](https://java-design-patterns.com/principles/#robustness-principle) says + +> Be conservative in what you do, be liberal in what you accept from others + +**Programmatic Example** + +Here's the versioned rainbowfish. Notice how the second version introduces additional properties. + +```java +public class RainbowFish implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + private int age; + private int lengthMeters; + private int weightTons; + + /** + * Constructor. + */ + public RainbowFish(String name, int age, int lengthMeters, int weightTons) { + this.name = name; + this.age = age; + this.lengthMeters = lengthMeters; + this.weightTons = weightTons; + } + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public int getLengthMeters() { + return lengthMeters; + } + + public int getWeightTons() { + return weightTons; + } +} + +public class RainbowFishV2 extends RainbowFish { + + private static final long serialVersionUID = 1L; + + private boolean sleeping; + private boolean hungry; + private boolean angry; + + public RainbowFishV2(String name, int age, int lengthMeters, int weightTons) { + super(name, age, lengthMeters, weightTons); + } + + /** + * Constructor. + */ + public RainbowFishV2(String name, int age, int lengthMeters, int weightTons, boolean sleeping, + boolean hungry, boolean angry) { + this(name, age, lengthMeters, weightTons); + this.sleeping = sleeping; + this.hungry = hungry; + this.angry = angry; + } + + public boolean getSleeping() { + return sleeping; + } + + public boolean getHungry() { + return hungry; + } + + public boolean getAngry() { + return angry; + } +} +``` + +Next we introduce the rainbowfish serializer. This is the class that implements the Tolerant Reader pattern. + +```java +public final class RainbowFishSerializer { + + private RainbowFishSerializer() { + } + + public static void writeV1(RainbowFish rainbowFish, String filename) throws IOException { + var map = Map.of( + "name", rainbowFish.getName(), + "age", String.format("%d", rainbowFish.getAge()), + "lengthMeters", String.format("%d", rainbowFish.getLengthMeters()), + "weightTons", String.format("%d", rainbowFish.getWeightTons()) + ); + + try (var fileOut = new FileOutputStream(filename); + var objOut = new ObjectOutputStream(fileOut)) { + objOut.writeObject(map); + } + } + + public static void writeV2(RainbowFishV2 rainbowFish, String filename) throws IOException { + var map = Map.of( + "name", rainbowFish.getName(), + "age", String.format("%d", rainbowFish.getAge()), + "lengthMeters", String.format("%d", rainbowFish.getLengthMeters()), + "weightTons", String.format("%d", rainbowFish.getWeightTons()), + "angry", Boolean.toString(rainbowFish.getAngry()), + "hungry", Boolean.toString(rainbowFish.getHungry()), + "sleeping", Boolean.toString(rainbowFish.getSleeping()) + ); + + try (var fileOut = new FileOutputStream(filename); + var objOut = new ObjectOutputStream(fileOut)) { + objOut.writeObject(map); + } + } + + public static RainbowFish readV1(String filename) throws IOException, ClassNotFoundException { + Map map; + + try (var fileIn = new FileInputStream(filename); + var objIn = new ObjectInputStream(fileIn)) { + map = (Map) objIn.readObject(); + } + + return new RainbowFish( + map.get("name"), + Integer.parseInt(map.get("age")), + Integer.parseInt(map.get("lengthMeters")), + Integer.parseInt(map.get("weightTons")) + ); + } +} +``` + +And finally here's the full example in action. + +```java + var fishV1 = new RainbowFish("Zed", 10, 11, 12); + LOGGER.info("fishV1 name={} age={} length={} weight={}", fishV1.getName(), + fishV1.getAge(), fishV1.getLengthMeters(), fishV1.getWeightTons()); + RainbowFishSerializer.writeV1(fishV1, "fish1.out"); + + var deserializedRainbowFishV1 = RainbowFishSerializer.readV1("fish1.out"); + LOGGER.info("deserializedFishV1 name={} age={} length={} weight={}", + deserializedRainbowFishV1.getName(), deserializedRainbowFishV1.getAge(), + deserializedRainbowFishV1.getLengthMeters(), deserializedRainbowFishV1.getWeightTons()); + + var fishV2 = new RainbowFishV2("Scar", 5, 12, 15, true, true, true); + LOGGER.info( + "fishV2 name={} age={} length={} weight={} sleeping={} hungry={} angry={}", + fishV2.getName(), fishV2.getAge(), fishV2.getLengthMeters(), fishV2.getWeightTons(), + fishV2.getHungry(), fishV2.getAngry(), fishV2.getSleeping()); + RainbowFishSerializer.writeV2(fishV2, "fish2.out"); + + var deserializedFishV2 = RainbowFishSerializer.readV1("fish2.out"); + LOGGER.info("deserializedFishV2 name={} age={} length={} weight={}", + deserializedFishV2.getName(), deserializedFishV2.getAge(), + deserializedFishV2.getLengthMeters(), deserializedFishV2.getWeightTons()); + + // fishV1 name=Zed age=10 length=11 weight=12 + // deserializedFishV1 name=Zed age=10 length=11 weight=12 + // fishV2 name=Scar age=5 length=12 weight=15 sleeping=true hungry=true angry=true + // deserializedFishV2 name=Scar age=5 length=12 weight=15 +``` + ## Class diagram ![alt text](./etc/tolerant-reader.png "Tolerant Reader") @@ -25,3 +204,4 @@ Use the Tolerant Reader pattern when ## Credits * [Martin Fowler - Tolerant Reader](http://martinfowler.com/bliki/TolerantReader.html) +* [Service Design Patterns: Fundamental Design Solutions for SOAP/WSDL and RESTful Web Services](https://www.amazon.com/gp/product/032154420X/ref=as_li_tl?ie=UTF8&tag=javadesignpat-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=032154420X&linkId=94f9516e747ac2b449a959d5b096c73c) From 8982392feaf0e65777fe615936345600ab238294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Wed, 22 Jul 2020 20:31:56 +0300 Subject: [PATCH 025/225] #590 add explanation for Throttling --- throttling/README.md | 163 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/throttling/README.md b/throttling/README.md index 12090c5e3..f3ef43c17 100644 --- a/throttling/README.md +++ b/throttling/README.md @@ -11,6 +11,164 @@ tags: ## Intent Ensure that a given client is not able to access service resources more than the assigned limit. +## Explanation +Real world example + +> A large multinational corporation offers API to its customers. The API is rate-limited and each customer can only make certain amount of calls per second. + +In plain words + +> Throttling pattern is used to rate-limit access to a resource. + +[Microsoft documentation](https://docs.microsoft.com/en-us/azure/architecture/patterns/throttling) says + +> Control the consumption of resources used by an instance of an application, an individual tenant, or an entire service. This can allow the system to continue to function and meet service level agreements, even when an increase in demand places an extreme load on resources. + +**Programmatic Example** + +Tenant class presents the clients of the API. CallsCount tracks the number of API calls per tenant. + +```java +public class Tenant { + + private String name; + private int allowedCallsPerSecond; + + public Tenant(String name, int allowedCallsPerSecond, CallsCount callsCount) { + if (allowedCallsPerSecond < 0) { + throw new InvalidParameterException("Number of calls less than 0 not allowed"); + } + this.name = name; + this.allowedCallsPerSecond = allowedCallsPerSecond; + callsCount.addTenant(name); + } + + public String getName() { + return name; + } + + public int getAllowedCallsPerSecond() { + return allowedCallsPerSecond; + } +} + +public final class CallsCount { + + private static final Logger LOGGER = LoggerFactory.getLogger(CallsCount.class); + private Map tenantCallsCount = new ConcurrentHashMap<>(); + + public void addTenant(String tenantName) { + tenantCallsCount.putIfAbsent(tenantName, new AtomicLong(0)); + } + + public void incrementCount(String tenantName) { + tenantCallsCount.get(tenantName).incrementAndGet(); + } + + public long getCount(String tenantName) { + return tenantCallsCount.get(tenantName).get(); + } + + public void reset() { + LOGGER.debug("Resetting the map."); + tenantCallsCount.replaceAll((k, v) -> new AtomicLong(0)); + } +} +``` + +Next we introduce the service that the tenants are calling. To track the call count we use the throttler timer. + +```java +public interface Throttler { + + void start(); +} + +public class ThrottleTimerImpl implements Throttler { + + private final int throttlePeriod; + private final CallsCount callsCount; + + public ThrottleTimerImpl(int throttlePeriod, CallsCount callsCount) { + this.throttlePeriod = throttlePeriod; + this.callsCount = callsCount; + } + + @Override + public void start() { + new Timer(true).schedule(new TimerTask() { + @Override + public void run() { + callsCount.reset(); + } + }, 0, throttlePeriod); + } +} + +class B2BService { + + private static final Logger LOGGER = LoggerFactory.getLogger(B2BService.class); + private final CallsCount callsCount; + + public B2BService(Throttler timer, CallsCount callsCount) { + this.callsCount = callsCount; + timer.start(); + } + + public int dummyCustomerApi(Tenant tenant) { + var tenantName = tenant.getName(); + var count = callsCount.getCount(tenantName); + LOGGER.debug("Counter for {} : {} ", tenant.getName(), count); + if (count >= tenant.getAllowedCallsPerSecond()) { + LOGGER.error("API access per second limit reached for: {}", tenantName); + return -1; + } + callsCount.incrementCount(tenantName); + return getRandomCustomerId(); + } + + private int getRandomCustomerId() { + return ThreadLocalRandom.current().nextInt(1, 10000); + } +} +``` + +Now we are ready to see the full example in action. Tenant Adidas is rate-limited to 5 calls per second and Nike to 6. + +```java + public static void main(String[] args) { + var callsCount = new CallsCount(); + var adidas = new Tenant("Adidas", 5, callsCount); + var nike = new Tenant("Nike", 6, callsCount); + + var executorService = Executors.newFixedThreadPool(2); + executorService.execute(() -> makeServiceCalls(adidas, callsCount)); + executorService.execute(() -> makeServiceCalls(nike, callsCount)); + executorService.shutdown(); + + try { + executorService.awaitTermination(10, TimeUnit.SECONDS); + } catch (InterruptedException e) { + LOGGER.error("Executor Service terminated: {}", e.getMessage()); + } + } + + private static void makeServiceCalls(Tenant tenant, CallsCount callsCount) { + var timer = new ThrottleTimerImpl(10, callsCount); + var service = new B2BService(timer, callsCount); + // Sleep is introduced to keep the output in check and easy to view and analyze the results. + IntStream.range(0, 20).forEach(i -> { + service.dummyCustomerApi(tenant); + try { + Thread.sleep(1); + } catch (InterruptedException e) { + LOGGER.error("Thread interrupted: {}", e.getMessage()); + } + }); + } +``` + + ## Class diagram ![alt text](./etc/throttling-pattern.png "Throttling pattern class diagram") @@ -19,3 +177,8 @@ The Throttling pattern should be used: * When a service access needs to be restricted to not have high impacts on the performance of the service. * When multiple clients are consuming the same service resources and restriction has to be made according to the usage per client. + +## Credits + +* [Throttling pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/throttling) +* [Cloud Design Patterns: Prescriptive Architecture Guidance for Cloud Applications (Microsoft patterns & practices)](https://www.amazon.com/gp/product/B00ITGHBBS/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=B00ITGHBBS&linkId=12aacdd0cec04f372e7152689525631a) From 9db997d0aee466000b26c2cd56e2f19e0a6db8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Wed, 22 Jul 2020 20:59:14 +0300 Subject: [PATCH 026/225] #590 add explanation for Thread Pool --- thread-pool/README.md | 145 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/thread-pool/README.md b/thread-pool/README.md index 0e125176d..62a2a3339 100644 --- a/thread-pool/README.md +++ b/thread-pool/README.md @@ -15,6 +15,146 @@ the system spend more time creating and destroying the threads than executing the actual tasks. Thread Pool solves this problem by reusing existing threads and eliminating the latency of creating new threads. +## Explanation +Real world example + +> We have a large number of relatively short tasks at hand. We need to peel huge amounts of potatoes and serve mighty amount of coffee cups. Creating a new thread for each task would be a waste so we establish a thread pool. + +In plain words + +> Thread Pool is a concurrency pattern where threads are allocated once and reused between tasks. + +Wikipedia says + +> In computer programming, a thread pool is a software design pattern for achieving concurrency of execution in a computer program. Often also called a replicated workers or worker-crew model, a thread pool maintains multiple threads waiting for tasks to be allocated for concurrent execution by the supervising program. By maintaining a pool of threads, the model increases performance and avoids latency in execution due to frequent creation and destruction of threads for short-lived tasks. The number of available threads is tuned to the computing resources available to the program, such as a parallel task queue after completion of execution. + +**Programmatic Example** + +Let's first look at our task hierarchy. We have a base class and then concrete CoffeeMakingTask and PotatoPeelingTask. + +```java +public abstract class Task { + + private static final AtomicInteger ID_GENERATOR = new AtomicInteger(); + + private final int id; + private final int timeMs; + + public Task(final int timeMs) { + this.id = ID_GENERATOR.incrementAndGet(); + this.timeMs = timeMs; + } + + public int getId() { + return id; + } + + public int getTimeMs() { + return timeMs; + } + + @Override + public String toString() { + return String.format("id=%d timeMs=%d", id, timeMs); + } +} + +public class CoffeeMakingTask extends Task { + + private static final int TIME_PER_CUP = 100; + + public CoffeeMakingTask(int numCups) { + super(numCups * TIME_PER_CUP); + } + + @Override + public String toString() { + return String.format("%s %s", this.getClass().getSimpleName(), super.toString()); + } +} + +public class PotatoPeelingTask extends Task { + + private static final int TIME_PER_POTATO = 200; + + public PotatoPeelingTask(int numPotatoes) { + super(numPotatoes * TIME_PER_POTATO); + } + + @Override + public String toString() { + return String.format("%s %s", this.getClass().getSimpleName(), super.toString()); + } +} +``` + +Next we present a runnable Worker class that the thread pool will utilize to handle all the potato peeling and coffee +making. + +```java +public class Worker implements Runnable { + + private static final Logger LOGGER = LoggerFactory.getLogger(Worker.class); + + private final Task task; + + public Worker(final Task task) { + this.task = task; + } + + @Override + public void run() { + LOGGER.info("{} processing {}", Thread.currentThread().getName(), task.toString()); + try { + Thread.sleep(task.getTimeMs()); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } +} +``` + +Now we are ready to show the full example in action. + +```java + LOGGER.info("Program started"); + + // Create a list of tasks to be executed + var tasks = List.of( + new PotatoPeelingTask(3), + new PotatoPeelingTask(6), + new CoffeeMakingTask(2), + new CoffeeMakingTask(6), + new PotatoPeelingTask(4), + new CoffeeMakingTask(2), + new PotatoPeelingTask(4), + new CoffeeMakingTask(9), + new PotatoPeelingTask(3), + new CoffeeMakingTask(2), + new PotatoPeelingTask(4), + new CoffeeMakingTask(2), + new CoffeeMakingTask(7), + new PotatoPeelingTask(4), + new PotatoPeelingTask(5)); + + // Creates a thread pool that reuses a fixed number of threads operating off a shared + // unbounded queue. At any point, at most nThreads threads will be active processing + // tasks. If additional tasks are submitted when all threads are active, they will wait + // in the queue until a thread is available. + var executor = Executors.newFixedThreadPool(3); + + // Allocate new worker for each task + // The worker is executed when a thread becomes + // available in the thread pool + tasks.stream().map(Worker::new).forEach(executor::execute); + // All tasks were executed, now shutdown + executor.shutdown(); + while (!executor.isTerminated()) { + Thread.yield(); + } + LOGGER.info("Program finished"); +``` + ## Class diagram ![alt text](./etc/thread-pool.png "Thread Pool") @@ -22,3 +162,8 @@ and eliminating the latency of creating new threads. Use the Thread Pool pattern when * You have a large number of short-lived tasks to be executed in parallel + +## Credits + +* [Effective Java](https://www.amazon.com/gp/product/0134685997/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=0134685997&linkId=e1b9ddd5e669591642c4f30d40cd9f6b) +* [Java Concurrency in Practice](https://www.amazon.com/gp/product/0321349601/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=0321349601&linkId=fbedb3bad3c6cbead5afa56eea39ed59) From 1886a6f969b03dbc56c2bc9907b6e41a6c1cfdd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Wed, 22 Jul 2020 21:34:44 +0300 Subject: [PATCH 027/225] #590 add explanation for Game Loop --- game-loop/README.md | 216 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 205 insertions(+), 11 deletions(-) diff --git a/game-loop/README.md b/game-loop/README.md index f0a7eeebb..5f2cd9653 100644 --- a/game-loop/README.md +++ b/game-loop/README.md @@ -9,33 +9,227 @@ tags: --- ## Intent -A game loop runs continuously during gameplay. Each turn of the loop, it processes user input without blocking, updates the game state, and renders the game. It tracks the passage of time to control the rate of gameplay. +A game loop runs continuously during gameplay. Each turn of the loop, it processes user input without blocking, updates +the game state, and renders the game. It tracks the passage of time to control the rate of gameplay. -This pattern decouple the progression of game time from user input and processor speed. +This pattern decouples progression of game time from user input and processor speed. ## Applicability This pattern is used in every game engine. ## Explanation -Game loop is the main process of all the game rendering threads. It drives input process, internal status update, rendering, AI and all the other processes. +Real world example -There are a lot of implementations of game loop: +> Game loop is the main process of all the game rendering threads. It's present in all modern games. It drives input process, internal status update, rendering, AI and all the other processes. -- Frame-based game loop +In plain words -Frame-based game loop is the easiest implementation. The loop always keeps spinning for the following three processes: processInput, update and render. The problem with it is you have no control over how fast the game runs. On a fast machine, that loop will spin so fast users won’t be able to see what’s going on. On a slow machine, the game will crawl. If you have a part of the game that’s content-heavy or does more AI or physics, the game will actually play slower there. +> Game Loop pattern ensures that game time progresses in equal speed in all different hardware setups. -- Variable-step game loop +Wikipedia says -The variable-step game loop chooses a time step to advance based on how much real time passed since the last frame. The longer the frame takes, the bigger steps the game takes. It always keeps up with real time because it will take bigger and bigger steps to get there. +> The central component of any game, from a programming standpoint, is the game loop. The game loop allows the game to run smoothly regardless of a user's input or lack thereof. -- Fixed-step game loop +**Programmatic Example** -For fixed-step game loop, a certain amount of real time has elapsed since the last turn of the game loop. This is how much game time need to be simulated for the game’s “now” to catch up with the player’s. +Let's start with something simple. Here's a bullet that will move in our game. For demonstration it's enough that it has 1-dimensional position. + +```java +public class Bullet { + + private float position; + + public Bullet() { + position = 0.0f; + } + + public float getPosition() { + return position; + } + + public void setPosition(float position) { + this.position = position; + } +} +``` + +GameController is responsible for moving objects in the game. Including the aforementioned bullet. + +```java +public class GameController { + + protected final Bullet bullet; + + public GameController() { + bullet = new Bullet(); + } + + public void moveBullet(float offset) { + var currentPosition = bullet.getPosition(); + bullet.setPosition(currentPosition + offset); + } + + public float getBulletPosition() { + return bullet.getPosition(); + } +} +``` + +Now we introduce the game loop. Or actually in this demo we have 3 different game loops. + +```java +public enum GameStatus { + + RUNNING, STOPPED +} + +public abstract class GameLoop { + + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); + + protected volatile GameStatus status; + + protected GameController controller; + + private Thread gameThread; + + public GameLoop() { + controller = new GameController(); + status = GameStatus.STOPPED; + } + + public void run() { + status = GameStatus.RUNNING; + gameThread = new Thread(() -> processGameLoop()); + gameThread.start(); + } + + public void stop() { + status = GameStatus.STOPPED; + } + + public boolean isGameRunning() { + return status == GameStatus.RUNNING; + } + + protected void processInput() { + try { + var lag = new Random().nextInt(200) + 50; + Thread.sleep(lag); + } catch (InterruptedException e) { + logger.error(e.getMessage()); + } + } + + protected void render() { + var position = controller.getBulletPosition(); + logger.info("Current bullet position: " + position); + } + + protected abstract void processGameLoop(); +} + +public class FrameBasedGameLoop extends GameLoop { + + @Override + protected void processGameLoop() { + while (isGameRunning()) { + processInput(); + update(); + render(); + } + } + + protected void update() { + controller.moveBullet(0.5f); + } +} + +public class VariableStepGameLoop extends GameLoop { + + @Override + protected void processGameLoop() { + var lastFrameTime = System.currentTimeMillis(); + while (isGameRunning()) { + processInput(); + var currentFrameTime = System.currentTimeMillis(); + var elapsedTime = currentFrameTime - lastFrameTime; + update(elapsedTime); + lastFrameTime = currentFrameTime; + render(); + } + } + + protected void update(Long elapsedTime) { + controller.moveBullet(0.5f * elapsedTime / 1000); + } +} + +public class FixedStepGameLoop extends GameLoop { + + private static final long MS_PER_FRAME = 20; + + @Override + protected void processGameLoop() { + var previousTime = System.currentTimeMillis(); + var lag = 0L; + while (isGameRunning()) { + var currentTime = System.currentTimeMillis(); + var elapsedTime = currentTime - previousTime; + previousTime = currentTime; + lag += elapsedTime; + + processInput(); + + while (lag >= MS_PER_FRAME) { + update(); + lag -= MS_PER_FRAME; + } + + render(); + } + } + + protected void update() { + controller.moveBullet(0.5f * MS_PER_FRAME / 1000); + } +} +``` + +Finally we can show all these game loops in action. + +```java + try { + LOGGER.info("Start frame-based game loop:"); + var frameBasedGameLoop = new FrameBasedGameLoop(); + frameBasedGameLoop.run(); + Thread.sleep(GAME_LOOP_DURATION_TIME); + frameBasedGameLoop.stop(); + LOGGER.info("Stop frame-based game loop."); + + LOGGER.info("Start variable-step game loop:"); + var variableStepGameLoop = new VariableStepGameLoop(); + variableStepGameLoop.run(); + Thread.sleep(GAME_LOOP_DURATION_TIME); + variableStepGameLoop.stop(); + LOGGER.info("Stop variable-step game loop."); + + LOGGER.info("Start fixed-step game loop:"); + var fixedStepGameLoop = new FixedStepGameLoop(); + fixedStepGameLoop.run(); + Thread.sleep(GAME_LOOP_DURATION_TIME); + fixedStepGameLoop.stop(); + LOGGER.info("Stop variable-step game loop."); + + } catch (InterruptedException e) { + LOGGER.error(e.getMessage()); + } +``` ## Class diagram ![alt text](./etc/game-loop.urm.png "Game Loop pattern class diagram") ## Credits - * [Game Programming Patterns - Game Loop](http://gameprogrammingpatterns.com/game-loop.html) +* [Game Programming Patterns](https://www.amazon.com/gp/product/0990582906/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=0990582906&linkId=1289749a703b3fe0e24cd8d604d7c40b) +* [Game Engine Architecture, Third Edition](https://www.amazon.com/gp/product/1138035459/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1138035459&linkId=94502746617211bc40e0ef49d29333ac) From 645fb20730bd7d9381813773abdb269ad95703a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Thu, 23 Jul 2020 17:50:20 +0300 Subject: [PATCH 028/225] #590 improve Retry explanation --- retry/README.md | 61 ++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/retry/README.md b/retry/README.md index 0f8345412..fa56c1240 100644 --- a/retry/README.md +++ b/retry/README.md @@ -8,16 +8,12 @@ tags: - Performance --- -## Retry / resiliency -Enables an application to handle transient failures from external resources. - ## Intent -Transparently retry certain operations that involve communication with external -resources, particularly over the network, isolating calling code from the -retry implementation details. +Transparently retry certain operations that involve communication with external resources, particularly over the +network, isolating calling code from the retry implementation details. ## Explanation -The `Retry` pattern consists retrying operations on remote resources over the +Retry pattern consists retrying operations on remote resources over the network a set number of times. It closely depends on both business and technical requirements: how much time will the business allow the end user to wait while the operation finishes? What are the performance characteristics of the @@ -30,11 +26,7 @@ Another concern is the impact on the calling code by implementing the retry mechanism. The retry mechanics should ideally be completely transparent to the calling code (service interface remains unaltered). There are two general approaches to this problem: from an enterprise architecture standpoint -(**strategic**), and a shared library standpoint (**tactical**). - -*(As an aside, one interesting property is that, since implementations tend to -be configurable at runtime, daily monitoring and operation of this capability -is shifted over to operations support instead of the developers themselves.)* +(strategic), and a shared library standpoint (tactical). From a strategic point of view, this would be solved by having requests be redirected to a separate intermediary system, traditionally an @@ -42,11 +34,26 @@ be redirected to a separate intermediary system, traditionally an a [Service Mesh](https://medium.com/microservices-in-practice/service-mesh-for-microservices-2953109a3c9a). From a tactical point of view, this would be solved by reusing shared libraries -like [Hystrix](https://github.com/Netflix/Hystrix)[1]. This is the type of -solution showcased in the simple example that accompanies this *README*. +like [Hystrix](https://github.com/Netflix/Hystrix) (please note that *Hystrix* is a complete implementation of +the [Circuit Breaker](https://java-design-patterns.com/patterns/circuit-breaker/) pattern, of which the Retry pattern +can be considered a subset of.). This is the type of solution showcased in the simple example that accompanies this +*README*. -In our hypothetical application, we have a generic interface for all -operations on remote interfaces: +Real world example + +> Our application uses a service providing customer information. Once in a while the service seems to be flaky and can return errors or sometimes it just times out. To circumvent these problems we apply the retry pattern. + +In plain words + +> Retry pattern transparently retries failed operations over network. + +[Microsoft documentation](https://docs.microsoft.com/en-us/azure/architecture/patterns/retry) says + +> Enable an application to handle transient failures when it tries to connect to a service or network resource, by transparently retrying a failed operation. This can improve the stability of the application. + +**Programmatic Example** + +In our hypothetical application, we have a generic interface for all operations on remote interfaces. ```java public interface BusinessOperation { @@ -54,8 +61,7 @@ public interface BusinessOperation { } ``` -And we have an implementation of this interface that finds our customers -by looking up a database: +And we have an implementation of this interface that finds our customers by looking up a database. ```java public final class FindCustomer implements BusinessOperation { @@ -122,20 +128,12 @@ more importantly we did *not* instruct our `Retry` to ignore, then the operation would have failed immediately upon receiving the error, not matter how many attempts were left. -

- -[1] Please note that *Hystrix* is a complete implementation of the *Circuit -Breaker* pattern, of which the *Retry* pattern can be considered a subset of. - ## Class diagram ![alt text](./etc/retry.png "Retry") ## Applicability -Whenever an application needs to communicate with an external resource, -particularly in a cloud environment, and if the business requirements allow it. - -## Presentations -You can view Microsoft's article [here](https://docs.microsoft.com/en-us/azure/architecture/patterns/retry). +Whenever an application needs to communicate with an external resource, particularly in a cloud environment, and if +the business requirements allow it. ## Consequences **Pros:** @@ -150,4 +148,9 @@ You can view Microsoft's article [here](https://docs.microsoft.com/en-us/azure/a ## Related Patterns -* [Circuit Breaker](https://martinfowler.com/bliki/CircuitBreaker.html) +* [Circuit Breaker](https://java-design-patterns.com/patterns/circuit-breaker/) + +## Credits + +* [Retry pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/retry) +* [Cloud Design Patterns: Prescriptive Architecture Guidance for Cloud Applications](https://www.amazon.com/gp/product/1621140369/ref=as_li_tl?ie=UTF8&tag=javadesignpat-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=1621140369&linkId=3e3f686af5e60a7a453b48adb286797b) From 9deb587c52175b0e340a5213b3db08c983e0c798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Thu, 23 Jul 2020 18:27:00 +0300 Subject: [PATCH 029/225] #590 add explanation for Fluent Interface --- fluentinterface/README.md | 136 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 131 insertions(+), 5 deletions(-) diff --git a/fluentinterface/README.md b/fluentinterface/README.md index 3068468b9..61c5f2eb5 100644 --- a/fluentinterface/README.md +++ b/fluentinterface/README.md @@ -9,26 +9,151 @@ tags: --- ## Intent -A fluent interface provides an easy-readable, flowing interface, that often mimics a domain specific language. Using this pattern results in code that can be read nearly as human language. +A fluent interface provides an easy-readable, flowing interface, that often mimics a domain specific language. Using +this pattern results in code that can be read nearly as human language. -## Implementation +## Explanation +The Fluent Interface pattern is useful when you want to provide an easy readable, flowing API. Those interfaces tend +to mimic domain specific languages, so they can nearly be read as human languages. + A fluent interface can be implemented using any of * Method Chaining - calling a method returns some object on which further methods can be called. * Static Factory Methods and Imports * Named parameters - can be simulated in Java using static factory methods. +Real world example + +> We need to select numbers based on different criteria from the list. It's a great chance to utilize fluent interface pattern to provide readable easy-to-use developer experience. + +In plain words + +> Fluent Interface pattern provides easily readable flowing interface to code. + +Wikipedia says + +> In software engineering, a fluent interface is an object-oriented API whose design relies extensively on method chaining. Its goal is to increase code legibility by creating a domain-specific language (DSL). + +**Programmatic Example** + +In this example two implementations of a `FluentIterable` interface are given. + +```java +public interface FluentIterable extends Iterable { + + FluentIterable filter(Predicate predicate); + + Optional first(); + + FluentIterable first(int count); + + Optional last(); + + FluentIterable last(int count); + + FluentIterable map(Function function); + + List asList(); + + static List copyToList(Iterable iterable) { + var copy = new ArrayList(); + iterable.forEach(copy::add); + return copy; + } +} +``` + +The `SimpleFluentIterable` evaluates eagerly and would be too costly for real world applications. + +```java +public class SimpleFluentIterable implements FluentIterable { + ... +} +``` + +The `LazyFluentIterable` is evaluated on termination. + +```java +public class LazyFluentIterable implements FluentIterable { + ... +} +``` + +Their usage is demonstrated with a simple number list that is filtered, transformed and collected. The +result is printed afterwards. + +```java + var integerList = List.of(1, -61, 14, -22, 18, -87, 6, 64, -82, 26, -98, 97, 45, 23, 2, -68); + + prettyPrint("The initial list contains: ", integerList); + + var firstFiveNegatives = SimpleFluentIterable + .fromCopyOf(integerList) + .filter(negatives()) + .first(3) + .asList(); + prettyPrint("The first three negative values are: ", firstFiveNegatives); + + + var lastTwoPositives = SimpleFluentIterable + .fromCopyOf(integerList) + .filter(positives()) + .last(2) + .asList(); + prettyPrint("The last two positive values are: ", lastTwoPositives); + + SimpleFluentIterable + .fromCopyOf(integerList) + .filter(number -> number % 2 == 0) + .first() + .ifPresent(evenNumber -> LOGGER.info("The first even number is: {}", evenNumber)); + + + var transformedList = SimpleFluentIterable + .fromCopyOf(integerList) + .filter(negatives()) + .map(transformToString()) + .asList(); + prettyPrint("A string-mapped list of negative numbers contains: ", transformedList); + + + var lastTwoOfFirstFourStringMapped = LazyFluentIterable + .from(integerList) + .filter(positives()) + .first(4) + .last(2) + .map(number -> "String[" + valueOf(number) + "]") + .asList(); + prettyPrint("The lazy list contains the last two of the first four positive numbers " + + "mapped to Strings: ", lastTwoOfFirstFourStringMapped); + + LazyFluentIterable + .from(integerList) + .filter(negatives()) + .first(2) + .last() + .ifPresent(number -> LOGGER.info("Last amongst first two negatives: {}", number)); + + // The initial list contains: 1, -61, 14, -22, 18, -87, 6, 64, -82, 26, -98, 97, 45, 23, 2, -68. + // The first three negative values are: -61, -22, -87. + // The last two positive values are: 23, 2. + // The first even number is: 14 + // A string-mapped list of negative numbers contains: String[-61], String[-22], String[-87], String[-82], String[-98], String[-68]. + // The lazy list contains the last two of the first four positive numbers mapped to Strings: String[18], String[6]. + // Last amongst first two negatives: -22 +``` + ## Class diagram ![Fluent Interface](./etc/fluentinterface.png "Fluent Interface") ## Applicability Use the Fluent Interface pattern when -* you provide an API that would benefit from a DSL-like usage -* you have objects that are difficult to configure or use +* You provide an API that would benefit from a DSL-like usage +* You have objects that are difficult to configure or use -## Real world examples +## Known uses * [Java 8 Stream API](http://www.oracle.com/technetwork/articles/java/ma14-java-se-8-streams-2177646.html) * [Google Guava FluentInterable](https://github.com/google/guava/wiki/FunctionalExplained) @@ -41,3 +166,4 @@ Use the Fluent Interface pattern when * [Fluent Interface - Martin Fowler](http://www.martinfowler.com/bliki/FluentInterface.html) * [Evolutionary architecture and emergent design: Fluent interfaces - Neal Ford](http://www.ibm.com/developerworks/library/j-eaed14/) * [Internal DSL](http://www.infoq.com/articles/internal-dsls-java) +* [Domain Specific Languages](https://www.amazon.com/gp/product/0321712943/ref=as_li_tl?ie=UTF8&tag=javadesignpat-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=0321712943&linkId=ad8351d6f5be7d8b7ecdb650731f85df) From 689486267d975dd9d40932d1f431e85ee73c4dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Thu, 23 Jul 2020 18:53:47 +0300 Subject: [PATCH 030/225] #590 add explanation to Pipeline --- pipeline/README.md | 88 +++++++++++++++++-- .../main/java/com/iluwatar/pipeline/App.java | 3 +- 2 files changed, 84 insertions(+), 7 deletions(-) diff --git a/pipeline/README.md b/pipeline/README.md index bc8f9399a..fd03cd7b9 100644 --- a/pipeline/README.md +++ b/pipeline/README.md @@ -9,7 +9,83 @@ tags: --- ## Intent -Allows processing of data in a series of stages by giving in an initial input and passing the processed output to be used by the next stages. +Allows processing of data in a series of stages by giving in an initial input and passing the processed output to be +used by the next stages. + +## Explanation + +The Pipeline pattern uses ordered stages to process a sequence of input values. Each implemented task is represented by +a stage of the pipeline. You can think of pipelines as similar to assembly lines in a factory, where each item in the +assembly line is constructed in stages. The partially assembled item is passed from one assembly stage to another. The +outputs of the assembly line occur in the same order as that of the inputs. + +Real world example + +> Suppose we wanted to pass through a string to a series of filtering stages and convert it as a char array on the last stage. + +In plain words + +> Pipeline pattern is an assembly line where partial results are passed from one stage to another. + +Wikipedia says + +> In software engineering, a pipeline consists of a chain of processing elements (processes, threads, coroutines, functions, etc.), arranged so that the output of each element is the input of the next; the name is by analogy to a physical pipeline. + +**Programmatic Example** + +The stages of our pipeline are called `Handler`s. + +```java +interface Handler { + O process(I input); +} +``` + +In our string processing example we have 3 different concrete `Handler`s. + +```java +class RemoveAlphabetsHandler implements Handler { + ... +} + +class RemoveDigitsHandler implements Handler { + ... +} + +class ConvertToCharArrayHandler implements Handler { + ... +} +``` + +Here is the `Pipeline` that will gather and execute the handlers one by one. + +```java +class Pipeline { + + private final Handler currentHandler; + + Pipeline(Handler currentHandler) { + this.currentHandler = currentHandler; + } + + Pipeline addHandler(Handler newHandler) { + return new Pipeline<>(input -> newHandler.process(currentHandler.process(input))); + } + + O execute(I input) { + return currentHandler.process(input); + } +} +``` + +And here's the `Pipeline` in action processing the string. + +```java + var filters = new Pipeline<>(new RemoveAlphabetsHandler()) + .addHandler(new RemoveDigitsHandler()) + .addHandler(new ConvertToCharArrayHandler()); + filters.execute("GoYankees123!"); +``` ## Class diagram ![alt text](./etc/pipeline.urm.png "Pipeline pattern class diagram") @@ -21,16 +97,16 @@ Use the Pipeline pattern when you want to * Add readability to complex sequence of operations by providing a fluent builder as an interface * Improve testability of code since stages will most likely be doing a single thing, complying to the [Single Responsibility Principle (SRP)](https://java-design-patterns.com/principles/#single-responsibility-principle) -## Typical Use Case - -* Implement stages and execute them in an ordered manner - -## Real world examples +## Known uses * [java.util.Stream](https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html) * [Maven Build Lifecycle](http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html) * [Functional Java](https://github.com/functionaljava/functionaljava) +## Related patterns + +* [Chain of Responsibility](https://java-design-patterns.com/patterns/chain/) + ## Credits * [The Pipeline Pattern — for fun and profit](https://medium.com/@aaronweatherall/the-pipeline-pattern-for-fun-and-profit-9b5f43a98130) diff --git a/pipeline/src/main/java/com/iluwatar/pipeline/App.java b/pipeline/src/main/java/com/iluwatar/pipeline/App.java index 1b1e443e6..cfbcbafc2 100644 --- a/pipeline/src/main/java/com/iluwatar/pipeline/App.java +++ b/pipeline/src/main/java/com/iluwatar/pipeline/App.java @@ -59,8 +59,9 @@ public class App { then is expected to receive an input of char[] array since that is the type being returned by the previous handler, ConvertToCharArrayHandler. */ - new Pipeline<>(new RemoveAlphabetsHandler()) + var filters = new Pipeline<>(new RemoveAlphabetsHandler()) .addHandler(new RemoveDigitsHandler()) .addHandler(new ConvertToCharArrayHandler()); + filters.execute("GoYankees123!"); } } From 205b87cd9352f303c3ba9165f32286cfc9aef244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Fri, 24 Jul 2020 16:45:28 +0300 Subject: [PATCH 031/225] Improve Prototype description --- prototype/README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/prototype/README.md b/prototype/README.md index c51f5c9bc..472e8330c 100644 --- a/prototype/README.md +++ b/prototype/README.md @@ -10,10 +10,13 @@ tags: --- ## Intent -Specify the kinds of objects to create using a prototypical -instance, and create new objects by copying this prototype. +Specify the kinds of objects to create using a prototypical instance, and create new objects by copying this prototype. ## Explanation + +First it should be noted that Prototype pattern is not used to gain performance benefits. It's only used for creating +new objects from prototype instance. + Real world example > Remember Dolly? The sheep that was cloned! Lets not get into the details but the key point here is that it is all about cloning. From d9ed8a52b50feaa3be97ae991060171adb418650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sat, 25 Jul 2020 14:28:43 +0300 Subject: [PATCH 032/225] Update readme --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 53c9cd7a5..2eabb5e82 100644 --- a/README.md +++ b/README.md @@ -31,19 +31,20 @@ programming tutorials how to implement a specific pattern. We use the most popular battle-proven open source Java technologies. Before you dive into the material, you should be familiar with various -software design principles. +[Software Design Principles](https://java-design-patterns.com/principles/). All designs should be as simple as possible. You should start with KISS, YAGNI, and Do The Simplest Thing That Could Possibly Work principles. Complexity and patterns should only be introduced when they are needed for practical extensibility. -Once you are familiar with these concepts you can start drilling down into -patterns by any of the following approaches +Once you are familiar with these concepts you can start drilling down into the +[available design patterns](https://java-design-patterns.com/patterns/) by any +of the following approaches - - Using difficulty tags, `Difficulty-Beginner`, `Difficulty-Intermediate` & `Difficulty-Expert`. + - Search for a specific pattern by name. Can't find one? Please report a new pattern [here](https://github.com/iluwatar/java-design-patterns/issues). + - Using tags such as `Performance`, `Gang of Four` or `Data access`. - Using pattern categories, `Creational`, `Behavioral`, and others. - - Search for a specific pattern. Can't find one? Please report a new pattern [here](https://github.com/iluwatar/java-design-patterns/issues). Hopefully you find the object oriented solutions presented on this site useful in your architectures and have as much fun learning them as we had developing them. From 2ee5789c7739ecb676f57348320c0d845c1a99af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sat, 25 Jul 2020 15:48:21 +0300 Subject: [PATCH 033/225] #590 explanation for Trampoline --- trampoline/README.md | 129 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 112 insertions(+), 17 deletions(-) diff --git a/trampoline/README.md b/trampoline/README.md index 2356e8715..8831f41e1 100644 --- a/trampoline/README.md +++ b/trampoline/README.md @@ -9,14 +9,111 @@ tags: --- ## Intent -Trampoline pattern is used for implementing algorithms recursively in Java without blowing the stack -and to interleave the execution of functions without hard coding them together -It is possible by representing a computation in one of 2 states : done | more -(completed with result, or a reference to the reminder of the computation, -something like the way a java.util.Supplier does). + +Trampoline pattern is used for implementing algorithms recursively in Java without blowing the stack and to interleave +the execution of functions without hard coding them together. ## Explanation -Trampoline pattern allows to define recursive algorithms by iterative loop. + +Recursion is a frequently adopted technique for solving algorithmic problems in a divide and conquer +style. For example calculating fibonacci accumulating sum and factorials. In these kinds of problems recursion is +more straightforward than their loop counterpart. Furthermore recursion may need less code and looks more concise. +There is a saying that every recursion problem can be solved using a loop with the cost of writing code that is more +difficult to understand. + +However recursion type solutions have one big caveat. For each recursive call it typically needs an intermediate value +stored and there is a limited amount of stack memory available. Running out of stack memory creates a stack overflow +error and halts the program execution. + +Trampoline pattern is a trick that allows us define recursive algorithms in Java without blowing the stack. + +Real world example + +> A recursive Fibonacci calculation without the stack overflow problem using the Trampoline pattern. + +In plain words + +> Trampoline pattern allows recursion without running out of stack memory. + +Wikipedia says + +> In Java, trampoline refers to using reflection to avoid using inner classes, for example in event listeners. The time overhead of a reflection call is traded for the space overhead of an inner class. Trampolines in Java usually involve the creation of a GenericListener to pass events to an outer class. + +**Programmatic Example** + +Here's the `Trampoline` implementation in Java. + +When `get` is called on the returned Trampoline, internally it will iterate calling `jump` on the returned `Trampoline` +as long as the concrete instance returned is `Trampoline`, stopping once the returned instance is `done`. + +```java +public interface Trampoline { + + T get(); + + default Trampoline jump() { + return this; + } + + default T result() { + return get(); + } + + default boolean complete() { + return true; + } + + static Trampoline done(final T result) { + return () -> result; + } + + static Trampoline more(final Trampoline> trampoline) { + return new Trampoline() { + @Override + public boolean complete() { + return false; + } + + @Override + public Trampoline jump() { + return trampoline.result(); + } + + @Override + public T get() { + return trampoline(this); + } + + T trampoline(final Trampoline trampoline) { + return Stream.iterate(trampoline, Trampoline::jump) + .filter(Trampoline::complete) + .findFirst() + .map(Trampoline::result) + .orElseThrow(); + } + }; + } +} +``` + +Using the `Trampoline` to get Fibonacci values. + +```java + public static Trampoline loop(int times, int prod) { + if (times == 0) { + return Trampoline.done(prod); + } else { + return Trampoline.more(() -> loop(times - 1, prod * times)); + } + } + + log.info("start pattern"); + var result = loop(10, 1).result(); + log.info("result {}", result); + + // start pattern + // result 3628800 +``` ## Class diagram ![alt text](./etc/trampoline.urm.png "Trampoline pattern class diagram") @@ -27,18 +124,16 @@ Use the Trampoline pattern when * For implementing tail recursive function. This pattern allows to switch on a stackless operation. * For interleaving the execution of two or more functions on the same thread. -## Known uses(real world examples) +## Known uses -* Trampoline refers to using reflection to avoid using inner classes, for example in event listeners. -The time overhead of a reflection call is traded for the space overhead of an inner class. -Trampolines in Java usually involve the creation of a GenericListener to pass events to an outer class. - - -## Tutorials - -* [Trampolining: a practical guide for awesome Java Developers](https://medium.com/@johnmcclean/trampolining-a-practical-guide-for-awesome-java-developers-4b657d9c3076) -* [Trampoline in java ](http://mindprod.com/jgloss/trampoline.html) +* [cyclops-react](https://github.com/aol/cyclops-react) ## Credits -* [library 'cyclops-react' uses the pattern](https://github.com/aol/cyclops-react) +* [Trampolining: a practical guide for awesome Java Developers](https://medium.com/@johnmcclean/trampolining-a-practical-guide-for-awesome-java-developers-4b657d9c3076) +* [Trampoline in java ](http://mindprod.com/jgloss/trampoline.html) +* [Laziness, trampolines, monoids and other functional amenities: this is not your father's Java](https://www.slideshare.net/mariofusco/lazine) +* [Trampoline implementation](https://github.com/bodar/totallylazy/blob/master/src/com/googlecode/totallylazy/Trampoline.java) +* [What is a trampoline function?](https://stackoverflow.com/questions/189725/what-is-a-trampoline-function) +* [Modern Java in Action: Lambdas, streams, functional and reactive programming](https://www.amazon.com/gp/product/1617293563/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1617293563&linkId=ad53ae6f9f7c0982e759c3527bd2595c) +* [Java 8 in Action: Lambdas, Streams, and functional-style programming](https://www.amazon.com/gp/product/1617291994/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1617291994&linkId=e3e5665b0732c59c9d884896ffe54f4f) From 1eafb46b6160ec36a2f09d5ef2e866e3728b47f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 26 Jul 2020 11:30:42 +0300 Subject: [PATCH 034/225] Update links and tags --- ambassador/README.md | 6 +++--- caching/README.md | 5 +++-- circuit-breaker/README.md | 7 ++++--- cqrs/README.md | 11 ++++++----- event-sourcing/README.md | 4 +++- leader-election/README.md | 2 +- priority-queue/README.md | 8 ++++---- queue-load-leveling/README.md | 3 ++- retry/README.md | 1 + saga/README.md | 1 + sharding/README.md | 2 +- strangler/README.md | 5 ++--- throttling/README.md | 1 + 13 files changed, 32 insertions(+), 24 deletions(-) diff --git a/ambassador/README.md b/ambassador/README.md index 78b3a8856..11abfaf88 100644 --- a/ambassador/README.md +++ b/ambassador/README.md @@ -5,7 +5,8 @@ folder: ambassador permalink: /patterns/ambassador/ categories: Structural tags: - - Decoupling + - Decoupling + - Cloud distributed --- ## Intent @@ -22,8 +23,7 @@ In plain words Microsoft documentation states -> An ambassador service can be thought of as an out-of-process proxy that is co-located with the client. - This pattern can be useful for offloading common client connectivity tasks such as monitoring, logging, routing, security (such as TLS), and resiliency patterns in a language agnostic way. It is often used with legacy applications, or other applications that are difficult to modify, in order to extend their networking capabilities. It can also enable a specialized team to implement those features. +> An ambassador service can be thought of as an out-of-process proxy that is co-located with the client. This pattern can be useful for offloading common client connectivity tasks such as monitoring, logging, routing, security (such as TLS), and resiliency patterns in a language agnostic way. It is often used with legacy applications, or other applications that are difficult to modify, in order to extend their networking capabilities. It can also enable a specialized team to implement those features. **Programmatic Example** diff --git a/caching/README.md b/caching/README.md index 4172cc72a..912f1d218 100644 --- a/caching/README.md +++ b/caching/README.md @@ -5,7 +5,8 @@ folder: caching permalink: /patterns/caching/ categories: Behavioral tags: - - Performance + - Performance + - Cloud distributed --- ## Intent @@ -25,4 +26,4 @@ Use the Caching pattern(s) when * [Write-through, write-around, write-back: Cache explained](http://www.computerweekly.com/feature/Write-through-write-around-write-back-Cache-explained) * [Read-Through, Write-Through, Write-Behind, and Refresh-Ahead Caching](https://docs.oracle.com/cd/E15357_01/coh.360/e15723/cache_rtwtwbra.htm#COHDG5177) -* [Cache-Aside](https://msdn.microsoft.com/en-us/library/dn589799.aspx) +* [Cache-Aside pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/cache-aside) diff --git a/circuit-breaker/README.md b/circuit-breaker/README.md index e0ef7d1fb..ce280a570 100644 --- a/circuit-breaker/README.md +++ b/circuit-breaker/README.md @@ -5,8 +5,9 @@ folder: circuit-breaker permalink: /patterns/circuit-breaker/ categories: Behavioral tags: - - Performance - - Decoupling + - Performance + - Decoupling + - Cloud distributed --- ## Intent @@ -187,4 +188,4 @@ Use the Circuit Breaker pattern when * [Understanding Circuit Breaker Pattern](https://itnext.io/understand-circuitbreaker-design-pattern-with-simple-practical-example-92a752615b42) * [Martin Fowler on Circuit Breaker](https://martinfowler.com/bliki/CircuitBreaker.html) * [Fault tolerance in a high volume, distributed system](https://medium.com/netflix-techblog/fault-tolerance-in-a-high-volume-distributed-system-91ab4faae74a) -* [Microsoft docs](https://docs.microsoft.com/en-us/azure/architecture/patterns/circuit-breaker) +* [Circuit Breaker pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/circuit-breaker) diff --git a/cqrs/README.md b/cqrs/README.md index 431ae6279..017e0a003 100644 --- a/cqrs/README.md +++ b/cqrs/README.md @@ -5,8 +5,8 @@ folder: cqrs permalink: /patterns/cqrs/ categories: Architectural tags: - - Performance - - Cloud distributed + - Performance + - Cloud distributed --- ## Intent @@ -18,12 +18,13 @@ CQRS Command Query Responsibility Segregation - Separate the query side from the ## Applicability Use the CQRS pattern when -* you want to scale the queries and commands independently. -* you want to use different data models for queries and commands. Useful when dealing with complex domains. -* you want to use architectures like event sourcing or task based UI. +* You want to scale the queries and commands independently. +* You want to use different data models for queries and commands. Useful when dealing with complex domains. +* You want to use architectures like event sourcing or task based UI. ## Credits * [Greg Young - CQRS, Task Based UIs, Event Sourcing agh!](http://codebetter.com/gregyoung/2010/02/16/cqrs-task-based-uis-event-sourcing-agh/) * [Martin Fowler - CQRS](https://martinfowler.com/bliki/CQRS.html) * [Oliver Wolf - CQRS for Great Good](https://www.youtube.com/watch?v=Ge53swja9Dw) +* [Command and Query Responsibility Segregation (CQRS) pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/cqrs) diff --git a/event-sourcing/README.md b/event-sourcing/README.md index 5efbbbd02..6d24a40e5 100644 --- a/event-sourcing/README.md +++ b/event-sourcing/README.md @@ -5,7 +5,8 @@ folder: event-sourcing permalink: /patterns/event-sourcing/ categories: Architectural tags: - - Performance + - Performance + - Cloud distributed --- ## Intent @@ -30,3 +31,4 @@ Use the Event Sourcing pattern when * [Martin Fowler - Event Sourcing] (https://martinfowler.com/eaaDev/EventSourcing.html) * [Event Sourcing | Microsoft Docs] (https://docs.microsoft.com/en-us/azure/architecture/patterns/event-sourcing) * [Reference 3: Introducing Event Sourcing] (https://msdn.microsoft.com/en-us/library/jj591559.aspx) +* [Event Sourcing pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/event-sourcing) diff --git a/leader-election/README.md b/leader-election/README.md index 3cfa7a662..85943d5b4 100644 --- a/leader-election/README.md +++ b/leader-election/README.md @@ -30,4 +30,4 @@ Do not use this pattern when ## Credits -* [ Cloud Design Patterns: Prescriptive Architecture Guidance for Cloud Applications](https://docs.microsoft.com/en-us/previous-versions/msp-n-p/dn568104(v=pandp.10)) +* [Leader Election pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/leader-election) diff --git a/priority-queue/README.md b/priority-queue/README.md index c8d1f7773..924d7169f 100644 --- a/priority-queue/README.md +++ b/priority-queue/README.md @@ -6,6 +6,7 @@ permalink: /patterns/priority-queue/ categories: Behavioral tags: - Decoupling + - Cloud distributed --- ## Intent @@ -18,12 +19,11 @@ Applications may delegate specific tasks to other services; for example, to perf ![alt text](./etc/priority-queue.urm.png "Priority Queue pattern class diagram") ## Applicability -Use the Property pattern when +Use the Priority Queue pattern when * The system must handle multiple tasks that might have different priorities. * Different users or tenants should be served with different priority.. -## Real world examples +## Credits -* [ Priority Queue Pattern](https://docs.microsoft.com/en-us/previous-versions/msp-n-p/dn589794(v=pandp.10)) -Microsoft Azure does not provide a queuing mechanism that natively support automatic prioritization of messages through sorting. However, it does provide Azure Service Bus topics and subscriptions, which support a queuing mechanism that provides message filtering, together with a wide range of flexible capabilities that make it ideal for use in almost all priority queue implementations. +* [Priority Queue pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/priority-queue) diff --git a/queue-load-leveling/README.md b/queue-load-leveling/README.md index 3674e7413..5cad88636 100644 --- a/queue-load-leveling/README.md +++ b/queue-load-leveling/README.md @@ -7,6 +7,7 @@ categories: Concurrency tags: - Decoupling - Performance + - Cloud distributed --- ## Intent @@ -32,4 +33,4 @@ for both the task and the service. ## Credits -* [Microsoft Cloud Design Patterns: Queue-Based Load Leveling Pattern](https://msdn.microsoft.com/en-us/library/dn589783.aspx) +* [Queue-Based Load Leveling pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/queue-based-load-leveling) diff --git a/retry/README.md b/retry/README.md index fa56c1240..056674a18 100644 --- a/retry/README.md +++ b/retry/README.md @@ -6,6 +6,7 @@ permalink: /patterns/retry/ categories: Behavioral tags: - Performance + - Cloud distributed --- ## Intent diff --git a/saga/README.md b/saga/README.md index 50aeb7d73..394398f99 100644 --- a/saga/README.md +++ b/saga/README.md @@ -46,3 +46,4 @@ Use the Saga pattern, if: ## Credits - [Pattern: Saga](https://microservices.io/patterns/data/saga.html) +- [Saga distributed transactions pattern](https://docs.microsoft.com/en-us/azure/architecture/reference-architectures/saga/saga) diff --git a/sharding/README.md b/sharding/README.md index 2ee465401..cc2121bb5 100644 --- a/sharding/README.md +++ b/sharding/README.md @@ -26,4 +26,4 @@ This pattern offers the following benefits: ## Credits -* [Cloud Design Patterns: Prescriptive Architecture Guidance for Cloud Applications - Sharding Pattern](https://docs.microsoft.com/en-us/previous-versions/msp-n-p/dn589797(v=pandp.10)?redirectedfrom=MSDN) +* [Sharding pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/sharding) diff --git a/strangler/README.md b/strangler/README.md index 2f157f1d2..667940798 100644 --- a/strangler/README.md +++ b/strangler/README.md @@ -6,6 +6,7 @@ permalink: /patterns/strangler/ categories: Structural tags: - Extensibility + - Cloud distributed --- ## Intent @@ -25,7 +26,5 @@ so usually use it when the system is not so simple. ## Credits -* [Strangler pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/strangler#context-and-problem) +* [Strangler pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/strangler) * [Legacy Application Strangulation : Case Studies](https://paulhammant.com/2013/07/14/legacy-application-strangulation-case-studies/) - - diff --git a/throttling/README.md b/throttling/README.md index f3ef43c17..48e1b1c78 100644 --- a/throttling/README.md +++ b/throttling/README.md @@ -6,6 +6,7 @@ permalink: /patterns/throttling/ categories: Behavioral tags: - Performance + - Cloud distributed --- ## Intent From 0a35cdfbe4b9a3ac90a3b39b7da809c390de1207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 26 Jul 2020 12:10:48 +0300 Subject: [PATCH 035/225] #590 explanation for Unit of Work --- unit-of-work/README.md | 165 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 2 deletions(-) diff --git a/unit-of-work/README.md b/unit-of-work/README.md index 94ef784f5..1f6c7c5b2 100644 --- a/unit-of-work/README.md +++ b/unit-of-work/README.md @@ -7,11 +7,167 @@ permalink: /patterns/unit-of-work/ categories: Architectural tags: - Data access + - Performance --- ## Intent -When a business transaction is completed, all the these updates are sent as one - big unit of work to be persisted in a database in one go so as to minimize database trips. +When a business transaction is completed, all the the updates are sent as one big unit of work to be persisted +in one go to minimize database round-trips. + +## Explanation +Real world example + +> We have a database containing student information. Administrators all over the country are constantly updating this information and it causes high load on the database server. To make the load more manageable we apply to Unit of Work pattern to send many small updates in batches. + +In plain words + +> Unit of Work merges many small database updates in single batch to optimize the number of round-trips. + +[MartinFowler.com](https://martinfowler.com/eaaCatalog/unitOfWork.html) says + +> Maintains a list of objects affected by a business transaction and coordinates the writing out of changes and the resolution of concurrency problems. + +**Programmatic Example** + +Here's the `Student` entity that is being persisted to the database. + +```java +public class Student { + private final Integer id; + private final String name; + private final String address; + + public Student(Integer id, String name, String address) { + this.id = id; + this.name = name; + this.address = address; + } + + public String getName() { + return name; + } + + public Integer getId() { + return id; + } + + public String getAddress() { + return address; + } +} +``` + +The essence of the implementation is the `StudentRepository` implementing the Unit of Work pattern. It maintains a map +of database operations (`context`) that need to be done and when `commit` is called it applies them in single batch. + +```java +public interface IUnitOfWork { + + String INSERT = "INSERT"; + String DELETE = "DELETE"; + String MODIFY = "MODIFY"; + + void registerNew(T entity); + + void registerModified(T entity); + + void registerDeleted(T entity); + + void commit(); +} + +public class StudentRepository implements IUnitOfWork { + private static final Logger LOGGER = LoggerFactory.getLogger(StudentRepository.class); + + private Map> context; + private StudentDatabase studentDatabase; + + public StudentRepository(Map> context, StudentDatabase studentDatabase) { + this.context = context; + this.studentDatabase = studentDatabase; + } + + @Override + public void registerNew(Student student) { + LOGGER.info("Registering {} for insert in context.", student.getName()); + register(student, IUnitOfWork.INSERT); + } + + @Override + public void registerModified(Student student) { + LOGGER.info("Registering {} for modify in context.", student.getName()); + register(student, IUnitOfWork.MODIFY); + + } + + @Override + public void registerDeleted(Student student) { + LOGGER.info("Registering {} for delete in context.", student.getName()); + register(student, IUnitOfWork.DELETE); + } + + private void register(Student student, String operation) { + var studentsToOperate = context.get(operation); + if (studentsToOperate == null) { + studentsToOperate = new ArrayList<>(); + } + studentsToOperate.add(student); + context.put(operation, studentsToOperate); + } + + @Override + public void commit() { + if (context == null || context.size() == 0) { + return; + } + LOGGER.info("Commit started"); + if (context.containsKey(IUnitOfWork.INSERT)) { + commitInsert(); + } + + if (context.containsKey(IUnitOfWork.MODIFY)) { + commitModify(); + } + if (context.containsKey(IUnitOfWork.DELETE)) { + commitDelete(); + } + LOGGER.info("Commit finished."); + } + + private void commitInsert() { + var studentsToBeInserted = context.get(IUnitOfWork.INSERT); + for (var student : studentsToBeInserted) { + LOGGER.info("Saving {} to database.", student.getName()); + studentDatabase.insert(student); + } + } + + private void commitModify() { + var modifiedStudents = context.get(IUnitOfWork.MODIFY); + for (var student : modifiedStudents) { + LOGGER.info("Modifying {} to database.", student.getName()); + studentDatabase.modify(student); + } + } + + private void commitDelete() { + var deletedStudents = context.get(IUnitOfWork.DELETE); + for (var student : deletedStudents) { + LOGGER.info("Deleting {} to database.", student.getName()); + studentDatabase.delete(student); + } + } +} +``` + +Finally here's how we use the `StudentRepository` and `commit` the transaction. + +```java + studentRepository.registerNew(ram); + studentRepository.registerModified(shyam); + studentRepository.registerDeleted(gopi); + studentRepository.commit(); +``` ## Class diagram ![alt text](etc/unit-of-work.urm.png "unit-of-work") @@ -23,6 +179,11 @@ Use the Unit Of Work pattern when * To send changes to database as a unit of work which ensures atomicity of the transaction. * To reduce number of database calls. +## Tutorials + +* [Repository and Unit of Work Pattern](https://www.programmingwithwolfgang.com/repository-and-unit-of-work-pattern/) +* [Unit of Work - a Design Pattern](https://mono.software/2017/01/13/unit-of-work-a-design-pattern/) + ## Credits * [Design Pattern - Unit Of Work Pattern](https://www.codeproject.com/Articles/581487/Unit-of-Work-Design-Pattern) From 3e1a83e29d6242e000c2ec73a2de2db26d749bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 26 Jul 2020 15:53:48 +0300 Subject: [PATCH 036/225] #590 explanation for API Gateway --- api-gateway/README.md | 141 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 6 deletions(-) diff --git a/api-gateway/README.md b/api-gateway/README.md index 3a4f13e35..0d67b8d9b 100644 --- a/api-gateway/README.md +++ b/api-gateway/README.md @@ -5,14 +5,142 @@ folder: api-gateway permalink: /patterns/api-gateway/ categories: Architectural tags: -- Cloud distributed -- Decoupling + - Cloud distributed + - Decoupling + - Microservices --- ## Intent -Aggregate calls to microservices in a single location: the API Gateway. The user makes a single -call to the API Gateway, and the API Gateway then calls each relevant microservice. +Aggregate calls to microservices in a single location: the API Gateway. The user makes a single call to the API Gateway, +and the API Gateway then calls each relevant microservice. + +## Explanation + +With the Microservices pattern, a client may need data from multiple different microservices. If the client called each +microservice directly, that could contribute to longer load times, since the client would have to make a network request +for each microservice called. Moreover, having the client call each microservice directly ties the client to that +microservice - if the internal implementations of the microservices change (for example, if two microservices are +combined sometime in the future) or if the location (host and port) of a microservice changes, then every client that +makes use of those microservices must be updated. + +The intent of the API Gateway pattern is to alleviate some of these issues. In the API Gateway pattern, an additional +entity (the API Gateway) is placed between the client and the microservices. The job of the API Gateway is to aggregate +the calls to the microservices. Rather than the client calling each microservice individually, the client calls the +API Gateway a single time. The API Gateway then calls each of the microservices that the client needs. + +Real world example + +> We are implementing microservices and API Gateway pattern for an e-commerce site. In this system the API Gateway makes +calls to the Image and Price microservices. + +In plain words + +> For a system implemented using microservices architecture, API Gateway is the single entry point that aggregates the +calls to the individual microservices. + +Wikipedia says + +> API Gateway is a server that acts as an API front-end, receives API requests, enforces throttling and security +policies, passes requests to the back-end service and then passes the response back to the requester. A gateway often +includes a transformation engine to orchestrate and modify the requests and responses on the fly. A gateway can also +provide functionality such as collecting analytics data and providing caching. The gateway can provide functionality to +support authentication, authorization, security, audit and regulatory compliance. + +**Programmatic Example** + +This implementation shows what the API Gateway pattern could look like for an e-commerce site. The `ApiGateway` makes +calls to the Image and Price microservices using the `ImageClientImpl` and `PriceClientImpl` respectively. Customers +viewing the site on a desktop device can see both price information and an image of a product, so the `ApiGateway` calls +both of the microservices and aggregates the data in the `DesktopProduct` model. However, mobile users only see price +information; they do not see a product image. For mobile users, the `ApiGateway` only retrieves price information, which +it uses to populate the `MobileProduct`. + +Here's the Image microservice implementation. + +```java +public interface ImageClient { + String getImagePath(); +} + +public class ImageClientImpl implements ImageClient { + + @Override + public String getImagePath() { + var httpClient = HttpClient.newHttpClient(); + var httpGet = HttpRequest.newBuilder() + .GET() + .uri(URI.create("http://localhost:50005/image-path")) + .build(); + + try { + var httpResponse = httpClient.send(httpGet, BodyHandlers.ofString()); + return httpResponse.body(); + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + + return null; + } +} +``` + +Here's the Price microservice implementation. + +```java +public interface PriceClient { + String getPrice(); +} + +public class PriceClientImpl implements PriceClient { + + @Override + public String getPrice() { + var httpClient = HttpClient.newHttpClient(); + var httpGet = HttpRequest.newBuilder() + .GET() + .uri(URI.create("http://localhost:50006/price")) + .build(); + + try { + var httpResponse = httpClient.send(httpGet, BodyHandlers.ofString()); + return httpResponse.body(); + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + + return null; + } +} +``` + +And here we can see how API Gateway maps the requests to the microservices. + +```java +public class ApiGateway { + + @Resource + private ImageClient imageClient; + + @Resource + private PriceClient priceClient; + + @RequestMapping(path = "/desktop", method = RequestMethod.GET) + public DesktopProduct getProductDesktop() { + var desktopProduct = new DesktopProduct(); + desktopProduct.setImagePath(imageClient.getImagePath()); + desktopProduct.setPrice(priceClient.getPrice()); + return desktopProduct; + } + + @RequestMapping(path = "/mobile", method = RequestMethod.GET) + public MobileProduct getProductMobile() { + var mobileProduct = new MobileProduct(); + mobileProduct.setPrice(priceClient.getPrice()); + return mobileProduct; + } +} +``` ## Class diagram ![alt text](./etc/api-gateway.png "API Gateway") @@ -21,10 +149,11 @@ call to the API Gateway, and the API Gateway then calls each relevant microservi Use the API Gateway pattern when -* you're also using the Microservices pattern and need a single point of aggregation for your -microservice calls +* You're using microservices architecture and need a single point of aggregation for your microservice calls. ## Credits * [microservices.io - API Gateway](http://microservices.io/patterns/apigateway.html) * [NGINX - Building Microservices: Using an API Gateway](https://www.nginx.com/blog/building-microservices-using-an-api-gateway/) +* [Microservices Patterns: With examples in Java](https://www.amazon.com/gp/product/1617294543/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1617294543&linkId=ac7b6a57f866ac006a309d9086e8cfbd) +* [Building Microservices: Designing Fine-Grained Systems](https://www.amazon.com/gp/product/1491950358/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1491950358&linkId=4c95ca9831e05e3f0dadb08841d77bf1) From f37d697a606a4d37465cb4959459bffc3d019b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 26 Jul 2020 19:25:25 +0300 Subject: [PATCH 037/225] #590 explanation for Service Layer --- service-layer/README.md | 210 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 204 insertions(+), 6 deletions(-) diff --git a/service-layer/README.md b/service-layer/README.md index 3feaf8395..910eaeaea 100644 --- a/service-layer/README.md +++ b/service-layer/README.md @@ -9,12 +9,210 @@ tags: --- ## Intent -Service Layer is an abstraction over domain logic. Typically -applications require multiple kinds of interfaces to the data they store and -logic they implement: data loaders, user interfaces, integration gateways, and -others. Despite their different purposes, these interfaces often need common -interactions with the application to access and manipulate its data and invoke -its business logic. The Service Layer fulfills this role. + +Service Layer is an abstraction over domain logic. It defines application's boundary with a layer of services that +establishes a set of available operations and coordinates the application's response in each operation. + +## Explanation + +Typically applications require different kinds of interfaces to the data they store and the logic they implement. +Despite their different purposes, these interfaces often need common interactions with the application to access and +manipulate its data and invoke its business logic. Encoding the logic of the interactions separately in each module +causes a lot of duplication. It's better to centralize building the business logic inside single Service Layer to avoid +these pitfalls. + +Real world example + +> We are writing an application that tracks wizards, spellbooks and spells. Wizards may have spellbooks and spellbooks +may have spells. + +In plain words + +> Service Layer is an abstraction over application's business logic. + +Wikipedia says + +> Service layer is an architectural pattern, applied within the service-orientation design paradigm, which aims to +organize the services, within a service inventory, into a set of logical layers. Services that are categorized into +a particular layer share functionality. This helps to reduce the conceptual overhead related to managing the service +inventory, as the services belonging to the same layer address a smaller set of activities. + +**Programmatic Example** + +The example application demonstrates interactions between a client `App` and a service `MagicService` that allows +interaction between wizards, spellbooks and spells. The service is implemented with 3-layer architecture +(entity, dao, service). + +For this explanation we are looking at one vertical slice of the system. Let's start from the entity layer and look at +`Wizard` class. Other entities not shown here are `Spellbook` and `Spell`. + +```java +@Entity +@Table(name = "WIZARD") +public class Wizard extends BaseEntity { + + @Id + @GeneratedValue + @Column(name = "WIZARD_ID") + private Long id; + + private String name; + + @ManyToMany(cascade = CascadeType.ALL) + private Set spellbooks; + + public Wizard() { + spellbooks = new HashSet<>(); + } + + public Wizard(String name) { + this(); + this.name = name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Set getSpellbooks() { + return spellbooks; + } + + public void setSpellbooks(Set spellbooks) { + this.spellbooks = spellbooks; + } + + public void addSpellbook(Spellbook spellbook) { + spellbook.getWizards().add(this); + spellbooks.add(spellbook); + } + + @Override + public String toString() { + return name; + } +} +``` + +Above the entity layer we have DAOs. For `Wizard` the DAO layer looks as follows. + +```java +public interface WizardDao extends Dao { + + Wizard findByName(String name); +} + +public class WizardDaoImpl extends DaoBaseImpl implements WizardDao { + + @Override + public Wizard findByName(String name) { + Transaction tx = null; + Wizard result; + try (var session = getSessionFactory().openSession()) { + tx = session.beginTransaction(); + var criteria = session.createCriteria(persistentClass); + criteria.add(Restrictions.eq("name", name)); + result = (Wizard) criteria.uniqueResult(); + tx.commit(); + } catch (Exception e) { + if (tx != null) { + tx.rollback(); + } + throw e; + } + return result; + } +} +``` + +Next we can look at the Service Layer, which in our case consists of a single `MagicService`. + +```java +public interface MagicService { + + List findAllWizards(); + + List findAllSpellbooks(); + + List findAllSpells(); + + List findWizardsWithSpellbook(String name); + + List findWizardsWithSpell(String name); +} + +public class MagicServiceImpl implements MagicService { + + private WizardDao wizardDao; + private SpellbookDao spellbookDao; + private SpellDao spellDao; + + public MagicServiceImpl(WizardDao wizardDao, SpellbookDao spellbookDao, SpellDao spellDao) { + this.wizardDao = wizardDao; + this.spellbookDao = spellbookDao; + this.spellDao = spellDao; + } + + @Override + public List findAllWizards() { + return wizardDao.findAll(); + } + + @Override + public List findAllSpellbooks() { + return spellbookDao.findAll(); + } + + @Override + public List findAllSpells() { + return spellDao.findAll(); + } + + @Override + public List findWizardsWithSpellbook(String name) { + var spellbook = spellbookDao.findByName(name); + return new ArrayList<>(spellbook.getWizards()); + } + + @Override + public List findWizardsWithSpell(String name) { + var spell = spellDao.findByName(name); + var spellbook = spell.getSpellbook(); + return new ArrayList<>(spellbook.getWizards()); + } +} +``` + +And finally we can show how the client `App` interacts with `MagicService` in the Service Layer. + +```java + var service = new MagicServiceImpl(wizardDao, spellbookDao, spellDao); + LOGGER.info("Enumerating all wizards"); + service.findAllWizards().stream().map(Wizard::getName).forEach(LOGGER::info); + LOGGER.info("Enumerating all spellbooks"); + service.findAllSpellbooks().stream().map(Spellbook::getName).forEach(LOGGER::info); + LOGGER.info("Enumerating all spells"); + service.findAllSpells().stream().map(Spell::getName).forEach(LOGGER::info); + LOGGER.info("Find wizards with spellbook 'Book of Idores'"); + var wizardsWithSpellbook = service.findWizardsWithSpellbook("Book of Idores"); + wizardsWithSpellbook.forEach(w -> LOGGER.info("{} has 'Book of Idores'", w.getName())); + LOGGER.info("Find wizards with spell 'Fireball'"); + var wizardsWithSpell = service.findWizardsWithSpell("Fireball"); + wizardsWithSpell.forEach(w -> LOGGER.info("{} has 'Fireball'", w.getName())); +``` + ## Class diagram ![alt text](./etc/service-layer.png "Service Layer") From 2fdd7a11e93c38d0a3496f09232fa10c51de3f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 26 Jul 2020 22:40:42 +0300 Subject: [PATCH 038/225] SonarQube check runs only in master branch (workaround for https://jira.sonarsource.com/browse/MMF-1371) --- .github/workflows/maven.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 53460c97d..01caaab67 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -46,7 +46,13 @@ jobs: # Some tests need screen access - name: Install xvfb run: sudo apt-get install xvfb + # SonarQube scan does not work for forked repositories + # See https://jira.sonarsource.com/browse/MMF-1371 - name: Build with Maven + if: github.ref != ‘refs/heads/master’ + run: xvfb-run mvn clean verify + - name: Build with Maven and run SonarQube analysis + if: github.ref == ‘refs/heads/master’ run: xvfb-run mvn clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar env: # These two env variables are needed for sonar analysis From eee409f2840d6276826f8577fd5408afa52e7a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 26 Jul 2020 22:44:54 +0300 Subject: [PATCH 039/225] Fix syntax --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 01caaab67..336c103d6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -49,10 +49,10 @@ jobs: # SonarQube scan does not work for forked repositories # See https://jira.sonarsource.com/browse/MMF-1371 - name: Build with Maven - if: github.ref != ‘refs/heads/master’ + if: "github.ref != ‘refs/heads/master’" run: xvfb-run mvn clean verify - name: Build with Maven and run SonarQube analysis - if: github.ref == ‘refs/heads/master’ + if: "github.ref == ‘refs/heads/master’" run: xvfb-run mvn clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar env: # These two env variables are needed for sonar analysis From 4b88214baef78c362806311d88f96bebb0cd4d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 26 Jul 2020 22:47:33 +0300 Subject: [PATCH 040/225] Fix syntax --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 336c103d6..d18cad280 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -49,10 +49,10 @@ jobs: # SonarQube scan does not work for forked repositories # See https://jira.sonarsource.com/browse/MMF-1371 - name: Build with Maven - if: "github.ref != ‘refs/heads/master’" + if: github.ref != 'refs/heads/master' run: xvfb-run mvn clean verify - name: Build with Maven and run SonarQube analysis - if: "github.ref == ‘refs/heads/master’" + if: github.ref == 'refs/heads/master' run: xvfb-run mvn clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar env: # These two env variables are needed for sonar analysis From 54c0b1725c522666e7dbdcb973719cefb7a9daed Mon Sep 17 00:00:00 2001 From: amit1307 Date: Mon, 27 Jul 2020 14:50:32 +0100 Subject: [PATCH 041/225] Fix broken logging in service layer (#1342) --- service-layer/src/main/resources/logback.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/service-layer/src/main/resources/logback.xml b/service-layer/src/main/resources/logback.xml index 47fe42236..e6678aff2 100644 --- a/service-layer/src/main/resources/logback.xml +++ b/service-layer/src/main/resources/logback.xml @@ -43,6 +43,7 @@ + From b62bed7e433591af1585aa13ca8b7aecd1842e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 27 Jul 2020 18:28:12 +0300 Subject: [PATCH 042/225] #590 explanation for Promise --- promise/README.md | 278 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 272 insertions(+), 6 deletions(-) diff --git a/promise/README.md b/promise/README.md index cf3d96c88..993d29a9f 100644 --- a/promise/README.md +++ b/promise/README.md @@ -9,18 +9,277 @@ tags: --- ## Also known as + CompletableFuture ## Intent -A Promise represents a proxy for a value not necessarily known when the promise is created. It -allows you to associate dependent promises to an asynchronous action's eventual success value or -failure reason. Promises are a way to write async code that still appears as though it is executing -in a synchronous way. + +A Promise represents a proxy for a value not necessarily known when the promise is created. It allows you to associate +dependent promises to an asynchronous action's eventual success value or failure reason. Promises are a way to write +async code that still appears as though it is executing in a synchronous way. + +## Explanation + +The Promise object is used for asynchronous computations. A Promise represents an operation that hasn't completed yet, +but is expected in the future. + +Promises provide a few advantages over callback objects: + * Functional composition and error handling + * Prevents callback hell and provides callback aggregation + +Real world example + +> We are developing a software solution that downloads files and calculates the number of lines and character +frequencies in those files. Promise is an ideal solution to make the code concise and easy to understand. + +In plain words + +> Promise is a placeholder for an asynchronous operation that is ongoing. + +Wikipedia says + +> In computer science, future, promise, delay, and deferred refer to constructs used for synchronizing program +execution in some concurrent programming languages. They describe an object that acts as a proxy for a result that is +initially unknown, usually because the computation of its value is not yet complete. + +**Programmatic Example** + +In the example a file is downloaded and its line count is calculated. The calculated line count is then consumed and +printed on console. + +Let's first introduce a support class we need for implementation. Here's `PromiseSupport`. + +```java +class PromiseSupport implements Future { + + private static final Logger LOGGER = LoggerFactory.getLogger(PromiseSupport.class); + + private static final int RUNNING = 1; + private static final int FAILED = 2; + private static final int COMPLETED = 3; + + private final Object lock; + + private volatile int state = RUNNING; + private T value; + private Exception exception; + + PromiseSupport() { + this.lock = new Object(); + } + + void fulfill(T value) { + this.value = value; + this.state = COMPLETED; + synchronized (lock) { + lock.notifyAll(); + } + } + + void fulfillExceptionally(Exception exception) { + this.exception = exception; + this.state = FAILED; + synchronized (lock) { + lock.notifyAll(); + } + } + + @Override + public boolean cancel(boolean mayInterruptIfRunning) { + return false; + } + + @Override + public boolean isCancelled() { + return false; + } + + @Override + public boolean isDone() { + return state > RUNNING; + } + + @Override + public T get() throws InterruptedException, ExecutionException { + synchronized (lock) { + while (state == RUNNING) { + lock.wait(); + } + } + if (state == COMPLETED) { + return value; + } + throw new ExecutionException(exception); + } + + @Override + public T get(long timeout, TimeUnit unit) throws ExecutionException { + synchronized (lock) { + while (state == RUNNING) { + try { + lock.wait(unit.toMillis(timeout)); + } catch (InterruptedException e) { + LOGGER.warn("Interrupted!", e); + Thread.currentThread().interrupt(); + } + } + } + + if (state == COMPLETED) { + return value; + } + throw new ExecutionException(exception); + } +} +``` + +With `PromiseSupport` in place we can implement the actual `Promise`. + +```java +public class Promise extends PromiseSupport { + + private Runnable fulfillmentAction; + private Consumer exceptionHandler; + + public Promise() { + } + + @Override + public void fulfill(T value) { + super.fulfill(value); + postFulfillment(); + } + + @Override + public void fulfillExceptionally(Exception exception) { + super.fulfillExceptionally(exception); + handleException(exception); + postFulfillment(); + } + + private void handleException(Exception exception) { + if (exceptionHandler == null) { + return; + } + exceptionHandler.accept(exception); + } + + private void postFulfillment() { + if (fulfillmentAction == null) { + return; + } + fulfillmentAction.run(); + } + + public Promise fulfillInAsync(final Callable task, Executor executor) { + executor.execute(() -> { + try { + fulfill(task.call()); + } catch (Exception ex) { + fulfillExceptionally(ex); + } + }); + return this; + } + + public Promise thenAccept(Consumer action) { + var dest = new Promise(); + fulfillmentAction = new ConsumeAction(this, dest, action); + return dest; + } + + public Promise onError(Consumer exceptionHandler) { + this.exceptionHandler = exceptionHandler; + return this; + } + + public Promise thenApply(Function func) { + Promise dest = new Promise<>(); + fulfillmentAction = new TransformAction(this, dest, func); + return dest; + } + + private class ConsumeAction implements Runnable { + + private final Promise src; + private final Promise dest; + private final Consumer action; + + private ConsumeAction(Promise src, Promise dest, Consumer action) { + this.src = src; + this.dest = dest; + this.action = action; + } + + @Override + public void run() { + try { + action.accept(src.get()); + dest.fulfill(null); + } catch (Throwable throwable) { + dest.fulfillExceptionally((Exception) throwable.getCause()); + } + } + } + + private class TransformAction implements Runnable { + + private final Promise src; + private final Promise dest; + private final Function func; + + private TransformAction(Promise src, Promise dest, Function func) { + this.src = src; + this.dest = dest; + this.func = func; + } + + @Override + public void run() { + try { + dest.fulfill(func.apply(src.get())); + } catch (Throwable throwable) { + dest.fulfillExceptionally((Exception) throwable.getCause()); + } + } + } +} +``` + +Now we can show the full example in action. Here's how to download and count the number of lines in a file using +`Promise`. + +```java + countLines().thenAccept( + count -> { + LOGGER.info("Line count is: {}", count); + taskCompleted(); + } + ); + + private Promise countLines() { + return download(DEFAULT_URL).thenApply(Utility::countLines); + } + + private Promise download(String urlString) { + return new Promise() + .fulfillInAsync( + () -> Utility.downloadFile(urlString), executor) + .onError( + throwable -> { + throwable.printStackTrace(); + taskCompleted(); + } + ); + } +``` ## Class diagram + ![alt text](./etc/promise.png "Promise") ## Applicability + Promise pattern is applicable in concurrent programming when some work needs to be done asynchronously and: @@ -35,10 +294,17 @@ and: * [Guava ListenableFuture](https://github.com/google/guava/wiki/ListenableFutureExplained) ## Related Patterns - * Async Method Invocation - * Callback + + * [Async Method Invocation](https://java-design-patterns.com/patterns/async-method-invocation/) + * [Callback](https://java-design-patterns.com/patterns/callback/) + +## Tutorials + +* [Guide To CompletableFuture](https://www.baeldung.com/java-completablefuture) ## Credits * [You are missing the point to Promises](https://gist.github.com/domenic/3889970) * [Functional style callbacks using CompletableFuture](https://www.infoq.com/articles/Functional-Style-Callbacks-Using-CompletableFuture) +* [Java 8 in Action: Lambdas, Streams, and functional-style programming](https://www.amazon.com/gp/product/1617291994/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1617291994&linkId=995af46887bb7b65e6c788a23eaf7146) +* [Modern Java in Action: Lambdas, streams, functional and reactive programming](https://www.amazon.com/gp/product/1617293563/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1617293563&linkId=f70fe0d3e1efaff89554a6479c53759c) From ef4de30310fa46c95c562612c3863ddd1200db92 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 20:59:08 +0300 Subject: [PATCH 043/225] docs: add iluwatar as a contributor (#1343) * docs: update README.md [skip ci] * docs: create .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 24 ++++++++++++++++++++++++ README.md | 22 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 .all-contributorsrc diff --git a/.all-contributorsrc b/.all-contributorsrc new file mode 100644 index 000000000..4e92d6568 --- /dev/null +++ b/.all-contributorsrc @@ -0,0 +1,24 @@ +{ + "files": [ + "README.md" + ], + "imageSize": 100, + "commit": false, + "contributors": [ + { + "login": "iluwatar", + "name": "Ilkka Seppälä", + "avatar_url": "https://avatars1.githubusercontent.com/u/582346?v=4", + "profile": "https://github.com/iluwatar", + "contributions": [ + "code" + ] + } + ], + "contributorsPerLine": 7, + "projectName": "java-design-patterns", + "projectOwner": "iluwatar", + "repoType": "github", + "repoHost": "https://github.com", + "skipCi": true +} diff --git a/README.md b/README.md index 2eabb5e82..533eec47e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ +[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-) + that smart and dearly wants an empty line before a heading to be able to display it as such, e.g. website) --> @@ -58,3 +61,22 @@ you and answer your questions in the [Gitter chatroom](https://gitter.im/iluwata # License This project is licensed under the terms of the MIT license. + +## Contributors ✨ + +Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): + + + + + + + + +

Ilkka Seppälä
💻
+ + + + + +This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! \ No newline at end of file From 93c11fdf233e19f75b8a39afa7e7dbd8c2d87157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 27 Jul 2020 21:01:48 +0300 Subject: [PATCH 044/225] Update README.md --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 533eec47e..d7148dde7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@ -[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-) - that smart and dearly wants an empty line before a heading to be able to display it as such, e.g. website) --> @@ -11,6 +8,9 @@ [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/iluwatar/java-design-patterns/master/LICENSE.md) [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) + +[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-) + # Introduction @@ -62,9 +62,7 @@ you and answer your questions in the [Gitter chatroom](https://gitter.im/iluwata This project is licensed under the terms of the MIT license. -## Contributors ✨ - -Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): +# Contributors @@ -79,4 +77,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d -This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! \ No newline at end of file +This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! From b7d122f6146c3ae36750a9eaef0083649749800d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 21:13:13 +0300 Subject: [PATCH 045/225] docs: add iluwatar as a contributor (#1344) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: create .all-contributorsrc [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 3 ++- README.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 4e92d6568..80d7f54b4 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -11,7 +11,8 @@ "avatar_url": "https://avatars1.githubusercontent.com/u/582346?v=4", "profile": "https://github.com/iluwatar", "contributions": [ - "code" + "code", + "projectManagement" ] } ], diff --git a/README.md b/README.md index d7148dde7..55f11e702 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ This project is licensed under the terms of the MIT license. - +

Ilkka Seppälä
💻
Ilkka Seppälä
💻 📆
From ae7a0b8a4a331ccf96d6dbd956c4fd1c541888ed Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 21:17:52 +0300 Subject: [PATCH 046/225] docs: add amit1307 as a contributor (#1345) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 80d7f54b4..d919371f1 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -14,6 +14,15 @@ "code", "projectManagement" ] + }, + { + "login": "amit1307", + "name": "amit1307", + "avatar_url": "https://avatars0.githubusercontent.com/u/23420222?v=4", + "profile": "https://github.com/amit1307", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 55f11e702..04ddf6372 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -70,6 +70,7 @@ This project is licensed under the terms of the MIT license. +

Ilkka Seppälä
💻 📆
amit1307
💻
From 76f634ff7a10f4a9f1840680938318bd02af2738 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 21:50:31 +0300 Subject: [PATCH 047/225] docs: add iluwatar as a contributor (#1346) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: create .all-contributorsrc [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 8 ++++++++ README.md | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index d919371f1..dbf65aeb8 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -12,6 +12,14 @@ "profile": "https://github.com/iluwatar", "contributions": [ "code", + "projectManagement", + "maintenance", + "blog", + "content", + "doc", + "ideas", + "infra", + "review" "projectManagement" ] }, diff --git a/README.md b/README.md index 04ddf6372..279f02028 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ This project is licensed under the terms of the MIT license. - +

Ilkka Seppälä
💻 📆
Ilkka Seppälä
💻 📆 🚧 📝 🖋 📖 🤔 🚇 👀
amit1307
💻
From 02b6aba6ae25aae1c23823c0b458782d859f1e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 27 Jul 2020 22:38:07 +0300 Subject: [PATCH 048/225] fix config syntax --- .all-contributorsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index dbf65aeb8..9c7f063a7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -19,7 +19,7 @@ "doc", "ideas", "infra", - "review" + "review", "projectManagement" ] }, From 211d7903ae480e05cef03795779a00115050b216 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 22:40:20 +0300 Subject: [PATCH 049/225] docs: add npathai as a contributor (#1347) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 13 +++++++++++++ README.md | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9c7f063a7..90490c998 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -31,6 +31,19 @@ "contributions": [ "code" ] + }, + { + "login": "npathai", + "name": "Narendra Pathai", + "avatar_url": "https://avatars2.githubusercontent.com/u/1792515?v=4", + "profile": "https://github.com/npathai", + "contributions": [ + "code", + "ideas", + "maintenance", + "question", + "review" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 279f02028..bce11a908 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -69,8 +69,9 @@ This project is licensed under the terms of the MIT license. - + +

Ilkka Seppälä
💻 📆 🚧 📝 🖋 📖 🤔 🚇 👀
Ilkka Seppälä
💻 📆 🚧 📝 🖋 📖 🤔 🚇 👀 📆
amit1307
💻
Narendra Pathai
💻 🤔 🚧 💬 👀
From aea90ab115039ac008194e2743b365f2e2da3df4 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 22:48:15 +0300 Subject: [PATCH 050/225] docs: add fluxw42 as a contributor (#1348) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 90490c998..25335e77a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -44,6 +44,15 @@ "question", "review" ] + }, + { + "login": "fluxw42", + "name": "Jeroen Meulemeester", + "avatar_url": "https://avatars1.githubusercontent.com/u/1545460?v=4", + "profile": "https://github.com/fluxw42", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index bce11a908..7525ddb43 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -72,6 +72,7 @@ This project is licensed under the terms of the MIT license.
Ilkka Seppälä
💻 📆 🚧 📝 🖋 📖 🤔 🚇 👀 📆
amit1307
💻
Narendra Pathai
💻 🤔 🚧 💬 👀 +
Jeroen Meulemeester
💻 From 2c8535e839223a445220bef981b5591da12e4c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 27 Jul 2020 23:07:58 +0300 Subject: [PATCH 051/225] max 3 contribution types per person --- .all-contributorsrc | 11 +---------- README.md | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 25335e77a..8e44fd9e2 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -11,16 +11,9 @@ "avatar_url": "https://avatars1.githubusercontent.com/u/582346?v=4", "profile": "https://github.com/iluwatar", "contributions": [ - "code", "projectManagement", "maintenance", - "blog", - "content", - "doc", - "ideas", - "infra", - "review", - "projectManagement" + "content" ] }, { @@ -40,8 +33,6 @@ "contributions": [ "code", "ideas", - "maintenance", - "question", "review" ] }, diff --git a/README.md b/README.md index 7525ddb43..ba9fd307e 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,9 @@ This project is licensed under the terms of the MIT license. - + - +

Ilkka Seppälä
💻 📆 🚧 📝 🖋 📖 🤔 🚇 👀 📆
Ilkka Seppälä
📆 🚧 🖋
amit1307
💻
Narendra Pathai
💻 🤔 🚧 💬 👀
Narendra Pathai
💻 🤔 👀
Jeroen Meulemeester
💻
From 05dfd31fb7e55e185499f7fa3a2944b2690853c9 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 23:14:34 +0300 Subject: [PATCH 052/225] docs: add mikulucky as a contributor (#1349) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8e44fd9e2..cecc9e2dc 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -44,6 +44,15 @@ "contributions": [ "code" ] + }, + { + "login": "mikulucky", + "name": "Joseph McCarthy", + "avatar_url": "https://avatars0.githubusercontent.com/u/4526195?v=4", + "profile": "http://www.joemccarthy.co.uk", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index ba9fd307e..743017959 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -69,10 +69,11 @@ This project is licensed under the terms of the MIT license. - + +

Ilkka Seppälä
📆 🚧 🖋
Ilkka Seppälä
📆 🚧 🖋
amit1307
💻
Narendra Pathai
💻 🤔 👀
Jeroen Meulemeester
💻
Joseph McCarthy
💻
From 64eff5eb93da95bf55ce48222d1f41200424e785 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 23:18:02 +0300 Subject: [PATCH 053/225] docs: add thomasoss as a contributor (#1350) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index cecc9e2dc..68751f4a7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -53,6 +53,15 @@ "contributions": [ "code" ] + }, + { + "login": "thomasoss", + "name": "Thomas", + "avatar_url": "https://avatars1.githubusercontent.com/u/22516154?v=4", + "profile": "https://github.com/thomasoss", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 743017959..08f10e096 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -74,6 +74,7 @@ This project is licensed under the terms of the MIT license.
Narendra Pathai
💻 🤔 👀
Jeroen Meulemeester
💻
Joseph McCarthy
💻 +
Thomas
💻 From 09dd0bee30519c7b4e0539744b2cb7a2f222fe97 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 23:20:44 +0300 Subject: [PATCH 054/225] docs: add anuragagarwal561994 as a contributor (#1351) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 68751f4a7..a3ed0c8f2 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -62,6 +62,15 @@ "contributions": [ "code" ] + }, + { + "login": "anuragagarwal561994", + "name": "Anurag Agarwal", + "avatar_url": "https://avatars1.githubusercontent.com/u/6075379?v=4", + "profile": "https://github.com/anuragagarwal561994", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 08f10e096..d8231ef7e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -75,6 +75,7 @@ This project is licensed under the terms of the MIT license.
Jeroen Meulemeester
💻
Joseph McCarthy
💻
Thomas
💻 +
Anurag Agarwal
💻 From d609f3eec69488e021b3bd34c9c08114b11f9c95 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:26:03 +0300 Subject: [PATCH 055/225] docs: add markusmo3 as a contributor (#1352) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 11 +++++++++++ README.md | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index a3ed0c8f2..4fda28295 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -71,6 +71,17 @@ "contributions": [ "code" ] + }, + { + "login": "markusmo3", + "name": "Markus Moser", + "avatar_url": "https://avatars1.githubusercontent.com/u/3317416?v=4", + "profile": "https://markusmo3.github.io", + "contributions": [ + "design", + "code", + "ideas" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index d8231ef7e..d8f9f5e7a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -77,6 +77,9 @@ This project is licensed under the terms of the MIT license.
Thomas
💻
Anurag Agarwal
💻 + +
Markus Moser
🎨 💻 🤔 + From b3eb6ccea424c54bf7cfab8c2ac36b8c467dd53e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:28:35 +0300 Subject: [PATCH 056/225] docs: add isabiq as a contributor (#1353) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 4fda28295..113d84373 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -82,6 +82,15 @@ "code", "ideas" ] + }, + { + "login": "isabiq", + "name": "Sabiq Ihab", + "avatar_url": "https://avatars1.githubusercontent.com/u/19510920?v=4", + "profile": "https://twitter.com/i_sabiq", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index d8f9f5e7a..c3aa4249e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -79,6 +79,7 @@ This project is licensed under the terms of the MIT license.
Markus Moser
🎨 💻 🤔 +
Sabiq Ihab
💻 From 960adfc37a3fd30bdf33f2c75256c79e8ce1d7ca Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:30:42 +0300 Subject: [PATCH 057/225] docs: add inbravo as a contributor (#1354) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 113d84373..8bcf19fb5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -91,6 +91,15 @@ "contributions": [ "code" ] + }, + { + "login": "inbravo", + "name": "Amit Dixit", + "avatar_url": "https://avatars3.githubusercontent.com/u/5253764?v=4", + "profile": "http://inbravo.github.io", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index c3aa4249e..4dee660b8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -80,6 +80,7 @@ This project is licensed under the terms of the MIT license.
Markus Moser
🎨 💻 🤔
Sabiq Ihab
💻 +
Amit Dixit
💻 From 781a7c8b52af7ff3edde4bb89ceb4456ed3b897c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:32:58 +0300 Subject: [PATCH 058/225] docs: add piyushchaudhari04 as a contributor (#1355) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8bcf19fb5..1b3b280e2 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -100,6 +100,15 @@ "contributions": [ "code" ] + }, + { + "login": "piyushchaudhari04", + "name": "Piyush Kailash Chaudhari", + "avatar_url": "https://avatars3.githubusercontent.com/u/10268029?v=4", + "profile": "https://github.com/piyushchaudhari04", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 4dee660b8..4f5c8b5b7 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -81,6 +81,7 @@ This project is licensed under the terms of the MIT license.
Markus Moser
🎨 💻 🤔
Sabiq Ihab
💻
Amit Dixit
💻 +
Piyush Kailash Chaudhari
💻 From d6edeee326d03e8d85a246889afb6ef41e3f5d50 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:35:49 +0300 Subject: [PATCH 059/225] docs: add joshzambales as a contributor (#1356) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 1b3b280e2..bd011b233 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -109,6 +109,15 @@ "contributions": [ "code" ] + }, + { + "login": "joshzambales", + "name": "joshzambales", + "avatar_url": "https://avatars1.githubusercontent.com/u/8704552?v=4", + "profile": "https://github.com/joshzambales", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 4f5c8b5b7..5c559363f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -82,6 +82,7 @@ This project is licensed under the terms of the MIT license.
Sabiq Ihab
💻
Amit Dixit
💻
Piyush Kailash Chaudhari
💻 +
joshzambales
💻 From 1cb9c2bcde9c8a1c32e453bf4ab273b25b878e97 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:37:56 +0300 Subject: [PATCH 060/225] docs: add Crossy147 as a contributor (#1357) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index bd011b233..fdd99c31c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -118,6 +118,15 @@ "contributions": [ "code" ] + }, + { + "login": "Crossy147", + "name": "Kamil Pietruszka", + "avatar_url": "https://avatars2.githubusercontent.com/u/7272996?v=4", + "profile": "https://github.com/Crossy147", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 5c559363f..d21e9a476 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -83,6 +83,7 @@ This project is licensed under the terms of the MIT license.
Amit Dixit
💻
Piyush Kailash Chaudhari
💻
joshzambales
💻 +
Kamil Pietruszka
💻 From 8ba111fe60ffe21d6155cc98c82a7907814ba752 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:40:28 +0300 Subject: [PATCH 061/225] docs: add zafarella as a contributor (#1358) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 10 ++++++++++ README.md | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index fdd99c31c..eb77506ca 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -127,6 +127,16 @@ "contributions": [ "code" ] + }, + { + "login": "zafarella", + "name": "Zafar Khaydarov", + "avatar_url": "https://avatars2.githubusercontent.com/u/660742?v=4", + "profile": "http://cs.joensuu.fi/~zkhayda", + "contributions": [ + "code", + "doc" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index d21e9a476..cee9e18bc 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -84,6 +84,7 @@ This project is licensed under the terms of the MIT license.
Piyush Kailash Chaudhari
💻
joshzambales
💻
Kamil Pietruszka
💻 +
Zafar Khaydarov
💻 📖 From 80605283f55a0abe33b01f4d337304d0107b64e2 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:42:27 +0300 Subject: [PATCH 062/225] docs: add kemitix as a contributor (#1359) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index eb77506ca..387c34849 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -137,6 +137,15 @@ "code", "doc" ] + }, + { + "login": "kemitix", + "name": "Paul Campbell", + "avatar_url": "https://avatars1.githubusercontent.com/u/1147749?v=4", + "profile": "https://kemitix.github.io/", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index cee9e18bc..95d2724e6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-15-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -86,6 +86,9 @@ This project is licensed under the terms of the MIT license.
Kamil Pietruszka
💻
Zafar Khaydarov
💻 📖 + +
Paul Campbell
💻 + From cf8e366e2518af8354f1879d3caf690ff0b93194 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:44:46 +0300 Subject: [PATCH 063/225] docs: add Argyro-Sioziou as a contributor (#1360) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 387c34849..a07d447af 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -146,6 +146,15 @@ "contributions": [ "code" ] + }, + { + "login": "Argyro-Sioziou", + "name": "Argyro Sioziou", + "avatar_url": "https://avatars0.githubusercontent.com/u/22822639?v=4", + "profile": "https://github.com/Argyro-Sioziou", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 95d2724e6..d1ca6e8bc 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-15-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-16-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -88,6 +88,7 @@ This project is licensed under the terms of the MIT license.
Paul Campbell
💻 +
Argyro Sioziou
💻 From a77e9620b5274321e1753de42c3945d14b2bc2fd Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:46:41 +0300 Subject: [PATCH 064/225] docs: add TylerMcConville as a contributor (#1361) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index a07d447af..eb1b24798 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -155,6 +155,15 @@ "contributions": [ "code" ] + }, + { + "login": "TylerMcConville", + "name": "TylerMcConville", + "avatar_url": "https://avatars0.githubusercontent.com/u/4946449?v=4", + "profile": "https://github.com/TylerMcConville", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index d1ca6e8bc..b73859360 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-16-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-17-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -89,6 +89,7 @@ This project is licensed under the terms of the MIT license.
Paul Campbell
💻
Argyro Sioziou
💻 +
TylerMcConville
💻 From f360b64877fb459666c597fc0985408c49481af7 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:48:50 +0300 Subject: [PATCH 065/225] docs: add saksham93 as a contributor (#1362) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index eb1b24798..81e67d559 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -164,6 +164,15 @@ "contributions": [ "code" ] + }, + { + "login": "saksham93", + "name": "saksham93", + "avatar_url": "https://avatars1.githubusercontent.com/u/37399540?v=4", + "profile": "https://github.com/saksham93", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index b73859360..833d65eae 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-17-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-18-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -90,6 +90,7 @@ This project is licensed under the terms of the MIT license.
Paul Campbell
💻
Argyro Sioziou
💻
TylerMcConville
💻 +
saksham93
💻 From c85d764e397029aedd3148a8338fabebf2956f88 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:50:39 +0300 Subject: [PATCH 066/225] docs: add nikhilbarar as a contributor (#1363) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 81e67d559..61f88d89a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -173,6 +173,15 @@ "contributions": [ "code" ] + }, + { + "login": "nikhilbarar", + "name": "nikhilbarar", + "avatar_url": "https://avatars2.githubusercontent.com/u/37332144?v=4", + "profile": "https://github.com/nikhilbarar", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 833d65eae..ccfa6e4ff 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-18-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-19-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -91,6 +91,7 @@ This project is licensed under the terms of the MIT license.
Argyro Sioziou
💻
TylerMcConville
💻
saksham93
💻 +
nikhilbarar
💻 From 4c766b9e71fe927e2fd39003d7f44c2a70c7b024 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:52:39 +0300 Subject: [PATCH 067/225] docs: add colinbut as a contributor (#1364) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 61f88d89a..c90df750f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -182,6 +182,15 @@ "contributions": [ "code" ] + }, + { + "login": "colinbut", + "name": "Colin But", + "avatar_url": "https://avatars2.githubusercontent.com/u/10725674?v=4", + "profile": "http://colinbut.com", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index ccfa6e4ff..5fa2d303e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-19-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -92,6 +92,7 @@ This project is licensed under the terms of the MIT license.
TylerMcConville
💻
saksham93
💻
nikhilbarar
💻 +
Colin But
💻 From d8f12529f2703845cd58c253ba7886c379ec9630 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:55:47 +0300 Subject: [PATCH 068/225] docs: add ruslanpa as a contributor (#1365) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index c90df750f..28abe71da 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -191,6 +191,15 @@ "contributions": [ "code" ] + }, + { + "login": "ruslanpa", + "name": "Ruslan", + "avatar_url": "https://avatars2.githubusercontent.com/u/1503411?v=4", + "profile": "https://github.com/ruslanpa", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 5fa2d303e..559f2a69c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -93,6 +93,7 @@ This project is licensed under the terms of the MIT license.
saksham93
💻
nikhilbarar
💻
Colin But
💻 +
Ruslan
💻 From 97adc13a1bcf09bf45d4a1a37b1384caa1de9b7a Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 17:57:26 +0300 Subject: [PATCH 069/225] docs: add JuhoKang as a contributor (#1366) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 28abe71da..d532a2baf 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -200,6 +200,15 @@ "contributions": [ "code" ] + }, + { + "login": "JuhoKang", + "name": "Juho Kang", + "avatar_url": "https://avatars1.githubusercontent.com/u/4745294?v=4", + "profile": "https://github.com/JuhoKang", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 559f2a69c..eab98e6c0 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -95,6 +95,9 @@ This project is licensed under the terms of the MIT license.
Colin But
💻
Ruslan
💻 + +
Juho Kang
💻 + From a5ff32c13ea3d66794bda314bc542a93eafa08aa Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:02:49 +0300 Subject: [PATCH 070/225] docs: add dheeraj-mummareddy as a contributor (#1367) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index d532a2baf..5f5df0ed5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -209,6 +209,15 @@ "contributions": [ "code" ] + }, + { + "login": "dheeraj-mummareddy", + "name": "Dheeraj Mummareddy", + "avatar_url": "https://avatars2.githubusercontent.com/u/7002230?v=4", + "profile": "https://github.com/dheeraj-mummareddy", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index eab98e6c0..912cc1b25 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-23-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -97,6 +97,7 @@ This project is licensed under the terms of the MIT license.
Juho Kang
💻 +
Dheeraj Mummareddy
💻 From 0563ac7645484ea12382d1c7240873c7607dbbc9 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:08:01 +0300 Subject: [PATCH 071/225] docs: add bernardosulzbach as a contributor (#1368) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 5f5df0ed5..512859f34 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -218,6 +218,15 @@ "contributions": [ "code" ] + }, + { + "login": "bernardosulzbach", + "name": "Bernardo Sulzbach", + "avatar_url": "https://avatars0.githubusercontent.com/u/8271090?v=4", + "profile": "https://www.bernardosulzbach.com", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 912cc1b25..bb324ec26 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-23-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-24-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -98,6 +98,7 @@ This project is licensed under the terms of the MIT license.
Juho Kang
💻
Dheeraj Mummareddy
💻 +
Bernardo Sulzbach
💻 From 5b269d5af1e7dd3eaf7b0e9e5b4363faedbb5abd Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:09:43 +0300 Subject: [PATCH 072/225] docs: add 4lexis as a contributor (#1369) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 512859f34..3d129d1a1 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -227,6 +227,15 @@ "contributions": [ "code" ] + }, + { + "login": "4lexis", + "name": "Aleksandar Dudukovic", + "avatar_url": "https://avatars0.githubusercontent.com/u/19871727?v=4", + "profile": "https://github.com/4lexis", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index bb324ec26..8da13c04e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-24-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-25-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -99,6 +99,7 @@ This project is licensed under the terms of the MIT license.
Juho Kang
💻
Dheeraj Mummareddy
💻
Bernardo Sulzbach
💻 +
Aleksandar Dudukovic
💻 From 03ebd5f353edcb6becfc0e6c1ca1944e131c689d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:11:29 +0300 Subject: [PATCH 073/225] docs: add yusufaytas as a contributor (#1370) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3d129d1a1..2d1a8c2ab 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -236,6 +236,15 @@ "contributions": [ "code" ] + }, + { + "login": "yusufaytas", + "name": "Yusuf Aytaş", + "avatar_url": "https://avatars2.githubusercontent.com/u/1049483?v=4", + "profile": "https://www.yusufaytas.com", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 8da13c04e..d3485ec5c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-25-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -100,6 +100,7 @@ This project is licensed under the terms of the MIT license.
Dheeraj Mummareddy
💻
Bernardo Sulzbach
💻
Aleksandar Dudukovic
💻 +
Yusuf Aytaş
💻 From 2706c8fc37037d7a5fa7bca319038112d3addc3b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:13:03 +0300 Subject: [PATCH 074/225] docs: add qpi as a contributor (#1371) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 2d1a8c2ab..d51e82608 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -245,6 +245,15 @@ "contributions": [ "code" ] + }, + { + "login": "qpi", + "name": "Mihály Kuprivecz", + "avatar_url": "https://avatars2.githubusercontent.com/u/1001491?v=4", + "profile": "http://futurehomes.hu", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index d3485ec5c..2646704d8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-27-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -101,6 +101,7 @@ This project is licensed under the terms of the MIT license.
Bernardo Sulzbach
💻
Aleksandar Dudukovic
💻
Yusuf Aytaş
💻 +
Mihály Kuprivecz
💻 From 452981669b5b95a0b3c78453a456eaf22f4cc2e7 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:14:37 +0300 Subject: [PATCH 075/225] docs: add kapinuss as a contributor (#1372) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index d51e82608..42d3fd6ce 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -254,6 +254,15 @@ "contributions": [ "code" ] + }, + { + "login": "kapinuss", + "name": "Stanislav Kapinus", + "avatar_url": "https://avatars0.githubusercontent.com/u/17639945?v=4", + "profile": "https://github.com/kapinuss", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 2646704d8..b8ea48ef0 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-27-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-28-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -102,6 +102,7 @@ This project is licensed under the terms of the MIT license.
Aleksandar Dudukovic
💻
Yusuf Aytaş
💻
Mihály Kuprivecz
💻 +
Stanislav Kapinus
💻 From 0cff538c271ffdae6eb6adadc9ac4fde7f7fe2fc Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:16:14 +0300 Subject: [PATCH 076/225] docs: add gvsharma as a contributor (#1373) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 42d3fd6ce..ceefb272f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -263,6 +263,15 @@ "contributions": [ "code" ] + }, + { + "login": "gvsharma", + "name": "GVSharma", + "avatar_url": "https://avatars1.githubusercontent.com/u/6648152?v=4", + "profile": "https://github.com/gvsharma", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index b8ea48ef0..3ec2bcbab 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-28-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-29-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -104,6 +104,9 @@ This project is licensed under the terms of the MIT license.
Mihály Kuprivecz
💻
Stanislav Kapinus
💻 + +
GVSharma
💻 + From b805a7526eb7b741933a041992f0b610b50d0390 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:17:42 +0300 Subject: [PATCH 077/225] docs: add SrdjanPaunovic as a contributor (#1374) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index ceefb272f..7c71a2167 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -272,6 +272,15 @@ "contributions": [ "code" ] + }, + { + "login": "SrdjanPaunovic", + "name": "Srđan Paunović", + "avatar_url": "https://avatars1.githubusercontent.com/u/22815104?v=4", + "profile": "https://github.com/SrdjanPaunovic", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 3ec2bcbab..514df2349 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-29-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-30-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -106,6 +106,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻 +
Srđan Paunović
💻 From d94199f5fff6cf83604d3aaa8b2b130315e2f5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Tue, 28 Jul 2020 18:23:47 +0300 Subject: [PATCH 078/225] update readme --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 514df2349..eafae6ef5 100644 --- a/README.md +++ b/README.md @@ -113,5 +113,3 @@ This project is licensed under the terms of the MIT license. - -This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! From 0bc3756250ef110a1c6adfd910cc1ecf0ededefd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Tue, 28 Jul 2020 18:49:46 +0300 Subject: [PATCH 079/225] update all-contributors config --- .all-contributorsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7c71a2167..bdd7dfdaa 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -283,7 +283,7 @@ ] } ], - "contributorsPerLine": 7, + "contributorsPerLine": 4, "projectName": "java-design-patterns", "projectOwner": "iluwatar", "repoType": "github", From 96344142e9064e5afd08c3c8450b38419ca3528b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:52:31 +0300 Subject: [PATCH 080/225] docs: add sideris as a contributor (#1375) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index bdd7dfdaa..1d6b1aabc 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -281,6 +281,15 @@ "contributions": [ "code" ] + }, + { + "login": "sideris", + "name": "Petros G. Sideris", + "avatar_url": "https://avatars3.githubusercontent.com/u/5484694?v=4", + "profile": "https://sideris.xyz/", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index eafae6ef5..55e167ef8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-30-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-31-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -73,32 +73,38 @@ This project is licensed under the terms of the MIT license.
amit1307
💻
Narendra Pathai
💻 🤔 👀
Jeroen Meulemeester
💻 + +
Joseph McCarthy
💻
Thomas
💻
Anurag Agarwal
💻 +
Markus Moser
🎨 💻 🤔 -
Markus Moser
🎨 💻 🤔
Sabiq Ihab
💻
Amit Dixit
💻
Piyush Kailash Chaudhari
💻
joshzambales
💻 -
Kamil Pietruszka
💻 -
Zafar Khaydarov
💻 📖 +
Kamil Pietruszka
💻 +
Zafar Khaydarov
💻 📖
Paul Campbell
💻
Argyro Sioziou
💻 + +
TylerMcConville
💻
saksham93
💻
nikhilbarar
💻
Colin But
💻 -
Ruslan
💻 +
Ruslan
💻
Juho Kang
💻
Dheeraj Mummareddy
💻
Bernardo Sulzbach
💻 + +
Aleksandar Dudukovic
💻
Yusuf Aytaş
💻
Mihály Kuprivecz
💻 @@ -107,6 +113,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻 +
Petros G. Sideris
💻 From c0d2c7fdb04a239488db9457197d095173fc1b79 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 20:23:30 +0300 Subject: [PATCH 081/225] docs: add robertt240 as a contributor (#1376) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 1d6b1aabc..f5238558b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -290,6 +290,15 @@ "contributions": [ "code" ] + }, + { + "login": "robertt240", + "name": "Robert Kasperczyk", + "avatar_url": "https://avatars1.githubusercontent.com/u/9137432?v=4", + "profile": "https://github.com/robertt240", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 55e167ef8..026ba94e3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-31-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-32-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -114,6 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 +
Robert Kasperczyk
💻 From cfba28f9a4a0017d22506a7655e97c648413a79b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 20:33:05 +0300 Subject: [PATCH 082/225] docs: add okinskas as a contributor (#1377) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index f5238558b..9780bbbf8 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "okinskas", + "name": "Ovidijus Okinskas", + "avatar_url": "https://avatars0.githubusercontent.com/u/20372387?v=4", + "profile": "https://www.linkedin.com/in/ovidijus-okinskas/", + "contributions": [ + "code" + ] + }, { "login": "robertt240", "name": "Robert Kasperczyk", diff --git a/README.md b/README.md index 026ba94e3..4e931dca2 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 +
Ovidijus Okinskas
💻
Robert Kasperczyk
💻 From 2b095bec283932368a7111463ae0082836c0afdf Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 20:37:11 +0300 Subject: [PATCH 083/225] docs: add ankurkaushal as a contributor (#1378) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9780bbbf8..724d5e0d7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "ankurkaushal", + "name": "Ankur Kaushal", + "avatar_url": "https://avatars2.githubusercontent.com/u/2236616?v=4", + "profile": "https://github.com/ankurkaushal", + "contributions": [ + "code" + ] + }, { "login": "okinskas", "name": "Ovidijus Okinskas", diff --git a/README.md b/README.md index 4e931dca2..7e71b1e62 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 +
Ankur Kaushal
💻
Ovidijus Okinskas
💻
Robert Kasperczyk
💻 From f85e4db0bed8b96864375028d90ee31bf05f9ccc Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 20:40:11 +0300 Subject: [PATCH 084/225] docs: add Tschis as a contributor (#1379) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 724d5e0d7..cfc3cdfc5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "Tschis", + "name": "Rodolfo Forte", + "avatar_url": "https://avatars1.githubusercontent.com/u/20662669?v=4", + "profile": "http://tschis.github.io", + "contributions": [ + "content" + ] + }, { "login": "ankurkaushal", "name": "Ankur Kaushal", diff --git a/README.md b/README.md index 7e71b1e62..506948ca9 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 +
Rodolfo Forte
🖋
Ankur Kaushal
💻
Ovidijus Okinskas
💻
Robert Kasperczyk
💻 From 60ab9fa3ceb61e63acf8267507a502a8433ded70 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 20:43:09 +0300 Subject: [PATCH 085/225] docs: add qza as a contributor (#1380) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index cfc3cdfc5..9b817c42d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "qza", + "name": "qza", + "avatar_url": "https://avatars3.githubusercontent.com/u/233149?v=4", + "profile": "https://github.com/qza", + "contributions": [ + "code" + ] + }, { "login": "Tschis", "name": "Rodolfo Forte", diff --git a/README.md b/README.md index 506948ca9..ad0a2fa5d 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 +
qza
💻
Rodolfo Forte
🖋
Ankur Kaushal
💻
Ovidijus Okinskas
💻 From 023865ad4c5b63f85bf1b6d001636543ff354f0e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 20:45:59 +0300 Subject: [PATCH 086/225] docs: add pitsios-s as a contributor (#1381) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9b817c42d..df2e3e857 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "pitsios-s", + "name": "Stamatis Pitsios", + "avatar_url": "https://avatars1.githubusercontent.com/u/6773603?v=4", + "profile": "https://twitter.com/StPitsios", + "contributions": [ + "code" + ] + }, { "login": "qza", "name": "qza", diff --git a/README.md b/README.md index ad0a2fa5d..94615bf9c 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 +
Stamatis Pitsios
💻
qza
💻
Rodolfo Forte
🖋
Ankur Kaushal
💻 From 0358fcec4c1f35c84d631e214c81bb6b96e2c74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Tue, 28 Jul 2020 20:53:31 +0300 Subject: [PATCH 087/225] update readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 94615bf9c..97e3111cf 100644 --- a/README.md +++ b/README.md @@ -115,10 +115,14 @@ This project is licensed under the terms of the MIT license.
Srđan Paunović
💻
Petros G. Sideris
💻
Stamatis Pitsios
💻 + +
qza
💻
Rodolfo Forte
🖋
Ankur Kaushal
💻
Ovidijus Okinskas
💻 + +
Robert Kasperczyk
💻 From eb8ddde98ffd9d63dce24ddd8f76a00649520889 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:36:32 +0300 Subject: [PATCH 088/225] docs: add llitfkitfk as a contributor (#1382) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index df2e3e857..3d7e4065e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "llitfkitfk", + "name": "田浩", + "avatar_url": "https://avatars1.githubusercontent.com/u/2404785?v=4", + "profile": "https://t.me/paul_docker", + "contributions": [ + "content" + ] + }, { "login": "pitsios-s", "name": "Stamatis Pitsios", diff --git a/README.md b/README.md index 97e3111cf..79f9b34ff 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Stamatis Pitsios
💻 +
田浩
🖋
qza
💻 @@ -123,6 +123,7 @@ This project is licensed under the terms of the MIT license.
Ovidijus Okinskas
💻 +
Stamatis Pitsios
💻
Robert Kasperczyk
💻 From 8d6791490b63dbbfab8c093378c730eeee805bcd Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:39:11 +0300 Subject: [PATCH 089/225] docs: add gwildor28 as a contributor (#1383) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3d7e4065e..f37d603e5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "gwildor28", + "name": "gwildor28", + "avatar_url": "https://avatars0.githubusercontent.com/u/16000365?v=4", + "profile": "https://github.com/gwildor28", + "contributions": [ + "content" + ] + }, { "login": "llitfkitfk", "name": "田浩", diff --git a/README.md b/README.md index 79f9b34ff..104d7afa2 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
田浩
🖋 +
gwildor28
💻
qza
💻 @@ -125,6 +125,7 @@ This project is licensed under the terms of the MIT license.
Stamatis Pitsios
💻
Robert Kasperczyk
💻 +
田浩
🖋 From 39e5436ed5ed13c1ff81487a08cd5b2d30eca0a5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:41:35 +0300 Subject: [PATCH 090/225] docs: add amit2103 as a contributor (#1384) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index f37d603e5..c9c27ed6b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "amit2103", + "name": "Amit Pandey", + "avatar_url": "https://avatars3.githubusercontent.com/u/7566692?v=4", + "profile": "https://github.com/amit2103", + "contributions": [ + "code" + ] + }, { "login": "gwildor28", "name": "gwildor28", diff --git a/README.md b/README.md index 104d7afa2..1417b68d3 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
gwildor28
💻 +
Amit Pandey
💻
qza
💻 @@ -126,6 +126,7 @@ This project is licensed under the terms of the MIT license.
Stamatis Pitsios
💻
Robert Kasperczyk
💻
田浩
🖋 +
gwildor28
💻 From 81824057968557335d4812093ddc70ec7c12e73c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:44:05 +0300 Subject: [PATCH 091/225] docs: add hoswey as a contributor (#1385) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index c9c27ed6b..ef533e802 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "hoswey", + "name": "Hoswey", + "avatar_url": "https://avatars3.githubusercontent.com/u/3689445?v=4", + "profile": "https://github.com/hoswey", + "contributions": [ + "code" + ] + }, { "login": "amit2103", "name": "Amit Pandey", diff --git a/README.md b/README.md index 1417b68d3..e9cb72003 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Amit Pandey
💻 +
Hoswey
💻
qza
💻 @@ -128,6 +128,9 @@ This project is licensed under the terms of the MIT license.
田浩
🖋
gwildor28
💻 + +
Amit Pandey
💻 + From 37bffb4a99865f4ca34a4d4ac6816a52e8b79b9f Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:47:06 +0300 Subject: [PATCH 092/225] docs: add gopinath-langote as a contributor (#1386) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index ef533e802..21d993c64 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "gopinath-langote", + "name": "Gopinath Langote", + "avatar_url": "https://avatars2.githubusercontent.com/u/10210778?v=4", + "profile": "https://www.linkedin.com/in/gopinathlangote/", + "contributions": [ + "code" + ] + }, { "login": "hoswey", "name": "Hoswey", diff --git a/README.md b/README.md index e9cb72003..d9fba1e99 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Hoswey
💻 +
Gopinath Langote
💻
qza
💻 @@ -130,6 +130,7 @@ This project is licensed under the terms of the MIT license.
Amit Pandey
💻 +
Hoswey
💻 From 8c21809dad7caf2d42d19e32c1eead5c6fc6de8e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:49:00 +0300 Subject: [PATCH 093/225] docs: add ThatGuyWithTheHat as a contributor (#1387) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 21d993c64..edef8c2c5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "ThatGuyWithTheHat", + "name": "Matt", + "avatar_url": "https://avatars0.githubusercontent.com/u/24470582?v=4", + "profile": "https://github.com/ThatGuyWithTheHat", + "contributions": [ + "content" + ] + }, { "login": "gopinath-langote", "name": "Gopinath Langote", diff --git a/README.md b/README.md index d9fba1e99..5d9b81ca7 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Gopinath Langote
💻 +
Matt
🖋
qza
💻 @@ -131,6 +131,7 @@ This project is licensed under the terms of the MIT license.
Amit Pandey
💻
Hoswey
💻 +
Gopinath Langote
💻 From 5a23fab795d1588a2cada9e923eb8856ff2398a0 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:50:53 +0300 Subject: [PATCH 094/225] docs: add vehpsr as a contributor (#1389) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index edef8c2c5..e1b8032cb 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "vehpsr", + "name": "gans", + "avatar_url": "https://avatars2.githubusercontent.com/u/3133265?v=4", + "profile": "https://github.com/vehpsr", + "contributions": [ + "code" + ] + }, { "login": "ThatGuyWithTheHat", "name": "Matt", diff --git a/README.md b/README.md index 5d9b81ca7..62c70ae2f 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Matt
🖋 +
gans
💻
qza
💻 @@ -132,6 +132,7 @@ This project is licensed under the terms of the MIT license.
Amit Pandey
💻
Hoswey
💻
Gopinath Langote
💻 +
Matt
🖋 From c0d7c8922e82eb02cbeff2b331dc8b1ed30924b8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:53:30 +0300 Subject: [PATCH 095/225] docs: add Azureyjt as a contributor (#1388) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index e1b8032cb..7a1681230 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "Azureyjt", + "name": "Azureyjt", + "avatar_url": "https://avatars2.githubusercontent.com/u/18476317?v=4", + "profile": "https://github.com/Azureyjt", + "contributions": [ + "code" + ] + }, { "login": "vehpsr", "name": "gans", diff --git a/README.md b/README.md index 62c70ae2f..6b90e2df8 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
gans
💻 +
Azureyjt
💻
qza
💻 @@ -134,6 +134,9 @@ This project is licensed under the terms of the MIT license.
Gopinath Langote
💻
Matt
🖋 + +
gans
💻 + From 7968615ad466c86b9d68cd25eee5d9a53a27f682 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:55:53 +0300 Subject: [PATCH 096/225] docs: add mookkiah as a contributor (#1390) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7a1681230..ec24b3888 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "mookkiah", + "name": "Mahendran Mookkiah", + "avatar_url": "https://avatars1.githubusercontent.com/u/8975264?v=4", + "profile": "https://github.com/mookkiah", + "contributions": [ + "code" + ] + }, { "login": "Azureyjt", "name": "Azureyjt", diff --git a/README.md b/README.md index 6b90e2df8..ac8ab189a 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Azureyjt
💻 +
Mahendran Mookkiah
💻
qza
💻 @@ -136,6 +136,7 @@ This project is licensed under the terms of the MIT license.
gans
💻 +
Azureyjt
💻 From c5479cc882d3a1ff8c52fedd8ec8d6371bb64368 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:58:00 +0300 Subject: [PATCH 097/225] docs: add llorllale as a contributor (#1391) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index ec24b3888..02b8d2f37 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "llorllale", + "name": "George Aristy", + "avatar_url": "https://avatars1.githubusercontent.com/u/2019896?v=4", + "profile": "https://llorllale.github.io/", + "contributions": [ + "code" + ] + }, { "login": "mookkiah", "name": "Mahendran Mookkiah", diff --git a/README.md b/README.md index ac8ab189a..8869d6e26 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Mahendran Mookkiah
💻 +
George Aristy
💻
qza
💻 @@ -137,6 +137,7 @@ This project is licensed under the terms of the MIT license.
gans
💻
Azureyjt
💻 +
Mahendran Mookkiah
💻 From c2fb5917496f001fc4293e2a4f7beb3a2af5542c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:00:07 +0300 Subject: [PATCH 098/225] docs: add igeligel as a contributor (#1392) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 02b8d2f37..71677e31f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "igeligel", + "name": "Kevin Peters", + "avatar_url": "https://avatars1.githubusercontent.com/u/12736734?v=4", + "profile": "https://www.kevinpeters.net/about/", + "contributions": [ + "code" + ] + }, { "login": "llorllale", "name": "George Aristy", diff --git a/README.md b/README.md index 8869d6e26..f8d66532b 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
George Aristy
💻 +
Kevin Peters
💻
qza
💻 @@ -138,6 +138,7 @@ This project is licensed under the terms of the MIT license.
gans
💻
Azureyjt
💻
Mahendran Mookkiah
💻 +
George Aristy
💻 From d1de4657801a2f4715673f79102cbf181e89e819 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:02:13 +0300 Subject: [PATCH 099/225] docs: add hbothra15 as a contributor (#1393) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 71677e31f..c7cef5bea 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "hbothra15", + "name": "Hemant Bothra", + "avatar_url": "https://avatars1.githubusercontent.com/u/7418012?v=4", + "profile": "https://github.com/hbothra15", + "contributions": [ + "code" + ] + }, { "login": "igeligel", "name": "Kevin Peters", diff --git a/README.md b/README.md index f8d66532b..1b57fa8ab 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Kevin Peters
💻 +
Hemant Bothra
💻
qza
💻 @@ -140,6 +140,9 @@ This project is licensed under the terms of the MIT license.
Mahendran Mookkiah
💻
George Aristy
💻 + +
Kevin Peters
💻 + From ec80402fe50b81cc651946a48c7aa0b0f5b9e224 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:05:22 +0300 Subject: [PATCH 100/225] docs: add giorgosmav21 as a contributor (#1394) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index c7cef5bea..9518ede79 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "giorgosmav21", + "name": "George Mavroeidis", + "avatar_url": "https://avatars2.githubusercontent.com/u/22855493?v=4", + "profile": "https://github.com/giorgosmav21", + "contributions": [ + "code" + ] + }, { "login": "hbothra15", "name": "Hemant Bothra", diff --git a/README.md b/README.md index 1b57fa8ab..12ba1a7e4 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Hemant Bothra
💻 +
George Mavroeidis
💻
qza
💻 @@ -142,6 +142,7 @@ This project is licensed under the terms of the MIT license.
Kevin Peters
💻 +
Hemant Bothra
💻 From be54dc1c7e24e71d6fdae7069811e6eddf4f06c5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:07:15 +0300 Subject: [PATCH 101/225] docs: add oconnelc as a contributor (#1395) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9518ede79..25192ed78 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "oconnelc", + "name": "Christopher O'Connell", + "avatar_url": "https://avatars0.githubusercontent.com/u/1112973?v=4", + "profile": "https://github.com/oconnelc", + "contributions": [ + "code" + ] + }, { "login": "giorgosmav21", "name": "George Mavroeidis", diff --git a/README.md b/README.md index 12ba1a7e4..d1cbd2f1c 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
George Mavroeidis
💻 +
Christopher O'Connell
💻
qza
💻 @@ -143,6 +143,7 @@ This project is licensed under the terms of the MIT license.
Kevin Peters
💻
Hemant Bothra
💻 +
George Mavroeidis
💻 From ba485e2c3efb6669cece11164f93fb9bd4186316 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:09:00 +0300 Subject: [PATCH 102/225] docs: add npczwh as a contributor (#1396) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 25192ed78..17c9bc3d6 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "npczwh", + "name": "Zhang WH", + "avatar_url": "https://avatars0.githubusercontent.com/u/14066422?v=4", + "profile": "https://github.com/npczwh", + "contributions": [ + "code" + ] + }, { "login": "oconnelc", "name": "Christopher O'Connell", diff --git a/README.md b/README.md index d1cbd2f1c..227c62c60 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Christopher O'Connell
💻 +
Zhang WH
💻
qza
💻 @@ -144,6 +144,7 @@ This project is licensed under the terms of the MIT license.
Kevin Peters
💻
Hemant Bothra
💻
George Mavroeidis
💻 +
Christopher O'Connell
💻 From d791c785014b200b38c95d07859cabf9f8a16b8b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:11:09 +0300 Subject: [PATCH 103/225] docs: add leogtzr as a contributor (#1397) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 17c9bc3d6..985bd474f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "leogtzr", + "name": "Leo Gutiérrez Ramírez", + "avatar_url": "https://avatars0.githubusercontent.com/u/1211969?v=4", + "profile": "https://github.com/leogtzr", + "contributions": [ + "code" + ] + }, { "login": "npczwh", "name": "Zhang WH", diff --git a/README.md b/README.md index 227c62c60..7e2ffc3d3 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,9 @@ This project is licensed under the terms of the MIT license.
George Mavroeidis
💻
Christopher O'Connell
💻 + +
Leo Gutiérrez Ramírez
💻 + From e924c9399ad236da1db94edd049147a3975fa007 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:12:47 +0300 Subject: [PATCH 104/225] docs: add hannespernpeintner as a contributor (#1398) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 985bd474f..69a4de8f3 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "hannespernpeintner", + "name": "Hannes", + "avatar_url": "https://avatars3.githubusercontent.com/u/1679437?v=4", + "profile": "https://bitbucket.org/hannespernpeintner/", + "contributions": [ + "code" + ] + }, { "login": "leogtzr", "name": "Leo Gutiérrez Ramírez", diff --git a/README.md b/README.md index 7e2ffc3d3..9ceb86f80 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,7 @@ This project is licensed under the terms of the MIT license.
Leo Gutiérrez Ramírez
💻 +
Hannes
💻 From 8137609e2f4a3ff7a9d43615c2707f634d699f70 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:14:30 +0300 Subject: [PATCH 105/225] docs: add dgruntz as a contributor (#1399) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 69a4de8f3..c36df4855 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "dgruntz", + "name": "Dominik Gruntz", + "avatar_url": "https://avatars0.githubusercontent.com/u/1516800?v=4", + "profile": "https://github.com/dgruntz", + "contributions": [ + "code" + ] + }, { "login": "hannespernpeintner", "name": "Hannes", diff --git a/README.md b/README.md index 9ceb86f80..fef0bf614 100644 --- a/README.md +++ b/README.md @@ -149,6 +149,7 @@ This project is licensed under the terms of the MIT license.
Leo Gutiérrez Ramírez
💻
Hannes
💻 +
Dominik Gruntz
💻 From 46fdc5a54f0b4ec741f4dae395acf5d9ffe35eaf Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:16:12 +0300 Subject: [PATCH 106/225] docs: add christofferh as a contributor (#1400) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index c36df4855..8e0e6d13a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "christofferh", + "name": "Christoffer Hamberg", + "avatar_url": "https://avatars1.githubusercontent.com/u/767643?v=4", + "profile": "https://christofferh.com", + "contributions": [ + "code" + ] + }, { "login": "dgruntz", "name": "Dominik Gruntz", diff --git a/README.md b/README.md index fef0bf614..9720fbad5 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,7 @@ This project is licensed under the terms of the MIT license.
Leo Gutiérrez Ramírez
💻
Hannes
💻
Dominik Gruntz
💻 +
Christoffer Hamberg
💻 From a727a1d05b79b17ca2dd1a926d67cf8e651dcc52 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:18:07 +0300 Subject: [PATCH 107/225] docs: add AnaghaSasikumar as a contributor (#1401) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8e0e6d13a..ca442aa6e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "AnaghaSasikumar", + "name": "AnaghaSasikumar", + "avatar_url": "https://avatars2.githubusercontent.com/u/42939261?v=4", + "profile": "https://github.com/AnaghaSasikumar", + "contributions": [ + "code" + ] + }, { "login": "christofferh", "name": "Christoffer Hamberg", diff --git a/README.md b/README.md index 9720fbad5..508a1dbef 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,9 @@ This project is licensed under the terms of the MIT license.
Dominik Gruntz
💻
Christoffer Hamberg
💻 + +
AnaghaSasikumar
💻 + From 96bfb8bd9f1c293634828c0fd8e5ef074a4821f8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:19:53 +0300 Subject: [PATCH 108/225] docs: add waisuan as a contributor (#1402) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index ca442aa6e..94158246d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "waisuan", + "name": "Evan Sia Wai Suan", + "avatar_url": "https://avatars2.githubusercontent.com/u/10975700?v=4", + "profile": "https://github.com/waisuan", + "contributions": [ + "code" + ] + }, { "login": "AnaghaSasikumar", "name": "AnaghaSasikumar", diff --git a/README.md b/README.md index 508a1dbef..6a091ea20 100644 --- a/README.md +++ b/README.md @@ -154,6 +154,7 @@ This project is licensed under the terms of the MIT license.
AnaghaSasikumar
💻 +
Evan Sia Wai Suan
💻 From 09880e3850277b372975089725a7d3cdf8754a37 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:21:41 +0300 Subject: [PATCH 109/225] docs: add perwramdemark as a contributor (#1403) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 94158246d..a2cfd2a03 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "perwramdemark", + "name": "Per Wramdemark", + "avatar_url": "https://avatars2.githubusercontent.com/u/7052193?v=4", + "profile": "http://www.wramdemark.se", + "contributions": [ + "code" + ] + }, { "login": "waisuan", "name": "Evan Sia Wai Suan", diff --git a/README.md b/README.md index 6a091ea20..51c774275 100644 --- a/README.md +++ b/README.md @@ -155,6 +155,7 @@ This project is licensed under the terms of the MIT license.
AnaghaSasikumar
💻
Evan Sia Wai Suan
💻 +
Per Wramdemark
💻 From 19929d9e7215223eddc03b5f1e950b7ec164297d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:23:23 +0300 Subject: [PATCH 110/225] docs: add leonmak as a contributor (#1404) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index a2cfd2a03..fa19cf391 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "leonmak", + "name": "Leon Mak", + "avatar_url": "https://avatars3.githubusercontent.com/u/13071508?v=4", + "profile": "http://leonmak.me", + "contributions": [ + "code" + ] + }, { "login": "perwramdemark", "name": "Per Wramdemark", diff --git a/README.md b/README.md index 51c774275..abea00951 100644 --- a/README.md +++ b/README.md @@ -156,6 +156,9 @@ This project is licensed under the terms of the MIT license.
AnaghaSasikumar
💻
Evan Sia Wai Suan
💻
Per Wramdemark
💻 +
Leon Mak
💻 + + From a70213f8521cadab757ed874183e7d4c43e6ac50 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:25:03 +0300 Subject: [PATCH 111/225] docs: add kanwarpreet25 as a contributor (#1405) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index fa19cf391..7b91a7aa5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "kanwarpreet25", + "name": "kanwarpreet25", + "avatar_url": "https://avatars0.githubusercontent.com/u/39183641?v=4", + "profile": "https://github.com/kanwarpreet25", + "contributions": [ + "code" + ] + }, { "login": "leonmak", "name": "Leon Mak", diff --git a/README.md b/README.md index abea00951..53f0fedbb 100644 --- a/README.md +++ b/README.md @@ -159,6 +159,7 @@ This project is licensed under the terms of the MIT license.
Leon Mak
💻 +
kanwarpreet25
💻 From 54bb02f69131cccd0b6655e19de3df3e314e6ea8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:26:34 +0300 Subject: [PATCH 112/225] docs: add MSaifAsif as a contributor (#1406) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7b91a7aa5..1fadb0530 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "MSaifAsif", + "name": "M Saif Asif", + "avatar_url": "https://avatars1.githubusercontent.com/u/6280554?v=4", + "profile": "https://github.com/MSaifAsif", + "contributions": [ + "code" + ] + }, { "login": "kanwarpreet25", "name": "kanwarpreet25", diff --git a/README.md b/README.md index 53f0fedbb..708a62ca6 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,7 @@ This project is licensed under the terms of the MIT license.
kanwarpreet25
💻 +
M Saif Asif
💻 From e2a42b0051f4818908936aee5627329e1309cbfe Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:28:10 +0300 Subject: [PATCH 113/225] docs: add Alwayswithme as a contributor (#1407) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 1fadb0530..782955f0c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "Alwayswithme", + "name": "PhoenixYip", + "avatar_url": "https://avatars3.githubusercontent.com/u/3234786?v=4", + "profile": "https://alwayswithme.github.io", + "contributions": [ + "code" + ] + }, { "login": "MSaifAsif", "name": "M Saif Asif", diff --git a/README.md b/README.md index 708a62ca6..173485073 100644 --- a/README.md +++ b/README.md @@ -161,6 +161,7 @@ This project is licensed under the terms of the MIT license.
kanwarpreet25
💻
M Saif Asif
💻 +
PhoenixYip
💻 From fe2f8f74a1d1126d5de4e3fa5c598038ec9b7a8d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:29:41 +0300 Subject: [PATCH 114/225] docs: add ranjeet-floyd as a contributor (#1408) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 782955f0c..27e8872d7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "ranjeet-floyd", + "name": "Ranjeet", + "avatar_url": "https://avatars0.githubusercontent.com/u/1992972?v=4", + "profile": "https://ranjeet-floyd.github.io", + "contributions": [ + "code" + ] + }, { "login": "Alwayswithme", "name": "PhoenixYip", diff --git a/README.md b/README.md index 173485073..46a1443e7 100644 --- a/README.md +++ b/README.md @@ -162,6 +162,7 @@ This project is licensed under the terms of the MIT license.
kanwarpreet25
💻
M Saif Asif
💻
PhoenixYip
💻 +
Ranjeet
💻 From 8e268cf261cd23f5de815f32da2d9c2b417d5c1a Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:32:59 +0300 Subject: [PATCH 115/225] docs: add mitchellirvin as a contributor (#1409) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 27e8872d7..4b9a0dd1a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "mitchellirvin", + "name": "Mitchell Irvin", + "avatar_url": "https://avatars0.githubusercontent.com/u/16233245?v=4", + "profile": "http://mitchell-irvin.com", + "contributions": [ + "code" + ] + }, { "login": "ranjeet-floyd", "name": "Ranjeet", diff --git a/README.md b/README.md index 46a1443e7..d587771d1 100644 --- a/README.md +++ b/README.md @@ -164,6 +164,17 @@ This project is licensed under the terms of the MIT license.
PhoenixYip
💻
Ranjeet
💻 +
Mitchell Irvin
💻 + + + + + + + + + + From 9b5ae765fccfaac7be5fec221a48b0f0dde9ad54 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:34:45 +0300 Subject: [PATCH 116/225] docs: add kirill-vlasov as a contributor (#1410) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 4b9a0dd1a..6d3a4741f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "kirill-vlasov", + "name": "Kirill Vlasov", + "avatar_url": "https://avatars3.githubusercontent.com/u/16112495?v=4", + "profile": "https://github.com/kirill-vlasov", + "contributions": [ + "code" + ] + }, { "login": "mitchellirvin", "name": "Mitchell Irvin", diff --git a/README.md b/README.md index d587771d1..f12fcb9ab 100644 --- a/README.md +++ b/README.md @@ -166,6 +166,7 @@ This project is licensed under the terms of the MIT license.
Mitchell Irvin
💻 +
Kirill Vlasov
💻 From 1bc77a80f2b8fcafc52e611af600f9a77d77c744 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:36:27 +0300 Subject: [PATCH 117/225] docs: add joningiwork as a contributor (#1411) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 6d3a4741f..7352e906e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "joningiwork", + "name": "Jón Ingi Sveinbjörnsson", + "avatar_url": "https://avatars2.githubusercontent.com/u/6115148?v=4", + "profile": "http://joningi.net", + "contributions": [ + "code" + ] + }, { "login": "kirill-vlasov", "name": "Kirill Vlasov", diff --git a/README.md b/README.md index f12fcb9ab..655c71e26 100644 --- a/README.md +++ b/README.md @@ -167,6 +167,7 @@ This project is licensed under the terms of the MIT license.
Mitchell Irvin
💻
Kirill Vlasov
💻 +
Jón Ingi Sveinbjörnsson
💻 From a475df845bf44163ce49c9289371d08436d27bb5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:38:07 +0300 Subject: [PATCH 118/225] docs: add jarpit96 as a contributor (#1412) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7352e906e..ffe698d84 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "jarpit96", + "name": "Arpit Jain", + "avatar_url": "https://avatars2.githubusercontent.com/u/10098713?v=4", + "profile": "https://github.com/jarpit96", + "contributions": [ + "code" + ] + }, { "login": "joningiwork", "name": "Jón Ingi Sveinbjörnsson", diff --git a/README.md b/README.md index 655c71e26..c59bfac02 100644 --- a/README.md +++ b/README.md @@ -165,6 +165,7 @@ This project is licensed under the terms of the MIT license.
Ranjeet
💻
Mitchell Irvin
💻 +
Arpit Jain
💻
Kirill Vlasov
💻
Jón Ingi Sveinbjörnsson
💻 From 2a66fec6fe509a2b3a96d086d3e7265aebf823b1 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:41:17 +0300 Subject: [PATCH 119/225] docs: add hoangnam2261 as a contributor (#1413) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index ffe698d84..ca9e4c8e0 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "hoangnam2261", + "name": "hoangnam2261", + "avatar_url": "https://avatars2.githubusercontent.com/u/31692990?v=4", + "profile": "https://github.com/hoangnam2261", + "contributions": [ + "code" + ] + }, { "login": "jarpit96", "name": "Arpit Jain", diff --git a/README.md b/README.md index c59bfac02..b10ea2a59 100644 --- a/README.md +++ b/README.md @@ -166,6 +166,7 @@ This project is licensed under the terms of the MIT license.
Mitchell Irvin
💻
Arpit Jain
💻 +
hoangnam2261
💻
Kirill Vlasov
💻
Jón Ingi Sveinbjörnsson
💻 From d11b2f06ea91219a2952ca0ea578faef13384ab8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:42:55 +0300 Subject: [PATCH 120/225] docs: add fanofxiaofeng as a contributor (#1414) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index ca9e4c8e0..76018eb5a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "fanofxiaofeng", + "name": "靳阳", + "avatar_url": "https://avatars0.githubusercontent.com/u/3983683?v=4", + "profile": "https://github.com/fanofxiaofeng", + "contributions": [ + "code" + ] + }, { "login": "hoangnam2261", "name": "hoangnam2261", diff --git a/README.md b/README.md index b10ea2a59..9d2c2fb91 100644 --- a/README.md +++ b/README.md @@ -167,6 +167,7 @@ This project is licensed under the terms of the MIT license.
Mitchell Irvin
💻
Arpit Jain
💻
hoangnam2261
💻 +
靳阳
💻
Kirill Vlasov
💻
Jón Ingi Sveinbjörnsson
💻 From 1bbae5fd5a63a6c56e4b576ce4b6cd0abbc59855 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:44:29 +0300 Subject: [PATCH 121/225] docs: add dmitraver as a contributor (#1415) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 76018eb5a..c04339058 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "dmitraver", + "name": "Dmitry Avershin", + "avatar_url": "https://avatars3.githubusercontent.com/u/1798156?v=4", + "profile": "https://github.com/dmitraver", + "contributions": [ + "code" + ] + }, { "login": "fanofxiaofeng", "name": "靳阳", diff --git a/README.md b/README.md index 9d2c2fb91..04721d214 100644 --- a/README.md +++ b/README.md @@ -171,6 +171,7 @@ This project is licensed under the terms of the MIT license.
Kirill Vlasov
💻
Jón Ingi Sveinbjörnsson
💻 +
Dmitry Avershin
💻 From b67a019c48c185e824acf3936b917a0b06764715 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:45:53 +0300 Subject: [PATCH 122/225] docs: add besok as a contributor (#1416) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index c04339058..f30ec4f26 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "besok", + "name": "Boris", + "avatar_url": "https://avatars2.githubusercontent.com/u/29834592?v=4", + "profile": "https://github.com/besok", + "contributions": [ + "code" + ] + }, { "login": "dmitraver", "name": "Dmitry Avershin", diff --git a/README.md b/README.md index 04721d214..4407d4f36 100644 --- a/README.md +++ b/README.md @@ -172,6 +172,7 @@ This project is licensed under the terms of the MIT license.
Kirill Vlasov
💻
Jón Ingi Sveinbjörnsson
💻
Dmitry Avershin
💻 +
Boris
💻 From b4e4cf9cfe4633ebc35e0f91836ce20bd671e11c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:48:09 +0300 Subject: [PATCH 123/225] docs: add baislsl as a contributor (#1417) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index f30ec4f26..39babdca5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "baislsl", + "name": "Shengli Bai", + "avatar_url": "https://avatars0.githubusercontent.com/u/17060584?v=4", + "profile": "https://github.com/baislsl", + "contributions": [ + "code" + ] + }, { "login": "besok", "name": "Boris", diff --git a/README.md b/README.md index 4407d4f36..cc5d3a99e 100644 --- a/README.md +++ b/README.md @@ -164,10 +164,12 @@ This project is licensed under the terms of the MIT license.
PhoenixYip
💻
Ranjeet
💻 +
Mitchell Irvin
💻
Arpit Jain
💻
hoangnam2261
💻
靳阳
💻 +
Kirill Vlasov
💻
Jón Ingi Sveinbjörnsson
💻 @@ -175,6 +177,7 @@ This project is licensed under the terms of the MIT license.
Boris
💻 +
Shengli Bai
💻 From 65d627b2ed11a5d8fdbeae32266bf2cf3dbfcdd8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:49:46 +0300 Subject: [PATCH 124/225] docs: add akrystian as a contributor (#1418) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 39babdca5..92b26c57e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "akrystian", + "name": "adamski.pro", + "avatar_url": "https://avatars1.githubusercontent.com/u/6537430?v=4", + "profile": "http://adamski.pro", + "contributions": [ + "code" + ] + }, { "login": "baislsl", "name": "Shengli Bai", diff --git a/README.md b/README.md index cc5d3a99e..0d91ed28f 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ This project is licensed under the terms of the MIT license.
Shengli Bai
💻 +
adamski.pro
💻 From 47acedaaf7e733d131df78126c3968df40ad4072 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:10:44 +0300 Subject: [PATCH 125/225] docs: add Rzeposlaw as a contributor (#1419) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 92b26c57e..8ff68a0b8 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "Rzeposlaw", + "name": "Katarzyna Rzepecka", + "avatar_url": "https://avatars2.githubusercontent.com/u/18425745?v=4", + "profile": "https://github.com/Rzeposlaw", + "contributions": [ + "code" + ] + }, { "login": "akrystian", "name": "adamski.pro", diff --git a/README.md b/README.md index 0d91ed28f..8e02e8749 100644 --- a/README.md +++ b/README.md @@ -179,6 +179,7 @@ This project is licensed under the terms of the MIT license.
Shengli Bai
💻
adamski.pro
💻 +
Katarzyna Rzepecka
💻 From ae57ec75f3dbe269113e40691d7fbab038735035 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:12:46 +0300 Subject: [PATCH 126/225] docs: add LuigiCortese as a contributor (#1420) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8ff68a0b8..98f1a8eba 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "LuigiCortese", + "name": "Luigi Cortese", + "avatar_url": "https://avatars0.githubusercontent.com/u/9956006?v=4", + "profile": "http://www.devsedge.net/", + "contributions": [ + "code" + ] + }, { "login": "Rzeposlaw", "name": "Katarzyna Rzepecka", diff --git a/README.md b/README.md index 8e02e8749..182219262 100644 --- a/README.md +++ b/README.md @@ -180,6 +180,7 @@ This project is licensed under the terms of the MIT license.
Shengli Bai
💻
adamski.pro
💻
Katarzyna Rzepecka
💻 +
Luigi Cortese
💻 From efd8c8156e9f6ce3ab5714e971973ec35360d683 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:14:26 +0300 Subject: [PATCH 127/225] docs: add Juaanma as a contributor (#1421) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 98f1a8eba..df021acbe 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "Juaanma", + "name": "Juan Manuel Suárez", + "avatar_url": "https://avatars3.githubusercontent.com/u/7390500?v=4", + "profile": "https://github.com/Juaanma", + "contributions": [ + "code" + ] + }, { "login": "LuigiCortese", "name": "Luigi Cortese", diff --git a/README.md b/README.md index 182219262..33df95b87 100644 --- a/README.md +++ b/README.md @@ -183,6 +183,7 @@ This project is licensed under the terms of the MIT license.
Luigi Cortese
💻 +
Juan Manuel Suárez
💻 From 325f0d93b24d9779109391cb7a5c876eaf048aa1 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:16:02 +0300 Subject: [PATCH 128/225] docs: add 7agustibm as a contributor (#1422) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index df021acbe..c7d6637a9 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "7agustibm", + "name": "Agustí Becerra Milà", + "avatar_url": "https://avatars0.githubusercontent.com/u/8149332?v=4", + "profile": "https://github.com/7agustibm", + "contributions": [ + "code" + ] + }, { "login": "Juaanma", "name": "Juan Manuel Suárez", diff --git a/README.md b/README.md index 33df95b87..c9429805b 100644 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ This project is licensed under the terms of the MIT license.
Juan Manuel Suárez
💻 +
Agustí Becerra Milà
💻 From 1841fba8319af0e7a12a0ea04320311702b4b950 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:17:45 +0300 Subject: [PATCH 129/225] docs: add yosfik as a contributor (#1423) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index c7d6637a9..1e49b8d91 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "yosfik", + "name": "Yosfik Alqadri", + "avatar_url": "https://avatars3.githubusercontent.com/u/4850270?v=4", + "profile": "https://github.com/yosfik", + "contributions": [ + "code" + ] + }, { "login": "7agustibm", "name": "Agustí Becerra Milà", diff --git a/README.md b/README.md index c9429805b..74c9220bc 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,7 @@ This project is licensed under the terms of the MIT license.
Juan Manuel Suárez
💻
Agustí Becerra Milà
💻 +
Yosfik Alqadri
💻 From ecb7b44f970c3701ef04db47575f11078c45fa8c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:19:24 +0300 Subject: [PATCH 130/225] docs: add vanogrid as a contributor (#1424) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 1e49b8d91..8d9026820 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "vanogrid", + "name": "Alexander Ivanov", + "avatar_url": "https://avatars0.githubusercontent.com/u/4307918?v=4", + "profile": "https://www.vanogrid.com", + "contributions": [ + "code" + ] + }, { "login": "yosfik", "name": "Yosfik Alqadri", diff --git a/README.md b/README.md index 74c9220bc..13a649741 100644 --- a/README.md +++ b/README.md @@ -186,6 +186,7 @@ This project is licensed under the terms of the MIT license.
Juan Manuel Suárez
💻
Agustí Becerra Milà
💻
Yosfik Alqadri
💻 +
Alexander Ivanov
💻 From b5fac5cf861df4414dfb76f6b2560cb72f1c9be4 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:21:22 +0300 Subject: [PATCH 131/225] docs: add valdar-hu as a contributor (#1425) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8d9026820..0087c240e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "valdar-hu", + "name": "Krisztián Nagy", + "avatar_url": "https://avatars3.githubusercontent.com/u/17962817?v=4", + "profile": "https://github.com/valdar-hu", + "contributions": [ + "code" + ] + }, { "login": "vanogrid", "name": "Alexander Ivanov", diff --git a/README.md b/README.md index 13a649741..4f2b4895c 100644 --- a/README.md +++ b/README.md @@ -189,6 +189,7 @@ This project is licensed under the terms of the MIT license.
Alexander Ivanov
💻 +
Krisztián Nagy
💻 From 652a68b134838ed0f6d7a9fd2f4b29d0e1ad6961 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:23:12 +0300 Subject: [PATCH 132/225] docs: add staillebois as a contributor (#1426) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 0087c240e..fd2186072 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "staillebois", + "name": "staillebois", + "avatar_url": "https://avatars0.githubusercontent.com/u/23701200?v=4", + "profile": "https://github.com/staillebois", + "contributions": [ + "code" + ] + }, { "login": "valdar-hu", "name": "Krisztián Nagy", diff --git a/README.md b/README.md index 4f2b4895c..a93f15b13 100644 --- a/README.md +++ b/README.md @@ -190,6 +190,7 @@ This project is licensed under the terms of the MIT license.
Krisztián Nagy
💻 +
staillebois
💻 From 6f0035e7c23879b19eb514b2907fd392a55680c0 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:25:03 +0300 Subject: [PATCH 133/225] docs: add sankypanhale as a contributor (#1427) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index fd2186072..511466186 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "sankypanhale", + "name": "Sanket Panhale", + "avatar_url": "https://avatars1.githubusercontent.com/u/6478783?v=4", + "profile": "https://github.com/sankypanhale", + "contributions": [ + "content" + ] + }, { "login": "staillebois", "name": "staillebois", diff --git a/README.md b/README.md index a93f15b13..911440c14 100644 --- a/README.md +++ b/README.md @@ -191,6 +191,7 @@ This project is licensed under the terms of the MIT license.
Krisztián Nagy
💻
staillebois
💻 +
Sanket Panhale
🖋 From dafe4956108c9602aed8bd241c80f3cef6247bd0 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:26:38 +0300 Subject: [PATCH 134/225] docs: add prafful1 as a contributor (#1428) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 511466186..591781b1c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "prafful1", + "name": "Prafful Agarwal", + "avatar_url": "https://avatars0.githubusercontent.com/u/14350274?v=4", + "profile": "https://github.com/prafful1", + "contributions": [ + "content" + ] + }, { "login": "sankypanhale", "name": "Sanket Panhale", diff --git a/README.md b/README.md index 911440c14..7ab4f2b78 100644 --- a/README.md +++ b/README.md @@ -192,6 +192,7 @@ This project is licensed under the terms of the MIT license.
Krisztián Nagy
💻
staillebois
💻
Sanket Panhale
🖋 +
Prafful Agarwal
🖋 From 7fdcd2ec5ab7558ca29227d19acbade450f29cad Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:28:18 +0300 Subject: [PATCH 135/225] docs: add pnowy as a contributor (#1429) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 591781b1c..9edfc2588 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "pnowy", + "name": "Przemek", + "avatar_url": "https://avatars1.githubusercontent.com/u/3254609?v=4", + "profile": "https://przemeknowak.com", + "contributions": [ + "code" + ] + }, { "login": "prafful1", "name": "Prafful Agarwal", diff --git a/README.md b/README.md index 7ab4f2b78..e159ca59f 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,7 @@ This project is licensed under the terms of the MIT license.
Prafful Agarwal
🖋 +
Przemek
💻 From 6c9b912620f1ac84f6b7a61c486c8a400ee6d43d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:29:55 +0300 Subject: [PATCH 136/225] docs: add lbroman as a contributor (#1430) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9edfc2588..3a9ed11ac 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "lbroman", + "name": "lbroman", + "avatar_url": "https://avatars1.githubusercontent.com/u/86007?v=4", + "profile": "https://github.com/lbroman", + "contributions": [ + "code" + ] + }, { "login": "pnowy", "name": "Przemek", diff --git a/README.md b/README.md index e159ca59f..03f77ef7d 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,7 @@ This project is licensed under the terms of the MIT license.
Przemek
💻 +
lbroman
💻 From 5d21a03acd97f13e8876686b936f5d48307f2c0a Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:31:35 +0300 Subject: [PATCH 137/225] docs: add kaiwinter as a contributor (#1431) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3a9ed11ac..ad0a07bff 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "kaiwinter", + "name": "Kai Winter", + "avatar_url": "https://avatars0.githubusercontent.com/u/110982?v=4", + "profile": "http://about.me/kaiwinter", + "contributions": [ + "code" + ] + }, { "login": "lbroman", "name": "lbroman", diff --git a/README.md b/README.md index 03f77ef7d..4a55b3c68 100644 --- a/README.md +++ b/README.md @@ -197,6 +197,7 @@ This project is licensed under the terms of the MIT license.
Przemek
💻
lbroman
💻 +
Kai Winter
💻 From 1f900d164d3b697c29b2e26f17507495e2cd2367 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:33:18 +0300 Subject: [PATCH 138/225] docs: add jjjimenez100 as a contributor (#1432) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index ad0a07bff..e7bc74009 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "jjjimenez100", + "name": "Joshua Jimenez", + "avatar_url": "https://avatars3.githubusercontent.com/u/22243493?v=4", + "profile": "https://github.com/jjjimenez100", + "contributions": [ + "code" + ] + }, { "login": "kaiwinter", "name": "Kai Winter", diff --git a/README.md b/README.md index 4a55b3c68..bbb11f58d 100644 --- a/README.md +++ b/README.md @@ -198,6 +198,7 @@ This project is licensed under the terms of the MIT license.
Przemek
💻
lbroman
💻
Kai Winter
💻 +
Joshua Jimenez
💻 From 73d55afd585106f169da9a3d3275714393073c90 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:34:58 +0300 Subject: [PATCH 139/225] docs: add dzmitryh as a contributor (#1433) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index e7bc74009..9913c1e64 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "dzmitryh", + "name": "Dima Gubin", + "avatar_url": "https://avatars2.githubusercontent.com/u/5390492?v=4", + "profile": "https://about.me/dzmitryh", + "contributions": [ + "code" + ] + }, { "login": "jjjimenez100", "name": "Joshua Jimenez", diff --git a/README.md b/README.md index bbb11f58d..b0a836d2a 100644 --- a/README.md +++ b/README.md @@ -200,6 +200,9 @@ This project is licensed under the terms of the MIT license.
Kai Winter
💻
Joshua Jimenez
💻 + +
Dima Gubin
💻 + From 9483888b5eb0fa1c4fe05ad15f0b19b9a6fed043 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:36:36 +0300 Subject: [PATCH 140/225] docs: add christophercolumbusdog as a contributor (#1434) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9913c1e64..19119645d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "christophercolumbusdog", + "name": "Christian Cygnus", + "avatar_url": "https://avatars1.githubusercontent.com/u/9342724?v=4", + "profile": "http://ccygnus.com/", + "contributions": [ + "code" + ] + }, { "login": "dzmitryh", "name": "Dima Gubin", diff --git a/README.md b/README.md index b0a836d2a..c188513e2 100644 --- a/README.md +++ b/README.md @@ -202,6 +202,7 @@ This project is licensed under the terms of the MIT license.
Dima Gubin
💻 +
Christian Cygnus
💻 From e222a699648758ae29204ed699d17e809752653e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:38:23 +0300 Subject: [PATCH 141/225] docs: add anthonycampbell as a contributor (#1435) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 19119645d..b9991fc22 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "anthonycampbell", + "name": "anthony", + "avatar_url": "https://avatars3.githubusercontent.com/u/10249255?v=4", + "profile": "https://github.com/anthonycampbell", + "contributions": [ + "code" + ] + }, { "login": "christophercolumbusdog", "name": "Christian Cygnus", diff --git a/README.md b/README.md index c188513e2..cdb66ef3b 100644 --- a/README.md +++ b/README.md @@ -203,6 +203,7 @@ This project is licensed under the terms of the MIT license.
Dima Gubin
💻
Christian Cygnus
💻 +
anthony
💻 From 706c5092c106420a1942a9d6a63db34b5fa133ab Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:40:00 +0300 Subject: [PATCH 142/225] docs: add amogozov as a contributor (#1436) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index b9991fc22..385e4448c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "amogozov", + "name": "Artur Mogozov", + "avatar_url": "https://avatars3.githubusercontent.com/u/7372215?v=4", + "profile": "https://github.com/amogozov", + "contributions": [ + "code" + ] + }, { "login": "anthonycampbell", "name": "anthony", diff --git a/README.md b/README.md index cdb66ef3b..e213d97c0 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,7 @@ This project is licensed under the terms of the MIT license.
Dima Gubin
💻
Christian Cygnus
💻
anthony
💻 +
Artur Mogozov
💻 From beffc87deb9a27b46f56fe91b3a69b6b52774fe3 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:41:47 +0300 Subject: [PATCH 143/225] docs: add alexsomai as a contributor (#1437) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 385e4448c..dced8bd77 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "alexsomai", + "name": "Alexandru Somai", + "avatar_url": "https://avatars1.githubusercontent.com/u/5720977?v=4", + "profile": "https://alexsomai.com", + "contributions": [ + "code" + ] + }, { "login": "amogozov", "name": "Artur Mogozov", diff --git a/README.md b/README.md index e213d97c0..7405d01c4 100644 --- a/README.md +++ b/README.md @@ -206,6 +206,9 @@ This project is licensed under the terms of the MIT license.
anthony
💻
Artur Mogozov
💻 + +
Alexandru Somai
💻 + From 62ac59afda52a62fca08c7c066d57eae62a8ea74 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:43:26 +0300 Subject: [PATCH 144/225] docs: add MaVdbussche as a contributor (#1438) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index dced8bd77..c6400808a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "MaVdbussche", + "name": "Martin Vandenbussche", + "avatar_url": "https://avatars1.githubusercontent.com/u/26136934?v=4", + "profile": "https://github.com/MaVdbussche", + "contributions": [ + "code" + ] + }, { "login": "alexsomai", "name": "Alexandru Somai", diff --git a/README.md b/README.md index 7405d01c4..fef3b2712 100644 --- a/README.md +++ b/README.md @@ -208,6 +208,7 @@ This project is licensed under the terms of the MIT license.
Alexandru Somai
💻 +
Martin Vandenbussche
💻 From 34a36cb519b7718d19eb06ed7b088b960f722e3c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:45:07 +0300 Subject: [PATCH 145/225] docs: add Harshrajsinh as a contributor (#1439) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index c6400808a..f694230e6 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "Harshrajsinh", + "name": "Harshraj Thakor", + "avatar_url": "https://avatars2.githubusercontent.com/u/22811531?v=4", + "profile": "https://github.com/Harshrajsinh", + "contributions": [ + "code" + ] + }, { "login": "MaVdbussche", "name": "Martin Vandenbussche", diff --git a/README.md b/README.md index fef3b2712..985605cd2 100644 --- a/README.md +++ b/README.md @@ -209,6 +209,7 @@ This project is licensed under the terms of the MIT license.
Alexandru Somai
💻
Martin Vandenbussche
💻 +
Harshraj Thakor
💻 From 1d025b70193e361f39a73ed1faf7090f21c1ff16 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:47:29 +0300 Subject: [PATCH 146/225] docs: add Deathnerd as a contributor (#1440) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index f694230e6..7f925d4b8 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "Deathnerd", + "name": "Wes Gilleland", + "avatar_url": "https://avatars0.githubusercontent.com/u/1685953?v=4", + "profile": "http://theerroris.me", + "contributions": [ + "code" + ] + }, { "login": "Harshrajsinh", "name": "Harshraj Thakor", diff --git a/README.md b/README.md index 985605cd2..c879245d4 100644 --- a/README.md +++ b/README.md @@ -210,6 +210,7 @@ This project is licensed under the terms of the MIT license.
Alexandru Somai
💻
Martin Vandenbussche
💻
Harshraj Thakor
💻 +
Wes Gilleland
💻 From 87c2644842bfa5cbbbcd89ce0b2a4c1de3e4c76c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:49:20 +0300 Subject: [PATCH 147/225] docs: add Anurag870 as a contributor (#1441) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7f925d4b8..60837ff7d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "Anurag870", + "name": "Anurag870", + "avatar_url": "https://avatars1.githubusercontent.com/u/6295975?v=4", + "profile": "https://github.com/Anurag870", + "contributions": [ + "code" + ] + }, { "login": "Deathnerd", "name": "Wes Gilleland", diff --git a/README.md b/README.md index c879245d4..9f7e24500 100644 --- a/README.md +++ b/README.md @@ -212,6 +212,9 @@ This project is licensed under the terms of the MIT license.
Harshraj Thakor
💻
Wes Gilleland
💻 + +
Anurag870
💻 + From a1b2ab129e6388cb8ac6fd4a10566fe347e8f49d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:51:03 +0300 Subject: [PATCH 148/225] docs: add Amarnath510 as a contributor (#1442) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 60837ff7d..d2109eea0 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "Amarnath510", + "name": "Amarnath Chandana", + "avatar_url": "https://avatars0.githubusercontent.com/u/4599623?v=4", + "profile": "https://amarnath510.github.io/portfolio", + "contributions": [ + "code" + ] + }, { "login": "Anurag870", "name": "Anurag870", diff --git a/README.md b/README.md index 9f7e24500..319a3760f 100644 --- a/README.md +++ b/README.md @@ -214,6 +214,7 @@ This project is licensed under the terms of the MIT license.
Anurag870
💻 +
Amarnath Chandana
💻 From 69341ff7124debb5c114f680debf81a94da2cb65 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:53:14 +0300 Subject: [PATCH 149/225] docs: add IAmPramod as a contributor (#1443) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index d2109eea0..29549be77 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -291,6 +291,15 @@ "code" ] }, + { + "login": "IAmPramod", + "name": "Pramod Gupta", + "avatar_url": "https://avatars1.githubusercontent.com/u/2184241?v=4", + "profile": "https://www.linkedin.com/in/pramodgupta3/", + "contributions": [ + "review" + ] + }, { "login": "Amarnath510", "name": "Amarnath Chandana", diff --git a/README.md b/README.md index 319a3760f..8769e4a56 100644 --- a/README.md +++ b/README.md @@ -215,6 +215,7 @@ This project is licensed under the terms of the MIT license.
Anurag870
💻
Amarnath Chandana
💻 +
Pramod Gupta
👀 From 1f0a24cefa9f2c8c3036ccac64acbc8af67ad815 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:59:40 +0300 Subject: [PATCH 150/225] docs: add trautonen as a contributor (#1445) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++ README.md | 139 ++++++++++++++++++++++---------------------- 2 files changed, 79 insertions(+), 69 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 29549be77..57fed1a81 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -902,6 +902,15 @@ "contributions": [ "code" ] + }, + { + "login": "trautonen", + "name": "Tapio Rautonen", + "avatar_url": "https://avatars3.githubusercontent.com/u/1641063?v=4", + "profile": "https://github.com/trautonen", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 8769e4a56..b3c8f964d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-32-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-100-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -114,108 +114,109 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Zhang WH
💻 +
Pramod Gupta
👀 -
qza
💻 -
Rodolfo Forte
🖋 -
Ankur Kaushal
💻 -
Ovidijus Okinskas
💻 +
Amarnath Chandana
💻 +
Anurag870
💻 +
Wes Gilleland
💻 +
Harshraj Thakor
💻 -
Stamatis Pitsios
💻 -
Robert Kasperczyk
💻 -
田浩
🖋 -
gwildor28
💻 +
Martin Vandenbussche
💻 +
Alexandru Somai
💻 +
Artur Mogozov
💻 +
anthony
💻 -
Amit Pandey
💻 -
Hoswey
💻 -
Gopinath Langote
💻 -
Matt
🖋 +
Christian Cygnus
💻 +
Dima Gubin
💻 +
Joshua Jimenez
💻 +
Kai Winter
💻 -
gans
💻 -
Azureyjt
💻 -
Mahendran Mookkiah
💻 -
George Aristy
💻 +
lbroman
💻 +
Przemek
💻 +
Prafful Agarwal
🖋 +
Sanket Panhale
🖋 -
Kevin Peters
💻 -
Hemant Bothra
💻 -
George Mavroeidis
💻 -
Christopher O'Connell
💻 +
staillebois
💻 +
Krisztián Nagy
💻 +
Alexander Ivanov
💻 +
Yosfik Alqadri
💻 -
Leo Gutiérrez Ramírez
💻 -
Hannes
💻 -
Dominik Gruntz
💻 -
Christoffer Hamberg
💻 +
Agustí Becerra Milà
💻 +
Juan Manuel Suárez
💻 +
Luigi Cortese
💻 +
Katarzyna Rzepecka
💻 -
AnaghaSasikumar
💻 -
Evan Sia Wai Suan
💻 -
Per Wramdemark
💻 -
Leon Mak
💻 +
adamski.pro
💻 +
Shengli Bai
💻 +
Boris
💻 +
Dmitry Avershin
💻 -
kanwarpreet25
💻 -
M Saif Asif
💻 -
PhoenixYip
💻 -
Ranjeet
💻 - - -
Mitchell Irvin
💻 -
Arpit Jain
💻 -
hoangnam2261
💻
靳阳
💻 +
hoangnam2261
💻 +
Arpit Jain
💻 +
Jón Ingi Sveinbjörnsson
💻
Kirill Vlasov
💻 -
Jón Ingi Sveinbjörnsson
💻 -
Dmitry Avershin
💻 -
Boris
💻 +
Mitchell Irvin
💻 +
Ranjeet
💻 +
PhoenixYip
💻 -
Shengli Bai
💻 -
adamski.pro
💻 -
Katarzyna Rzepecka
💻 -
Luigi Cortese
💻 +
M Saif Asif
💻 +
kanwarpreet25
💻 +
Leon Mak
💻 +
Per Wramdemark
💻 -
Juan Manuel Suárez
💻 -
Agustí Becerra Milà
💻 -
Yosfik Alqadri
💻 -
Alexander Ivanov
💻 +
Evan Sia Wai Suan
💻 +
AnaghaSasikumar
💻 +
Christoffer Hamberg
💻 +
Dominik Gruntz
💻 -
Krisztián Nagy
💻 -
staillebois
💻 -
Sanket Panhale
🖋 -
Prafful Agarwal
🖋 +
Hannes
💻 +
Leo Gutiérrez Ramírez
💻 +
Zhang WH
💻 +
Christopher O'Connell
💻 -
Przemek
💻 -
lbroman
💻 -
Kai Winter
💻 -
Joshua Jimenez
💻 +
George Mavroeidis
💻 +
Hemant Bothra
💻 +
Kevin Peters
💻 +
George Aristy
💻 -
Dima Gubin
💻 -
Christian Cygnus
💻 -
anthony
💻 -
Artur Mogozov
💻 +
Mahendran Mookkiah
💻 +
Azureyjt
💻 +
gans
💻 +
Matt
🖋 -
Alexandru Somai
💻 -
Martin Vandenbussche
💻 -
Harshraj Thakor
💻 -
Wes Gilleland
💻 +
Gopinath Langote
💻 +
Hoswey
💻 +
Amit Pandey
💻 +
gwildor28
🖋 -
Anurag870
💻 -
Amarnath Chandana
💻 -
Pramod Gupta
👀 +
田浩
🖋 +
Stamatis Pitsios
💻 +
qza
💻 +
Rodolfo Forte
🖋 + + +
Ankur Kaushal
💻 +
Ovidijus Okinskas
💻 +
Robert Kasperczyk
💻 +
Tapio Rautonen
💻 From 075fbe74332aa7fec0a8420751d86ecca0bc79c0 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:04:33 +0300 Subject: [PATCH 151/225] docs: add yorlov as a contributor (#1446) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 57fed1a81..0fb6f83cc 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -911,6 +911,15 @@ "contributions": [ "code" ] + }, + { + "login": "yorlov", + "name": "Yuri Orlov", + "avatar_url": "https://avatars0.githubusercontent.com/u/1595733?v=4", + "profile": "http://vk.com/yuri.orlov", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index b3c8f964d..a9889ab9e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-100-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-101-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -218,6 +218,9 @@ This project is licensed under the terms of the MIT license.
Robert Kasperczyk
💻
Tapio Rautonen
💻 + +
Yuri Orlov
💻 + From 4db3a1cfb2dde15e545ee3ba2d5f6b06b6b46a32 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:06:01 +0300 Subject: [PATCH 152/225] docs: add varunu28 as a contributor (#1447) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 0fb6f83cc..17039ce00 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -920,6 +920,15 @@ "contributions": [ "code" ] + }, + { + "login": "varunu28", + "name": "Varun Upadhyay", + "avatar_url": "https://avatars0.githubusercontent.com/u/7676016?v=4", + "profile": "https://www.linkedin.com/in/varunu28/", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index a9889ab9e..0a9b45188 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-101-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-102-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -220,6 +220,7 @@ This project is licensed under the terms of the MIT license.
Yuri Orlov
💻 +
Varun Upadhyay
💻 From 047285aed7742a7d93f8b7df33cc4ab170246122 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:07:30 +0300 Subject: [PATCH 153/225] docs: add PalAditya as a contributor (#1448) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 17039ce00..3ec5459fb 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -929,6 +929,15 @@ "contributions": [ "code" ] + }, + { + "login": "PalAditya", + "name": "Aditya Pal", + "avatar_url": "https://avatars2.githubusercontent.com/u/25523604?v=4", + "profile": "https://github.com/PalAditya", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 0a9b45188..0801c677c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-102-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-103-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -221,6 +221,7 @@ This project is licensed under the terms of the MIT license.
Yuri Orlov
💻
Varun Upadhyay
💻 +
Aditya Pal
💻 From 51ef7176b191685edd39a71118dd3e5a6550e269 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:08:47 +0300 Subject: [PATCH 154/225] docs: add grzesiekkedzior as a contributor (#1449) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3ec5459fb..c7a0d5b48 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -938,6 +938,15 @@ "contributions": [ "code" ] + }, + { + "login": "grzesiekkedzior", + "name": "grzesiekkedzior", + "avatar_url": "https://avatars3.githubusercontent.com/u/23739158?v=4", + "profile": "https://github.com/grzesiekkedzior", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 0801c677c..733bb5afb 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-103-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-104-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -222,6 +222,7 @@ This project is licensed under the terms of the MIT license.
Yuri Orlov
💻
Varun Upadhyay
💻
Aditya Pal
💻 +
grzesiekkedzior
💻 From f878bf63aa17e8d618865c9c3bba2bcbeb3ebf17 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:11:51 +0300 Subject: [PATCH 155/225] docs: add sivasubramanim as a contributor (#1450) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index c7a0d5b48..3a791df55 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -947,6 +947,15 @@ "contributions": [ "code" ] + }, + { + "login": "sivasubramanim", + "name": "Sivasubramani M", + "avatar_url": "https://avatars2.githubusercontent.com/u/51107434?v=4", + "profile": "https://github.com/sivasubramanim", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 733bb5afb..5ecb3a77e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-104-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-105-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -224,6 +224,9 @@ This project is licensed under the terms of the MIT license.
Aditya Pal
💻
grzesiekkedzior
💻 + +
Sivasubramani M
💻 + From f49f9a15b6a2a470a16ad9446f459f12ec8b32d8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:13:24 +0300 Subject: [PATCH 156/225] docs: add d4gg4d as a contributor (#1451) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3a791df55..b49ea6397 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -956,6 +956,15 @@ "contributions": [ "code" ] + }, + { + "login": "d4gg4d", + "name": "Sami Airaksinen", + "avatar_url": "https://avatars2.githubusercontent.com/u/99457?v=4", + "profile": "https://github.com/d4gg4d", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 5ecb3a77e..c4d62eae4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-105-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-106-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -226,6 +226,7 @@ This project is licensed under the terms of the MIT license.
Sivasubramani M
💻 +
Sami Airaksinen
💻 From c9e30390d36209c58028674d87052a3cc66ba19f Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:14:42 +0300 Subject: [PATCH 157/225] docs: add vertti as a contributor (#1452) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index b49ea6397..edc3b8767 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -965,6 +965,15 @@ "contributions": [ "code" ] + }, + { + "login": "vertti", + "name": "Janne Sinivirta", + "avatar_url": "https://avatars0.githubusercontent.com/u/557751?v=4", + "profile": "https://github.com/vertti", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index c4d62eae4..e7902e395 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-106-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-107-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -227,6 +227,7 @@ This project is licensed under the terms of the MIT license.
Sivasubramani M
💻
Sami Airaksinen
💻 +
Janne Sinivirta
💻 From f2ac53edcad689ee382c701bd24eb4f736a7c0a2 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:16:54 +0300 Subject: [PATCH 158/225] docs: add Bobo1239 as a contributor (#1453) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index edc3b8767..b62e7856c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -974,6 +974,15 @@ "contributions": [ "code" ] + }, + { + "login": "Bobo1239", + "name": "Boris-Chengbiao Zhou", + "avatar_url": "https://avatars1.githubusercontent.com/u/2302947?v=4", + "profile": "https://github.com/Bobo1239", + "contributions": [ + "content" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index e7902e395..65f05e5ba 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-107-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-108-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -228,6 +228,7 @@ This project is licensed under the terms of the MIT license.
Sivasubramani M
💻
Sami Airaksinen
💻
Janne Sinivirta
💻 +
Boris-Chengbiao Zhou
🖋 From de79019ece03d380534f6d21f4230eca81bf4535 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:18:15 +0300 Subject: [PATCH 159/225] docs: add Jahhein as a contributor (#1454) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index b62e7856c..7ae53172f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -983,6 +983,15 @@ "contributions": [ "content" ] + }, + { + "login": "Jahhein", + "name": "Jacob Hein", + "avatar_url": "https://avatars2.githubusercontent.com/u/10779515?v=4", + "profile": "https://jahhein.github.io", + "contributions": [ + "content" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 65f05e5ba..adbc505a3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-108-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-109-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -230,6 +230,9 @@ This project is licensed under the terms of the MIT license.
Janne Sinivirta
💻
Boris-Chengbiao Zhou
🖋 + +
Jacob Hein
🖋 + From ec7a2025f088e9c08629f7c2bf8b1d2815310946 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:19:47 +0300 Subject: [PATCH 160/225] docs: add iamrichardjones as a contributor (#1455) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7ae53172f..46558d4fa 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -992,6 +992,15 @@ "contributions": [ "content" ] + }, + { + "login": "iamrichardjones", + "name": "Richard Jones", + "avatar_url": "https://avatars3.githubusercontent.com/u/14842151?v=4", + "profile": "https://github.com/iamrichardjones", + "contributions": [ + "content" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index adbc505a3..6b601290a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-109-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-110-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -232,6 +232,7 @@ This project is licensed under the terms of the MIT license.
Jacob Hein
🖋 +
Richard Jones
🖋 From 1e38edec151b59c6aa3c1c3907bf967ba1b3359f Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:21:07 +0300 Subject: [PATCH 161/225] docs: add rachelcarmena as a contributor (#1456) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 46558d4fa..e203d5615 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1001,6 +1001,15 @@ "contributions": [ "content" ] + }, + { + "login": "rachelcarmena", + "name": "Rachel M. Carmena", + "avatar_url": "https://avatars0.githubusercontent.com/u/22792183?v=4", + "profile": "https://rachelcarmena.github.io", + "contributions": [ + "content" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 6b601290a..4b128803a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-110-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-111-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -233,6 +233,7 @@ This project is licensed under the terms of the MIT license.
Jacob Hein
🖋
Richard Jones
🖋 +
Rachel M. Carmena
🖋 From 6a28d09a3c3fe781d1a1f92743c2a46636230309 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:22:29 +0300 Subject: [PATCH 162/225] docs: add zd-zero as a contributor (#1457) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index e203d5615..038baf8ec 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1010,6 +1010,15 @@ "contributions": [ "content" ] + }, + { + "login": "zd-zero", + "name": "Zaerald Denze Lungos", + "avatar_url": "https://avatars0.githubusercontent.com/u/21978370?v=4", + "profile": "https://zd-zero.github.io", + "contributions": [ + "content" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 4b128803a..a5b0e8a73 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-111-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-112-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -234,6 +234,7 @@ This project is licensed under the terms of the MIT license.
Jacob Hein
🖋
Richard Jones
🖋
Rachel M. Carmena
🖋 +
Zaerald Denze Lungos
🖋 From 402b753480b517257d26f96de76e445922f4d8e5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:24:01 +0300 Subject: [PATCH 163/225] docs: add webpro as a contributor (#1458) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 038baf8ec..c9e63d0b3 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1019,6 +1019,15 @@ "contributions": [ "content" ] + }, + { + "login": "webpro", + "name": "Lars Kappert", + "avatar_url": "https://avatars1.githubusercontent.com/u/456426?v=4", + "profile": "https://webpro.nl", + "contributions": [ + "content" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index a5b0e8a73..731f334f7 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-112-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-113-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -236,6 +236,9 @@ This project is licensed under the terms of the MIT license.
Rachel M. Carmena
🖋
Zaerald Denze Lungos
🖋 + +
Lars Kappert
🖋 + From f95aadc8f54068c87430d7077903126c2b8a4e65 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:42:45 +0300 Subject: [PATCH 164/225] docs: add hbothra15 as a contributor (#1459) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] * fix merge Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä --- .all-contributorsrc | 3 ++- README.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index c9e63d0b3..da6e03b58 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -747,7 +747,8 @@ "avatar_url": "https://avatars1.githubusercontent.com/u/7418012?v=4", "profile": "https://github.com/hbothra15", "contributions": [ - "code" + "code", + "design" ] }, { diff --git a/README.md b/README.md index 731f334f7..96ad7b25c 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Pramod Gupta
👀 +
Hemant Bothra
💻 🎨
Amarnath Chandana
💻 @@ -237,6 +237,7 @@ This project is licensed under the terms of the MIT license.
Zaerald Denze Lungos
🖋 +
Pramod Gupta
👀
Lars Kappert
🖋 From 5381387026365f3800859a4c64118b99e3dcd328 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 21:03:29 +0300 Subject: [PATCH 165/225] docs: add xiaod-dev as a contributor (#1460) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index da6e03b58..9a536d34d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1029,6 +1029,15 @@ "contributions": [ "content" ] + }, + { + "login": "xiaod-dev", + "name": "Mike Liu", + "avatar_url": "https://avatars2.githubusercontent.com/u/21277644?v=4", + "profile": "https://xiaod.info", + "contributions": [ + "translation" + ] } ], "contributorsPerLine": 4, diff --git a/README.md b/README.md index 96ad7b25c..d3c815cb3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-113-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-114-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
GVSharma
💻
Srđan Paunović
💻
Petros G. Sideris
💻 -
Hemant Bothra
💻 🎨 +
Pramod Gupta
👀
Amarnath Chandana
💻 @@ -190,7 +190,7 @@ This project is licensed under the terms of the MIT license.
George Mavroeidis
💻 -
Hemant Bothra
💻 +
Hemant Bothra
💻 🎨
Kevin Peters
💻
George Aristy
💻 @@ -237,8 +237,8 @@ This project is licensed under the terms of the MIT license.
Zaerald Denze Lungos
🖋 -
Pramod Gupta
👀
Lars Kappert
🖋 +
Mike Liu
🌍 From 417f21ed3dda41d65e7d748c5aff8a168840b788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Thu, 30 Jul 2020 20:28:47 +0300 Subject: [PATCH 166/225] Code cleanup (#1461) * Code cleanup * Fix flux tests * Fix checkstyle errors * Fix compile error --- .../AbstractDocumentTest.java | 2 +- .../abstractfactory/AbstractFactoryTest.java | 2 +- .../ConfigureForDosVisitorTest.java | 2 +- adapter/README.md | 4 +- .../iluwatar/adapter/FishingBoatAdapter.java | 2 +- .../ambassador/RemoteServiceTest.java | 2 +- .../invocation/ThreadAsyncExecutor.java | 2 +- .../iluwatar/business/delegate/Client.java | 2 +- .../business/delegate/ServiceType.java | 2 +- .../com/iluwatar/bytecode/VirtualMachine.java | 4 +- .../iluwatar/bytecode/VirtualMachineTest.java | 2 +- .../com/iluwatar/caching/CachingPolicy.java | 2 +- chain/README.md | 2 +- .../com/iluwatar/chain/RequestHandler.java | 2 +- .../com/iluwatar/collectionpipeline/Car.java | 5 +- .../iluwatar/collectionpipeline/Person.java | 2 +- .../iluwatar/collectionpipeline/AppTest.java | 2 +- command/README.md | 4 +- .../main/java/com/iluwatar/command/Size.java | 86 ++++---- .../java/com/iluwatar/command/Visibility.java | 86 ++++---- .../java/com/iluwatar/command/Wizard.java | 4 +- .../employeehandle/EmployeeDatabase.java | 2 +- .../messagingservice/MessagingDatabase.java | 2 +- .../paymentservice/PaymentDatabase.java | 2 +- .../commander/queue/QueueDatabase.java | 2 +- .../shippingservice/ShippingDatabase.java | 2 +- composite/README.md | 4 +- .../java/com/iluwatar/composite/Letter.java | 2 +- .../iluwatar/composite/LetterComposite.java | 116 +++++------ .../java/com/iluwatar/converter/User.java | 8 +- .../java/com/iluwatar/converter/UserDto.java | 8 +- .../com/iluwatar/converter/ConverterTest.java | 2 +- .../cqrs/commandes/CommandServiceImpl.java | 2 +- .../cqrs/queries/QueryServiceImpl.java | 2 +- dao/README.md | 2 +- dao/src/main/java/com/iluwatar/dao/App.java | 2 +- .../com/iluwatar/dao/InMemoryCustomerDao.java | 2 +- .../com/iluwatar/dao/DbCustomerDaoTest.java | 2 +- .../members/MessageCollectorMember.java | 2 +- .../java/com/iluwatar/datamapper/App.java | 166 ++++++++-------- .../datamapper/StudentDataMapperImpl.java | 2 +- data-transfer-object/README.md | 2 +- .../datatransfer/CustomerResource.java | 2 +- decorator/README.md | 2 +- .../com/iluwatar/decorator/ClubbedTroll.java | 2 +- .../iluwatar/decorator/SimpleTrollTest.java | 2 +- .../delegation/simple/DelegateTest.java | 2 +- dependency-injection/README.md | 2 +- .../dependency/injection/AdvancedWizard.java | 2 +- .../dependency/injection/GuiceWizard.java | 2 +- .../dependency/injection/SimpleWizard.java | 2 +- .../injection/utils/InMemoryAppender.java | 2 +- .../java/com/iluwatar/dirtyflag/World.java | 2 +- .../iluwatar/doublebuffer/FrameBuffer.java | 2 +- .../java/com/iluwatar/doublebuffer/Pixel.java | 2 +- .../java/com/iluwatar/doublebuffer/Scene.java | 2 +- .../doublechecked/locking/InventoryTest.java | 2 +- .../iluwatar/doubledispatch/Rectangle.java | 8 +- .../com/iluwatar/event/aggregator/Event.java | 2 +- .../event/aggregator/EventEmitter.java | 2 +- .../iluwatar/event/aggregator/Weekday.java | 2 +- .../event/aggregator/KingJoffreyTest.java | 2 +- .../iluwatar/event/asynchronous/Event.java | 6 +- .../event/asynchronous/EventManager.java | 4 +- .../iluwatar/eda/event/UserCreatedEvent.java | 2 +- .../iluwatar/eda/event/UserUpdatedEvent.java | 2 +- .../eda/framework/EventDispatcher.java | 2 +- .../java/com/iluwatar/eda/model/User.java | 2 +- .../java/com/iluwatar/event/queue/Audio.java | 2 +- .../java/concreteextensions/Commander.java | 2 +- .../java/concreteextensions/Sergeant.java | 2 +- .../main/java/concreteextensions/Soldier.java | 2 +- facade/README.md | 2 +- .../facade/DwarvenGoldmineFacadeTest.java | 2 +- .../factory/method/ElfBlacksmith.java | 2 +- .../iluwatar/factory/method/ElfWeapon.java | 2 +- .../factory/method/OrcBlacksmith.java | 2 +- .../iluwatar/factory/method/OrcWeapon.java | 2 +- .../iluwatar/factory/method/WeaponType.java | 2 +- .../PropertiesFeatureToggleVersion.java | 2 +- .../com/iluwatar/featuretoggle/user/User.java | 2 +- .../featuretoggle/user/UserGroup.java | 4 +- .../com/iluwatar/fluentinterface/app/App.java | 2 +- .../lazy/LazyFluentIterable.java | 2 +- .../java/com/iluwatar/flux/action/Action.java | 2 +- .../com/iluwatar/flux/action/ActionType.java | 2 +- .../com/iluwatar/flux/action/Content.java | 2 +- .../iluwatar/flux/action/ContentAction.java | 2 +- .../com/iluwatar/flux/action/MenuAction.java | 2 +- .../com/iluwatar/flux/action/MenuItem.java | 2 +- .../iluwatar/flux/dispatcher/Dispatcher.java | 2 +- .../java/com/iluwatar/flux/store/Store.java | 2 +- .../com/iluwatar/flyweight/AlchemistShop.java | 4 +- .../controller/utils/InMemoryAppender.java | 2 +- .../com/iluwatar/halfsynchalfasync/App.java | 2 +- .../AsynchronousService.java | 2 +- .../hexagonal/banking/InMemoryBank.java | 2 +- .../database/InMemoryTicketRepository.java | 2 +- .../hexagonal/domain/LotteryNumbers.java | 2 +- .../hexagonal/domain/LotteryTicketId.java | 2 +- .../hexagonal/eventlog/MongoEventLog.java | 2 +- .../hexagonal/domain/LotteryTest.java | 2 +- .../iluwatar/intercepting/filter/Client.java | 10 +- .../intercepting/filter/FilterManager.java | 2 +- .../iluwatar/intercepting/filter/Target.java | 6 +- .../iluwatar/interpreter/MinusExpression.java | 4 +- .../interpreter/MultiplyExpression.java | 4 +- .../interpreter/NumberExpression.java | 2 +- .../iluwatar/interpreter/PlusExpression.java | 4 +- iterator/README.md | 4 +- .../iluwatar/iterator/bst/BstIterator.java | 2 +- .../com/iluwatar/iterator/bst/TreeNode.java | 2 +- .../java/com/iluwatar/iterator/list/Item.java | 2 +- .../iluwatar/iterator/list/TreasureChest.java | 2 +- .../list/TreasureChestItemIterator.java | 4 +- layers/README.md | 2 +- .../java/com/iluwatar/layers/app/App.java | 2 +- .../layers/service/CakeBakingServiceImpl.java | 2 +- .../iluwatar/layers/view/CakeViewImpl.java | 2 +- .../layers/view/CakeViewImplTest.java | 2 +- .../iluwatar/lazy/loading/Java8Holder.java | 2 +- .../com.iluwatar.leaderfollowers/TaskSet.java | 2 +- .../WorkCenter.java | 2 +- .../system/systemmaster/Master.java | 2 +- .../java/com/iluwatar/mediator/Action.java | 104 +++++----- .../iluwatar/mediator/PartyMemberTest.java | 2 +- memento/README.md | 2 +- .../java/com/iluwatar/memento/StarType.java | 2 +- .../model/view/controller/Fatigue.java | 2 +- .../view/controller/GiantController.java | 4 +- .../model/view/controller/Health.java | 2 +- .../model/view/controller/Nourishment.java | 2 +- .../model/view/controller/GiantViewTest.java | 2 +- .../view/presenter/FileSelectorJFrame.java | 14 +- .../view/presenter/FileSelectorPresenter.java | 2 +- .../main/java/com/iluwatar/monad/User.java | 132 ++++++------- multiton/README.md | 6 +- .../java/com/iluwatar/multiton/Nazgul.java | 4 +- .../com/iluwatar/multiton/NazgulEnum.java | 2 +- .../com/iluwatar/multiton/NazgulName.java | 2 +- null-object/README.md | 2 +- .../com/iluwatar/nullobject/NullNode.java | 2 +- .../com/iluwatar/nullobject/TreeTest.java | 2 +- .../java/com/iluwatar/objectmother/Queen.java | 5 +- object-pool/README.md | 6 +- .../com/iluwatar/object/pool/ObjectPool.java | 4 +- .../com/iluwatar/object/pool/Oliphaunt.java | 2 +- observer/README.md | 2 +- .../java/com/iluwatar/observer/Weather.java | 2 +- .../observer/utils/InMemoryAppender.java | 2 +- .../pageobject/AlbumListPageTest.java | 2 +- .../iluwatar/pageobject/AlbumPageTest.java | 2 +- .../iluwatar/pageobject/LoginPageTest.java | 2 +- .../pageobject/AlbumListPageTest.java | 2 +- .../iluwatar/pageobject/AlbumPageTest.java | 2 +- .../iluwatar/pageobject/LoginPageTest.java | 2 +- .../partialresponse/VideoResource.java | 4 +- poison-pill/README.md | 2 +- .../iluwatar/poison/pill/SimpleMessage.java | 2 +- .../iluwatar/poison/pill/ConsumerTest.java | 2 +- .../privateclassdata/ImmutableStew.java | 100 +++++----- .../iluwatar/privateclassdata/StewData.java | 122 ++++++------ .../utils/InMemoryAppender.java | 2 +- .../com/iluwatar/producer/consumer/Item.java | 4 +- .../iluwatar/producer/consumer/ItemQueue.java | 2 +- .../java/com/iluwatar/prototype/ElfBeast.java | 2 +- .../java/com/iluwatar/prototype/ElfMage.java | 2 +- .../com/iluwatar/prototype/ElfWarlord.java | 2 +- .../iluwatar/prototype/HeroFactoryImpl.java | 130 ++++++------ .../java/com/iluwatar/prototype/OrcBeast.java | 2 +- .../java/com/iluwatar/prototype/OrcMage.java | 2 +- .../com/iluwatar/prototype/OrcWarlord.java | 2 +- .../proxy/utils/InMemoryAppender.java | 2 +- .../java/com/iluwatar/reactor/app/App.java | 4 +- .../reactor/framework/NioDatagramChannel.java | 2 +- .../reactor/framework/NioReactor.java | 4 +- .../iluwatar/reader/writer/lock/Reader.java | 6 +- .../reader/writer/lock/ReaderWriterLock.java | 4 +- .../iluwatar/reader/writer/lock/Writer.java | 6 +- .../writer/lock/utils/InMemoryAppender.java | 2 +- repository/README.md | 4 +- .../repository/PersonSpecifications.java | 4 +- .../AnnotationBasedRepositoryTest.java | 10 +- .../iluwatar/repository/RepositoryTest.java | 10 +- .../is/initialization/ClosableTest.java | 2 +- .../com/iluwatar/roleobject/CustomerCore.java | 2 +- .../java/com/iluwatar/roleobject/Role.java | 2 +- .../com/iluwatar/saga/choreography/Saga.java | 4 +- .../choreography/ServiceDiscoveryService.java | 2 +- .../saga/orchestration/ChapterResult.java | 4 +- .../com/iluwatar/saga/orchestration/Saga.java | 2 +- .../ServiceDiscoveryService.java | 2 +- .../SagaOrchestratorInternallyTest.java | 2 +- .../java/com/iluwatar/semaphore/Fruit.java | 2 +- .../com/iluwatar/semaphore/FruitBowl.java | 2 +- .../com/iluwatar/semaphore/FruitShop.java | 6 +- .../main/java/com/iluwatar/servant/App.java | 4 +- .../baas/api/AbstractDynamoDbHandler.java | 2 +- .../baas/api/SavePersonApiHandlerTest.java | 2 +- service-layer/README.md | 6 +- .../servicelayer/magic/MagicServiceImpl.java | 6 +- .../servicelocator/ServiceLocator.java | 2 +- .../iluwatar/sharding/LookupShardManager.java | 2 +- .../java/com/iluwatar/sharding/Shard.java | 2 +- singleton/README.md | 2 +- specification/README.md | 2 +- .../creature/AbstractCreature.java | 10 +- .../specification/property/Color.java | 2 +- .../iluwatar/specification/property/Mass.java | 4 +- .../specification/property/Movement.java | 2 +- .../iluwatar/specification/property/Size.java | 2 +- .../selector/ConjunctionSelector.java | 2 +- .../selector/DisjunctionSelector.java | 2 +- .../selector/NegationSelector.java | 2 +- state/README.md | 4 +- .../java/com/iluwatar/state/AngryState.java | 104 +++++----- .../com/iluwatar/state/PeacefulState.java | 104 +++++----- .../java/com/iluwatar/state/MammothTest.java | 2 +- .../stepbuilder/CharacterStepBuilder.java | 2 +- .../strategy/DragonSlayingStrategyTest.java | 2 +- .../templatemethod/StealingMethodTest.java | 2 +- throttling/README.md | 6 +- .../com/iluwatar/throttling/CallsCount.java | 2 +- .../java/com/iluwatar/throttling/Tenant.java | 4 +- .../iluwatar/throttling/B2BServiceTest.java | 2 +- .../com/iluwatar/tls/DateFormatCallable.java | 186 +++++++++--------- .../main/java/com/iluwatar/tls/Result.java | 130 ++++++------ .../iluwatar/tls/DateFormatCallableTest.java | 6 +- ...FormatCallableTestIncorrectDateFormat.java | 6 +- .../DateFormatCallableTestMultiThread.java | 10 +- tolerant-reader/README.md | 8 +- .../iluwatar/tolerantreader/RainbowFish.java | 8 +- .../java/com/iluwatar/twin/BallItemTest.java | 2 +- .../java/com/iluwatar/typeobject/App.java | 2 +- .../java/com/iluwatar/typeobject/Candy.java | 2 +- .../com/iluwatar/typeobject/CellPool.java | 2 +- unit-of-work/README.md | 4 +- .../unitofwork/StudentRepository.java | 4 +- .../java/com/iluwatar/updatemethod/World.java | 3 +- .../com/iluwatar/value/object/HeroStat.java | 5 +- visitor/README.md | 2 +- .../main/java/com/iluwatar/visitor/Unit.java | 90 ++++----- .../com/iluwatar/visitor/VisitorTest.java | 2 +- 243 files changed, 1154 insertions(+), 1162 deletions(-) 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 d7fe5688d..c0791c30b 100644 --- a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java +++ b/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java @@ -47,7 +47,7 @@ public class AbstractDocumentTest { } } - private DocumentImplementation document = new DocumentImplementation(new HashMap<>()); + private final DocumentImplementation document = new DocumentImplementation(new HashMap<>()); @Test public void shouldPutAndGetValue() { 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 be83cc315..f3db525a1 100644 --- a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java +++ b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; */ public class AbstractFactoryTest { - private App app = new App(); + private final App app = new App(); private KingdomFactory elfFactory; private KingdomFactory orcFactory; diff --git a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java index 8847a131e..79097a454 100644 --- a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java +++ b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java @@ -37,7 +37,7 @@ import uk.org.lidalia.slf4jtest.TestLoggerFactory; */ public class ConfigureForDosVisitorTest { - private TestLogger logger = TestLoggerFactory.getTestLogger(ConfigureForDosVisitor.class); + private final TestLogger logger = TestLoggerFactory.getTestLogger(ConfigureForDosVisitor.class); @Test public void testVisitForZoom() { diff --git a/adapter/README.md b/adapter/README.md index b36558cbc..75edad180 100644 --- a/adapter/README.md +++ b/adapter/README.md @@ -56,7 +56,7 @@ And captain expects an implementation of `RowingBoat` interface to be able to mo ```java public class Captain { - private RowingBoat rowingBoat; + private final RowingBoat rowingBoat; // default constructor and setter for rowingBoat public Captain(RowingBoat rowingBoat) { this.rowingBoat = rowingBoat; @@ -75,7 +75,7 @@ public class FishingBoatAdapter implements RowingBoat { private static final Logger LOGGER = LoggerFactory.getLogger(FishingBoatAdapter.class); - private FishingBoat boat; + private final FishingBoat boat; public FishingBoatAdapter() { boat = new FishingBoat(); diff --git a/adapter/src/main/java/com/iluwatar/adapter/FishingBoatAdapter.java b/adapter/src/main/java/com/iluwatar/adapter/FishingBoatAdapter.java index 5ccde5c53..39a9adab4 100644 --- a/adapter/src/main/java/com/iluwatar/adapter/FishingBoatAdapter.java +++ b/adapter/src/main/java/com/iluwatar/adapter/FishingBoatAdapter.java @@ -29,7 +29,7 @@ package com.iluwatar.adapter; */ public class FishingBoatAdapter implements RowingBoat { - private FishingBoat boat; + private final FishingBoat boat; public FishingBoatAdapter() { boat = new FishingBoat(); diff --git a/ambassador/src/test/java/com/iluwatar/ambassador/RemoteServiceTest.java b/ambassador/src/test/java/com/iluwatar/ambassador/RemoteServiceTest.java index 3cfea2623..6c45acf66 100644 --- a/ambassador/src/test/java/com/iluwatar/ambassador/RemoteServiceTest.java +++ b/ambassador/src/test/java/com/iluwatar/ambassador/RemoteServiceTest.java @@ -48,7 +48,7 @@ class RemoteServiceTest { } private static class StaticRandomProvider implements RandomProvider { - private double value; + private final double value; StaticRandomProvider(double value) { this.value = value; 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 7bdf84171..e430e9ce4 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 @@ -100,7 +100,7 @@ public class ThreadAsyncExecutor implements AsyncExecutor { void setValue(T value) { this.value = value; this.state = COMPLETED; - this.callback.ifPresent(ac -> ac.onComplete(value, Optional.empty())); + this.callback.ifPresent(ac -> ac.onComplete(value, Optional.empty())); synchronized (lock) { lock.notifyAll(); } 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 dcf4ce6b2..2c13bc149 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 @@ -28,7 +28,7 @@ package com.iluwatar.business.delegate; */ public class Client { - private BusinessDelegate businessDelegate; + private final BusinessDelegate businessDelegate; public Client(BusinessDelegate businessDelegate) { this.businessDelegate = businessDelegate; 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 87fd1562d..c0f02b5e3 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 @@ -28,5 +28,5 @@ package com.iluwatar.business.delegate; */ public enum ServiceType { - EJB, JMS; + EJB, JMS } diff --git a/bytecode/src/main/java/com/iluwatar/bytecode/VirtualMachine.java b/bytecode/src/main/java/com/iluwatar/bytecode/VirtualMachine.java index 5afc2fb93..c45301c29 100644 --- a/bytecode/src/main/java/com/iluwatar/bytecode/VirtualMachine.java +++ b/bytecode/src/main/java/com/iluwatar/bytecode/VirtualMachine.java @@ -30,9 +30,9 @@ import java.util.Stack; */ public class VirtualMachine { - private Stack stack = new Stack<>(); + private final Stack stack = new Stack<>(); - private Wizard[] wizards = new Wizard[2]; + private final Wizard[] wizards = new Wizard[2]; /** * Constructor. diff --git a/bytecode/src/test/java/com/iluwatar/bytecode/VirtualMachineTest.java b/bytecode/src/test/java/com/iluwatar/bytecode/VirtualMachineTest.java index 61a316f5a..4518ca310 100644 --- a/bytecode/src/test/java/com/iluwatar/bytecode/VirtualMachineTest.java +++ b/bytecode/src/test/java/com/iluwatar/bytecode/VirtualMachineTest.java @@ -104,7 +104,7 @@ public class VirtualMachineTest { bytecode[2] = LITERAL.getIntValue(); bytecode[3] = 50; // health amount bytecode[4] = SET_HEALTH.getIntValue(); - bytecode[5] = LITERAL.getIntValue();; + bytecode[5] = LITERAL.getIntValue(); bytecode[6] = wizardNumber; bytecode[7] = GET_HEALTH.getIntValue(); diff --git a/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java b/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java index 6bc6dbd77..84b8307f3 100644 --- a/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java +++ b/caching/src/main/java/com/iluwatar/caching/CachingPolicy.java @@ -29,7 +29,7 @@ package com.iluwatar.caching; public enum CachingPolicy { THROUGH("through"), AROUND("around"), BEHIND("behind"), ASIDE("aside"); - private String policy; + private final String policy; CachingPolicy(String policy) { this.policy = policy; diff --git a/chain/README.md b/chain/README.md index cdc5966bd..f11f0c59e 100644 --- a/chain/README.md +++ b/chain/README.md @@ -65,7 +65,7 @@ Then the request handler hierarchy ```java public abstract class RequestHandler { private static final Logger LOGGER = LoggerFactory.getLogger(RequestHandler.class); - private RequestHandler next; + private final RequestHandler next; public RequestHandler(RequestHandler next) { this.next = next; diff --git a/chain/src/main/java/com/iluwatar/chain/RequestHandler.java b/chain/src/main/java/com/iluwatar/chain/RequestHandler.java index 7923f03a6..4778ecf91 100644 --- a/chain/src/main/java/com/iluwatar/chain/RequestHandler.java +++ b/chain/src/main/java/com/iluwatar/chain/RequestHandler.java @@ -33,7 +33,7 @@ public abstract class RequestHandler { private static final Logger LOGGER = LoggerFactory.getLogger(RequestHandler.class); - private RequestHandler next; + private final RequestHandler next; public RequestHandler(RequestHandler next) { this.next = next; diff --git a/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Car.java b/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Car.java index 2828cffd4..cffdc7c82 100644 --- a/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Car.java +++ b/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Car.java @@ -87,10 +87,7 @@ public class Car { } else if (!model.equals(other.model)) { return false; } - if (year != other.year) { - return false; - } - return true; + return year == other.year; } public String getMake() { diff --git a/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Person.java b/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Person.java index 2e564b701..3e25f6993 100644 --- a/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Person.java +++ b/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Person.java @@ -29,7 +29,7 @@ import java.util.List; * A Person class that has the list of cars that the person owns and use. */ public class Person { - private List cars; + private final List cars; /** * Constructor to create an instance of person. diff --git a/collection-pipeline/src/test/java/com/iluwatar/collectionpipeline/AppTest.java b/collection-pipeline/src/test/java/com/iluwatar/collectionpipeline/AppTest.java index 6bf373e81..cedc492b9 100644 --- a/collection-pipeline/src/test/java/com/iluwatar/collectionpipeline/AppTest.java +++ b/collection-pipeline/src/test/java/com/iluwatar/collectionpipeline/AppTest.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; public class AppTest { private static final Logger LOGGER = LoggerFactory.getLogger(AppTest.class); - private List cars = CarFactory.createCars(); + private final List cars = CarFactory.createCars(); @Test public void testGetModelsAfter2000UsingFor() { diff --git a/command/README.md b/command/README.md index 02a290e4d..fc0a11d9f 100644 --- a/command/README.md +++ b/command/README.md @@ -36,8 +36,8 @@ public class Wizard { private static final Logger LOGGER = LoggerFactory.getLogger(Wizard.class); - private Deque undoStack = new LinkedList<>(); - private Deque redoStack = new LinkedList<>(); + private final Deque undoStack = new LinkedList<>(); + private final Deque redoStack = new LinkedList<>(); public Wizard() {} diff --git a/command/src/main/java/com/iluwatar/command/Size.java b/command/src/main/java/com/iluwatar/command/Size.java index ae327d8b1..c9aeb7017 100644 --- a/command/src/main/java/com/iluwatar/command/Size.java +++ b/command/src/main/java/com/iluwatar/command/Size.java @@ -1,43 +1,43 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.command; - -/** - * Enumeration for target size. - */ -public enum Size { - - SMALL("small"), NORMAL("normal"); - - private String title; - - Size(String title) { - this.title = title; - } - - @Override - public String toString() { - return title; - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.command; + +/** + * Enumeration for target size. + */ +public enum Size { + + SMALL("small"), NORMAL("normal"); + + private final String title; + + Size(String title) { + this.title = title; + } + + @Override + public String toString() { + return title; + } +} diff --git a/command/src/main/java/com/iluwatar/command/Visibility.java b/command/src/main/java/com/iluwatar/command/Visibility.java index 3c48990a0..8fe0ce7bb 100644 --- a/command/src/main/java/com/iluwatar/command/Visibility.java +++ b/command/src/main/java/com/iluwatar/command/Visibility.java @@ -1,43 +1,43 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.command; - -/** - * Enumeration for target visibility. - */ -public enum Visibility { - - VISIBLE("visible"), INVISIBLE("invisible"); - - private String title; - - Visibility(String title) { - this.title = title; - } - - @Override - public String toString() { - return title; - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.command; + +/** + * Enumeration for target visibility. + */ +public enum Visibility { + + VISIBLE("visible"), INVISIBLE("invisible"); + + private final String title; + + Visibility(String title) { + this.title = title; + } + + @Override + public String toString() { + return title; + } +} diff --git a/command/src/main/java/com/iluwatar/command/Wizard.java b/command/src/main/java/com/iluwatar/command/Wizard.java index e0b973265..dd469d3c0 100644 --- a/command/src/main/java/com/iluwatar/command/Wizard.java +++ b/command/src/main/java/com/iluwatar/command/Wizard.java @@ -35,8 +35,8 @@ public class Wizard { private static final Logger LOGGER = LoggerFactory.getLogger(Wizard.class); - private Deque undoStack = new LinkedList<>(); - private Deque redoStack = new LinkedList<>(); + private final Deque undoStack = new LinkedList<>(); + private final Deque redoStack = new LinkedList<>(); public Wizard() { // comment to ignore sonar issue: LEVEL critical diff --git a/commander/src/main/java/com/iluwatar/commander/employeehandle/EmployeeDatabase.java b/commander/src/main/java/com/iluwatar/commander/employeehandle/EmployeeDatabase.java index 496bb545a..69ebc1fd9 100644 --- a/commander/src/main/java/com/iluwatar/commander/employeehandle/EmployeeDatabase.java +++ b/commander/src/main/java/com/iluwatar/commander/employeehandle/EmployeeDatabase.java @@ -33,7 +33,7 @@ import java.util.Hashtable; */ public class EmployeeDatabase extends Database { - private Hashtable data; + private final Hashtable data; public EmployeeDatabase() { this.data = new Hashtable<>(); diff --git a/commander/src/main/java/com/iluwatar/commander/messagingservice/MessagingDatabase.java b/commander/src/main/java/com/iluwatar/commander/messagingservice/MessagingDatabase.java index fbba52cac..22ad733cb 100644 --- a/commander/src/main/java/com/iluwatar/commander/messagingservice/MessagingDatabase.java +++ b/commander/src/main/java/com/iluwatar/commander/messagingservice/MessagingDatabase.java @@ -33,7 +33,7 @@ import java.util.Hashtable; */ public class MessagingDatabase extends Database { - private Hashtable data; + private final Hashtable data; public MessagingDatabase() { this.data = new Hashtable<>(); diff --git a/commander/src/main/java/com/iluwatar/commander/paymentservice/PaymentDatabase.java b/commander/src/main/java/com/iluwatar/commander/paymentservice/PaymentDatabase.java index 644979883..bf9e846bb 100644 --- a/commander/src/main/java/com/iluwatar/commander/paymentservice/PaymentDatabase.java +++ b/commander/src/main/java/com/iluwatar/commander/paymentservice/PaymentDatabase.java @@ -34,7 +34,7 @@ import java.util.Hashtable; public class PaymentDatabase extends Database { - private Hashtable data; + private final Hashtable data; public PaymentDatabase() { this.data = new Hashtable<>(); diff --git a/commander/src/main/java/com/iluwatar/commander/queue/QueueDatabase.java b/commander/src/main/java/com/iluwatar/commander/queue/QueueDatabase.java index 91a7966f7..003a7da46 100644 --- a/commander/src/main/java/com/iluwatar/commander/queue/QueueDatabase.java +++ b/commander/src/main/java/com/iluwatar/commander/queue/QueueDatabase.java @@ -35,7 +35,7 @@ import java.util.List; public class QueueDatabase extends Database { - private Queue data; + private final Queue data; public List exceptionsList; public QueueDatabase(Exception... exc) { diff --git a/commander/src/main/java/com/iluwatar/commander/shippingservice/ShippingDatabase.java b/commander/src/main/java/com/iluwatar/commander/shippingservice/ShippingDatabase.java index 305122db2..abaf27c9d 100644 --- a/commander/src/main/java/com/iluwatar/commander/shippingservice/ShippingDatabase.java +++ b/commander/src/main/java/com/iluwatar/commander/shippingservice/ShippingDatabase.java @@ -34,7 +34,7 @@ import java.util.Hashtable; public class ShippingDatabase extends Database { - private Hashtable data; + private final Hashtable data; public ShippingDatabase() { this.data = new Hashtable<>(); diff --git a/composite/README.md b/composite/README.md index 25b553b76..dad6fb5a5 100644 --- a/composite/README.md +++ b/composite/README.md @@ -34,7 +34,7 @@ Taking our sentence example from above. Here we have the base class and differen ```java public abstract class LetterComposite { - private List children = new ArrayList<>(); + private final List children = new ArrayList<>(); public void add(LetterComposite letter) { children.add(letter); @@ -59,7 +59,7 @@ public abstract class LetterComposite { public class Letter extends LetterComposite { - private char character; + private final char character; public Letter(char c) { this.character = c; diff --git a/composite/src/main/java/com/iluwatar/composite/Letter.java b/composite/src/main/java/com/iluwatar/composite/Letter.java index ab2d496ea..00b1a9639 100644 --- a/composite/src/main/java/com/iluwatar/composite/Letter.java +++ b/composite/src/main/java/com/iluwatar/composite/Letter.java @@ -28,7 +28,7 @@ package com.iluwatar.composite; */ public class Letter extends LetterComposite { - private char character; + private final char character; public Letter(char c) { this.character = c; diff --git a/composite/src/main/java/com/iluwatar/composite/LetterComposite.java b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java index 25808c468..0daf88222 100644 --- a/composite/src/main/java/com/iluwatar/composite/LetterComposite.java +++ b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java @@ -1,58 +1,58 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.composite; - -import java.util.ArrayList; -import java.util.List; - -/** - * Composite interface. - */ -public abstract class LetterComposite { - - private List children = new ArrayList<>(); - - public void add(LetterComposite letter) { - children.add(letter); - } - - public int count() { - return children.size(); - } - - protected void printThisBefore() { - } - - protected void printThisAfter() { - } - - /** - * Print. - */ - public void print() { - printThisBefore(); - children.forEach(LetterComposite::print); - printThisAfter(); - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.composite; + +import java.util.ArrayList; +import java.util.List; + +/** + * Composite interface. + */ +public abstract class LetterComposite { + + private final List children = new ArrayList<>(); + + public void add(LetterComposite letter) { + children.add(letter); + } + + public int count() { + return children.size(); + } + + protected void printThisBefore() { + } + + protected void printThisAfter() { + } + + /** + * Print. + */ + public void print() { + printThisBefore(); + children.forEach(LetterComposite::print); + printThisAfter(); + } +} diff --git a/converter/src/main/java/com/iluwatar/converter/User.java b/converter/src/main/java/com/iluwatar/converter/User.java index 637d77a25..2c1ba9ff0 100644 --- a/converter/src/main/java/com/iluwatar/converter/User.java +++ b/converter/src/main/java/com/iluwatar/converter/User.java @@ -29,10 +29,10 @@ import java.util.Objects; * User class. */ public class User { - private String firstName; - private String lastName; - private boolean isActive; - private String userId; + private final String firstName; + private final String lastName; + private final boolean isActive; + private final String userId; /** * Constructor. diff --git a/converter/src/main/java/com/iluwatar/converter/UserDto.java b/converter/src/main/java/com/iluwatar/converter/UserDto.java index e75aaab8c..67a886087 100644 --- a/converter/src/main/java/com/iluwatar/converter/UserDto.java +++ b/converter/src/main/java/com/iluwatar/converter/UserDto.java @@ -30,10 +30,10 @@ import java.util.Objects; */ public class UserDto { - private String firstName; - private String lastName; - private boolean isActive; - private String email; + private final String firstName; + private final String lastName; + private final boolean isActive; + private final String email; /** * Constructor. diff --git a/converter/src/test/java/com/iluwatar/converter/ConverterTest.java b/converter/src/test/java/com/iluwatar/converter/ConverterTest.java index d9e4e418b..46aca82a7 100644 --- a/converter/src/test/java/com/iluwatar/converter/ConverterTest.java +++ b/converter/src/test/java/com/iluwatar/converter/ConverterTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; */ public class ConverterTest { - private UserConverter userConverter = new UserConverter(); + private final UserConverter userConverter = new UserConverter(); /** * Tests whether a converter created of opposite functions holds equality as a bijection. diff --git a/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandServiceImpl.java b/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandServiceImpl.java index ba08811e7..e402adad8 100644 --- a/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandServiceImpl.java +++ b/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandServiceImpl.java @@ -34,7 +34,7 @@ import org.hibernate.SessionFactory; */ public class CommandServiceImpl implements ICommandService { - private SessionFactory sessionFactory = HibernateUtil.getSessionFactory(); + private final SessionFactory sessionFactory = HibernateUtil.getSessionFactory(); private Author getAuthorByUsername(String username) { Author author; diff --git a/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryServiceImpl.java b/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryServiceImpl.java index 9b008402e..d30c0f386 100644 --- a/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryServiceImpl.java +++ b/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryServiceImpl.java @@ -38,7 +38,7 @@ import org.hibernate.transform.Transformers; */ public class QueryServiceImpl implements IQueryService { - private SessionFactory sessionFactory = HibernateUtil.getSessionFactory(); + private final SessionFactory sessionFactory = HibernateUtil.getSessionFactory(); @Override public Author getAuthorByUsername(String username) { diff --git a/dao/README.md b/dao/README.md index 4b65679c4..11e5f9ca3 100644 --- a/dao/README.md +++ b/dao/README.md @@ -112,7 +112,7 @@ public interface CustomerDao { public class InMemoryCustomerDao implements CustomerDao { - private Map idToCustomer = new HashMap<>(); + private final Map idToCustomer = new HashMap<>(); @Override public Stream getAll() { diff --git a/dao/src/main/java/com/iluwatar/dao/App.java b/dao/src/main/java/com/iluwatar/dao/App.java index de9c7b7c1..6d578bc79 100644 --- a/dao/src/main/java/com/iluwatar/dao/App.java +++ b/dao/src/main/java/com/iluwatar/dao/App.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; */ public class App { private static final String DB_URL = "jdbc:h2:~/dao"; - private static Logger log = LoggerFactory.getLogger(App.class); + private static final Logger log = LoggerFactory.getLogger(App.class); private static final String ALL_CUSTOMERS = "customerDao.getAllCustomers(): "; /** diff --git a/dao/src/main/java/com/iluwatar/dao/InMemoryCustomerDao.java b/dao/src/main/java/com/iluwatar/dao/InMemoryCustomerDao.java index 6dbfa367a..0a3bd40e3 100644 --- a/dao/src/main/java/com/iluwatar/dao/InMemoryCustomerDao.java +++ b/dao/src/main/java/com/iluwatar/dao/InMemoryCustomerDao.java @@ -36,7 +36,7 @@ import java.util.stream.Stream; */ public class InMemoryCustomerDao implements CustomerDao { - private Map idToCustomer = new HashMap<>(); + private final Map idToCustomer = new HashMap<>(); /** * An eagerly evaluated stream of customers stored in memory. diff --git a/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java b/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java index b7a0b9769..8155cda79 100644 --- a/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java +++ b/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java @@ -50,7 +50,7 @@ public class DbCustomerDaoTest { private static final String DB_URL = "jdbc:h2:~/dao"; private DbCustomerDao dao; - private Customer existingCustomer = new Customer(1, "Freddy", "Krueger"); + private final Customer existingCustomer = new Customer(1, "Freddy", "Krueger"); /** * Creates customers schema. diff --git a/data-bus/src/main/java/com/iluwatar/databus/members/MessageCollectorMember.java b/data-bus/src/main/java/com/iluwatar/databus/members/MessageCollectorMember.java index 5a8218225..d77d56b9f 100644 --- a/data-bus/src/main/java/com/iluwatar/databus/members/MessageCollectorMember.java +++ b/data-bus/src/main/java/com/iluwatar/databus/members/MessageCollectorMember.java @@ -41,7 +41,7 @@ public class MessageCollectorMember implements Member { private final String name; - private List messages = new ArrayList<>(); + private final List messages = new ArrayList<>(); public MessageCollectorMember(String name) { this.name = name; diff --git a/data-mapper/src/main/java/com/iluwatar/datamapper/App.java b/data-mapper/src/main/java/com/iluwatar/datamapper/App.java index 9bfc32952..09c027401 100644 --- a/data-mapper/src/main/java/com/iluwatar/datamapper/App.java +++ b/data-mapper/src/main/java/com/iluwatar/datamapper/App.java @@ -1,83 +1,83 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.datamapper; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * The Data Mapper (DM) is a layer of software that separates the in-memory objects from the - * database. Its responsibility is to transfer data between the two and also to isolate them from - * each other. With Data Mapper the in-memory objects needn't know even that there's a database - * present; they need no SQL interface code, and certainly no knowledge of the database schema. (The - * database schema is always ignorant of the objects that use it.) Since it's a form of Mapper , - * Data Mapper itself is even unknown to the domain layer. - * - *

The below example demonstrates basic CRUD operations: Create, Read, Update, and Delete. - */ -public final class App { - - private static Logger log = LoggerFactory.getLogger(App.class); - private static final String STUDENT_STRING = "App.main(), student : "; - - - /** - * Program entry point. - * - * @param args command line args. - */ - public static void main(final String... args) { - - /* Create new data mapper for type 'first' */ - final var mapper = new StudentDataMapperImpl(); - - /* Create new student */ - var student = new Student(1, "Adam", 'A'); - - /* Add student in respectibe store */ - mapper.insert(student); - - log.debug(STUDENT_STRING + student + ", is inserted"); - - /* Find this student */ - final var studentToBeFound = mapper.find(student.getStudentId()); - - log.debug(STUDENT_STRING + studentToBeFound + ", is searched"); - - /* Update existing student object */ - student = new Student(student.getStudentId(), "AdamUpdated", 'A'); - - /* Update student in respectibe db */ - mapper.update(student); - - log.debug(STUDENT_STRING + student + ", is updated"); - log.debug(STUDENT_STRING + student + ", is going to be deleted"); - - /* Delete student in db */ - mapper.delete(student); - } - - private App() { - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.datamapper; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The Data Mapper (DM) is a layer of software that separates the in-memory objects from the + * database. Its responsibility is to transfer data between the two and also to isolate them from + * each other. With Data Mapper the in-memory objects needn't know even that there's a database + * present; they need no SQL interface code, and certainly no knowledge of the database schema. (The + * database schema is always ignorant of the objects that use it.) Since it's a form of Mapper , + * Data Mapper itself is even unknown to the domain layer. + * + *

The below example demonstrates basic CRUD operations: Create, Read, Update, and Delete. + */ +public final class App { + + private static final Logger log = LoggerFactory.getLogger(App.class); + private static final String STUDENT_STRING = "App.main(), student : "; + + + /** + * Program entry point. + * + * @param args command line args. + */ + public static void main(final String... args) { + + /* Create new data mapper for type 'first' */ + final var mapper = new StudentDataMapperImpl(); + + /* Create new student */ + var student = new Student(1, "Adam", 'A'); + + /* Add student in respectibe store */ + mapper.insert(student); + + log.debug(STUDENT_STRING + student + ", is inserted"); + + /* Find this student */ + final var studentToBeFound = mapper.find(student.getStudentId()); + + log.debug(STUDENT_STRING + studentToBeFound + ", is searched"); + + /* Update existing student object */ + student = new Student(student.getStudentId(), "AdamUpdated", 'A'); + + /* Update student in respectibe db */ + mapper.update(student); + + log.debug(STUDENT_STRING + student + ", is updated"); + log.debug(STUDENT_STRING + student + ", is going to be deleted"); + + /* Delete student in db */ + mapper.delete(student); + } + + private App() { + } +} diff --git a/data-mapper/src/main/java/com/iluwatar/datamapper/StudentDataMapperImpl.java b/data-mapper/src/main/java/com/iluwatar/datamapper/StudentDataMapperImpl.java index 85ad4aa8d..7abe04e3f 100644 --- a/data-mapper/src/main/java/com/iluwatar/datamapper/StudentDataMapperImpl.java +++ b/data-mapper/src/main/java/com/iluwatar/datamapper/StudentDataMapperImpl.java @@ -33,7 +33,7 @@ import java.util.Optional; public final class StudentDataMapperImpl implements StudentDataMapper { /* Note: Normally this would be in the form of an actual database */ - private List students = new ArrayList<>(); + private final List students = new ArrayList<>(); @Override public Optional find(int studentId) { diff --git a/data-transfer-object/README.md b/data-transfer-object/README.md index e9286ce03..fd0ff1137 100644 --- a/data-transfer-object/README.md +++ b/data-transfer-object/README.md @@ -64,7 +64,7 @@ Customer resource class acts as the server for customer information. ```java public class CustomerResource { - private List customers; + private final List customers; public CustomerResource(List customers) { this.customers = customers; diff --git a/data-transfer-object/src/main/java/com/iluwatar/datatransfer/CustomerResource.java b/data-transfer-object/src/main/java/com/iluwatar/datatransfer/CustomerResource.java index 7e4b8340d..d0a153f6f 100644 --- a/data-transfer-object/src/main/java/com/iluwatar/datatransfer/CustomerResource.java +++ b/data-transfer-object/src/main/java/com/iluwatar/datatransfer/CustomerResource.java @@ -30,7 +30,7 @@ import java.util.List; * has all customer details. */ public class CustomerResource { - private List customers; + private final List customers; /** * Initialise resource with existing customers. diff --git a/decorator/README.md b/decorator/README.md index a9dd5d745..26dbd1803 100644 --- a/decorator/README.md +++ b/decorator/README.md @@ -70,7 +70,7 @@ public class ClubbedTroll implements Troll { private static final Logger LOGGER = LoggerFactory.getLogger(ClubbedTroll.class); - private Troll decorated; + private final Troll decorated; public ClubbedTroll(Troll decorated) { this.decorated = decorated; diff --git a/decorator/src/main/java/com/iluwatar/decorator/ClubbedTroll.java b/decorator/src/main/java/com/iluwatar/decorator/ClubbedTroll.java index 70fd15489..74a1434e1 100644 --- a/decorator/src/main/java/com/iluwatar/decorator/ClubbedTroll.java +++ b/decorator/src/main/java/com/iluwatar/decorator/ClubbedTroll.java @@ -33,7 +33,7 @@ public class ClubbedTroll implements Troll { private static final Logger LOGGER = LoggerFactory.getLogger(ClubbedTroll.class); - private Troll decorated; + private final Troll decorated; public ClubbedTroll(Troll decorated) { this.decorated = decorated; diff --git a/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java b/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java index c9f62407c..a398135e6 100644 --- a/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java +++ b/decorator/src/test/java/com/iluwatar/decorator/SimpleTrollTest.java @@ -68,7 +68,7 @@ public class SimpleTrollTest { private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); 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 2da1e0571..8aefc4b56 100644 --- a/delegation/src/test/java/com/iluwatar/delegation/simple/DelegateTest.java +++ b/delegation/src/test/java/com/iluwatar/delegation/simple/DelegateTest.java @@ -86,7 +86,7 @@ public class DelegateTest { */ private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); diff --git a/dependency-injection/README.md b/dependency-injection/README.md index abf647b50..b47c1d2f9 100644 --- a/dependency-injection/README.md +++ b/dependency-injection/README.md @@ -62,7 +62,7 @@ public interface Wizard { public class AdvancedWizard implements Wizard { - private Tobacco tobacco; + private final Tobacco tobacco; public AdvancedWizard(Tobacco tobacco) { this.tobacco = tobacco; 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 e0c952186..f0ff2da94 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 @@ -29,7 +29,7 @@ package com.iluwatar.dependency.injection; */ public class AdvancedWizard implements Wizard { - private Tobacco tobacco; + private final Tobacco tobacco; public AdvancedWizard(Tobacco tobacco) { this.tobacco = tobacco; 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 319a635eb..d769ffd46 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 @@ -31,7 +31,7 @@ import javax.inject.Inject; */ public class GuiceWizard implements Wizard { - private Tobacco tobacco; + private final Tobacco tobacco; @Inject public GuiceWizard(Tobacco tobacco) { 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 40bca0ffb..0136ff69f 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 @@ -29,7 +29,7 @@ package com.iluwatar.dependency.injection; */ public class SimpleWizard implements Wizard { - private OldTobyTobacco tobacco = new OldTobyTobacco(); + private final OldTobyTobacco tobacco = new OldTobyTobacco(); public void smoke() { tobacco.smoke(this); 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 index 9d0ad1b3b..d91099af9 100644 --- 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 @@ -37,7 +37,7 @@ import java.util.List; */ public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); diff --git a/dirty-flag/src/main/java/com/iluwatar/dirtyflag/World.java b/dirty-flag/src/main/java/com/iluwatar/dirtyflag/World.java index db60924c1..1d4fbfa75 100644 --- a/dirty-flag/src/main/java/com/iluwatar/dirtyflag/World.java +++ b/dirty-flag/src/main/java/com/iluwatar/dirtyflag/World.java @@ -34,7 +34,7 @@ import java.util.List; public class World { private List countries; - private DataFetcher df; + private final DataFetcher df; public World() { this.countries = new ArrayList(); diff --git a/double-buffer/src/main/java/com/iluwatar/doublebuffer/FrameBuffer.java b/double-buffer/src/main/java/com/iluwatar/doublebuffer/FrameBuffer.java index 5f683cf1e..4b974a2e8 100644 --- a/double-buffer/src/main/java/com/iluwatar/doublebuffer/FrameBuffer.java +++ b/double-buffer/src/main/java/com/iluwatar/doublebuffer/FrameBuffer.java @@ -33,7 +33,7 @@ public class FrameBuffer implements Buffer { public static final int WIDTH = 10; public static final int HEIGHT = 8; - private Pixel[] pixels = new Pixel[WIDTH * HEIGHT]; + private final Pixel[] pixels = new Pixel[WIDTH * HEIGHT]; public FrameBuffer() { clearAll(); diff --git a/double-buffer/src/main/java/com/iluwatar/doublebuffer/Pixel.java b/double-buffer/src/main/java/com/iluwatar/doublebuffer/Pixel.java index 501797743..54f130b1d 100644 --- a/double-buffer/src/main/java/com/iluwatar/doublebuffer/Pixel.java +++ b/double-buffer/src/main/java/com/iluwatar/doublebuffer/Pixel.java @@ -31,7 +31,7 @@ public enum Pixel { WHITE(0), BLACK(1); - private int color; + private final int color; Pixel(int color) { this.color = color; diff --git a/double-buffer/src/main/java/com/iluwatar/doublebuffer/Scene.java b/double-buffer/src/main/java/com/iluwatar/doublebuffer/Scene.java index 2c1503918..8ee72ded4 100644 --- a/double-buffer/src/main/java/com/iluwatar/doublebuffer/Scene.java +++ b/double-buffer/src/main/java/com/iluwatar/doublebuffer/Scene.java @@ -35,7 +35,7 @@ public class Scene { private static final Logger LOGGER = LoggerFactory.getLogger(Scene.class); - private Buffer[] frameBuffers; + private final Buffer[] frameBuffers; private int current; 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 e8ea7c6f8..fe0cbf5e9 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 @@ -109,7 +109,7 @@ public class InventoryTest { private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); 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 bd832287c..ea18ca3dc 100644 --- a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Rectangle.java +++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Rectangle.java @@ -28,10 +28,10 @@ package com.iluwatar.doubledispatch; */ public class Rectangle { - private int left; - private int top; - private int right; - private int bottom; + private final int left; + private final int top; + private final int right; + private final int bottom; /** * Constructor. 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 7a125c042..91bb020ee 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 @@ -31,7 +31,7 @@ public enum Event { STARK_SIGHTED("Stark sighted"), WARSHIPS_APPROACHING("Warships approaching"), TRAITOR_DETECTED( "Traitor detected"); - private String description; + private final String description; Event(String description) { this.description = description; 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 9985cee60..7d3f32a68 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 @@ -31,7 +31,7 @@ import java.util.List; */ public abstract class EventEmitter { - private List observers; + private final List observers; public EventEmitter() { observers = new LinkedList<>(); 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 9ec61339c..1e0ce9491 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 @@ -36,7 +36,7 @@ public enum Weekday { SATURDAY("Saturday"), SUNDAY("Sunday"); - private String description; + private final String description; Weekday(String description) { this.description = description; 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 a8bb6cbaa..f8aa5cb37 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 @@ -74,7 +74,7 @@ public class KingJoffreyTest { } private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); 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 6925a2ffd..68c4c9781 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 @@ -33,9 +33,9 @@ public class Event implements IEvent, Runnable { private static final Logger LOGGER = LoggerFactory.getLogger(Event.class); - private int eventId; - private int eventTime; - private boolean isSynchronous; + private final int eventId; + private final int eventTime; + private final boolean isSynchronous; private Thread thread; private boolean isComplete = false; private ThreadCompleteListener eventListener; 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 14d28860b..55671fd82 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 @@ -43,8 +43,8 @@ public class EventManager implements ThreadCompleteListener { public static final int MAX_ID = MAX_RUNNING_EVENTS; public static final int MAX_EVENT_TIME = 1800; // in seconds / 30 minutes. private int currentlyRunningSyncEvent = -1; - private Random rand; - private Map eventPool; + private final Random rand; + private final Map eventPool; private static final String DOES_NOT_EXIST = " does not exist."; 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 c18426c95..dd5e65a9a 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 @@ -32,7 +32,7 @@ import com.iluwatar.eda.model.User; */ public class UserCreatedEvent extends AbstractEvent { - private User user; + private final User user; public UserCreatedEvent(User user) { this.user = user; 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 59583053c..05370c6a6 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 @@ -32,7 +32,7 @@ import com.iluwatar.eda.model.User; */ public class UserUpdatedEvent extends AbstractEvent { - private User user; + private final User user; public UserUpdatedEvent(User user) { this.user = user; 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 dd72c1e93..74a7ee145 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 @@ -32,7 +32,7 @@ import java.util.Map; */ public class EventDispatcher { - private Map, Handler> handlers; + private final Map, Handler> handlers; public EventDispatcher() { handlers = new HashMap<>(); 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 1492c175c..0c9f12501 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 @@ -32,7 +32,7 @@ import com.iluwatar.eda.event.UserUpdatedEvent; */ public class User { - private String username; + private final String username; public User(String username) { this.username = username; diff --git a/event-queue/src/main/java/com/iluwatar/event/queue/Audio.java b/event-queue/src/main/java/com/iluwatar/event/queue/Audio.java index 4286a5ed0..a0ff5d987 100644 --- a/event-queue/src/main/java/com/iluwatar/event/queue/Audio.java +++ b/event-queue/src/main/java/com/iluwatar/event/queue/Audio.java @@ -49,7 +49,7 @@ public class Audio { private volatile Thread updateThread = null; - private PlayMessage[] pendingAudio = new PlayMessage[MAX_PENDING]; + private final PlayMessage[] pendingAudio = new PlayMessage[MAX_PENDING]; // Visible only for testing purposes Audio() { diff --git a/extension-objects/src/main/java/concreteextensions/Commander.java b/extension-objects/src/main/java/concreteextensions/Commander.java index 5a0552b20..1d8054562 100644 --- a/extension-objects/src/main/java/concreteextensions/Commander.java +++ b/extension-objects/src/main/java/concreteextensions/Commander.java @@ -35,7 +35,7 @@ public class Commander implements CommanderExtension { private static final Logger LOGGER = LoggerFactory.getLogger(Commander.class); - private CommanderUnit unit; + private final CommanderUnit unit; public Commander(CommanderUnit commanderUnit) { this.unit = commanderUnit; diff --git a/extension-objects/src/main/java/concreteextensions/Sergeant.java b/extension-objects/src/main/java/concreteextensions/Sergeant.java index a45b82f11..4f5a474b3 100644 --- a/extension-objects/src/main/java/concreteextensions/Sergeant.java +++ b/extension-objects/src/main/java/concreteextensions/Sergeant.java @@ -35,7 +35,7 @@ public class Sergeant implements SergeantExtension { private static final Logger LOGGER = LoggerFactory.getLogger(Sergeant.class); - private SergeantUnit unit; + private final SergeantUnit unit; public Sergeant(SergeantUnit sergeantUnit) { this.unit = sergeantUnit; diff --git a/extension-objects/src/main/java/concreteextensions/Soldier.java b/extension-objects/src/main/java/concreteextensions/Soldier.java index b47ba595d..d500ab604 100644 --- a/extension-objects/src/main/java/concreteextensions/Soldier.java +++ b/extension-objects/src/main/java/concreteextensions/Soldier.java @@ -34,7 +34,7 @@ import units.SoldierUnit; public class Soldier implements SoldierExtension { private static final Logger LOGGER = LoggerFactory.getLogger(Soldier.class); - private SoldierUnit unit; + private final SoldierUnit unit; public Soldier(SoldierUnit soldierUnit) { this.unit = soldierUnit; diff --git a/facade/README.md b/facade/README.md index 018c493a7..ce9d892b6 100644 --- a/facade/README.md +++ b/facade/README.md @@ -83,7 +83,7 @@ public abstract class DwarvenMineWorker { public abstract String name(); - static enum Action { + enum Action { GO_TO_SLEEP, WAKE_UP, GO_HOME, GO_TO_MINE, WORK } } diff --git a/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java b/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java index 3b67f3754..10d6e1ecd 100644 --- a/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java +++ b/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java @@ -110,7 +110,7 @@ public class DwarvenGoldmineFacadeTest { private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); 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 b6f29e43a..99ebcef65 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 @@ -32,7 +32,7 @@ import java.util.Map; */ public class ElfBlacksmith implements Blacksmith { - private static Map ELFARSENAL; + private static final Map ELFARSENAL; static { ELFARSENAL = new HashMap<>(WeaponType.values().length); 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 66a6ea7e7..208dfa277 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 @@ -28,7 +28,7 @@ package com.iluwatar.factory.method; */ public class ElfWeapon implements Weapon { - private WeaponType weaponType; + private final WeaponType weaponType; public ElfWeapon(WeaponType weaponType) { this.weaponType = weaponType; 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 b04830085..ea99200de 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 @@ -32,7 +32,7 @@ import java.util.Map; */ public class OrcBlacksmith implements Blacksmith { - private static Map ORCARSENAL; + private static final Map ORCARSENAL; static { ORCARSENAL = new HashMap<>(WeaponType.values().length); 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 b35adf798..af1ee5bcf 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 @@ -28,7 +28,7 @@ package com.iluwatar.factory.method; */ public class OrcWeapon implements Weapon { - private WeaponType weaponType; + private final WeaponType weaponType; public OrcWeapon(WeaponType weaponType) { this.weaponType = weaponType; 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 73ab10dd6..6c7c86712 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 @@ -30,7 +30,7 @@ public enum WeaponType { SHORT_SWORD("short sword"), SPEAR("spear"), AXE("axe"), UNDEFINED(""); - private String title; + private final String title; WeaponType(String title) { this.title = title; 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 6e2281b9a..ed6e69518 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 @@ -42,7 +42,7 @@ import java.util.Properties; */ public class PropertiesFeatureToggleVersion implements Service { - private boolean isEnhanced; + private final boolean isEnhanced; /** * Creates an instance of {@link PropertiesFeatureToggleVersion} using the passed {@link 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 5c660ca59..7924f86e8 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 @@ -29,7 +29,7 @@ package com.iluwatar.featuretoggle.user; */ public class User { - private String name; + private final String name; /** * Default Constructor setting the username. 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 524ea6ef8..7b644afd7 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 @@ -35,8 +35,8 @@ import java.util.List; */ public class UserGroup { - private static List freeGroup = new ArrayList<>(); - private static List paidGroup = new ArrayList<>(); + private static final List freeGroup = new ArrayList<>(); + private static final List paidGroup = new ArrayList<>(); /** 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 547c657e4..09513163c 100644 --- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java +++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java @@ -94,7 +94,7 @@ public class App { .filter(positives()) .first(4) .last(2) - .map(number -> "String[" + valueOf(number) + "]") + .map(number -> "String[" + number + "]") .asList(); prettyPrint("The lazy list contains the last two of the first four positive numbers " + "mapped to Strings: ", lastTwoOfFirstFourStringMapped); 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 f001c532f..966f35287 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 @@ -198,7 +198,7 @@ public class LazyFluentIterable implements FluentIterable { @Override public Iterator iterator() { return new DecoratingIterator(null) { - Iterator oldTypeIterator = iterable.iterator(); + final Iterator oldTypeIterator = iterable.iterator(); @Override public T computeNext() { 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 6a5f608c2..c8e2e012b 100644 --- a/flux/src/main/java/com/iluwatar/flux/action/Action.java +++ b/flux/src/main/java/com/iluwatar/flux/action/Action.java @@ -28,7 +28,7 @@ package com.iluwatar.flux.action; */ public abstract class Action { - private ActionType type; + private final ActionType type; public Action(ActionType type) { this.type = type; 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 6399d2806..e84954efd 100644 --- a/flux/src/main/java/com/iluwatar/flux/action/ActionType.java +++ b/flux/src/main/java/com/iluwatar/flux/action/ActionType.java @@ -28,6 +28,6 @@ package com.iluwatar.flux.action; */ public enum ActionType { - MENU_ITEM_SELECTED, CONTENT_CHANGED; + MENU_ITEM_SELECTED, CONTENT_CHANGED } 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 59a63ec18..6fb2e3e0e 100644 --- a/flux/src/main/java/com/iluwatar/flux/action/Content.java +++ b/flux/src/main/java/com/iluwatar/flux/action/Content.java @@ -31,7 +31,7 @@ public enum Content { PRODUCTS("Products - This page lists the company's products."), COMPANY( "Company - This page displays information about the company."); - private String title; + private final String title; Content(String title) { this.title = title; 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 3b29b6b4e..c70561a65 100644 --- a/flux/src/main/java/com/iluwatar/flux/action/ContentAction.java +++ b/flux/src/main/java/com/iluwatar/flux/action/ContentAction.java @@ -28,7 +28,7 @@ package com.iluwatar.flux.action; */ public class ContentAction extends Action { - private Content content; + private final Content content; public ContentAction(Content content) { super(ActionType.CONTENT_CHANGED); 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 5ddeefde4..f833a6187 100644 --- a/flux/src/main/java/com/iluwatar/flux/action/MenuAction.java +++ b/flux/src/main/java/com/iluwatar/flux/action/MenuAction.java @@ -29,7 +29,7 @@ package com.iluwatar.flux.action; */ public class MenuAction extends Action { - private MenuItem menuItem; + private final MenuItem menuItem; public MenuAction(MenuItem menuItem) { super(ActionType.MENU_ITEM_SELECTED); 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 f251e1dd7..90fac3e2e 100644 --- a/flux/src/main/java/com/iluwatar/flux/action/MenuItem.java +++ b/flux/src/main/java/com/iluwatar/flux/action/MenuItem.java @@ -30,7 +30,7 @@ public enum MenuItem { HOME("Home"), PRODUCTS("Products"), COMPANY("Company"); - private String title; + private final String title; MenuItem(String title) { this.title = title; 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 cf09ecf68..27d374f5d 100644 --- a/flux/src/main/java/com/iluwatar/flux/dispatcher/Dispatcher.java +++ b/flux/src/main/java/com/iluwatar/flux/dispatcher/Dispatcher.java @@ -39,7 +39,7 @@ public final class Dispatcher { private static Dispatcher instance = new Dispatcher(); - private List stores = new LinkedList<>(); + private final List stores = new LinkedList<>(); private Dispatcher() { } 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 cfbdf4af5..34188fff2 100644 --- a/flux/src/main/java/com/iluwatar/flux/store/Store.java +++ b/flux/src/main/java/com/iluwatar/flux/store/Store.java @@ -33,7 +33,7 @@ import java.util.List; */ public abstract class Store { - private List views = new LinkedList<>(); + private final List views = new LinkedList<>(); public abstract void onAction(Action action); diff --git a/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java b/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java index 4fa7312e5..e7af8ee00 100644 --- a/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java @@ -34,8 +34,8 @@ public class AlchemistShop { private static final Logger LOGGER = LoggerFactory.getLogger(AlchemistShop.class); - private List topShelf; - private List bottomShelf; + private final List topShelf; + private final List bottomShelf; /** * Constructor. 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 index 57cfb2454..8cbf7c631 100644 --- 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 @@ -36,7 +36,7 @@ import java.util.List; */ public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); 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 7df2264ab..d013924cb 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 @@ -95,7 +95,7 @@ public class App { * ArithmeticSumTask. */ static class ArithmeticSumTask implements AsyncTask { - private long numberOfElements; + private final long numberOfElements; public ArithmeticSumTask(long numberOfElements) { this.numberOfElements = numberOfElements; 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 3a3bb474c..32f5e9d4a 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 @@ -48,7 +48,7 @@ public class AsynchronousService { * tasks should be performed in the background which does not affect the performance of main * thread. */ - private ExecutorService service; + private final ExecutorService service; /** * Creates an asynchronous service using {@code workQueue} as communication channel between 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 1a0fdb6b0..746b93508 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/InMemoryBank.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/InMemoryBank.java @@ -32,7 +32,7 @@ import java.util.Map; */ public class InMemoryBank implements WireTransfers { - private static Map accounts = new HashMap<>(); + private static final Map accounts = new HashMap<>(); static { accounts 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 973747acc..5c0461843 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/InMemoryTicketRepository.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/InMemoryTicketRepository.java @@ -34,7 +34,7 @@ import java.util.Optional; */ public class InMemoryTicketRepository implements LotteryTicketRepository { - private static Map tickets = new HashMap<>(); + private static final Map tickets = new HashMap<>(); @Override public Optional findById(LotteryTicketId id) { 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 8988bba88..acdd2b8c5 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryNumbers.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryNumbers.java @@ -116,7 +116,7 @@ public class LotteryNumbers { */ private static class RandomNumberGenerator { - private PrimitiveIterator.OfInt randomIterator; + private final PrimitiveIterator.OfInt randomIterator; /** * Initialize a new random number generator that generates random numbers in the range [min, 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 dfa324449..114e78c9c 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketId.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketId.java @@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ public class LotteryTicketId { - private static AtomicInteger numAllocated = new AtomicInteger(0); + private static final AtomicInteger numAllocated = new AtomicInteger(0); private final int id; public LotteryTicketId() { 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 ba46f2d97..c632debe8 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/MongoEventLog.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/eventlog/MongoEventLog.java @@ -41,7 +41,7 @@ public class MongoEventLog implements LotteryEventLog { private MongoDatabase database; private MongoCollection eventsCollection; - private StdOutEventLog stdOutEventLog = new StdOutEventLog(); + private final StdOutEventLog stdOutEventLog = new StdOutEventLog(); /** * Constructor. 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 6d3ba8bc5..541b2b98b 100644 --- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java +++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java @@ -43,7 +43,7 @@ import org.junit.jupiter.api.Test; */ class LotteryTest { - private Injector injector; + private final Injector injector; @Inject private LotteryAdministration administration; @Inject 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 656008c10..52aa890c1 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 @@ -51,11 +51,11 @@ public class Client extends JFrame { // NOSONAR private static final long serialVersionUID = 1L; private transient FilterManager filterManager; - private JLabel jl; - private JTextField[] jtFields; - private JTextArea[] jtAreas; - private JButton clearButton; - private JButton processButton; + private final JLabel jl; + private final JTextField[] jtFields; + private final JTextArea[] jtAreas; + private final JButton clearButton; + private final JButton processButton; /** * Constructor. 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 e8f3b941f..91e438882 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 @@ -30,7 +30,7 @@ package com.iluwatar.intercepting.filter; */ public class FilterManager { - private FilterChain filterChain; + private final FilterChain filterChain; public FilterManager() { filterChain = new FilterChain(); 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 08ed715b1..db552356d 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 @@ -46,9 +46,9 @@ public class Target extends JFrame { //NOSONAR private static final long serialVersionUID = 1L; - private JTable jt; - private DefaultTableModel dtm; - private JButton del; + private final JTable jt; + private final DefaultTableModel dtm; + private final JButton del; /** * Constructor. diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java index 24ef7914e..46b5c96cb 100644 --- a/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java @@ -28,8 +28,8 @@ package com.iluwatar.interpreter; */ public class MinusExpression extends Expression { - private Expression leftExpression; - private Expression rightExpression; + private final Expression leftExpression; + private final Expression rightExpression; public MinusExpression(Expression leftExpression, Expression rightExpression) { this.leftExpression = leftExpression; diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java index 606937e0b..926d6c119 100644 --- a/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java @@ -28,8 +28,8 @@ package com.iluwatar.interpreter; */ public class MultiplyExpression extends Expression { - private Expression leftExpression; - private Expression rightExpression; + private final Expression leftExpression; + private final Expression rightExpression; public MultiplyExpression(Expression leftExpression, Expression rightExpression) { this.leftExpression = leftExpression; diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java index 6b957f6aa..908eec8d1 100644 --- a/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java @@ -28,7 +28,7 @@ package com.iluwatar.interpreter; */ public class NumberExpression extends Expression { - private int number; + private final int number; public NumberExpression(int number) { this.number = number; diff --git a/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java index 1ce080259..38a8bb4af 100644 --- a/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java @@ -28,8 +28,8 @@ package com.iluwatar.interpreter; */ public class PlusExpression extends Expression { - private Expression leftExpression; - private Expression rightExpression; + private final Expression leftExpression; + private final Expression rightExpression; public PlusExpression(Expression leftExpression, Expression rightExpression) { this.leftExpression = leftExpression; diff --git a/iterator/README.md b/iterator/README.md index 7f06a64b9..a98010c5a 100644 --- a/iterator/README.md +++ b/iterator/README.md @@ -36,7 +36,7 @@ The main class in our example is the treasure chest that contains items. ```java public class TreasureChest { - private List items; + private final List items; public TreasureChest() { items = List.of( @@ -64,7 +64,7 @@ public class TreasureChest { public class Item { private ItemType type; - private String name; + private final String name; public Item(ItemType type, String name) { this.setType(type); diff --git a/iterator/src/main/java/com/iluwatar/iterator/bst/BstIterator.java b/iterator/src/main/java/com/iluwatar/iterator/bst/BstIterator.java index b3e0dc3d6..9f584cddc 100644 --- a/iterator/src/main/java/com/iluwatar/iterator/bst/BstIterator.java +++ b/iterator/src/main/java/com/iluwatar/iterator/bst/BstIterator.java @@ -36,7 +36,7 @@ import java.util.NoSuchElementException; */ public class BstIterator> implements Iterator> { - private ArrayDeque> pathStack; + private final ArrayDeque> pathStack; public BstIterator(TreeNode root) { pathStack = new ArrayDeque<>(); diff --git a/iterator/src/main/java/com/iluwatar/iterator/bst/TreeNode.java b/iterator/src/main/java/com/iluwatar/iterator/bst/TreeNode.java index 87f16e96c..b0ec5f486 100644 --- a/iterator/src/main/java/com/iluwatar/iterator/bst/TreeNode.java +++ b/iterator/src/main/java/com/iluwatar/iterator/bst/TreeNode.java @@ -31,7 +31,7 @@ package com.iluwatar.iterator.bst; */ public class TreeNode> { - private T val; + private final T val; private TreeNode left; private TreeNode right; diff --git a/iterator/src/main/java/com/iluwatar/iterator/list/Item.java b/iterator/src/main/java/com/iluwatar/iterator/list/Item.java index 82e66eb30..00d5625a8 100644 --- a/iterator/src/main/java/com/iluwatar/iterator/list/Item.java +++ b/iterator/src/main/java/com/iluwatar/iterator/list/Item.java @@ -29,7 +29,7 @@ package com.iluwatar.iterator.list; public class Item { private ItemType type; - private String name; + private final String name; public Item(ItemType type, String name) { this.setType(type); diff --git a/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java b/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java index f390c760f..8eb4a8e18 100644 --- a/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java +++ b/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java @@ -32,7 +32,7 @@ import java.util.List; */ public class TreasureChest { - private List items; + private final List items; /** * Constructor. diff --git a/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChestItemIterator.java b/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChestItemIterator.java index 90461c420..a309b4ece 100644 --- a/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChestItemIterator.java +++ b/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChestItemIterator.java @@ -30,9 +30,9 @@ import com.iluwatar.iterator.Iterator; */ public class TreasureChestItemIterator implements Iterator { - private TreasureChest chest; + private final TreasureChest chest; private int idx; - private ItemType type; + private final ItemType type; /** * Constructor. diff --git a/layers/README.md b/layers/README.md index c3c56ad00..1e309f92b 100644 --- a/layers/README.md +++ b/layers/README.md @@ -79,7 +79,7 @@ public class CakeViewImpl implements View { private static final Logger LOGGER = LoggerFactory.getLogger(CakeViewImpl.class); - private CakeBakingService cakeBakingService; + private final CakeBakingService cakeBakingService; public CakeViewImpl(CakeBakingService cakeBakingService) { this.cakeBakingService = cakeBakingService; diff --git a/layers/src/main/java/com/iluwatar/layers/app/App.java b/layers/src/main/java/com/iluwatar/layers/app/App.java index afeb5ba50..e5a4f9995 100644 --- a/layers/src/main/java/com/iluwatar/layers/app/App.java +++ b/layers/src/main/java/com/iluwatar/layers/app/App.java @@ -80,7 +80,7 @@ import java.util.List; */ public class App { - private static CakeBakingService cakeBakingService = new CakeBakingServiceImpl(); + private static final CakeBakingService cakeBakingService = new CakeBakingServiceImpl(); /** * Application entry point. diff --git a/layers/src/main/java/com/iluwatar/layers/service/CakeBakingServiceImpl.java b/layers/src/main/java/com/iluwatar/layers/service/CakeBakingServiceImpl.java index 226b5bcea..14fee4dfa 100644 --- a/layers/src/main/java/com/iluwatar/layers/service/CakeBakingServiceImpl.java +++ b/layers/src/main/java/com/iluwatar/layers/service/CakeBakingServiceImpl.java @@ -52,7 +52,7 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class CakeBakingServiceImpl implements CakeBakingService { - private AbstractApplicationContext context; + private final AbstractApplicationContext context; public CakeBakingServiceImpl() { this.context = new ClassPathXmlApplicationContext("applicationContext.xml"); diff --git a/layers/src/main/java/com/iluwatar/layers/view/CakeViewImpl.java b/layers/src/main/java/com/iluwatar/layers/view/CakeViewImpl.java index 5fcaac776..a5246e7db 100644 --- a/layers/src/main/java/com/iluwatar/layers/view/CakeViewImpl.java +++ b/layers/src/main/java/com/iluwatar/layers/view/CakeViewImpl.java @@ -34,7 +34,7 @@ public class CakeViewImpl implements View { private static final Logger LOGGER = LoggerFactory.getLogger(CakeViewImpl.class); - private CakeBakingService cakeBakingService; + private final CakeBakingService cakeBakingService; public CakeViewImpl(CakeBakingService cakeBakingService) { this.cakeBakingService = cakeBakingService; diff --git a/layers/src/test/java/com/iluwatar/layers/view/CakeViewImplTest.java b/layers/src/test/java/com/iluwatar/layers/view/CakeViewImplTest.java index b707731d2..3c13966de 100644 --- a/layers/src/test/java/com/iluwatar/layers/view/CakeViewImplTest.java +++ b/layers/src/test/java/com/iluwatar/layers/view/CakeViewImplTest.java @@ -90,7 +90,7 @@ public class CakeViewImplTest { private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); 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 2854a7822..395dfb81c 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 @@ -55,7 +55,7 @@ public class Java8Holder { } } - if (!HeavyFactory.class.isInstance(heavy)) { + if (!(heavy instanceof HeavyFactory)) { heavy = new HeavyFactory(); } diff --git a/leader-followers/src/main/java/com.iluwatar.leaderfollowers/TaskSet.java b/leader-followers/src/main/java/com.iluwatar.leaderfollowers/TaskSet.java index 3138427a3..3461bc8c0 100644 --- a/leader-followers/src/main/java/com.iluwatar.leaderfollowers/TaskSet.java +++ b/leader-followers/src/main/java/com.iluwatar.leaderfollowers/TaskSet.java @@ -31,7 +31,7 @@ import java.util.concurrent.BlockingQueue; */ public class TaskSet { - private BlockingQueue queue = new ArrayBlockingQueue<>(100); + private final BlockingQueue queue = new ArrayBlockingQueue<>(100); public void addTask(Task task) throws InterruptedException { queue.put(task); diff --git a/leader-followers/src/main/java/com.iluwatar.leaderfollowers/WorkCenter.java b/leader-followers/src/main/java/com.iluwatar.leaderfollowers/WorkCenter.java index 7c63d95d2..935462037 100644 --- a/leader-followers/src/main/java/com.iluwatar.leaderfollowers/WorkCenter.java +++ b/leader-followers/src/main/java/com.iluwatar.leaderfollowers/WorkCenter.java @@ -34,7 +34,7 @@ import java.util.concurrent.CopyOnWriteArrayList; public class WorkCenter { private Worker leader; - private List workers = new CopyOnWriteArrayList<>(); + private final List workers = new CopyOnWriteArrayList<>(); /** * Create workers and set leader. diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java index 2466df256..4578752c3 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java @@ -40,7 +40,7 @@ public abstract class Master { private final int numOfWorkers; private final ArrayList workers; private int expectedNumResults; - private Hashtable allResultData; + private final Hashtable allResultData; private Result finalResult; Master(int numOfWorkers) { diff --git a/mediator/src/main/java/com/iluwatar/mediator/Action.java b/mediator/src/main/java/com/iluwatar/mediator/Action.java index 66e1f42c4..17613b5ab 100644 --- a/mediator/src/main/java/com/iluwatar/mediator/Action.java +++ b/mediator/src/main/java/com/iluwatar/mediator/Action.java @@ -1,52 +1,52 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.mediator; - -/** - * Action enumeration. - */ -public enum Action { - - HUNT("hunted a rabbit", "arrives for dinner"), - TALE("tells a tale", "comes to listen"), - GOLD("found gold", "takes his share of the gold"), - ENEMY("spotted enemies", "runs for cover"), - NONE("", ""); - - private String title; - private String description; - - Action(String title, String description) { - this.title = title; - this.description = description; - } - - public String getDescription() { - return description; - } - - public String toString() { - return title; - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.mediator; + +/** + * Action enumeration. + */ +public enum Action { + + HUNT("hunted a rabbit", "arrives for dinner"), + TALE("tells a tale", "comes to listen"), + GOLD("found gold", "takes his share of the gold"), + ENEMY("spotted enemies", "runs for cover"), + NONE("", ""); + + private final String title; + private final String description; + + Action(String title, String description) { + this.title = title; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String toString() { + return title; + } +} diff --git a/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java b/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java index 951f8e166..01e855179 100644 --- a/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java +++ b/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java @@ -121,7 +121,7 @@ public class PartyMemberTest { } private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); diff --git a/memento/README.md b/memento/README.md index 8011dfc49..b8d95b72a 100644 --- a/memento/README.md +++ b/memento/README.md @@ -38,7 +38,7 @@ public enum StarType { SUN("sun"), RED_GIANT("red giant"), WHITE_DWARF("white dwarf"), SUPERNOVA("supernova"), DEAD( "dead star"), UNDEFINED(""); - private String title; + private final String title; StarType(String title) { this.title = title; diff --git a/memento/src/main/java/com/iluwatar/memento/StarType.java b/memento/src/main/java/com/iluwatar/memento/StarType.java index 507cd506b..339f05f9f 100644 --- a/memento/src/main/java/com/iluwatar/memento/StarType.java +++ b/memento/src/main/java/com/iluwatar/memento/StarType.java @@ -31,7 +31,7 @@ public enum StarType { SUN("sun"), RED_GIANT("red giant"), WHITE_DWARF("white dwarf"), SUPERNOVA("supernova"), DEAD( "dead star"), UNDEFINED(""); - private String title; + private final String title; StarType(String title) { this.title = title; 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 b1663df1f..2b7ca3999 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 @@ -30,7 +30,7 @@ public enum Fatigue { ALERT("alert"), TIRED("tired"), SLEEPING("sleeping"); - private String title; + private final String title; Fatigue(String title) { this.title = title; 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 e66608117..9acb49db4 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 @@ -28,8 +28,8 @@ package com.iluwatar.model.view.controller; */ public class GiantController { - private GiantModel giant; - private GiantView view; + private final GiantModel giant; + private final GiantView view; public GiantController(GiantModel giant, GiantView view) { this.giant = giant; 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 30b3b2b90..a8346b9c7 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 @@ -30,7 +30,7 @@ public enum Health { HEALTHY("healthy"), WOUNDED("wounded"), DEAD("dead"); - private String title; + private final String title; Health(String title) { this.title = title; 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 3ced564cc..c61d2de79 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 @@ -30,7 +30,7 @@ public enum Nourishment { SATURATED("saturated"), HUNGRY("hungry"), STARVING("starving"); - private String title; + private final String title; Nourishment(String title) { this.title = title; 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 a3e33f9dd..9d6421d13 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 @@ -75,7 +75,7 @@ public class GiantViewTest { * Logging Appender Implementation */ public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); 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 77523ccaa..6c4df5231 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 @@ -48,37 +48,37 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti /** * The "OK" button for loading the file. */ - private JButton ok; + private final JButton ok; /** * The cancel button. */ - private JButton cancel; + private final JButton cancel; /** * The information label. */ - private JLabel info; + private final JLabel info; /** * The contents label. */ - private JLabel contents; + private final JLabel contents; /** * The text field for giving the name of the file that we want to open. */ - private JTextField input; + private final JTextField input; /** * A text area that will keep the contents of the file opened. */ - private JTextArea area; + private final JTextArea area; /** * The panel that will hold our widgets. */ - private JPanel panel; + private final JPanel panel; /** * The Presenter component that the frame will interact with. 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 35e1c0076..6fa95b125 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 @@ -41,7 +41,7 @@ public class FileSelectorPresenter implements Serializable { /** * The View component that the presenter interacts with. */ - private FileSelectorView view; + private final FileSelectorView view; /** * The Model component that the presenter interacts with. diff --git a/monad/src/main/java/com/iluwatar/monad/User.java b/monad/src/main/java/com/iluwatar/monad/User.java index 77766d1aa..8644c4c0a 100644 --- a/monad/src/main/java/com/iluwatar/monad/User.java +++ b/monad/src/main/java/com/iluwatar/monad/User.java @@ -1,66 +1,66 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.monad; - -/** - * User Definition. - */ -public class User { - - private String name; - private int age; - private Sex sex; - private String email; - - /** - * Constructor. - * - * @param name - name - * @param age - age - * @param sex - sex - * @param email - email address - */ - public User(String name, int age, Sex sex, String email) { - this.name = name; - this.age = age; - this.sex = sex; - this.email = email; - } - - public String getName() { - return name; - } - - public int getAge() { - return age; - } - - public Sex getSex() { - return sex; - } - - public String getEmail() { - return email; - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.monad; + +/** + * User Definition. + */ +public class User { + + private final String name; + private final int age; + private final Sex sex; + private final String email; + + /** + * Constructor. + * + * @param name - name + * @param age - age + * @param sex - sex + * @param email - email address + */ + public User(String name, int age, Sex sex, String email) { + this.name = name; + this.age = age; + this.sex = sex; + this.email = email; + } + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Sex getSex() { + return sex; + } + + public String getEmail() { + return email; + } +} diff --git a/multiton/README.md b/multiton/README.md index ec1429a8f..85ce3acf2 100644 --- a/multiton/README.md +++ b/multiton/README.md @@ -35,14 +35,14 @@ Nazgul is the multiton class. ```java public enum NazgulName { - KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA; + KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA } public final class Nazgul { - private static Map nazguls; + private static final Map nazguls; - private NazgulName name; + private final NazgulName name; static { nazguls = new ConcurrentHashMap<>(); diff --git a/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java b/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java index f55f85aca..e08107eeb 100644 --- a/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java +++ b/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java @@ -31,9 +31,9 @@ import java.util.concurrent.ConcurrentHashMap; */ public final class Nazgul { - private static Map nazguls; + private static final Map nazguls; - private NazgulName name; + private final NazgulName name; static { nazguls = new ConcurrentHashMap<>(); diff --git a/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java b/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java index 5b5c48d66..ec20fbc97 100644 --- a/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java +++ b/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java @@ -28,6 +28,6 @@ package com.iluwatar.multiton; */ public enum NazgulEnum { - KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA; + KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA } diff --git a/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java b/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java index c7865dceb..76702c358 100644 --- a/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java +++ b/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java @@ -28,6 +28,6 @@ package com.iluwatar.multiton; */ public enum NazgulName { - KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA; + KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA } diff --git a/null-object/README.md b/null-object/README.md index 0fce86f0e..5b943630e 100644 --- a/null-object/README.md +++ b/null-object/README.md @@ -101,7 +101,7 @@ public class NodeImpl implements Node { public final class NullNode implements Node { - private static NullNode instance = new NullNode(); + private static final NullNode instance = new NullNode(); private NullNode() { } 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 9b28c249b..472a1a2fd 100644 --- a/null-object/src/main/java/com/iluwatar/nullobject/NullNode.java +++ b/null-object/src/main/java/com/iluwatar/nullobject/NullNode.java @@ -30,7 +30,7 @@ package com.iluwatar.nullobject; */ public final class NullNode implements Node { - private static NullNode instance = new NullNode(); + private static final NullNode instance = new NullNode(); private NullNode() { } 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 4ff30f524..3fe584425 100644 --- a/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java +++ b/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java @@ -141,7 +141,7 @@ public class TreeTest { } private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); diff --git a/object-mother/src/main/java/com/iluwatar/objectmother/Queen.java b/object-mother/src/main/java/com/iluwatar/objectmother/Queen.java index 4c704f6b1..308760ba9 100644 --- a/object-mother/src/main/java/com/iluwatar/objectmother/Queen.java +++ b/object-mother/src/main/java/com/iluwatar/objectmother/Queen.java @@ -66,9 +66,6 @@ public class Queen implements Royalty { * @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; + return this.isFlirty && king.isHappy && !king.isDrunk; } } diff --git a/object-pool/README.md b/object-pool/README.md index a8a20638c..34d216a02 100644 --- a/object-pool/README.md +++ b/object-pool/README.md @@ -36,7 +36,7 @@ Here's the basic Oliphaunt class. These are very expensive to create. ```java public class Oliphaunt { - private static AtomicInteger counter = new AtomicInteger(0); + private static final AtomicInteger counter = new AtomicInteger(0); private final int id; @@ -65,8 +65,8 @@ Next we present the Object Pool and more specifically Oliphaunt Pool. ```java public abstract class ObjectPool { - private Set available = new HashSet<>(); - private Set inUse = new HashSet<>(); + private final Set available = new HashSet<>(); + private final Set inUse = new HashSet<>(); protected abstract T create(); 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 b8ce3cc05..43ac5d873 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 @@ -33,8 +33,8 @@ import java.util.Set; */ public abstract class ObjectPool { - private Set available = new HashSet<>(); - private Set inUse = new HashSet<>(); + private final Set available = new HashSet<>(); + private final Set inUse = new HashSet<>(); protected abstract T create(); 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 42db07158..09dedbab0 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 @@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ public class Oliphaunt { - private static AtomicInteger counter = new AtomicInteger(0); + private static final AtomicInteger counter = new AtomicInteger(0); private final int id; diff --git a/observer/README.md b/observer/README.md index edc72ae24..e329a657c 100644 --- a/observer/README.md +++ b/observer/README.md @@ -99,7 +99,7 @@ public class Weather { private static final Logger LOGGER = LoggerFactory.getLogger(Weather.class); private WeatherType currentWeather; - private List observers; + private final List observers; public Weather() { observers = new ArrayList<>(); diff --git a/observer/src/main/java/com/iluwatar/observer/Weather.java b/observer/src/main/java/com/iluwatar/observer/Weather.java index 778858107..a0d80d6bc 100644 --- a/observer/src/main/java/com/iluwatar/observer/Weather.java +++ b/observer/src/main/java/com/iluwatar/observer/Weather.java @@ -37,7 +37,7 @@ public class Weather { private static final Logger LOGGER = LoggerFactory.getLogger(Weather.class); private WeatherType currentWeather; - private List observers; + private final List observers; public Weather() { observers = new ArrayList<>(); diff --git a/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java b/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java index b3d2bf1bc..132216d19 100644 --- a/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java +++ b/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java @@ -35,7 +35,7 @@ import java.util.List; * InMemory Log Appender Util. */ public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); 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 779458e05..22bc8a5fb 100644 --- a/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java +++ b/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; */ public class AlbumListPageTest { - private AlbumListPage albumListPage = new AlbumListPage(new WebClient()); + private final AlbumListPage albumListPage = new AlbumListPage(new WebClient()); @BeforeEach public void setUp() { 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 601093343..68c836bd3 100644 --- a/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java +++ b/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; */ public class AlbumPageTest { - private AlbumPage albumPage = new AlbumPage(new WebClient()); + private final AlbumPage albumPage = new AlbumPage(new WebClient()); @BeforeEach public void setUp() { 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 022f736ca..460bdcf96 100644 --- a/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java +++ b/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; */ public class LoginPageTest { - private LoginPage loginPage = new LoginPage(new WebClient()); + private final LoginPage loginPage = new LoginPage(new WebClient()); @BeforeEach public void setUp() { diff --git a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java index d1b450a24..1acdd5ba5 100644 --- a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java +++ b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; */ public class AlbumListPageTest { - private AlbumListPage albumListPage = new AlbumListPage(new WebClient()); + private final AlbumListPage albumListPage = new AlbumListPage(new WebClient()); @BeforeEach public void setUp() { diff --git a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java index 8e694a592..ecde999c3 100644 --- a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java +++ b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; */ public class AlbumPageTest { - private AlbumPage albumPage = new AlbumPage(new WebClient()); + private final AlbumPage albumPage = new AlbumPage(new WebClient()); @BeforeEach public void setUp() { diff --git a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java index 89668882d..429b7fcc5 100644 --- a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java +++ b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; */ public class LoginPageTest { - private LoginPage loginPage = new LoginPage(new WebClient()); + private final LoginPage loginPage = new LoginPage(new WebClient()); @BeforeEach public void setUp() { diff --git a/partial-response/src/main/java/com/iluwatar/partialresponse/VideoResource.java b/partial-response/src/main/java/com/iluwatar/partialresponse/VideoResource.java index a61a3c429..11a4f23ca 100644 --- a/partial-response/src/main/java/com/iluwatar/partialresponse/VideoResource.java +++ b/partial-response/src/main/java/com/iluwatar/partialresponse/VideoResource.java @@ -30,8 +30,8 @@ import java.util.Map; * has all video details. */ public class VideoResource { - private FieldJsonMapper fieldJsonMapper; - private Map videos; + private final FieldJsonMapper fieldJsonMapper; + private final Map videos; /** * Constructor. diff --git a/poison-pill/README.md b/poison-pill/README.md index 823bb7df8..a6cd2fe80 100644 --- a/poison-pill/README.md +++ b/poison-pill/README.md @@ -80,7 +80,7 @@ public interface Message { public class SimpleMessage implements Message { - private Map headers = new HashMap<>(); + private final Map headers = new HashMap<>(); private String body; @Override 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 8a7af515f..70d116c9f 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 @@ -32,7 +32,7 @@ import java.util.Map; */ public class SimpleMessage implements Message { - private Map headers = new HashMap<>(); + private final Map headers = new HashMap<>(); private String body; @Override 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 100565fbc..8365fca17 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 @@ -92,7 +92,7 @@ public class ConsumerTest { } private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); 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 695424695..d312cd34a 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,50 +1,50 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Immutable stew class, protected with Private Class Data pattern. - */ -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) { - data = new StewData(numPotatoes, numCarrots, numMeat, numPeppers); - } - - /** - * Mix the stew. - */ - public void mix() { - LOGGER - .info("Mixing the immutable stew we find: {} potatoes, {} carrots, {} meat and {} peppers", - data.getNumPotatoes(), data.getNumCarrots(), data.getNumMeat(), data.getNumPeppers()); - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Immutable stew class, protected with Private Class Data pattern. + */ +public class ImmutableStew { + + private static final Logger LOGGER = LoggerFactory.getLogger(ImmutableStew.class); + + private final StewData data; + + public ImmutableStew(int numPotatoes, int numCarrots, int numMeat, int numPeppers) { + data = new StewData(numPotatoes, numCarrots, numMeat, numPeppers); + } + + /** + * Mix the stew. + */ + public void mix() { + 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/StewData.java b/private-class-data/src/main/java/com/iluwatar/privateclassdata/StewData.java index bcdaba3e9..1b0fd269b 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,61 +1,61 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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; - -/** - * Stew ingredients. - */ -public class StewData { - - private int numPotatoes; - private int numCarrots; - private int numMeat; - private int numPeppers; - - /** - * Constructor. - */ - public StewData(int numPotatoes, int numCarrots, int numMeat, int numPeppers) { - this.numPotatoes = numPotatoes; - this.numCarrots = numCarrots; - this.numMeat = numMeat; - this.numPeppers = numPeppers; - } - - public int getNumPotatoes() { - return numPotatoes; - } - - public int getNumCarrots() { - return numCarrots; - } - - public int getNumMeat() { - return numMeat; - } - - public int getNumPeppers() { - return numPeppers; - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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; + +/** + * Stew ingredients. + */ +public class StewData { + + private final int numPotatoes; + private final int numCarrots; + private final int numMeat; + private final int numPeppers; + + /** + * Constructor. + */ + public StewData(int numPotatoes, int numCarrots, int numMeat, int numPeppers) { + this.numPotatoes = numPotatoes; + this.numCarrots = numCarrots; + this.numMeat = numMeat; + this.numPeppers = numPeppers; + } + + public int getNumPotatoes() { + return numPotatoes; + } + + public int getNumCarrots() { + return numCarrots; + } + + public int getNumMeat() { + return numMeat; + } + + public int getNumPeppers() { + return numPeppers; + } +} 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 index 6fbe638ae..bbcbc8021 100644 --- 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 @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; * InMemory Log Appender Util. */ public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); 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 6991ec4d1..89f692282 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 @@ -28,9 +28,9 @@ package com.iluwatar.producer.consumer; */ public class Item { - private String producer; + private final String producer; - private int id; + private final int id; public Item(String producer, int id) { this.id = id; 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 674fb069a..118e3265d 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 @@ -31,7 +31,7 @@ import java.util.concurrent.LinkedBlockingQueue; */ public class ItemQueue { - private BlockingQueue queue; + private final BlockingQueue queue; public ItemQueue() { diff --git a/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java b/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java index 1401460d6..8e2ed9474 100644 --- a/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java +++ b/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java @@ -28,7 +28,7 @@ package com.iluwatar.prototype; */ public class ElfBeast extends Beast { - private String helpType; + private final String helpType; public ElfBeast(String helpType) { this.helpType = helpType; diff --git a/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java b/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java index 4a7eea98f..42a54ca97 100644 --- a/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java +++ b/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java @@ -28,7 +28,7 @@ package com.iluwatar.prototype; */ public class ElfMage extends Mage { - private String helpType; + private final String helpType; public ElfMage(String helpType) { this.helpType = helpType; diff --git a/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java b/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java index 101cd5942..fb426a444 100644 --- a/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java +++ b/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java @@ -28,7 +28,7 @@ package com.iluwatar.prototype; */ public class ElfWarlord extends Warlord { - private String helpType; + private final String helpType; public ElfWarlord(String helpType) { this.helpType = helpType; diff --git a/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java b/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java index eb84b2982..14516f3b4 100644 --- a/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java +++ b/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java @@ -1,65 +1,65 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.prototype; - -/** - * Concrete factory class. - */ -public class HeroFactoryImpl implements HeroFactory { - - private Mage mage; - private Warlord warlord; - private Beast beast; - - /** - * Constructor. - */ - public HeroFactoryImpl(Mage mage, Warlord warlord, Beast beast) { - this.mage = mage; - this.warlord = warlord; - this.beast = beast; - } - - /** - * Create mage. - */ - public Mage createMage() { - return mage.copy(); - } - - /** - * Create warlord. - */ - public Warlord createWarlord() { - return warlord.copy(); - } - - /** - * Create beast. - */ - public Beast createBeast() { - return beast.copy(); - } - -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.prototype; + +/** + * Concrete factory class. + */ +public class HeroFactoryImpl implements HeroFactory { + + private final Mage mage; + private final Warlord warlord; + private final Beast beast; + + /** + * Constructor. + */ + public HeroFactoryImpl(Mage mage, Warlord warlord, Beast beast) { + this.mage = mage; + this.warlord = warlord; + this.beast = beast; + } + + /** + * Create mage. + */ + public Mage createMage() { + return mage.copy(); + } + + /** + * Create warlord. + */ + public Warlord createWarlord() { + return warlord.copy(); + } + + /** + * Create beast. + */ + public Beast createBeast() { + return beast.copy(); + } + +} diff --git a/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java b/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java index cf3dc18d8..91339887c 100644 --- a/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java +++ b/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java @@ -28,7 +28,7 @@ package com.iluwatar.prototype; */ public class OrcBeast extends Beast { - private String weapon; + private final String weapon; public OrcBeast(String weapon) { this.weapon = weapon; diff --git a/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java b/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java index cb8239c3f..439e7f368 100644 --- a/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java +++ b/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java @@ -28,7 +28,7 @@ package com.iluwatar.prototype; */ public class OrcMage extends Mage { - private String weapon; + private final String weapon; public OrcMage(String weapon) { this.weapon = weapon; diff --git a/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java b/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java index 39facc41e..a2ae31b4d 100644 --- a/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java +++ b/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java @@ -28,7 +28,7 @@ package com.iluwatar.prototype; */ public class OrcWarlord extends Warlord { - private String weapon; + private final String weapon; public OrcWarlord(String weapon) { this.weapon = weapon; diff --git a/proxy/src/test/java/com/iluwatar/proxy/utils/InMemoryAppender.java b/proxy/src/test/java/com/iluwatar/proxy/utils/InMemoryAppender.java index 2187c3300..173825288 100644 --- a/proxy/src/test/java/com/iluwatar/proxy/utils/InMemoryAppender.java +++ b/proxy/src/test/java/com/iluwatar/proxy/utils/InMemoryAppender.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * InMemory Log Appender Util. */ public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); 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 3bd8176a6..f656eacf6 100644 --- a/reactor/src/main/java/com/iluwatar/reactor/app/App.java +++ b/reactor/src/main/java/com/iluwatar/reactor/app/App.java @@ -89,8 +89,8 @@ import java.util.List; public class App { private NioReactor reactor; - private List channels = new ArrayList<>(); - private Dispatcher dispatcher; + private final List channels = new ArrayList<>(); + private final Dispatcher dispatcher; /** * Creates an instance of App which will use provided dispatcher for dispatching events on 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 13657cdb2..aba99d65c 100644 --- a/reactor/src/main/java/com/iluwatar/reactor/framework/NioDatagramChannel.java +++ b/reactor/src/main/java/com/iluwatar/reactor/framework/NioDatagramChannel.java @@ -134,7 +134,7 @@ public class NioDatagramChannel extends AbstractNioChannel { */ public static class DatagramPacket { private SocketAddress sender; - private ByteBuffer data; + private final ByteBuffer data; private SocketAddress receiver; /** 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 1a0b17386..77e39a88d 100644 --- a/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.java +++ b/reactor/src/main/java/com/iluwatar/reactor/framework/NioReactor.java @@ -228,8 +228,8 @@ public class NioReactor { * A command that changes the interested operations of the key provided. */ class ChangeKeyOpsCommand implements Runnable { - private SelectionKey key; - private int interestedOps; + private final SelectionKey key; + private final int interestedOps; public ChangeKeyOpsCommand(SelectionKey key, int interestedOps) { this.key = key; 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 6d705de2f..c54e62e58 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 @@ -34,11 +34,11 @@ public class Reader implements Runnable { private static final Logger LOGGER = LoggerFactory.getLogger(Reader.class); - private Lock readLock; + private final Lock readLock; - private String name; + private final String name; - private long readingTime; + private final long readingTime; /** * Create new Reader. 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 99c9b056b..932428b4f 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 @@ -59,8 +59,8 @@ public class ReaderWriterLock implements ReadWriteLock { */ private final Set globalMutex = new HashSet<>(); - private ReadLock readerLock = new ReadLock(); - private WriteLock writerLock = new WriteLock(); + private final ReadLock readerLock = new ReadLock(); + private final WriteLock writerLock = new WriteLock(); @Override public Lock readLock() { 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 7a971b28b..fbc8321f2 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 @@ -34,11 +34,11 @@ public class Writer implements Runnable { private static final Logger LOGGER = LoggerFactory.getLogger(Writer.class); - private Lock writeLock; + private final Lock writeLock; - private String name; + private final String name; - private long writingTime; + private final long writingTime; /** * Create new Writer who writes for 250ms. 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 index c7e8bc02a..01a63d6c8 100644 --- 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 @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; * InMemory Log Appender Util. */ public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender(Class clazz) { ((Logger) LoggerFactory.getLogger(clazz)).addAppender(this); diff --git a/repository/README.md b/repository/README.md index 09a9a2bba..ad603ee2b 100644 --- a/repository/README.md +++ b/repository/README.md @@ -157,9 +157,9 @@ public class PersonSpecifications { public static class AgeBetweenSpec implements Specification { - private int from; + private final int from; - private int to; + private final int to; public AgeBetweenSpec(int from, int to) { this.from = from; diff --git a/repository/src/main/java/com/iluwatar/repository/PersonSpecifications.java b/repository/src/main/java/com/iluwatar/repository/PersonSpecifications.java index f91c0a6e1..919b746be 100644 --- a/repository/src/main/java/com/iluwatar/repository/PersonSpecifications.java +++ b/repository/src/main/java/com/iluwatar/repository/PersonSpecifications.java @@ -39,9 +39,9 @@ public class PersonSpecifications { */ public static class AgeBetweenSpec implements Specification { - private int from; + private final int from; - private int to; + private final int to; public AgeBetweenSpec(int from, int to) { this.from = from; diff --git a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java index 6b47cbe9a..9e2e1f4e1 100644 --- a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java +++ b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java @@ -48,12 +48,12 @@ public class AnnotationBasedRepositoryTest { @Resource private PersonRepository repository; - private Person peter = new Person("Peter", "Sagan", 17); - private Person nasta = new Person("Nasta", "Kuzminova", 25); - private Person john = new Person("John", "lawrence", 35); - private Person terry = new Person("Terry", "Law", 36); + private final Person peter = new Person("Peter", "Sagan", 17); + private final Person nasta = new Person("Nasta", "Kuzminova", 25); + private final Person john = new Person("John", "lawrence", 35); + private final Person terry = new Person("Terry", "Law", 36); - private List persons = List.of(peter, nasta, john, terry); + private final List persons = List.of(peter, nasta, john, terry); /** * Prepare data for test diff --git a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java index ad9587aca..77e2b3e35 100644 --- a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java +++ b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java @@ -48,12 +48,12 @@ public class RepositoryTest { @Resource private PersonRepository repository; - private Person peter = new Person("Peter", "Sagan", 17); - private Person nasta = new Person("Nasta", "Kuzminova", 25); - private Person john = new Person("John", "lawrence", 35); - private Person terry = new Person("Terry", "Law", 36); + private final Person peter = new Person("Peter", "Sagan", 17); + private final Person nasta = new Person("Nasta", "Kuzminova", 25); + private final Person john = new Person("John", "lawrence", 35); + private final Person terry = new Person("Terry", "Law", 36); - private List persons = List.of(peter, nasta, john, terry); + private final List persons = List.of(peter, nasta, john, terry); /** * Prepare data for test 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 7bba17553..53caabea7 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 @@ -68,7 +68,7 @@ public class ClosableTest { * Logging Appender Implementation */ public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); diff --git a/role-object/src/main/java/com/iluwatar/roleobject/CustomerCore.java b/role-object/src/main/java/com/iluwatar/roleobject/CustomerCore.java index 966d0e3f0..1c4cf0383 100644 --- a/role-object/src/main/java/com/iluwatar/roleobject/CustomerCore.java +++ b/role-object/src/main/java/com/iluwatar/roleobject/CustomerCore.java @@ -36,7 +36,7 @@ import java.util.Optional; */ public class CustomerCore extends Customer { - private Map roles; + private final Map roles; public CustomerCore() { roles = new HashMap<>(); diff --git a/role-object/src/main/java/com/iluwatar/roleobject/Role.java b/role-object/src/main/java/com/iluwatar/roleobject/Role.java index cbc6cc79b..a776178fb 100644 --- a/role-object/src/main/java/com/iluwatar/roleobject/Role.java +++ b/role-object/src/main/java/com/iluwatar/roleobject/Role.java @@ -34,7 +34,7 @@ public enum Role { Borrower(BorrowerRole.class), Investor(InvestorRole.class); - private Class typeCst; + private final Class typeCst; Role(Class typeCst) { this.typeCst = typeCst; diff --git a/saga/src/main/java/com/iluwatar/saga/choreography/Saga.java b/saga/src/main/java/com/iluwatar/saga/choreography/Saga.java index 818b59a14..506587c76 100644 --- a/saga/src/main/java/com/iluwatar/saga/choreography/Saga.java +++ b/saga/src/main/java/com/iluwatar/saga/choreography/Saga.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Saga { - private List chapters; + private final List chapters; private int pos; private boolean forward; private boolean finished; @@ -153,7 +153,7 @@ public class Saga { * outcoming parameter). */ public static class Chapter { - private String name; + private final String name; private ChapterResult result; private Object inValue; diff --git a/saga/src/main/java/com/iluwatar/saga/choreography/ServiceDiscoveryService.java b/saga/src/main/java/com/iluwatar/saga/choreography/ServiceDiscoveryService.java index a616ff4a5..c6bc7bc80 100644 --- a/saga/src/main/java/com/iluwatar/saga/choreography/ServiceDiscoveryService.java +++ b/saga/src/main/java/com/iluwatar/saga/choreography/ServiceDiscoveryService.java @@ -32,7 +32,7 @@ import java.util.Optional; * The class representing a service discovery pattern. */ public class ServiceDiscoveryService { - private Map services; + private final Map services; /** * find any service. diff --git a/saga/src/main/java/com/iluwatar/saga/orchestration/ChapterResult.java b/saga/src/main/java/com/iluwatar/saga/orchestration/ChapterResult.java index ef34ddb98..b04d22849 100644 --- a/saga/src/main/java/com/iluwatar/saga/orchestration/ChapterResult.java +++ b/saga/src/main/java/com/iluwatar/saga/orchestration/ChapterResult.java @@ -29,8 +29,8 @@ package com.iluwatar.saga.orchestration; * @param incoming value */ public class ChapterResult { - private K value; - private State state; + private final K value; + private final State state; public K getValue() { return value; diff --git a/saga/src/main/java/com/iluwatar/saga/orchestration/Saga.java b/saga/src/main/java/com/iluwatar/saga/orchestration/Saga.java index aff3593f1..1b68d6cf7 100644 --- a/saga/src/main/java/com/iluwatar/saga/orchestration/Saga.java +++ b/saga/src/main/java/com/iluwatar/saga/orchestration/Saga.java @@ -32,7 +32,7 @@ import java.util.List; */ public class Saga { - private List chapters; + private final List chapters; private Saga() { diff --git a/saga/src/main/java/com/iluwatar/saga/orchestration/ServiceDiscoveryService.java b/saga/src/main/java/com/iluwatar/saga/orchestration/ServiceDiscoveryService.java index dbc6e7eb5..f88efae52 100644 --- a/saga/src/main/java/com/iluwatar/saga/orchestration/ServiceDiscoveryService.java +++ b/saga/src/main/java/com/iluwatar/saga/orchestration/ServiceDiscoveryService.java @@ -31,7 +31,7 @@ import java.util.Optional; * The class representing a service discovery pattern. */ public class ServiceDiscoveryService { - private Map> services; + private final Map> services; public Optional find(String service) { return Optional.ofNullable(services.getOrDefault(service, null)); diff --git a/saga/src/test/java/com/iluwatar/saga/orchestration/SagaOrchestratorInternallyTest.java b/saga/src/test/java/com/iluwatar/saga/orchestration/SagaOrchestratorInternallyTest.java index 423b8e12e..f80a46fdc 100644 --- a/saga/src/test/java/com/iluwatar/saga/orchestration/SagaOrchestratorInternallyTest.java +++ b/saga/src/test/java/com/iluwatar/saga/orchestration/SagaOrchestratorInternallyTest.java @@ -34,7 +34,7 @@ import org.junit.Test; */ public class SagaOrchestratorInternallyTest { - private List records = new ArrayList<>(); + private final List records = new ArrayList<>(); @Test public void executeTest() { diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/Fruit.java b/semaphore/src/main/java/com/iluwatar/semaphore/Fruit.java index d94764dbe..1f4026b92 100644 --- a/semaphore/src/main/java/com/iluwatar/semaphore/Fruit.java +++ b/semaphore/src/main/java/com/iluwatar/semaphore/Fruit.java @@ -35,7 +35,7 @@ public class Fruit { ORANGE, APPLE, LEMON } - private FruitType type; + private final FruitType type; public Fruit(FruitType type) { this.type = type; diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/FruitBowl.java b/semaphore/src/main/java/com/iluwatar/semaphore/FruitBowl.java index 6b43c8100..5c2901efe 100644 --- a/semaphore/src/main/java/com/iluwatar/semaphore/FruitBowl.java +++ b/semaphore/src/main/java/com/iluwatar/semaphore/FruitBowl.java @@ -31,7 +31,7 @@ import java.util.List; */ public class FruitBowl { - private List fruit = new ArrayList<>(); + private final List fruit = new ArrayList<>(); /** * Returns the amount of fruits left in bowl. diff --git a/semaphore/src/main/java/com/iluwatar/semaphore/FruitShop.java b/semaphore/src/main/java/com/iluwatar/semaphore/FruitShop.java index a360f955c..c74145610 100644 --- a/semaphore/src/main/java/com/iluwatar/semaphore/FruitShop.java +++ b/semaphore/src/main/java/com/iluwatar/semaphore/FruitShop.java @@ -31,7 +31,7 @@ public class FruitShop { /** * The FruitBowl instances stored in the class. */ - private FruitBowl[] bowls = { + private final FruitBowl[] bowls = { new FruitBowl(), new FruitBowl(), new FruitBowl() @@ -40,7 +40,7 @@ public class FruitShop { /** * Access flags for each of the FruitBowl instances. */ - private boolean[] available = { + private final boolean[] available = { true, true, true @@ -49,7 +49,7 @@ public class FruitShop { /** * The Semaphore that controls access to the class resources. */ - private Semaphore semaphore; + private final Semaphore semaphore; /** * FruitShop constructor. diff --git a/servant/src/main/java/com/iluwatar/servant/App.java b/servant/src/main/java/com/iluwatar/servant/App.java index b68cb9aee..9c4591b05 100644 --- a/servant/src/main/java/com/iluwatar/servant/App.java +++ b/servant/src/main/java/com/iluwatar/servant/App.java @@ -39,8 +39,8 @@ public class App { private static final Logger LOGGER = LoggerFactory.getLogger(App.class); - private static Servant jenkins = new Servant("Jenkins"); - private static Servant travis = new Servant("Travis"); + private static final Servant jenkins = new Servant("Jenkins"); + private static final Servant travis = new Servant("Travis"); /** * Program entry point. diff --git a/serverless/src/main/java/com/iluwatar/serverless/baas/api/AbstractDynamoDbHandler.java b/serverless/src/main/java/com/iluwatar/serverless/baas/api/AbstractDynamoDbHandler.java index a13893f70..abe7c388d 100644 --- a/serverless/src/main/java/com/iluwatar/serverless/baas/api/AbstractDynamoDbHandler.java +++ b/serverless/src/main/java/com/iluwatar/serverless/baas/api/AbstractDynamoDbHandler.java @@ -40,7 +40,7 @@ import java.util.Map; public abstract class AbstractDynamoDbHandler { private DynamoDBMapper dynamoDbMapper; - private ObjectMapper objectMapper; + private final ObjectMapper objectMapper; public AbstractDynamoDbHandler() { this.initAmazonDynamoDb(); diff --git a/serverless/src/test/java/com/iluwatar/serverless/baas/api/SavePersonApiHandlerTest.java b/serverless/src/test/java/com/iluwatar/serverless/baas/api/SavePersonApiHandlerTest.java index ef3909adc..a8c729163 100644 --- a/serverless/src/test/java/com/iluwatar/serverless/baas/api/SavePersonApiHandlerTest.java +++ b/serverless/src/test/java/com/iluwatar/serverless/baas/api/SavePersonApiHandlerTest.java @@ -52,7 +52,7 @@ public class SavePersonApiHandlerTest { @Mock private DynamoDBMapper dynamoDbMapper; - private ObjectMapper objectMapper = new ObjectMapper(); + private final ObjectMapper objectMapper = new ObjectMapper(); @Before public void setUp() { diff --git a/service-layer/README.md b/service-layer/README.md index 910eaeaea..5e8e49ea6 100644 --- a/service-layer/README.md +++ b/service-layer/README.md @@ -155,9 +155,9 @@ public interface MagicService { public class MagicServiceImpl implements MagicService { - private WizardDao wizardDao; - private SpellbookDao spellbookDao; - private SpellDao spellDao; + private final WizardDao wizardDao; + private final SpellbookDao spellbookDao; + private final SpellDao spellDao; public MagicServiceImpl(WizardDao wizardDao, SpellbookDao spellbookDao, SpellDao spellDao) { this.wizardDao = wizardDao; 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 962487bd9..cdcf926d0 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 @@ -37,9 +37,9 @@ import java.util.List; */ public class MagicServiceImpl implements MagicService { - private WizardDao wizardDao; - private SpellbookDao spellbookDao; - private SpellDao spellDao; + private final WizardDao wizardDao; + private final SpellbookDao spellbookDao; + private final SpellDao spellDao; /** * Constructor. 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 60f0f7c03..4e787d34c 100644 --- a/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java +++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java @@ -31,7 +31,7 @@ package com.iluwatar.servicelocator; */ public final class ServiceLocator { - private static ServiceCache serviceCache = new ServiceCache(); + private static final ServiceCache serviceCache = new ServiceCache(); private ServiceLocator() { } diff --git a/sharding/src/main/java/com/iluwatar/sharding/LookupShardManager.java b/sharding/src/main/java/com/iluwatar/sharding/LookupShardManager.java index 4948c2a19..ce239c156 100644 --- a/sharding/src/main/java/com/iluwatar/sharding/LookupShardManager.java +++ b/sharding/src/main/java/com/iluwatar/sharding/LookupShardManager.java @@ -39,7 +39,7 @@ public class LookupShardManager extends ShardManager { private static final Logger LOGGER = LoggerFactory.getLogger(LookupShardManager.class); - private Map lookupMap = new HashMap<>(); + private final Map lookupMap = new HashMap<>(); @Override public int storeData(Data data) { diff --git a/sharding/src/main/java/com/iluwatar/sharding/Shard.java b/sharding/src/main/java/com/iluwatar/sharding/Shard.java index eb0814258..56037bc3a 100644 --- a/sharding/src/main/java/com/iluwatar/sharding/Shard.java +++ b/sharding/src/main/java/com/iluwatar/sharding/Shard.java @@ -33,7 +33,7 @@ public class Shard { private final int id; - private Map dataStore; + private final Map dataStore; public Shard(final int id) { this.id = id; diff --git a/singleton/README.md b/singleton/README.md index 83f7fb355..60a103a3b 100644 --- a/singleton/README.md +++ b/singleton/README.md @@ -34,7 +34,7 @@ Joshua Bloch, Effective Java 2nd Edition p.18 ```java public enum EnumIvoryTower { - INSTANCE; + INSTANCE } ``` diff --git a/specification/README.md b/specification/README.md index 6e52bd2e7..6cc0c702f 100644 --- a/specification/README.md +++ b/specification/README.md @@ -146,7 +146,7 @@ public abstract class AbstractSelector implements Predicate { ```java public class ConjunctionSelector extends AbstractSelector { - private List> leafComponents; + private final List> leafComponents; @SafeVarargs ConjunctionSelector(AbstractSelector... selectors) { 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 6b359d8ac..214ae4562 100644 --- a/specification/src/main/java/com/iluwatar/specification/creature/AbstractCreature.java +++ b/specification/src/main/java/com/iluwatar/specification/creature/AbstractCreature.java @@ -33,11 +33,11 @@ import com.iluwatar.specification.property.Size; */ public abstract class AbstractCreature implements Creature { - private String name; - private Size size; - private Movement movement; - private Color color; - private Mass mass; + private final String name; + private final Size size; + private final Movement movement; + private final Color color; + private final Mass mass; /** * Constructor. 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 6e96b5813..b3128054e 100644 --- a/specification/src/main/java/com/iluwatar/specification/property/Color.java +++ b/specification/src/main/java/com/iluwatar/specification/property/Color.java @@ -30,7 +30,7 @@ public enum Color { DARK("dark"), LIGHT("light"), GREEN("green"), RED("red"); - private String title; + private final String title; Color(String title) { this.title = title; diff --git a/specification/src/main/java/com/iluwatar/specification/property/Mass.java b/specification/src/main/java/com/iluwatar/specification/property/Mass.java index b2d6ddc66..e0e90aa06 100644 --- a/specification/src/main/java/com/iluwatar/specification/property/Mass.java +++ b/specification/src/main/java/com/iluwatar/specification/property/Mass.java @@ -28,8 +28,8 @@ package com.iluwatar.specification.property; */ public class Mass { - private double value; - private String title; + private final double value; + private final String title; public Mass(double value) { this.value = value; 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 f76b0584f..fcdcfae70 100644 --- a/specification/src/main/java/com/iluwatar/specification/property/Movement.java +++ b/specification/src/main/java/com/iluwatar/specification/property/Movement.java @@ -30,7 +30,7 @@ public enum Movement { WALKING("walking"), SWIMMING("swimming"), FLYING("flying"); - private String title; + private final String title; Movement(String title) { this.title = title; 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 27bc48024..c5ad5525c 100644 --- a/specification/src/main/java/com/iluwatar/specification/property/Size.java +++ b/specification/src/main/java/com/iluwatar/specification/property/Size.java @@ -30,7 +30,7 @@ public enum Size { SMALL("small"), NORMAL("normal"), LARGE("large"); - private String title; + private final String title; Size(String title) { this.title = title; diff --git a/specification/src/main/java/com/iluwatar/specification/selector/ConjunctionSelector.java b/specification/src/main/java/com/iluwatar/specification/selector/ConjunctionSelector.java index bd29aa260..661c8bceb 100644 --- a/specification/src/main/java/com/iluwatar/specification/selector/ConjunctionSelector.java +++ b/specification/src/main/java/com/iluwatar/specification/selector/ConjunctionSelector.java @@ -30,7 +30,7 @@ import java.util.List; */ public class ConjunctionSelector extends AbstractSelector { - private List> leafComponents; + private final List> leafComponents; @SafeVarargs ConjunctionSelector(AbstractSelector... selectors) { diff --git a/specification/src/main/java/com/iluwatar/specification/selector/DisjunctionSelector.java b/specification/src/main/java/com/iluwatar/specification/selector/DisjunctionSelector.java index 1fb38a43d..32dcf7e73 100644 --- a/specification/src/main/java/com/iluwatar/specification/selector/DisjunctionSelector.java +++ b/specification/src/main/java/com/iluwatar/specification/selector/DisjunctionSelector.java @@ -30,7 +30,7 @@ import java.util.List; */ public class DisjunctionSelector extends AbstractSelector { - private List> leafComponents; + private final List> leafComponents; @SafeVarargs DisjunctionSelector(AbstractSelector... selectors) { diff --git a/specification/src/main/java/com/iluwatar/specification/selector/NegationSelector.java b/specification/src/main/java/com/iluwatar/specification/selector/NegationSelector.java index ad3063000..30302baa2 100644 --- a/specification/src/main/java/com/iluwatar/specification/selector/NegationSelector.java +++ b/specification/src/main/java/com/iluwatar/specification/selector/NegationSelector.java @@ -30,7 +30,7 @@ package com.iluwatar.specification.selector; */ public class NegationSelector extends AbstractSelector { - private AbstractSelector component; + private final AbstractSelector component; NegationSelector(AbstractSelector selector) { this.component = selector; diff --git a/state/README.md b/state/README.md index 7be4d3351..a8dd2b5fc 100644 --- a/state/README.md +++ b/state/README.md @@ -43,7 +43,7 @@ public class PeacefulState implements State { private static final Logger LOGGER = LoggerFactory.getLogger(PeacefulState.class); - private Mammoth mammoth; + private final Mammoth mammoth; public PeacefulState(Mammoth mammoth) { this.mammoth = mammoth; @@ -64,7 +64,7 @@ public class AngryState implements State { private static final Logger LOGGER = LoggerFactory.getLogger(AngryState.class); - private Mammoth mammoth; + private final Mammoth mammoth; public AngryState(Mammoth mammoth) { this.mammoth = mammoth; diff --git a/state/src/main/java/com/iluwatar/state/AngryState.java b/state/src/main/java/com/iluwatar/state/AngryState.java index 8dc296c53..e105262b8 100644 --- a/state/src/main/java/com/iluwatar/state/AngryState.java +++ b/state/src/main/java/com/iluwatar/state/AngryState.java @@ -1,52 +1,52 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.state; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Angry state. - */ -public class AngryState implements State { - - private static final Logger LOGGER = LoggerFactory.getLogger(AngryState.class); - - private Mammoth mammoth; - - public AngryState(Mammoth mammoth) { - this.mammoth = mammoth; - } - - @Override - public void observe() { - LOGGER.info("{} is furious!", mammoth); - } - - @Override - public void onEnterState() { - LOGGER.info("{} gets angry!", mammoth); - } - -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.state; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Angry state. + */ +public class AngryState implements State { + + private static final Logger LOGGER = LoggerFactory.getLogger(AngryState.class); + + private final Mammoth mammoth; + + public AngryState(Mammoth mammoth) { + this.mammoth = mammoth; + } + + @Override + public void observe() { + LOGGER.info("{} is furious!", mammoth); + } + + @Override + public void onEnterState() { + LOGGER.info("{} gets angry!", mammoth); + } + +} diff --git a/state/src/main/java/com/iluwatar/state/PeacefulState.java b/state/src/main/java/com/iluwatar/state/PeacefulState.java index ed83a0738..adf8be209 100644 --- a/state/src/main/java/com/iluwatar/state/PeacefulState.java +++ b/state/src/main/java/com/iluwatar/state/PeacefulState.java @@ -1,52 +1,52 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.state; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Peaceful state. - */ -public class PeacefulState implements State { - - private static final Logger LOGGER = LoggerFactory.getLogger(PeacefulState.class); - - private Mammoth mammoth; - - public PeacefulState(Mammoth mammoth) { - this.mammoth = mammoth; - } - - @Override - public void observe() { - LOGGER.info("{} is calm and peaceful.", mammoth); - } - - @Override - public void onEnterState() { - LOGGER.info("{} calms down.", mammoth); - } - -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.state; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Peaceful state. + */ +public class PeacefulState implements State { + + private static final Logger LOGGER = LoggerFactory.getLogger(PeacefulState.class); + + private final Mammoth mammoth; + + public PeacefulState(Mammoth mammoth) { + this.mammoth = mammoth; + } + + @Override + public void observe() { + LOGGER.info("{} is calm and peaceful.", mammoth); + } + + @Override + public void onEnterState() { + LOGGER.info("{} calms down.", mammoth); + } + +} diff --git a/state/src/test/java/com/iluwatar/state/MammothTest.java b/state/src/test/java/com/iluwatar/state/MammothTest.java index 15624c7ab..4cc6e0adb 100644 --- a/state/src/test/java/com/iluwatar/state/MammothTest.java +++ b/state/src/test/java/com/iluwatar/state/MammothTest.java @@ -96,7 +96,7 @@ public class MammothTest { } private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); 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 a0c7f84e6..5be38e471 100644 --- a/step-builder/src/main/java/com/iluwatar/stepbuilder/CharacterStepBuilder.java +++ b/step-builder/src/main/java/com/iluwatar/stepbuilder/CharacterStepBuilder.java @@ -105,7 +105,7 @@ public final class CharacterStepBuilder { private String wizardClass; private String weapon; private String spell; - private List abilities = new ArrayList<>(); + private final List abilities = new ArrayList<>(); @Override public ClassStep name(String name) { diff --git a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java index cca82cefc..0b5a2d615 100644 --- a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java +++ b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java @@ -91,7 +91,7 @@ public class DragonSlayingStrategyTest { } private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); 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 ba6030da4..95326eeec 100644 --- a/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java +++ b/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java @@ -146,7 +146,7 @@ public abstract class StealingMethodTest { } private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); diff --git a/throttling/README.md b/throttling/README.md index 48e1b1c78..257bce54a 100644 --- a/throttling/README.md +++ b/throttling/README.md @@ -32,8 +32,8 @@ Tenant class presents the clients of the API. CallsCount tracks the number of AP ```java public class Tenant { - private String name; - private int allowedCallsPerSecond; + private final String name; + private final int allowedCallsPerSecond; public Tenant(String name, int allowedCallsPerSecond, CallsCount callsCount) { if (allowedCallsPerSecond < 0) { @@ -56,7 +56,7 @@ public class Tenant { public final class CallsCount { private static final Logger LOGGER = LoggerFactory.getLogger(CallsCount.class); - private Map tenantCallsCount = new ConcurrentHashMap<>(); + private final Map tenantCallsCount = new ConcurrentHashMap<>(); public void addTenant(String tenantName) { tenantCallsCount.putIfAbsent(tenantName, new AtomicLong(0)); diff --git a/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java b/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java index 8f8036286..abfd4d351 100644 --- a/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java +++ b/throttling/src/main/java/com/iluwatar/throttling/CallsCount.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; public final class CallsCount { private static final Logger LOGGER = LoggerFactory.getLogger(CallsCount.class); - private Map tenantCallsCount = new ConcurrentHashMap<>(); + private final Map tenantCallsCount = new ConcurrentHashMap<>(); /** * Add a new tenant to the map. diff --git a/throttling/src/main/java/com/iluwatar/throttling/Tenant.java b/throttling/src/main/java/com/iluwatar/throttling/Tenant.java index d94344428..5fe2c72db 100644 --- a/throttling/src/main/java/com/iluwatar/throttling/Tenant.java +++ b/throttling/src/main/java/com/iluwatar/throttling/Tenant.java @@ -30,8 +30,8 @@ import java.security.InvalidParameterException; */ public class Tenant { - private String name; - private int allowedCallsPerSecond; + private final String name; + private final int allowedCallsPerSecond; /** * Constructor. diff --git a/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java b/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java index 6a328c3f0..786325237 100644 --- a/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java +++ b/throttling/src/test/java/com/iluwatar/throttling/B2BServiceTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test; */ public class B2BServiceTest { - private CallsCount callsCount = new CallsCount(); + private final CallsCount callsCount = new CallsCount(); @Test public void dummyCustomerApiTest() { diff --git a/tls/src/main/java/com/iluwatar/tls/DateFormatCallable.java b/tls/src/main/java/com/iluwatar/tls/DateFormatCallable.java index c4e885896..4e5c14e0b 100644 --- a/tls/src/main/java/com/iluwatar/tls/DateFormatCallable.java +++ b/tls/src/main/java/com/iluwatar/tls/DateFormatCallable.java @@ -1,93 +1,93 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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.tls; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.concurrent.Callable; -import java.util.stream.IntStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * DateFormatCallable converts string dates to a date format using SimpleDateFormat. The date format - * and the date value will be passed to the Callable by the constructor. The constructor creates a - * instance of SimpleDateFormat and stores it in a ThreadLocal class variable. For the complete - * description of the example see {@link App}. - * - *

You can comment out the code marked with //TLTL and comment in the code marked //NTLNTL. Then - * you can see what will happen if you do not use the ThreadLocal. For details see the description - * of {@link App} - * - * @author Thomas Bauer, 2017 - */ -public class DateFormatCallable implements Callable { - - private static final Logger LOGGER = LoggerFactory.getLogger(DateFormatCallable.class); - // class variables (members) - private ThreadLocal df; //TLTL - // private DateFormat df; //NTLNTL - - private String dateValue; // for dateValue Thread Local not needed - - - /** - * The date format and the date value are passed to the constructor. - * - * @param inDateFormat string date format string, e.g. "dd/MM/yyyy" - * @param inDateValue string date value, e.g. "21/06/2016" - */ - public DateFormatCallable(String inDateFormat, String inDateValue) { - final var idf = inDateFormat; //TLTL - this.df = ThreadLocal.withInitial(() -> { //TLTL - return new SimpleDateFormat(idf); //TLTL - }); //TLTL - // this.df = new SimpleDateFormat(inDateFormat); //NTLNTL - this.dateValue = inDateValue; - } - - @Override - public Result call() { - LOGGER.info(Thread.currentThread() + " started executing..."); - var result = new Result(); - - // Convert date value to date 5 times - IntStream.rangeClosed(1, 5).forEach(i -> { - try { - // this is the statement where it is important to have the - // instance of SimpleDateFormat locally - // Create the date value and store it in dateList - result.getDateList().add(this.df.get().parse(this.dateValue)); //TLTL - // result.getDateList().add(this.df.parse(this.dateValue)); //NTLNTL - } catch (Exception e) { - // write the Exception to a list and continue work - result.getExceptionList().add(e.getClass() + ": " + e.getMessage()); - } - }); - - LOGGER.info(Thread.currentThread() + " finished processing part of the thread"); - - return result; - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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.tls; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.concurrent.Callable; +import java.util.stream.IntStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * DateFormatCallable converts string dates to a date format using SimpleDateFormat. The date format + * and the date value will be passed to the Callable by the constructor. The constructor creates a + * instance of SimpleDateFormat and stores it in a ThreadLocal class variable. For the complete + * description of the example see {@link App}. + * + *

You can comment out the code marked with //TLTL and comment in the code marked //NTLNTL. Then + * you can see what will happen if you do not use the ThreadLocal. For details see the description + * of {@link App} + * + * @author Thomas Bauer, 2017 + */ +public class DateFormatCallable implements Callable { + + private static final Logger LOGGER = LoggerFactory.getLogger(DateFormatCallable.class); + // class variables (members) + private final ThreadLocal df; //TLTL + // private DateFormat df; //NTLNTL + + private final String dateValue; // for dateValue Thread Local not needed + + + /** + * The date format and the date value are passed to the constructor. + * + * @param inDateFormat string date format string, e.g. "dd/MM/yyyy" + * @param inDateValue string date value, e.g. "21/06/2016" + */ + public DateFormatCallable(String inDateFormat, String inDateValue) { + final var idf = inDateFormat; //TLTL + this.df = ThreadLocal.withInitial(() -> { //TLTL + return new SimpleDateFormat(idf); //TLTL + }); //TLTL + // this.df = new SimpleDateFormat(inDateFormat); //NTLNTL + this.dateValue = inDateValue; + } + + @Override + public Result call() { + LOGGER.info(Thread.currentThread() + " started executing..."); + var result = new Result(); + + // Convert date value to date 5 times + IntStream.rangeClosed(1, 5).forEach(i -> { + try { + // this is the statement where it is important to have the + // instance of SimpleDateFormat locally + // Create the date value and store it in dateList + result.getDateList().add(this.df.get().parse(this.dateValue)); //TLTL + // result.getDateList().add(this.df.parse(this.dateValue)); //NTLNTL + } catch (Exception e) { + // write the Exception to a list and continue work + result.getExceptionList().add(e.getClass() + ": " + e.getMessage()); + } + }); + + LOGGER.info(Thread.currentThread() + " finished processing part of the thread"); + + return result; + } +} diff --git a/tls/src/main/java/com/iluwatar/tls/Result.java b/tls/src/main/java/com/iluwatar/tls/Result.java index c98a07b91..38dc197cf 100644 --- a/tls/src/main/java/com/iluwatar/tls/Result.java +++ b/tls/src/main/java/com/iluwatar/tls/Result.java @@ -1,65 +1,65 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -/* - * Fiducia IT AG, All rights reserved. Use is subject to license terms. - */ - -package com.iluwatar.tls; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * Result object that will be returned by the Callable {@link DateFormatCallable} used in {@link - * App}. - * - * @author Thomas Bauer, 2017 - */ -public class Result { - // A list to collect the date values created in one thread - private List dateList = new ArrayList<>(); - - // A list to collect Exceptions thrown in one threads (should be none in - // this example) - private List exceptionList = new ArrayList<>(); - - /** - * Get list of date values collected within a thread execution. - * - * @return List of date values collected within an thread execution - */ - public List getDateList() { - return dateList; - } - - /** - * Get list of exceptions thrown within a thread execution. - * - * @return List of exceptions thrown within an thread execution - */ - public List getExceptionList() { - return exceptionList; - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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. + */ + +/* + * Fiducia IT AG, All rights reserved. Use is subject to license terms. + */ + +package com.iluwatar.tls; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * Result object that will be returned by the Callable {@link DateFormatCallable} used in {@link + * App}. + * + * @author Thomas Bauer, 2017 + */ +public class Result { + // A list to collect the date values created in one thread + private final List dateList = new ArrayList<>(); + + // A list to collect Exceptions thrown in one threads (should be none in + // this example) + private final List exceptionList = new ArrayList<>(); + + /** + * Get list of date values collected within a thread execution. + * + * @return List of date values collected within an thread execution + */ + public List getDateList() { + return dateList; + } + + /** + * Get list of exceptions thrown within a thread execution. + * + * @return List of exceptions thrown within an thread execution + */ + public List getExceptionList() { + return exceptionList; + } +} diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java index 48e5854a3..5338829d0 100644 --- a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java +++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java @@ -66,18 +66,18 @@ public class DateFormatCallableTest { /** * Expected number of date values in the date value list created by the run of DateFormatRunnalbe */ - private int expectedCounterDateValues = 5; + private final int expectedCounterDateValues = 5; /** * Expected number of exceptions in the exception list created by the run of DateFormatRunnalbe. */ - private int expectedCounterExceptions = 0; + private final int expectedCounterExceptions = 0; /** * Expected content of the list containing the date values created by the run of * DateFormatRunnalbe */ - private List expectedDateValues = + private final List expectedDateValues = List.of("15.11.2015", "15.11.2015", "15.11.2015", "15.11.2015", "15.11.2015"); /** diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java index 8b02faf0b..7b3d6b4ad 100644 --- a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java +++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java @@ -54,18 +54,18 @@ public class DateFormatCallableTestIncorrectDateFormat { /** * Expected number of date values in the date value list created by the run of DateFormatRunnalbe */ - private int expectedCounterDateValues = 0; + private final int expectedCounterDateValues = 0; /** * Expected number of exceptions in the exception list created by the run of DateFormatRunnalbe. */ - private int expectedCounterExceptions = 5; + private final int expectedCounterExceptions = 5; /** * Expected content of the list containing the exceptions created by the run of * DateFormatRunnalbe */ - private List expectedExceptions = List.of( + private final List expectedExceptions = List.of( "class java.text.ParseException: Unparseable date: \"15.12.2015\"", "class java.text.ParseException: Unparseable date: \"15.12.2015\"", "class java.text.ParseException: Unparseable date: \"15.12.2015\"", diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java index c0e8e1844..b3328d4c5 100644 --- a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java +++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java @@ -55,7 +55,7 @@ public class DateFormatCallableTestMultiThread { * Result object given back by DateFormatCallable, one for each thread -- Array with converted * date values -- Array with thrown exceptions */ - private static Result[] result = new Result[4]; + private static final Result[] result = new Result[4]; /** * The date values created by the run of of DateFormatRunnalbe. List will be filled in the setup() @@ -66,22 +66,22 @@ public class DateFormatCallableTestMultiThread { /* nothing needed here */ } - private static List[] createdDateValues = new StringArrayList[4]; + private static final List[] createdDateValues = new StringArrayList[4]; /** * Expected number of date values in the date value list created by each thread */ - private int expectedCounterDateValues = 5; + private final int expectedCounterDateValues = 5; /** * Expected number of exceptions in the exception list created by each thread */ - private int expectedCounterExceptions = 0; + private final int expectedCounterExceptions = 0; /** * Expected content of the list containing the date values created by each thread */ - private List expectedDateValues = + private final List expectedDateValues = List.of("15.11.2015", "15.11.2015", "15.11.2015", "15.11.2015", "15.11.2015"); /** diff --git a/tolerant-reader/README.md b/tolerant-reader/README.md index a62e5f4cd..922de90de 100644 --- a/tolerant-reader/README.md +++ b/tolerant-reader/README.md @@ -35,10 +35,10 @@ public class RainbowFish implements Serializable { private static final long serialVersionUID = 1L; - private String name; - private int age; - private int lengthMeters; - private int weightTons; + private final String name; + private final int age; + private final int lengthMeters; + private final int weightTons; /** * Constructor. 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 775fc98f7..7529435fe 100644 --- a/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.java +++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.java @@ -32,10 +32,10 @@ public class RainbowFish implements Serializable { private static final long serialVersionUID = 1L; - private String name; - private int age; - private int lengthMeters; - private int weightTons; + private final String name; + private final int age; + private final int lengthMeters; + private final int weightTons; /** * Constructor. diff --git a/twin/src/test/java/com/iluwatar/twin/BallItemTest.java b/twin/src/test/java/com/iluwatar/twin/BallItemTest.java index 568c1d7b0..18aba2bed 100644 --- a/twin/src/test/java/com/iluwatar/twin/BallItemTest.java +++ b/twin/src/test/java/com/iluwatar/twin/BallItemTest.java @@ -108,7 +108,7 @@ public class BallItemTest { * Logging Appender Implementation */ public class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); diff --git a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/App.java b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/App.java index e70acbf9e..80054a5fb 100644 --- a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/App.java +++ b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/App.java @@ -56,7 +56,7 @@ public class App { * * @param args command line args */ - public static void main(String[] args) throws FileNotFoundException, IOException, ParseException { + public static void main(String[] args) throws IOException, ParseException { var givenTime = 50; //50ms var toWin = 500; //points var pointsWon = 0; diff --git a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/Candy.java b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/Candy.java index ec41dc6cd..88bfe0ada 100644 --- a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/Candy.java +++ b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/Candy.java @@ -38,7 +38,7 @@ public class Candy { Candy parent; String parentName; private int points; - private Type type; + private final Type type; Candy(String name, String parentName, Type type, int points) { this.name = name; diff --git a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/CellPool.java b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/CellPool.java index 553458a6d..f33640f2a 100644 --- a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/CellPool.java +++ b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/CellPool.java @@ -77,7 +77,7 @@ public class CellPool { pointer++; } - Candy[] assignRandomCandytypes() throws FileNotFoundException, IOException, ParseException { + Candy[] assignRandomCandytypes() throws IOException, ParseException { var jp = new JsonParser(); jp.parse(); var randomCode = new Candy[jp.candies.size() - 2]; //exclude generic types 'fruit' and 'candy' diff --git a/unit-of-work/README.md b/unit-of-work/README.md index 1f6c7c5b2..590f718d3 100644 --- a/unit-of-work/README.md +++ b/unit-of-work/README.md @@ -79,8 +79,8 @@ public interface IUnitOfWork { public class StudentRepository implements IUnitOfWork { private static final Logger LOGGER = LoggerFactory.getLogger(StudentRepository.class); - private Map> context; - private StudentDatabase studentDatabase; + private final Map> context; + private final StudentDatabase studentDatabase; public StudentRepository(Map> context, StudentDatabase studentDatabase) { this.context = context; diff --git a/unit-of-work/src/main/java/com/iluwatar/unitofwork/StudentRepository.java b/unit-of-work/src/main/java/com/iluwatar/unitofwork/StudentRepository.java index ee5fc613d..73c1068b3 100644 --- a/unit-of-work/src/main/java/com/iluwatar/unitofwork/StudentRepository.java +++ b/unit-of-work/src/main/java/com/iluwatar/unitofwork/StudentRepository.java @@ -35,8 +35,8 @@ import org.slf4j.LoggerFactory; public class StudentRepository implements IUnitOfWork { private static final Logger LOGGER = LoggerFactory.getLogger(StudentRepository.class); - private Map> context; - private StudentDatabase studentDatabase; + private final Map> context; + private final StudentDatabase studentDatabase; /** * Constructor. diff --git a/update-method/src/main/java/com/iluwatar/updatemethod/World.java b/update-method/src/main/java/com/iluwatar/updatemethod/World.java index 8cabead56..5b99050c8 100644 --- a/update-method/src/main/java/com/iluwatar/updatemethod/World.java +++ b/update-method/src/main/java/com/iluwatar/updatemethod/World.java @@ -87,7 +87,8 @@ public class World { * Render the next frame. Here we do nothing since it is not related to the * pattern. */ - private void render() {} + private void render() { + } /** * Run game loop. 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 740be76b1..453718875 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 @@ -103,10 +103,7 @@ public class HeroStat { if (luck != other.luck) { return false; } - if (strength != other.strength) { - return false; - } - return true; + return strength == other.strength; } // The clone() method should not be public. Just don't override it. diff --git a/visitor/README.md b/visitor/README.md index 3b4be5082..c97e97120 100644 --- a/visitor/README.md +++ b/visitor/README.md @@ -32,7 +32,7 @@ Given the army unit example from above, we first have the Unit and UnitVisitor b ```java public abstract class Unit { - private Unit[] children; + private final Unit[] children; public Unit(Unit... children) { this.children = children; diff --git a/visitor/src/main/java/com/iluwatar/visitor/Unit.java b/visitor/src/main/java/com/iluwatar/visitor/Unit.java index c890884b3..3597c4d60 100644 --- a/visitor/src/main/java/com/iluwatar/visitor/Unit.java +++ b/visitor/src/main/java/com/iluwatar/visitor/Unit.java @@ -1,45 +1,45 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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 java.util.Arrays; - -/** - * Interface for the nodes in hierarchy. - */ -public abstract class Unit { - - private Unit[] children; - - public Unit(Unit... children) { - this.children = children; - } - - /** - * Accept visitor. - */ - public void accept(UnitVisitor visitor) { - Arrays.stream(children).forEach(child -> child.accept(visitor)); - } -} +/* + * The MIT License + * Copyright © 2014-2019 Ilkka Seppälä + * + * 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 java.util.Arrays; + +/** + * Interface for the nodes in hierarchy. + */ +public abstract class Unit { + + private final Unit[] children; + + public Unit(Unit... children) { + this.children = children; + } + + /** + * Accept visitor. + */ + public void accept(UnitVisitor visitor) { + Arrays.stream(children).forEach(child -> child.accept(visitor)); + } +} diff --git a/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java index 146ee22f8..fd2f1cb76 100644 --- a/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java +++ b/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java @@ -123,7 +123,7 @@ public abstract class VisitorTest { } private class InMemoryAppender extends AppenderBase { - private List log = new LinkedList<>(); + private final List log = new LinkedList<>(); public InMemoryAppender() { ((Logger) LoggerFactory.getLogger("root")).addAppender(this); From 8364b289b4c6bcfbee5df4f694f7f8bc3f59f58d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Thu, 30 Jul 2020 21:38:40 +0300 Subject: [PATCH 167/225] #590 explanation for Abstract Document --- abstract-document/README.md | 175 +++++++++++++++++- .../abstractdocument/domain/HasParts.java | 1 - .../abstractdocument/domain/HasPrice.java | 1 - .../abstractdocument/domain/HasType.java | 1 - 4 files changed, 168 insertions(+), 10 deletions(-) diff --git a/abstract-document/README.md b/abstract-document/README.md index 15f5c6c85..d985cff2b 100644 --- a/abstract-document/README.md +++ b/abstract-document/README.md @@ -9,21 +9,182 @@ tags: --- ## Intent -Achieve flexibility of untyped languages and keep the type-safety + +Use dynamic properties and achieve flexibility of untyped languages while keeping type-safety. + +## Explanation + +The Abstract Document pattern enables handling additional, non-static properties. This pattern +uses concept of traits to enable type safety and separate properties of different classes into +set of interfaces. + +Real world example + +> Consider a car that consists of multiple parts. However we don't know if the specific car really has all the parts, or just some of them. Our cars are dynamic and extremely flexible. + +In plain words + +> Abstract Document pattern allows attaching properties to objects without them knowing about it. + +Wikipedia says + +> An object-oriented structural design pattern for organizing objects in loosely typed key-value stores and exposing +the data using typed views. The purpose of the pattern is to achieve a high degree of flexibility between components +in a strongly typed language where new properties can be added to the object-tree on the fly, without losing the +support of type-safety. The pattern makes use of traits to separate different properties of a class into different +interfaces. + +**Programmatic Example** + +Let's first define the base classes `Document` and `AbstractDocument`. They basically make the object hold a property +map and any amount of child objects. + +```java +public interface Document { + + Void put(String key, Object value); + + Object get(String key); + + Stream children(String key, Function, T> constructor); +} + +public abstract class AbstractDocument implements Document { + + private final Map properties; + + protected AbstractDocument(Map properties) { + Objects.requireNonNull(properties, "properties map is required"); + this.properties = properties; + } + + @Override + public Void put(String key, Object value) { + properties.put(key, value); + return null; + } + + @Override + public Object get(String key) { + return properties.get(key); + } + + @Override + public Stream children(String key, Function, T> constructor) { + return Stream.ofNullable(get(key)) + .filter(Objects::nonNull) + .map(el -> (List>) el) + .findAny() + .stream() + .flatMap(Collection::stream) + .map(constructor); + } + ... +} +``` +Next we define an enum `Property` and a set of interfaces for type, price, model and parts. This allows us to create +static looking interface to our `Car` class. + +```java +public enum Property { + + PARTS, TYPE, PRICE, MODEL +} + +public interface HasType extends Document { + + default Optional getType() { + return Optional.ofNullable((String) get(Property.TYPE.toString())); + } +} + +public interface HasPrice extends Document { + + default Optional getPrice() { + return Optional.ofNullable((Number) get(Property.PRICE.toString())); + } +} +public interface HasModel extends Document { + + default Optional getModel() { + return Optional.ofNullable((String) get(Property.MODEL.toString())); + } +} + +public interface HasParts extends Document { + + default Stream getParts() { + return children(Property.PARTS.toString(), Part::new); + } +} +``` + +Now we are ready to introduce the `Car`. + +```java +public class Car extends AbstractDocument implements HasModel, HasPrice, HasParts { + + public Car(Map properties) { + super(properties); + } +} +``` + +And finally here's how we construct and use the `Car` in a full example. + +```java + LOGGER.info("Constructing parts and car"); + + var wheelProperties = Map.of( + Property.TYPE.toString(), "wheel", + Property.MODEL.toString(), "15C", + Property.PRICE.toString(), 100L); + + var doorProperties = Map.of( + Property.TYPE.toString(), "door", + Property.MODEL.toString(), "Lambo", + Property.PRICE.toString(), 300L); + + var carProperties = Map.of( + Property.MODEL.toString(), "300SL", + Property.PRICE.toString(), 10000L, + Property.PARTS.toString(), List.of(wheelProperties, doorProperties)); + + var car = new Car(carProperties); + + LOGGER.info("Here is our car:"); + LOGGER.info("-> model: {}", car.getModel().orElseThrow()); + LOGGER.info("-> price: {}", car.getPrice().orElseThrow()); + LOGGER.info("-> parts: "); + car.getParts().forEach(p -> LOGGER.info("\t{}/{}/{}", + p.getType().orElse(null), + p.getModel().orElse(null), + p.getPrice().orElse(null)) + ); + + // Constructing parts and car + // Here is our car: + // model: 300SL + // price: 10000 + // parts: + // wheel/15C/100 + // door/Lambo/300 +``` ## Class diagram + ![alt text](./etc/abstract-document.png "Abstract Document Traits and Domain") - ## Applicability + Use the Abstract Document Pattern when -* there is a need to add new properties on the fly -* you want a flexible way to organize domain in tree like structure -* you want more loosely coupled system - +* There is a need to add new properties on the fly +* You want a flexible way to organize domain in tree like structure +* You want more loosely coupled system ## Credits - +`` * [Wikipedia: Abstract Document Pattern](https://en.wikipedia.org/wiki/Abstract_Document_Pattern) * [Martin Fowler: Dealing with properties](http://martinfowler.com/apsupp/properties.pdf) +* [Pattern-Oriented Software Architecture Volume 4: A Pattern Language for Distributed Computing (v. 4)](https://www.amazon.com/gp/product/0470059028/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=0470059028&linkId=e3aacaea7017258acf184f9f3283b492) 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 8ecfa85fb..54f308ccf 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 @@ -32,7 +32,6 @@ import java.util.stream.Stream; */ public interface HasParts extends Document { - default Stream getParts() { return children(Property.PARTS.toString(), Part::new); } 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 9a95f2a51..a50c725c3 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 @@ -32,7 +32,6 @@ import java.util.Optional; */ public interface HasPrice extends Document { - default Optional getPrice() { return Optional.ofNullable((Number) get(Property.PRICE.toString())); } 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 b1d5bd6b5..2722564d5 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 @@ -32,7 +32,6 @@ import java.util.Optional; */ public interface HasType extends Document { - default Optional getType() { return Optional.ofNullable((String) get(Property.TYPE.toString())); } From 55bb1f11e0536a42196b1e9dde855b6eeabea237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Thu, 30 Jul 2020 21:57:07 +0300 Subject: [PATCH 168/225] #590 fix typo --- abstract-document/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abstract-document/README.md b/abstract-document/README.md index d985cff2b..cbb35cee8 100644 --- a/abstract-document/README.md +++ b/abstract-document/README.md @@ -184,7 +184,7 @@ Use the Abstract Document Pattern when * You want more loosely coupled system ## Credits -`` + * [Wikipedia: Abstract Document Pattern](https://en.wikipedia.org/wiki/Abstract_Document_Pattern) * [Martin Fowler: Dealing with properties](http://martinfowler.com/apsupp/properties.pdf) * [Pattern-Oriented Software Architecture Volume 4: A Pattern Language for Distributed Computing (v. 4)](https://www.amazon.com/gp/product/0470059028/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=0470059028&linkId=e3aacaea7017258acf184f9f3283b492) From 29f799c815379808624d6662b9172b2e2f3b3395 Mon Sep 17 00:00:00 2001 From: Matt Dolan Date: Fri, 31 Jul 2020 22:50:48 -0400 Subject: [PATCH 169/225] Corrected assertEquals order for expected, actual. --- .../java/com/iluwatar/arrangeactassert/CashAAATest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAAATest.java b/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAAATest.java index d7841843d..115dd3a11 100644 --- a/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAAATest.java +++ b/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAAATest.java @@ -60,7 +60,7 @@ public class CashAAATest { //Act cash.plus(4); //Assert - assertEquals(cash.count(), 7); + assertEquals(7, cash.count()); } @Test @@ -71,7 +71,7 @@ public class CashAAATest { var result = cash.minus(5); //Assert assertTrue(result); - assertEquals(cash.count(), 3); + assertEquals(3, cash.count()); } @Test @@ -82,7 +82,7 @@ public class CashAAATest { var result = cash.minus(6); //Assert assertFalse(result); - assertEquals(cash.count(), 1); + assertEquals(1, cash.count()); } @Test @@ -94,6 +94,6 @@ public class CashAAATest { var result = cash.minus(3); //Assert assertTrue(result); - assertEquals(cash.count(), 8); + assertEquals(8, cash.count()); } } From fb6507ceda06675fd910a736bcc35edd752321cb Mon Sep 17 00:00:00 2001 From: Matt Dolan Date: Fri, 31 Jul 2020 22:52:23 -0400 Subject: [PATCH 170/225] Corrected assertEquals order for expected, actual. --- .../com/iluwatar/arrangeactassert/CashAntiAAATest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAntiAAATest.java b/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAntiAAATest.java index 3f8c33d5e..564b923e7 100644 --- a/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAntiAAATest.java +++ b/arrange-act-assert/src/test/java/com/iluwatar/arrangeactassert/CashAntiAAATest.java @@ -44,16 +44,16 @@ public class CashAntiAAATest { var cash = new Cash(3); //test plus cash.plus(4); - assertEquals(cash.count(), 7); + assertEquals(7, cash.count()); //test minus cash = new Cash(8); assertTrue(cash.minus(5)); - assertEquals(cash.count(), 3); + assertEquals(3, cash.count()); assertFalse(cash.minus(6)); - assertEquals(cash.count(), 3); + assertEquals(3, cash.count()); //test update cash.plus(5); assertTrue(cash.minus(5)); - assertEquals(cash.count(), 3); + assertEquals(3, cash.count()); } } From 41020982de25493497b1976c19929e4e49b200e0 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 07:41:47 +0000 Subject: [PATCH 171/225] docs: update README.md [skip ci] --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d3c815cb3..401a92103 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-114-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-115-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -239,6 +239,7 @@ This project is licensed under the terms of the MIT license.
Lars Kappert
🖋
Mike Liu
🌍 +
Matt Dolan
💻 From 7908d38604403eb3e6459d8e8a15b984f32ceab5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 07:41:48 +0000 Subject: [PATCH 172/225] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9a536d34d..50f6363e0 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1038,6 +1038,15 @@ "contributions": [ "translation" ] + }, + { + "login": "charlesfinley", + "name": "Matt Dolan", + "avatar_url": "https://avatars1.githubusercontent.com/u/6307904?v=4", + "profile": "https://github.com/charlesfinley", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, From 15eb49e5743a80d588f8b562f2a23fd7151d4f47 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 08:07:20 +0000 Subject: [PATCH 173/225] docs: update README.md [skip ci] --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 401a92103..13a32d769 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-115-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-116-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -240,6 +240,7 @@ This project is licensed under the terms of the MIT license.
Lars Kappert
🖋
Mike Liu
🌍
Matt Dolan
💻 +
Manan
👀 From 0a2c87d49adbde9b96866a93f1886ff5764ce753 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 08:07:21 +0000 Subject: [PATCH 174/225] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 50f6363e0..8045f7326 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1047,6 +1047,15 @@ "contributions": [ "code" ] + }, + { + "login": "MananS77", + "name": "Manan", + "avatar_url": "https://avatars3.githubusercontent.com/u/21033516?v=4", + "profile": "https://github.com/MananS77", + "contributions": [ + "review" + ] } ], "contributorsPerLine": 4, From e4473e5c882f5496eb89959aa453e1b9aca2510f Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 08:45:38 +0000 Subject: [PATCH 175/225] docs: update README.md [skip ci] --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 13a32d769..feb64a1b5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-116-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-117-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -242,6 +242,9 @@ This project is licensed under the terms of the MIT license.
Matt Dolan
💻
Manan
👀 + +
Nishant Arora
💻 + From d41077f355a4f52c911220e5f001af377db851dd Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 08:45:39 +0000 Subject: [PATCH 176/225] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8045f7326..58d3e4c5d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1056,6 +1056,15 @@ "contributions": [ "review" ] + }, + { + "login": "nishant", + "name": "Nishant Arora", + "avatar_url": "https://avatars2.githubusercontent.com/u/15331971?v=4", + "profile": "https://github.com/nishant", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, From 27c40826de7fa6c059d51775f026e59b24333410 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 09:48:23 +0000 Subject: [PATCH 177/225] docs: update README.md [skip ci] --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index feb64a1b5..21939391e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-117-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-118-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -244,6 +244,7 @@ This project is licensed under the terms of the MIT license.
Nishant Arora
💻 +
Peeyush
💻 From 38791a6a661f080be6cc1b3e48f742de993c7599 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 09:48:24 +0000 Subject: [PATCH 178/225] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 58d3e4c5d..80c2288b6 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1065,6 +1065,15 @@ "contributions": [ "code" ] + }, + { + "login": "raja-peeyush-kumar-singh", + "name": "Peeyush", + "avatar_url": "https://avatars0.githubusercontent.com/u/5496024?v=4", + "profile": "https://github.com/raja-peeyush-kumar-singh", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, From 7ac8eba43467c9fc85a2b5a61516fccef20a8403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sat, 1 Aug 2020 15:18:32 +0300 Subject: [PATCH 179/225] #590 explanation for Acyclic Visitor --- acyclic-visitor/README.md | 126 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 122 insertions(+), 4 deletions(-) diff --git a/acyclic-visitor/README.md b/acyclic-visitor/README.md index f293e4393..19e886505 100644 --- a/acyclic-visitor/README.md +++ b/acyclic-visitor/README.md @@ -9,12 +9,126 @@ tags: --- ## Intent -Allow new functions to be added to existing class hierarchies without affecting those hierarchies, and without creating the troublesome dependency cycles that are inherent to the GOF VISITOR Pattern. + +Allow new functions to be added to existing class hierarchies without affecting those hierarchies, and without creating +the troublesome dependency cycles that are inherent to the GoF Visitor Pattern. + +## Explanation + +Real world example + +> We have a hierarchy of modem classes. The modems in this hierarchy need to be visited by an external algorithm based +> on filtering criteria (is it Unix or DOS compatible modem). + +In plain words + +> Acyclic Visitor allows functions to be added to existing class hierarchies without modifying the hierarchies. + +[WikiWikiWeb](https://wiki.c2.com/?AcyclicVisitor) says + +> The Acyclic Visitor pattern allows new functions to be added to existing class hierarchies without affecting those +> hierarchies, and without creating the dependency cycles that are inherent to the GangOfFour VisitorPattern. + +**Programmatic Example** + +Here's the `Modem` hierarchy. + +```java +public abstract class Modem { + public abstract void accept(ModemVisitor modemVisitor); +} + +public class Zoom extends Modem { + ... + @Override + public void accept(ModemVisitor modemVisitor) { + if (modemVisitor instanceof ZoomVisitor) { + ((ZoomVisitor) modemVisitor).visit(this); + } else { + LOGGER.info("Only ZoomVisitor is allowed to visit Zoom modem"); + } + } +} + +public class Hayes extends Modem { + ... + @Override + public void accept(ModemVisitor modemVisitor) { + if (modemVisitor instanceof HayesVisitor) { + ((HayesVisitor) modemVisitor).visit(this); + } else { + LOGGER.info("Only HayesVisitor is allowed to visit Hayes modem"); + } + } +} +``` + +Next we introduce the `ModemVisitor` hierarchy. + +```java +public interface ModemVisitor { +} + +public interface HayesVisitor extends ModemVisitor { + void visit(Hayes hayes); +} + +public interface ZoomVisitor extends ModemVisitor { + void visit(Zoom zoom); +} + +public interface AllModemVisitor extends ZoomVisitor, HayesVisitor { +} + +public class ConfigureForDosVisitor implements AllModemVisitor { + ... + @Override + public void visit(Hayes hayes) { + LOGGER.info(hayes + " used with Dos configurator."); + } + @Override + public void visit(Zoom zoom) { + LOGGER.info(zoom + " used with Dos configurator."); + } +} + +public class ConfigureForUnixVisitor implements ZoomVisitor { + ... + @Override + public void visit(Zoom zoom) { + LOGGER.info(zoom + " used with Unix configurator."); + } +} +``` + +Finally here are the visitors in action. + +```java + var conUnix = new ConfigureForUnixVisitor(); + var conDos = new ConfigureForDosVisitor(); + var zoom = new Zoom(); + var hayes = new Hayes(); + hayes.accept(conDos); + zoom.accept(conDos); + hayes.accept(conUnix); + zoom.accept(conUnix); +``` + +Program output: + +``` + // Hayes modem used with Dos configurator. + // Zoom modem used with Dos configurator. + // Only HayesVisitor is allowed to visit Hayes modem + // Zoom modem used with Unix configurator. +``` ## Class diagram + ![alt text](./etc/acyclic-visitor.png "Acyclic Visitor") ## Applicability + This pattern can be used: * When you need to add a new function to an existing hierarchy without the need to alter or affect that hierarchy. @@ -24,6 +138,7 @@ This pattern can be used: * When the recompilation, relinking, retesting or redistribution of the derivatives of Element is very expensive. ## Consequences + The good: * No dependency cycles between class hierarchies. @@ -32,11 +147,14 @@ The good: The bad: -* Violates the principle of least surprise or Liskov's Substitution principle by showing that it can accept all visitors but actually only being interested in particular visitors. +* Violates [Liskov's Substitution Principle](https://java-design-patterns.com/principles/#liskov-substitution-principle) by showing that it can accept all visitors but actually only being interested in particular visitors. * Parallel hierarchy of visitors has to be created for all members in visitable class hierarchy. ## Related patterns -* [Visitor Pattern](../visitor/) + +* [Visitor Pattern](https://java-design-patterns.com/patterns/visitor/) ## Credits -* [Acyclic Visitor](http://condor.depaul.edu/dmumaugh/OOT/Design-Principles/acv.pdf) + +* [Acyclic Visitor by Robert C. Martin](http://condor.depaul.edu/dmumaugh/OOT/Design-Principles/acv.pdf) +* [Acyclic Visitor in WikiWikiWeb](https://wiki.c2.com/?AcyclicVisitor) From 6a8297598e93195be7aa401af8f528768bef6f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sat, 1 Aug 2020 15:19:09 +0300 Subject: [PATCH 180/225] #1047 remove module infos --- .../abstractdocument/module-info.java | 26 ----------------- .../iluwatar/abstractfactory/module-info.java | 26 ----------------- .../iluwatar/acyclicvisitor/module-info.java | 26 ----------------- .../business/delegate/module-info.java | 26 ----------------- .../com/iluwatar/callback/module-info.java | 26 ----------------- .../java/com/iluwatar/chain/module-info.java | 26 ----------------- .../collectionpipeline/module-info.java | 26 ----------------- .../com/iluwatar/command/module-info.java | 26 ----------------- .../com/iluwatar/composite/module-info.java | 26 ----------------- .../com/iluwatar/converter/module-info.java | 26 ----------------- .../java/com/iluwatar/dao/module-info.java | 29 ------------------- .../com/iluwatar/datamapper/module-info.java | 26 ----------------- .../iluwatar/datatransfer/module-info.java | 26 ----------------- .../com/iluwatar/decorator/module-info.java | 26 ----------------- .../com/iluwatar/delegation/module-info.java | 26 ----------------- .../com/iluwatar/dirtyflag/module-info.java | 26 ----------------- .../doublechecked/locking/module-info.java | 26 ----------------- .../iluwatar/doubledispatch/module-info.java | 26 ----------------- .../eip/message/channel/module-info.java | 27 ----------------- .../eip/publish/subscribe/module-info.java | 27 ----------------- .../event/aggregator/module-info.java | 26 ----------------- .../event/asynchronous/module-info.java | 26 ----------------- .../iluwatar/execute/around/module-info.java | 26 ----------------- .../java/com/iluwatar/facade/module-info.java | 26 ----------------- .../com/iluwatar/factorykit/module-info.java | 26 ----------------- .../iluwatar/factory/method/module-info.java | 26 ----------------- .../iluwatar/featuretoggle/module-info.java | 26 ----------------- 27 files changed, 707 deletions(-) delete mode 100644 abstract-document/src/main/java/com/iluwatar/abstractdocument/module-info.java delete mode 100644 abstract-factory/src/main/java/com/iluwatar/abstractfactory/module-info.java delete mode 100644 acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/module-info.java delete mode 100644 business-delegate/src/main/java/com/iluwatar/business/delegate/module-info.java delete mode 100644 callback/src/main/java/com/iluwatar/callback/module-info.java delete mode 100644 chain/src/main/java/com/iluwatar/chain/module-info.java delete mode 100644 collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/module-info.java delete mode 100644 command/src/main/java/com/iluwatar/command/module-info.java delete mode 100644 composite/src/main/java/com/iluwatar/composite/module-info.java delete mode 100644 converter/src/main/java/com/iluwatar/converter/module-info.java delete mode 100644 dao/src/main/java/com/iluwatar/dao/module-info.java delete mode 100644 data-mapper/src/main/java/com/iluwatar/datamapper/module-info.java delete mode 100644 data-transfer-object/src/main/java/com/iluwatar/datatransfer/module-info.java delete mode 100644 decorator/src/main/java/com/iluwatar/decorator/module-info.java delete mode 100644 delegation/src/main/java/com/iluwatar/delegation/module-info.java delete mode 100644 dirty-flag/src/main/java/com/iluwatar/dirtyflag/module-info.java delete mode 100644 double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/module-info.java delete mode 100644 double-dispatch/src/main/java/com/iluwatar/doubledispatch/module-info.java delete mode 100644 eip-message-channel/src/main/java/com/iluwatar/eip/message/channel/module-info.java delete mode 100644 eip-publish-subscribe/src/main/java/com/iluwatar/eip/publish/subscribe/module-info.java delete mode 100644 event-aggregator/src/main/java/com/iluwatar/event/aggregator/module-info.java delete mode 100644 event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/module-info.java delete mode 100644 execute-around/src/main/java/com/iluwatar/execute/around/module-info.java delete mode 100644 facade/src/main/java/com/iluwatar/facade/module-info.java delete mode 100644 factory-kit/src/main/java/com/iluwatar/factorykit/module-info.java delete mode 100644 factory-method/src/main/java/com/iluwatar/factory/method/module-info.java delete mode 100644 feature-toggle/src/main/java/com/iluwatar/featuretoggle/module-info.java diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/module-info.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/module-info.java deleted file mode 100644 index 9121f0049..000000000 --- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.abstractdocument { - requires org.slf4j; -} \ No newline at end of file diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/module-info.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/module-info.java deleted file mode 100644 index f075aadc0..000000000 --- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.abstractfactory { - requires org.slf4j; -} \ No newline at end of file diff --git a/acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/module-info.java b/acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/module-info.java deleted file mode 100644 index 78de5a786..000000000 --- a/acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.acyclicvisitor { - requires org.slf4j; -} \ No newline at end of file diff --git a/business-delegate/src/main/java/com/iluwatar/business/delegate/module-info.java b/business-delegate/src/main/java/com/iluwatar/business/delegate/module-info.java deleted file mode 100644 index 8f331c848..000000000 --- a/business-delegate/src/main/java/com/iluwatar/business/delegate/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.business.delegate { - requires org.slf4j; -} \ No newline at end of file diff --git a/callback/src/main/java/com/iluwatar/callback/module-info.java b/callback/src/main/java/com/iluwatar/callback/module-info.java deleted file mode 100644 index 21a7a732b..000000000 --- a/callback/src/main/java/com/iluwatar/callback/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.callback { - requires org.slf4j; -} \ No newline at end of file diff --git a/chain/src/main/java/com/iluwatar/chain/module-info.java b/chain/src/main/java/com/iluwatar/chain/module-info.java deleted file mode 100644 index 4f11ab327..000000000 --- a/chain/src/main/java/com/iluwatar/chain/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.chain { - requires org.slf4j; -} \ No newline at end of file diff --git a/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/module-info.java b/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/module-info.java deleted file mode 100644 index f8bd30a68..000000000 --- a/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.collectionpipeline { - requires org.slf4j; -} \ No newline at end of file diff --git a/command/src/main/java/com/iluwatar/command/module-info.java b/command/src/main/java/com/iluwatar/command/module-info.java deleted file mode 100644 index 0e0c0b31f..000000000 --- a/command/src/main/java/com/iluwatar/command/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.command { - requires org.slf4j; -} \ No newline at end of file diff --git a/composite/src/main/java/com/iluwatar/composite/module-info.java b/composite/src/main/java/com/iluwatar/composite/module-info.java deleted file mode 100644 index d75a7b8f8..000000000 --- a/composite/src/main/java/com/iluwatar/composite/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.composite { - requires org.slf4j; -} \ No newline at end of file diff --git a/converter/src/main/java/com/iluwatar/converter/module-info.java b/converter/src/main/java/com/iluwatar/converter/module-info.java deleted file mode 100644 index d83a43c6b..000000000 --- a/converter/src/main/java/com/iluwatar/converter/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.converter { - requires org.slf4j; -} \ No newline at end of file diff --git a/dao/src/main/java/com/iluwatar/dao/module-info.java b/dao/src/main/java/com/iluwatar/dao/module-info.java deleted file mode 100644 index 08e4f662e..000000000 --- a/dao/src/main/java/com/iluwatar/dao/module-info.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.dao { - requires org.slf4j; - requires java.sql; - requires h2; - requires java.naming; -} \ No newline at end of file diff --git a/data-mapper/src/main/java/com/iluwatar/datamapper/module-info.java b/data-mapper/src/main/java/com/iluwatar/datamapper/module-info.java deleted file mode 100644 index 7abd78826..000000000 --- a/data-mapper/src/main/java/com/iluwatar/datamapper/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.datamapper { - requires org.slf4j; -} \ No newline at end of file diff --git a/data-transfer-object/src/main/java/com/iluwatar/datatransfer/module-info.java b/data-transfer-object/src/main/java/com/iluwatar/datatransfer/module-info.java deleted file mode 100644 index 25685d4d0..000000000 --- a/data-transfer-object/src/main/java/com/iluwatar/datatransfer/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.datatransfer { - requires org.slf4j; -} \ No newline at end of file diff --git a/decorator/src/main/java/com/iluwatar/decorator/module-info.java b/decorator/src/main/java/com/iluwatar/decorator/module-info.java deleted file mode 100644 index 50d17f022..000000000 --- a/decorator/src/main/java/com/iluwatar/decorator/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.decorator { - requires org.slf4j; -} \ No newline at end of file diff --git a/delegation/src/main/java/com/iluwatar/delegation/module-info.java b/delegation/src/main/java/com/iluwatar/delegation/module-info.java deleted file mode 100644 index 156477cde..000000000 --- a/delegation/src/main/java/com/iluwatar/delegation/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.delegation { - requires org.slf4j; -} \ No newline at end of file diff --git a/dirty-flag/src/main/java/com/iluwatar/dirtyflag/module-info.java b/dirty-flag/src/main/java/com/iluwatar/dirtyflag/module-info.java deleted file mode 100644 index bf47d2cd7..000000000 --- a/dirty-flag/src/main/java/com/iluwatar/dirtyflag/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.dirtyflag { - requires org.slf4j; -} \ No newline at end of file diff --git a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/module-info.java b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/module-info.java deleted file mode 100644 index 4f4216ea7..000000000 --- a/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.doublecheckedlocking { - requires org.slf4j; -} \ No newline at end of file diff --git a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/module-info.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/module-info.java deleted file mode 100644 index b1bc2e824..000000000 --- a/double-dispatch/src/main/java/com/iluwatar/doubledispatch/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.doubledispatch { - requires org.slf4j; -} \ No newline at end of file diff --git a/eip-message-channel/src/main/java/com/iluwatar/eip/message/channel/module-info.java b/eip-message-channel/src/main/java/com/iluwatar/eip/message/channel/module-info.java deleted file mode 100644 index b904ee1c8..000000000 --- a/eip-message-channel/src/main/java/com/iluwatar/eip/message/channel/module-info.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.eipmessagechannel { - requires org.slf4j; - requires camel.core; -} \ No newline at end of file diff --git a/eip-publish-subscribe/src/main/java/com/iluwatar/eip/publish/subscribe/module-info.java b/eip-publish-subscribe/src/main/java/com/iluwatar/eip/publish/subscribe/module-info.java deleted file mode 100644 index 50eab8360..000000000 --- a/eip-publish-subscribe/src/main/java/com/iluwatar/eip/publish/subscribe/module-info.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.eippublishsubscribe { - requires org.slf4j; - requires camel.core; -} \ No newline at end of file diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/module-info.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/module-info.java deleted file mode 100644 index 93ebd3173..000000000 --- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.eventaggregator { - requires org.slf4j; -} \ No newline at end of file diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/module-info.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/module-info.java deleted file mode 100644 index aa9b6c29d..000000000 --- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.eventasynchronous { - requires org.slf4j; -} \ No newline at end of file diff --git a/execute-around/src/main/java/com/iluwatar/execute/around/module-info.java b/execute-around/src/main/java/com/iluwatar/execute/around/module-info.java deleted file mode 100644 index a3e179094..000000000 --- a/execute-around/src/main/java/com/iluwatar/execute/around/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.executearound { - requires org.slf4j; -} \ No newline at end of file diff --git a/facade/src/main/java/com/iluwatar/facade/module-info.java b/facade/src/main/java/com/iluwatar/facade/module-info.java deleted file mode 100644 index 966758790..000000000 --- a/facade/src/main/java/com/iluwatar/facade/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.facade { - requires org.slf4j; -} \ No newline at end of file diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/module-info.java b/factory-kit/src/main/java/com/iluwatar/factorykit/module-info.java deleted file mode 100644 index 9440571c4..000000000 --- a/factory-kit/src/main/java/com/iluwatar/factorykit/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.factorykit { - requires org.slf4j; -} \ No newline at end of file diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/module-info.java b/factory-method/src/main/java/com/iluwatar/factory/method/module-info.java deleted file mode 100644 index 4ea385c8b..000000000 --- a/factory-method/src/main/java/com/iluwatar/factory/method/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.factorymethod { - requires org.slf4j; -} \ No newline at end of file diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/module-info.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/module-info.java deleted file mode 100644 index 55c2d7714..000000000 --- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.featuretoggle { - requires org.slf4j; -} \ No newline at end of file From b3bfd43bffdbb02cc9b990c9616ebf632c0896dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sat, 1 Aug 2020 15:54:46 +0300 Subject: [PATCH 181/225] #590 update Acyclic Visitor class diagram --- acyclic-visitor/etc/Acyclic Visitor.ucls | 115 ----------------------- acyclic-visitor/etc/acyclic-visitor.png | Bin 26645 -> 49064 bytes 2 files changed, 115 deletions(-) delete mode 100644 acyclic-visitor/etc/Acyclic Visitor.ucls diff --git a/acyclic-visitor/etc/Acyclic Visitor.ucls b/acyclic-visitor/etc/Acyclic Visitor.ucls deleted file mode 100644 index 03b6c77dd..000000000 --- a/acyclic-visitor/etc/Acyclic Visitor.ucls +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/acyclic-visitor/etc/acyclic-visitor.png b/acyclic-visitor/etc/acyclic-visitor.png index 636532c4d5d6443c94173fec7b0782eb8b661fe9..7b4df13d80f8c0d1be8ca32cbc39594bbd9ec7d4 100644 GIT binary patch literal 49064 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 J8O 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 Date: Sat, 1 Aug 2020 16:26:14 +0300 Subject: [PATCH 182/225] work on Abstract Factory readme --- abstract-factory/README.md | 53 ++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/abstract-factory/README.md b/abstract-factory/README.md index fba3460c1..141bf5021 100644 --- a/abstract-factory/README.md +++ b/abstract-factory/README.md @@ -9,13 +9,16 @@ tags: --- ## Also known as + Kit ## Intent + Provide an interface for creating families of related or dependent objects without specifying their concrete classes. ## Explanation + Real world example > To create a kingdom we need objects with common theme. Elven kingdom needs an Elven king, Elven castle and Elven army whereas Orcish kingdom needs an Orcish king, Orcish castle and Orcish army. There is a dependency between the objects in the kingdom. @@ -36,9 +39,11 @@ Translating the kingdom example above. First of all we have some interfaces and public interface Castle { String getDescription(); } + public interface King { String getDescription(); } + public interface Army { String getDescription(); } @@ -66,7 +71,7 @@ public class ElfArmy implements Army { } } -// Orcish implementations similarly... +// Orcish implementations similarly -> ... ``` @@ -112,9 +117,17 @@ var castle = factory.createCastle(); var king = factory.createKing(); var army = factory.createArmy(); -castle.getDescription(); // Output: This is the Elven castle! -king.getDescription(); // Output: This is the Elven king! -army.getDescription(); // Output: This is the Elven Army! +castle.getDescription(); +king.getDescription(); +army.getDescription(); +``` + +Program output: + +```java +This is the Elven castle! +This is the Elven king! +This is the Elven Army! ``` Now, we can design a factory for our different kingdom factories. In this example, we created FactoryMaker, responsible for returning an instance of either ElfKingdomFactory or OrcKingdomFactory. @@ -156,37 +169,39 @@ public static void main(String[] args) { ``` ## Class diagram + ![alt text](./etc/abstract-factory.urm.png "Abstract Factory class diagram") ## Applicability + Use the Abstract Factory pattern when -* a system should be independent of how its products are created, composed and represented -* a system should be configured with one of multiple families of products -* a family of related product objects is designed to be used together, and you need to enforce this constraint -* you want to provide a class library of products, and you want to reveal just their interfaces, not their implementations -* the lifetime of the dependency is conceptually shorter than the lifetime of the consumer. -* you need a run-time value to construct a particular dependency -* you want to decide which product to call from a family at runtime. -* you need to supply one or more parameters only known at run-time before you can resolve a dependency. -* when you need consistency among products -* you don’t want to change existing code when adding new products or families of products to the program. +* The system should be independent of how its products are created, composed and represented +* The system should be configured with one of multiple families of products +* The family of related product objects is designed to be used together, and you need to enforce this constraint +* You want to provide a class library of products, and you want to reveal just their interfaces, not their implementations +* The lifetime of the dependency is conceptually shorter than the lifetime of the consumer. +* You need a run-time value to construct a particular dependency +* You want to decide which product to call from a family at runtime. +* You need to supply one or more parameters only known at run-time before you can resolve a dependency. +* When you need consistency among products +* You don’t want to change existing code when adding new products or families of products to the program. ## Use Cases: -* Selecting to call the appropriate implementation of FileSystemAcmeService or DatabaseAcmeService or NetworkAcmeService at runtime. -* Unit test case writing becomes much easier +* Selecting to call the appropriate implementation of FileSystemAcmeService or DatabaseAcmeService or NetworkAcmeService at runtime. +* Unit test case writing becomes much easier * UI tools for different OS ## Consequences: -* Dependency injection in java hides the service class dependencies that can lead to runtime errors that would have been caught at compile time. +* Dependency injection in java hides the service class dependencies that can lead to runtime errors that would have been caught at compile time. * While the pattern is great when creating predefined objects, adding the new ones might be challenging. -* The code may become more complicated than it should be, since a lot of new interfaces and classes are introduced along with the pattern. - +* The code becomes more complicated than it should be, since a lot of new interfaces and classes are introduced along with the pattern. ## Tutorial + * [Abstract Factory Pattern Tutorial](https://www.journaldev.com/1418/abstract-factory-design-pattern-in-java) From 14487261d078ef96f0dec07633c05a213ee1e1ca Mon Sep 17 00:00:00 2001 From: Matt Dolan Date: Sun, 2 Aug 2020 00:03:36 -0400 Subject: [PATCH 183/225] Use of ${artifactId} is deprecated and should be updated to ${project.artifactId} --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f23369107..65d6d3e2b 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ https://sonarcloud.io iluwatar iluwatar_java-design-patterns - ${artifactId} + ${project.artifactId} Java Design Patterns From 689cc8b59b2f1c914ef9c05841e7e9998cb0bdbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 2 Aug 2020 11:53:52 +0300 Subject: [PATCH 184/225] Update surefire and minor improvements --- pom.xml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 65d6d3e2b..3b4f05b37 100644 --- a/pom.xml +++ b/pom.xml @@ -375,10 +375,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M3 - - -Xmx1024M ${argLine} - + 3.0.0-M5 org.springframework.boot @@ -474,7 +471,7 @@ true - ${projectRoot}${file.separator}license-plugin-header-style.xml + license-plugin-header-style.xml SLASHSTAR_CUSTOM_STYLE @@ -540,14 +537,4 @@ - - - - org.apache.maven.plugins - maven-jxr-plugin - 3.0.0 - - - - - \ No newline at end of file + From b0ded54c664141bfb7732579817598004cbc0399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sun, 2 Aug 2020 22:48:54 +0300 Subject: [PATCH 185/225] Cleanup --- .../java/com/iluwatar/abstractdocument/App.java | 16 ++++------------ .../abstractdocument/AbstractDocumentTest.java | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) 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 b881ee7ac..d13021e72 100644 --- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java +++ b/abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java @@ -43,9 +43,11 @@ public class App { private static final Logger LOGGER = LoggerFactory.getLogger(App.class); /** - * Executes the App. + * Program entry point. + * + * @param args command line args */ - public App() { + public static void main(String[] args) { LOGGER.info("Constructing parts and car"); var wheelProperties = Map.of( @@ -75,14 +77,4 @@ public class App { p.getPrice().orElse(null)) ); } - - /** - * Program entry point. - * - * @param args command line args - */ - public static void main(String[] args) { - new App(); - } - } 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 c0791c30b..13db318e4 100644 --- a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java +++ b/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java @@ -40,7 +40,7 @@ public class AbstractDocumentTest { private static final String KEY = "key"; private static final String VALUE = "value"; - private class DocumentImplementation extends AbstractDocument { + private static class DocumentImplementation extends AbstractDocument { DocumentImplementation(Map properties) { super(properties); From 83acaa82d441b7373855e8c7acbcbddc2de339b9 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2020 13:30:51 +0000 Subject: [PATCH 186/225] docs: update README.md [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 401a92103..b9509ee16 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,7 @@ This project is licensed under the terms of the MIT license.
Lars Kappert
🖋
Mike Liu
🌍 -
Matt Dolan
💻 +
Matt Dolan
💻 👀 From f84f7b973cf955a8aae29602f2629206647c54f7 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2020 13:30:52 +0000 Subject: [PATCH 187/225] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 50f6363e0..5e0b93860 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1045,7 +1045,8 @@ "avatar_url": "https://avatars1.githubusercontent.com/u/6307904?v=4", "profile": "https://github.com/charlesfinley", "contributions": [ - "code" + "code", + "review" ] } ], From 9ff5b9e7c09277cc51c3b26224608c699b457156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 3 Aug 2020 16:49:46 +0300 Subject: [PATCH 188/225] Fix merge --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index a48db3dd2..d7115a51d 100644 --- a/README.md +++ b/README.md @@ -239,13 +239,12 @@ This project is licensed under the terms of the MIT license.
Lars Kappert
🖋
Mike Liu
🌍 -
Matt Dolan
💻 +
Matt Dolan
💻 👀
Manan
👀
Nishant Arora
💻
Peeyush
💻 -
Matt Dolan
💻 👀 From 3ae74666473dc4ee90340d810ec9e6ea6a5ae665 Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Mon, 3 Aug 2020 16:51:30 +0200 Subject: [PATCH 189/225] Typically command pattern is implemented using interfaces and concrete classes. Refactor the code to use the same --- .../src/main/java/com/iluwatar/command/Command.java | 11 +++++------ .../java/com/iluwatar/command/InvisibilitySpell.java | 2 +- .../main/java/com/iluwatar/command/ShrinkSpell.java | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/command/src/main/java/com/iluwatar/command/Command.java b/command/src/main/java/com/iluwatar/command/Command.java index 85deff74e..df91e1df3 100644 --- a/command/src/main/java/com/iluwatar/command/Command.java +++ b/command/src/main/java/com/iluwatar/command/Command.java @@ -26,15 +26,14 @@ package com.iluwatar.command; /** * Interface for Commands. */ -public abstract class Command { +public interface Command { - public abstract void execute(Target target); + public void execute(Target target); - public abstract void undo(); + public void undo(); - public abstract void redo(); + public void redo(); - @Override - public abstract String toString(); + public String toString(); } diff --git a/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java b/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java index 3e0f7bbf4..33e053cc2 100644 --- a/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java +++ b/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java @@ -26,7 +26,7 @@ package com.iluwatar.command; /** * InvisibilitySpell is a concrete command. */ -public class InvisibilitySpell extends Command { +public class InvisibilitySpell implements Command { private Target target; diff --git a/command/src/main/java/com/iluwatar/command/ShrinkSpell.java b/command/src/main/java/com/iluwatar/command/ShrinkSpell.java index 87497bb7b..3f21fc7c1 100644 --- a/command/src/main/java/com/iluwatar/command/ShrinkSpell.java +++ b/command/src/main/java/com/iluwatar/command/ShrinkSpell.java @@ -26,7 +26,7 @@ package com.iluwatar.command; /** * ShrinkSpell is a concrete command. */ -public class ShrinkSpell extends Command { +public class ShrinkSpell implements Command { private Size oldSize; private Target target; From b9f17824fa026a9027d584db142b12f1f3d3c64e Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Mon, 3 Aug 2020 17:38:03 +0200 Subject: [PATCH 190/225] removing unwanted modifiers --- .../src/main/java/com/iluwatar/command/Command.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/command/src/main/java/com/iluwatar/command/Command.java b/command/src/main/java/com/iluwatar/command/Command.java index df91e1df3..83010f160 100644 --- a/command/src/main/java/com/iluwatar/command/Command.java +++ b/command/src/main/java/com/iluwatar/command/Command.java @@ -27,13 +27,11 @@ package com.iluwatar.command; * Interface for Commands. */ public interface Command { + void execute(Target target); - public void execute(Target target); + void undo(); - public void undo(); - - public void redo(); - - public String toString(); + void redo(); + String toString(); } From 44a654a2e31507cca2be00f86054dca7ac3cbf9e Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Mon, 3 Aug 2020 15:45:29 +0000 Subject: [PATCH 191/225] Resolves CR comments --- marker/src/main/java/App.java | 4 ++-- marker/src/main/java/Guard.java | 1 - marker/src/main/java/Thief.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/marker/src/main/java/App.java b/marker/src/main/java/App.java index 8a08a8f70..0908503e5 100644 --- a/marker/src/main/java/App.java +++ b/marker/src/main/java/App.java @@ -46,7 +46,7 @@ public class App { * @param args command line args */ public static void main(String[] args) { - final Logger logger = LoggerFactory.getLogger(App.class); + final var logger = LoggerFactory.getLogger(App.class); var guard = new Guard(); var thief = new Thief(); @@ -59,7 +59,7 @@ public class App { //noinspection ConstantConditions if (thief instanceof Permission) { - thief.doNothing(); + thief.steal(); } else { thief.doNothing(); } diff --git a/marker/src/main/java/Guard.java b/marker/src/main/java/Guard.java index 54443603c..9e7b731b6 100644 --- a/marker/src/main/java/Guard.java +++ b/marker/src/main/java/Guard.java @@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory; * Class defining Guard. */ public class Guard implements Permission { - private static final Logger LOGGER = LoggerFactory.getLogger(Guard.class); protected void enter() { diff --git a/marker/src/main/java/Thief.java b/marker/src/main/java/Thief.java index 22155ef7b..0e4cf92e3 100644 --- a/marker/src/main/java/Thief.java +++ b/marker/src/main/java/Thief.java @@ -28,10 +28,9 @@ import org.slf4j.LoggerFactory; * Class defining Thief. */ public class Thief { - private static final Logger LOGGER = LoggerFactory.getLogger(Thief.class); - protected static void steal() { + protected void steal() { LOGGER.info("Steal valuable items"); } From 054b1eaac6e79ac9bf43babca0a3521a0e4a5c04 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Mon, 3 Aug 2020 15:59:28 +0000 Subject: [PATCH 192/225] Resolves test failures --- .../model/view/controller/Fatigue.java | 5 +++-- .../iluwatar/model/view/controller/Health.java | 5 +++-- .../model/view/controller/Nourishment.java | 5 +++-- .../model/view/controller/GiantModelTest.java | 18 +++++++++--------- 4 files changed, 18 insertions(+), 15 deletions(-) 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 2b7ca3999..64bae6e51 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 @@ -27,8 +27,9 @@ package com.iluwatar.model.view.controller; * Fatigue enumeration. */ public enum Fatigue { - - ALERT("alert"), TIRED("tired"), SLEEPING("sleeping"); + ALERT("alert"), + TIRED("tired"), + SLEEPING("sleeping"); private final String title; 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 a8346b9c7..f15585cdd 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 @@ -27,8 +27,9 @@ package com.iluwatar.model.view.controller; * Health enumeration. */ public enum Health { - - HEALTHY("healthy"), WOUNDED("wounded"), DEAD("dead"); + HEALTHY("healthy"), + WOUNDED("wounded"), + DEAD("dead"); private final String title; 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 c61d2de79..ba00c38c5 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 @@ -27,8 +27,9 @@ package com.iluwatar.model.view.controller; * Nourishment enumeration. */ public enum Nourishment { - - SATURATED("saturated"), HUNGRY("hungry"), STARVING("starving"); + SATURATED("saturated"), + HUNGRY("hungry"), + STARVING("starving"); private final String title; 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 c1a86b750..677ab436e 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 @@ -39,13 +39,13 @@ public class GiantModelTest { */ @Test public void testSetHealth() { - final var model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.HUNGRY); + final var model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED); assertEquals(Health.HEALTHY, model.getHealth()); + var messageFormat = "The giant looks %s, alert and saturated."; for (final var health : Health.values()) { model.setHealth(health); assertEquals(health, model.getHealth()); - assertEquals("The giant looks " + health.toString() + ", alert and saturated.", model - .toString()); + assertEquals(String.format(messageFormat, health), model.toString()); } } @@ -54,13 +54,13 @@ public class GiantModelTest { */ @Test public void testSetFatigue() { - final var model = new GiantModel(Health.WOUNDED, Fatigue.ALERT, Nourishment.SATURATED); + final var model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED); assertEquals(Fatigue.ALERT, model.getFatigue()); + var messageFormat = "The giant looks healthy, %s and saturated."; for (final var fatigue : Fatigue.values()) { model.setFatigue(fatigue); assertEquals(fatigue, model.getFatigue()); - assertEquals("The giant looks healthy, " + fatigue.toString() + " and saturated.", model - .toString()); + assertEquals(String.format(messageFormat, fatigue), model.toString()); } } @@ -69,13 +69,13 @@ public class GiantModelTest { */ @Test public void testSetNourishment() { - final var model = new GiantModel(Health.HEALTHY, Fatigue.TIRED, Nourishment.SATURATED); + final var model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED); assertEquals(Nourishment.SATURATED, model.getNourishment()); + var messageFormat = "The giant looks healthy, alert and %s."; for (final var nourishment : Nourishment.values()) { model.setNourishment(nourishment); assertEquals(nourishment, model.getNourishment()); - assertEquals("The giant looks healthy, alert and " + nourishment.toString() + ".", model - .toString()); + assertEquals(String.format(messageFormat, nourishment), model.toString()); } } From a7b4194a71af7a1a36eca938471a1aa557cbe26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 3 Aug 2020 21:08:10 +0300 Subject: [PATCH 193/225] #590 explanation for Aggregator Microservices --- aggregator-microservices/README.md | 91 ++++++++++++++++-- .../etc/aggregator-microservice.png | Bin 41304 -> 0 bytes 2 files changed, 84 insertions(+), 7 deletions(-) delete mode 100644 aggregator-microservices/etc/aggregator-microservice.png diff --git a/aggregator-microservices/README.md b/aggregator-microservices/README.md index 74a411fc5..3dd5527bc 100644 --- a/aggregator-microservices/README.md +++ b/aggregator-microservices/README.md @@ -10,16 +10,91 @@ tags: ## Intent -The user makes a single call to the Aggregator, and the aggregator then calls each relevant microservice and collects -the data, apply business logic to it, and further publish is as a REST Endpoint. -More variations of the aggregator are: -- Proxy Microservice Design Pattern: A different microservice is called upon the business need. -- Chained Microservice Design Pattern: In this case each microservice is dependent/ chained to a series -of other microservices. +The user makes a single call to the aggregator service, and the aggregator then calls each relevant microservice. + +## Explanation + +Real world example + +> Our web marketplace needs information about products and their current inventory. It makes a call to an aggregator +> service that in turn calls the product information microservice and product inventory microservice returning the +> combined information. + +In plain words + +> Aggregator Microservice collects pieces of data from various microservices and returns an aggregate for processing. + +Stack Overflow says + +> Aggregator Microservice invokes multiple services to achieve the functionality required by the application. + +**Programmatic Example** + +Let's start from the data model. Here's our `Product`. + +```java +public class Product { + private String title; + private int productInventories; + // getters and setters -> + ... +} +``` + +Next we can introduct our `Aggregator` microservice. It contains clients `ProductInformationClient` and +`ProductInventoryClient` for calling respective microservices. + +```java +@RestController +public class Aggregator { + + @Resource + private ProductInformationClient informationClient; + + @Resource + private ProductInventoryClient inventoryClient; + + @RequestMapping(path = "/product", method = RequestMethod.GET) + public Product getProduct() { + + var product = new Product(); + var productTitle = informationClient.getProductTitle(); + var productInventory = inventoryClient.getProductInventories(); + + //Fallback to error message + product.setTitle(requireNonNullElse(productTitle, "Error: Fetching Product Title Failed")); + + //Fallback to default error inventory + product.setProductInventories(requireNonNullElse(productInventory, -1)); + + return product; + } +} +``` + +Here's the essence of information microservice implementation. Inventory microservice is similar, it just returns +inventory counts. + +```java +@RestController +public class InformationController { + @RequestMapping(value = "/information", method = RequestMethod.GET) + public String getProductTitle() { + return "The Product Title."; + } +} +``` + +Now calling our `Aggregator` REST API returns the product information. + +```bash +curl http://localhost:50004/product +{"title":"The Product Title.","productInventories":5} +``` ## Class diagram -![alt text](./etc/aggregator-microservice.png "Aggregator Microservice") +![alt text](./etc/aggregator-service.png "Aggregator Microservice") ## Applicability @@ -28,3 +103,5 @@ Use the Aggregator Microservices pattern when you need a unified API for various ## Credits * [Microservice Design Patterns](http://web.archive.org/web/20190705163602/http://blog.arungupta.me/microservice-design-patterns/) +* [Microservices Patterns: With examples in Java](https://www.amazon.com/gp/product/1617294543/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1617294543&linkId=8b4e570267bc5fb8b8189917b461dc60) +* [Architectural Patterns: Uncover essential patterns in the most indispensable realm of enterprise architecture](https://www.amazon.com/gp/product/B077T7V8RC/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=B077T7V8RC&linkId=c34d204bfe1b277914b420189f09c1a4) diff --git a/aggregator-microservices/etc/aggregator-microservice.png b/aggregator-microservices/etc/aggregator-microservice.png deleted file mode 100644 index ad344a7e1e0fa72633fb06e53ae4ddc0a0695ae4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41304 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˂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

+0z( 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 From fa3b93bf8d899fd02f13b1902bc2eee576a9c615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Mon, 3 Aug 2020 21:25:13 +0300 Subject: [PATCH 194/225] #590 fix diagram --- aggregator-microservices/README.md | 2 +- .../etc/aggregator-service.png | Bin 0 -> 41498 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 aggregator-microservices/aggregator-service/etc/aggregator-service.png diff --git a/aggregator-microservices/README.md b/aggregator-microservices/README.md index 3dd5527bc..71c4ab69a 100644 --- a/aggregator-microservices/README.md +++ b/aggregator-microservices/README.md @@ -94,7 +94,7 @@ curl http://localhost:50004/product ## Class diagram -![alt text](./etc/aggregator-service.png "Aggregator Microservice") +![alt text](./aggregator-service/etc/aggregator-service.png "Aggregator Microservice") ## Applicability diff --git a/aggregator-microservices/aggregator-service/etc/aggregator-service.png b/aggregator-microservices/aggregator-service/etc/aggregator-service.png new file mode 100644 index 0000000000000000000000000000000000000000..75ee82328bbe925e11e7175224294b925f22683e GIT binary patch literal 41498 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 literal 0 HcmV?d00001 From ca7192889dd0d00b6dba4964530110ecac6d1d26 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Mon, 3 Aug 2020 18:50:45 +0000 Subject: [PATCH 195/225] Fixes test cases for master-worker-pattern --- .../masterworker/system/systemmaster/Master.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java index 6f889edaa..a6d8966ea 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java @@ -75,7 +75,7 @@ public abstract class Master { } private void divideWork(Input input) { - List> dividedInput = input.divideData(numOfWorkers); + var dividedInput = input.divideData(numOfWorkers); if (dividedInput != null) { this.expectedNumResults = dividedInput.size(); for (var i = 0; i < this.expectedNumResults; i++) { @@ -83,6 +83,13 @@ public abstract class Master { this.workers.get(i).setReceivedData(this, dividedInput.get(i)); this.workers.get(i).start(); } + for (var i = 0; i < this.expectedNumResults; i++) { + try { + this.workers.get(i).join(); + } catch (InterruptedException e) { + System.err.println("Error while executing thread"); + } + } } } From ca58fa3f2127b8b0734875515a1df5a8561ed081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Tue, 4 Aug 2020 17:31:33 +0300 Subject: [PATCH 196/225] #590 add related patterns to Abstract Factory --- abstract-factory/README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/abstract-factory/README.md b/abstract-factory/README.md index 141bf5021..22edb81e0 100644 --- a/abstract-factory/README.md +++ b/abstract-factory/README.md @@ -21,7 +21,7 @@ objects without specifying their concrete classes. Real world example -> To create a kingdom we need objects with common theme. Elven kingdom needs an Elven king, Elven castle and Elven army whereas Orcish kingdom needs an Orcish king, Orcish castle and Orcish army. There is a dependency between the objects in the kingdom. +> To create a kingdom we need objects with a common theme. Elven kingdom needs an Elven king, Elven castle and Elven army whereas Orcish kingdom needs an Orcish king, Orcish castle and Orcish army. There is a dependency between the objects in the kingdom. In plain words @@ -33,7 +33,8 @@ Wikipedia says **Programmatic Example** -Translating the kingdom example above. First of all we have some interfaces and implementation for the objects in the kingdom +Translating the kingdom example above. First of all we have some interfaces and implementation for the objects in the +kingdom. ```java public interface Castle { @@ -188,9 +189,9 @@ Use the Abstract Factory pattern when * When you need consistency among products * You don’t want to change existing code when adding new products or families of products to the program. -## Use Cases: +Example use cases -* Selecting to call the appropriate implementation of FileSystemAcmeService or DatabaseAcmeService or NetworkAcmeService at runtime. +* Selecting to call to the appropriate implementation of FileSystemAcmeService or DatabaseAcmeService or NetworkAcmeService at runtime. * Unit test case writing becomes much easier * UI tools for different OS @@ -204,13 +205,17 @@ Use the Abstract Factory pattern when * [Abstract Factory Pattern Tutorial](https://www.journaldev.com/1418/abstract-factory-design-pattern-in-java) - -## Real world examples +## Known uses * [javax.xml.parsers.DocumentBuilderFactory](http://docs.oracle.com/javase/8/docs/api/javax/xml/parsers/DocumentBuilderFactory.html) * [javax.xml.transform.TransformerFactory](http://docs.oracle.com/javase/8/docs/api/javax/xml/transform/TransformerFactory.html#newInstance--) * [javax.xml.xpath.XPathFactory](http://docs.oracle.com/javase/8/docs/api/javax/xml/xpath/XPathFactory.html#newInstance--) +## Related patterns + +[Factory Method](https://java-design-patterns.com/patterns/factory-method/) +[Factory Kit](https://java-design-patterns.com/patterns/factory-kit/) + ## Credits * [Design Patterns: Elements of Reusable Object-Oriented Software](https://www.amazon.com/gp/product/0201633612/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0201633612&linkCode=as2&tag=javadesignpat-20&linkId=675d49790ce11db99d90bde47f1aeb59) From f234baf25839ac530d86c06cfbedbf92bb799f9e Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Tue, 4 Aug 2020 16:34:41 +0200 Subject: [PATCH 197/225] Cleanup code --- command/README.md | 15 +++++++-------- command/etc/command.png | Bin 27613 -> 77145 bytes command/etc/command.urm.puml | 10 +++++----- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/command/README.md b/command/README.md index fc0a11d9f..b763cf4dd 100644 --- a/command/README.md +++ b/command/README.md @@ -75,19 +75,18 @@ public class Wizard { Next we present the spell hierarchy. ```java -public abstract class Command { +public interface Command { - public abstract void execute(Target target); + void execute(Target target); - public abstract void undo(); + void undo(); - public abstract void redo(); + void redo(); - @Override - public abstract String toString(); + String toString(); } -public class InvisibilitySpell extends Command { +public class InvisibilitySpell implements Command { private Target target; @@ -117,7 +116,7 @@ public class InvisibilitySpell extends Command { } } -public class ShrinkSpell extends Command { +public class ShrinkSpell implements Command { private Size oldSize; private Target target; diff --git a/command/etc/command.png b/command/etc/command.png index 81b47d6d0a0c8f7f8d92ffdece551b5377e2264f..5564b0ec52280784242f384c1f9f4ac154772f7c 100644 GIT binary patch literal 77145 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≶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 "-oldSize" Size InvisibilitySpell --> "-target" Target ShrinkSpell --> "-target" Target Target --> "-visibility" Visibility -Goblin --|> Target -InvisibilitySpell --|> Command -ShrinkSpell --|> Command -@enduml \ No newline at end of file +Goblin --|> Target +InvisibilitySpell ..|> Command +ShrinkSpell ..|> Command +@enduml From bf4706addf2b5d9cb7c0867a06b46e82216da1f9 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 4 Aug 2020 14:48:05 +0000 Subject: [PATCH 198/225] docs: update README.md [skip ci] --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d7115a51d..a11ce5f89 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=alert_status)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns) -[![All Contributors](https://img.shields.io/badge/all_contributors-118-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-119-orange.svg?style=flat-square)](#contributors-) # Introduction @@ -245,6 +245,7 @@ This project is licensed under the terms of the MIT license.
Nishant Arora
💻
Peeyush
💻 +
Rakesh
💻 From 20a5dde8a455e332685ef8af89bbb39a399caca3 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 4 Aug 2020 14:48:06 +0000 Subject: [PATCH 199/225] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 2431125de..7f632c157 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1075,6 +1075,15 @@ "contributions": [ "code" ] + }, + { + "login": "ravening", + "name": "Rakesh", + "avatar_url": "https://avatars1.githubusercontent.com/u/10645273?v=4", + "profile": "https://github.com/ravening", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 4, From 7f29c2455f9df2167d772957eca1a89e3ba1527b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Tue, 4 Aug 2020 21:35:41 +0300 Subject: [PATCH 200/225] #590 explanation for Ambassador --- ambassador/README.md | 49 +++++++++++++++---- .../ambassador/RemoteServiceInterface.java | 2 +- proxy/README.md | 6 ++- 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/ambassador/README.md b/ambassador/README.md index 11abfaf88..dfba18649 100644 --- a/ambassador/README.md +++ b/ambassador/README.md @@ -10,28 +10,37 @@ tags: --- ## Intent + Provide a helper service instance on a client and offload common functionality away from a shared resource. ## Explanation + Real world example -> A remote service has many clients accessing a function it provides. The service is a legacy application and is impossible to update. Large numbers of requests from users are causing connectivity issues. New rules for request frequency should be implemented along with latency checks and client-side logging. +> A remote service has many clients accessing a function it provides. The service is a legacy application and is +> impossible to update. Large numbers of requests from users are causing connectivity issues. New rules for request +> frequency should be implemented along with latency checks and client-side logging. In plain words -> Using the ambassador pattern, we can implement less-frequent polling from clients along with latency checks and logging. +> With the Ambassador pattern, we can implement less-frequent polling from clients along with latency checks and +> logging. Microsoft documentation states -> An ambassador service can be thought of as an out-of-process proxy that is co-located with the client. This pattern can be useful for offloading common client connectivity tasks such as monitoring, logging, routing, security (such as TLS), and resiliency patterns in a language agnostic way. It is often used with legacy applications, or other applications that are difficult to modify, in order to extend their networking capabilities. It can also enable a specialized team to implement those features. +> An ambassador service can be thought of as an out-of-process proxy which is co-located with the client. This pattern +> can be useful for offloading common client connectivity tasks such as monitoring, logging, routing, +> security (such as TLS), and resiliency patterns in a language agnostic way. It is often used with legacy applications, +> or other applications that are difficult to modify, in order to extend their networking capabilities. It can also +> enable a specialized team to implement those features. **Programmatic Example** -With the above example in mind we will imitate the functionality in a simple manner. We have an interface implemented by the remote service as well as the ambassador service: +With the above introduction in mind we will imitate the functionality in this example. We have an interface implemented +by the remote service as well as the ambassador service: ```java interface RemoteServiceInterface { - long doRemoteFunction(int value) throws Exception; } ``` @@ -136,7 +145,7 @@ public class Client { } ``` -And here are two clients using the service. +Here are two clients using the service. ```java public class App { @@ -149,13 +158,29 @@ public class App { } ``` +Here's the output for running the example: + +```java +Time taken (ms): 111 +Service result: 120 +Time taken (ms): 931 +Failed to reach remote: (1) +Time taken (ms): 665 +Failed to reach remote: (2) +Time taken (ms): 538 +Failed to reach remote: (3) +Service result: -1 +``` + ## Class diagram + ![alt text](./etc/ambassador.urm.png "Ambassador class diagram") ## Applicability -Ambassador is applicable when working with a legacy remote service that cannot -be modified or would be extremely difficult to modify. Connectivity features can -be implemented on the client avoiding the need for changes on the remote service. + +Ambassador is applicable when working with a legacy remote service which cannot be modified or would be extremely +difficult to modify. Connectivity features can be implemented on the client avoiding the need for changes on the remote +service. * Ambassador provides a local interface for a remote service. * Ambassador provides logging, circuit breaking, retries and security on the client. @@ -168,10 +193,14 @@ be implemented on the client avoiding the need for changes on the remote service * Offload remote service tasks * Facilitate network connection -## Real world examples +## Known uses * [Kubernetes-native API gateway for microservices](https://github.com/datawire/ambassador) +## Related patterns + +* [Proxy](https://java-design-patterns.com/patterns/proxy/) + ## Credits * [Ambassador pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/ambassador) diff --git a/ambassador/src/main/java/com/iluwatar/ambassador/RemoteServiceInterface.java b/ambassador/src/main/java/com/iluwatar/ambassador/RemoteServiceInterface.java index 013015936..5b4995134 100644 --- a/ambassador/src/main/java/com/iluwatar/ambassador/RemoteServiceInterface.java +++ b/ambassador/src/main/java/com/iluwatar/ambassador/RemoteServiceInterface.java @@ -29,5 +29,5 @@ package com.iluwatar.ambassador; interface RemoteServiceInterface { int FAILURE = -1; - long doRemoteFunction(int value) throws Exception; + long doRemoteFunction(int value); } diff --git a/proxy/README.md b/proxy/README.md index b89d2a624..ddcc4e784 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -132,12 +132,16 @@ are several common situations in which the Proxy pattern is applicable * [Controlling Access With Proxy Pattern](http://java-design-patterns.com/blog/controlling-access-with-proxy-pattern/) -## Real world examples +## Known uses * [java.lang.reflect.Proxy](http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Proxy.html) * [Apache Commons Proxy](https://commons.apache.org/proper/commons-proxy/) * Mocking frameworks Mockito, Powermock, EasyMock +## Related patterns + +* [Ambassador](https://java-design-patterns.com/patterns/ambassador/) + ## Credits * [Design Patterns: Elements of Reusable Object-Oriented Software](https://www.amazon.com/gp/product/0201633612/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0201633612&linkCode=as2&tag=javadesignpat-20&linkId=675d49790ce11db99d90bde47f1aeb59) From cd20e7a3f4b9f8a0dd30d9e7699f6c12f3f402fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Tue, 4 Aug 2020 21:45:16 +0300 Subject: [PATCH 201/225] Minor readme fixes --- acyclic-visitor/README.md | 2 +- adapter/README.md | 5 ++--- aggregator-microservices/README.md | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/acyclic-visitor/README.md b/acyclic-visitor/README.md index 19e886505..835a5743e 100644 --- a/acyclic-visitor/README.md +++ b/acyclic-visitor/README.md @@ -101,7 +101,7 @@ public class ConfigureForUnixVisitor implements ZoomVisitor { } ``` -Finally here are the visitors in action. +Finally, here are the visitors in action. ```java var conUnix = new ConfigureForUnixVisitor(); diff --git a/adapter/README.md b/adapter/README.md index 75edad180..aef4cdb69 100644 --- a/adapter/README.md +++ b/adapter/README.md @@ -12,9 +12,8 @@ tags: Wrapper ## Intent -Convert the interface of a class into another interface the clients -expect. Adapter lets classes work together that couldn't otherwise because of -incompatible interfaces. +Convert the interface of a class into another interface the clients expect. Adapter lets classes work together that +couldn't otherwise because of incompatible interfaces. ## Explanation diff --git a/aggregator-microservices/README.md b/aggregator-microservices/README.md index 71c4ab69a..36cbad33d 100644 --- a/aggregator-microservices/README.md +++ b/aggregator-microservices/README.md @@ -17,7 +17,7 @@ The user makes a single call to the aggregator service, and the aggregator then Real world example > Our web marketplace needs information about products and their current inventory. It makes a call to an aggregator -> service that in turn calls the product information microservice and product inventory microservice returning the +> service which in turn calls the product information microservice and product inventory microservice returning the > combined information. In plain words @@ -41,7 +41,7 @@ public class Product { } ``` -Next we can introduct our `Aggregator` microservice. It contains clients `ProductInformationClient` and +Next we can introduce our `Aggregator` microservice. It contains clients `ProductInformationClient` and `ProductInventoryClient` for calling respective microservices. ```java From 4b38746ce9e5777f939068691168742143bc04ce Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Tue, 4 Aug 2020 21:41:25 +0000 Subject: [PATCH 202/225] Removes usage of Dictionary --- .../iluwatar/masterworker/system/systemmaster/Master.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java index a6d8966ea..06ea3a8fe 100644 --- a/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java +++ b/master-worker-pattern/src/main/java/com/iluwatar/masterworker/system/systemmaster/Master.java @@ -26,7 +26,6 @@ package com.iluwatar.masterworker.system.systemmaster; import com.iluwatar.masterworker.Input; import com.iluwatar.masterworker.Result; import com.iluwatar.masterworker.system.systemworkers.Worker; -import java.util.Dictionary; import java.util.Hashtable; import java.util.List; @@ -40,7 +39,7 @@ import java.util.List; public abstract class Master { private final int numOfWorkers; private final List workers; - private final Dictionary> allResultData; + private final Hashtable> allResultData; private int expectedNumResults; private Result finalResult; @@ -56,7 +55,7 @@ public abstract class Master { return this.finalResult; } - Dictionary> getAllResultData() { + Hashtable> getAllResultData() { return this.allResultData; } From a7095602d6299aed284f665b67de7283826f5a39 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Tue, 4 Aug 2020 21:46:30 +0000 Subject: [PATCH 203/225] Refactors using var --- memento/README.md | 19 ++++++++++--------- .../main/java/com/iluwatar/memento/Star.java | 4 ---- .../java/com/iluwatar/memento/StarType.java | 9 ++++++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/memento/README.md b/memento/README.md index b8d95b72a..8bbebd36a 100644 --- a/memento/README.md +++ b/memento/README.md @@ -34,9 +34,12 @@ Let's first define the types of stars we are capable to handle. ```java public enum StarType { - - SUN("sun"), RED_GIANT("red giant"), WHITE_DWARF("white dwarf"), SUPERNOVA("supernova"), DEAD( - "dead star"), UNDEFINED(""); + SUN("sun"), + RED_GIANT("red giant"), + WHITE_DWARF("white dwarf"), + SUPERNOVA("supernova"), + DEAD("dead star"), + UNDEFINED(""); private final String title; @@ -95,8 +98,7 @@ public class Star { } StarMemento getMemento() { - - StarMementoInternal state = new StarMementoInternal(); + var state = new StarMementoInternal(); state.setAgeYears(ageYears); state.setMassTons(massTons); state.setType(type); @@ -104,8 +106,7 @@ public class Star { } void setMemento(StarMemento memento) { - - StarMementoInternal state = (StarMementoInternal) memento; + var state = (StarMementoInternal) memento; this.type = state.getType(); this.ageYears = state.getAgeYears(); this.massTons = state.getMassTons(); @@ -152,8 +153,8 @@ public class Star { And finally here's how we use the mementos to store and restore star states. ```java - Stack states = new Stack<>(); - Star star = new Star(StarType.SUN, 10000000, 500000); + var states = new Stack<>(); + var star = new Star(StarType.SUN, 10000000, 500000); LOGGER.info(star.toString()); states.add(star.getMemento()); star.timePasses(); diff --git a/memento/src/main/java/com/iluwatar/memento/Star.java b/memento/src/main/java/com/iluwatar/memento/Star.java index aac58b817..af1c98b04 100644 --- a/memento/src/main/java/com/iluwatar/memento/Star.java +++ b/memento/src/main/java/com/iluwatar/memento/Star.java @@ -70,22 +70,18 @@ public class Star { } StarMemento getMemento() { - var state = new StarMementoInternal(); state.setAgeYears(ageYears); state.setMassTons(massTons); state.setType(type); return state; - } void setMemento(StarMemento memento) { - var state = (StarMementoInternal) memento; this.type = state.getType(); this.ageYears = state.getAgeYears(); this.massTons = state.getMassTons(); - } @Override diff --git a/memento/src/main/java/com/iluwatar/memento/StarType.java b/memento/src/main/java/com/iluwatar/memento/StarType.java index 339f05f9f..aa92bf6e6 100644 --- a/memento/src/main/java/com/iluwatar/memento/StarType.java +++ b/memento/src/main/java/com/iluwatar/memento/StarType.java @@ -27,9 +27,12 @@ package com.iluwatar.memento; * StarType enumeration. */ public enum StarType { - - SUN("sun"), RED_GIANT("red giant"), WHITE_DWARF("white dwarf"), SUPERNOVA("supernova"), DEAD( - "dead star"), UNDEFINED(""); + SUN("sun"), + RED_GIANT("red giant"), + WHITE_DWARF("white dwarf"), + SUPERNOVA("supernova"), + DEAD("dead star"), + UNDEFINED(""); private final String title; From 0c83ccc2fe996eba856cabfeb270445629717d18 Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Wed, 5 Aug 2020 15:50:05 +0200 Subject: [PATCH 204/225] Use enums instead os switch blocks Its better to use enums instead of switch blocks which makes the code longer and difficult to maintain as and when new state appears. --- observer/README.md | 55 +++++------------- observer/etc/observer.urm.puml | 16 ++--- observer/etc/observer_with_generics.png | Bin 0 -> 104313 bytes .../java/com/iluwatar/observer/Hobbits.java | 17 +----- .../main/java/com/iluwatar/observer/Orcs.java | 17 +----- .../com/iluwatar/observer/WeatherType.java | 15 ++++- .../iluwatar/observer/generic/GHobbits.java | 17 +----- .../com/iluwatar/observer/generic/GOrcs.java | 17 +----- .../com/iluwatar/observer/HobbitsTest.java | 8 +-- .../java/com/iluwatar/observer/OrcsTest.java | 8 +-- .../observer/generic/GHobbitsTest.java | 8 +-- .../iluwatar/observer/generic/OrcsTest.java | 8 +-- 12 files changed, 56 insertions(+), 130 deletions(-) create mode 100644 observer/etc/observer_with_generics.png diff --git a/observer/README.md b/observer/README.md index e329a657c..e4b3cea76 100644 --- a/observer/README.md +++ b/observer/README.md @@ -13,18 +13,18 @@ tags: Dependents, Publish-Subscribe ## Intent -Define a one-to-many dependency between objects so that when one object changes state, all its dependents are notified +Define a one-to-many dependency between objects so that when one object changes state, all its dependents are notified and updated automatically. ## Explanation Real world example -> In a land far away lives the races of hobbits and orcs. Both of them are mostly outdoors so they closely follow the changes in weather. One could say that they are constantly observing the weather. +> In a land far away lives the races of hobbits and orcs. Both of them are mostly outdoors so they closely follow the changes in weather. One could say that they are constantly observing the weather. In plain words -> Register as an observer to receive state changes in the object. +> Register as an observer to receive state changes in the object. Wikipedia says @@ -46,22 +46,7 @@ public class Orcs implements WeatherObserver { @Override public void update(WeatherType currentWeather) { - switch (currentWeather) { - case COLD: - LOGGER.info("The orcs are freezing cold."); - break; - case RAINY: - LOGGER.info("The orcs are dripping wet."); - break; - case SUNNY: - LOGGER.info("The sun hurts the orcs' eyes."); - break; - case WINDY: - LOGGER.info("The orc smell almost vanishes in the wind."); - break; - default: - break; - } + LOGGER.info("The hobbits are facing " + currentWeather.getDescription() + " weather now"); } } @@ -72,21 +57,7 @@ public class Hobbits implements WeatherObserver { @Override public void update(WeatherType currentWeather) { switch (currentWeather) { - case COLD: - LOGGER.info("The hobbits are shivering in the cold weather."); - break; - case RAINY: - LOGGER.info("The hobbits look for cover from the rain."); - break; - case SUNNY: - LOGGER.info("The happy hobbits bade in the warm sun."); - break; - case WINDY: - LOGGER.info("The hobbits hold their hats tightly in the windy weather."); - break; - default: - break; - } + LOGGER.info("The hobbits are facing " + currentWeather.getDescription() + " weather now"); } } ``` @@ -141,20 +112,20 @@ Here's the full example in action. weather.timePasses(); // The weather changed to rainy. - // The orcs are dripping wet. - // The hobbits look for cover from the rain. + // The orcs are facing rainy weather now + // The hobbits are facing rainy weather now weather.timePasses(); // The weather changed to windy. - // The orc smell almost vanishes in the wind. - // The hobbits hold their hats tightly in the windy weather. + // The orcs are facing windy weather now + // The hobbits are facing windy weather now weather.timePasses(); // The weather changed to cold. - // The orcs are freezing cold. - // The hobbits are shivering in the cold weather. + // The orcs are facing cold weather now + // The hobbits are facing cold weather now weather.timePasses(); // The weather changed to sunny. - // The sun hurts the orcs' eyes. - // The happy hobbits bade in the warm sun. + // The orcs are facing sunny weather now + // The hobbits are facing sunny weather now ``` ## Class diagram diff --git a/observer/etc/observer.urm.puml b/observer/etc/observer.urm.puml index bea9aab53..497ef5fde 100644 --- a/observer/etc/observer.urm.puml +++ b/observer/etc/observer.urm.puml @@ -33,7 +33,9 @@ package com.iluwatar.observer { + RAINY {static} + SUNNY {static} + WINDY {static} + + description String + toString() : String + + getDescription() : String + valueOf(name : String) : WeatherType {static} + values() : WeatherType[] {static} } @@ -71,10 +73,10 @@ package com.iluwatar.observer.generic { Weather --> "-currentWeather" WeatherType GWeather --> "-currentWeather" WeatherType Weather --> "-observers" WeatherObserver -Hobbits ..|> WeatherObserver -Orcs ..|> WeatherObserver -GHobbits ..|> Race -GOrcs ..|> Race -GWeather --|> Observable -Race --|> Observer -@enduml \ No newline at end of file +Hobbits ..|> WeatherObserver +Orcs ..|> WeatherObserver +GHobbits ..|> Race +GOrcs ..|> Race +GWeather --|> Observable +Race --|> Observer +@enduml diff --git a/observer/etc/observer_with_generics.png b/observer/etc/observer_with_generics.png new file mode 100644 index 0000000000000000000000000000000000000000..06ff0d9cc246106c7ce7bb6f7fb0c7eca88c608b GIT binary patch literal 104313 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 LTx~0@&tCaArrqvR literal 0 HcmV?d00001 diff --git a/observer/src/main/java/com/iluwatar/observer/Hobbits.java b/observer/src/main/java/com/iluwatar/observer/Hobbits.java index 646ceebfd..5894c93a6 100644 --- a/observer/src/main/java/com/iluwatar/observer/Hobbits.java +++ b/observer/src/main/java/com/iluwatar/observer/Hobbits.java @@ -35,21 +35,6 @@ public class Hobbits implements WeatherObserver { @Override public void update(WeatherType currentWeather) { - switch (currentWeather) { - case COLD: - LOGGER.info("The hobbits are shivering in the cold weather."); - break; - case RAINY: - LOGGER.info("The hobbits look for cover from the rain."); - break; - case SUNNY: - LOGGER.info("The happy hobbits bade in the warm sun."); - break; - case WINDY: - LOGGER.info("The hobbits hold their hats tightly in the windy weather."); - break; - default: - break; - } + LOGGER.info("The hobbits are facing " + currentWeather.getDescription() + " weather now"); } } diff --git a/observer/src/main/java/com/iluwatar/observer/Orcs.java b/observer/src/main/java/com/iluwatar/observer/Orcs.java index a28ffbc5b..1a955aafd 100644 --- a/observer/src/main/java/com/iluwatar/observer/Orcs.java +++ b/observer/src/main/java/com/iluwatar/observer/Orcs.java @@ -35,21 +35,6 @@ public class Orcs implements WeatherObserver { @Override public void update(WeatherType currentWeather) { - switch (currentWeather) { - case COLD: - LOGGER.info("The orcs are freezing cold."); - break; - case RAINY: - LOGGER.info("The orcs are dripping wet."); - break; - case SUNNY: - LOGGER.info("The sun hurts the orcs' eyes."); - break; - case WINDY: - LOGGER.info("The orc smell almost vanishes in the wind."); - break; - default: - break; - } + LOGGER.info("The orcs are facing " + currentWeather.getDescription() + " weather now"); } } diff --git a/observer/src/main/java/com/iluwatar/observer/WeatherType.java b/observer/src/main/java/com/iluwatar/observer/WeatherType.java index 75ee17d60..e11317c21 100644 --- a/observer/src/main/java/com/iluwatar/observer/WeatherType.java +++ b/observer/src/main/java/com/iluwatar/observer/WeatherType.java @@ -28,7 +28,20 @@ package com.iluwatar.observer; */ public enum WeatherType { - SUNNY, RAINY, WINDY, COLD; + SUNNY("Sunny"), + RAINY("Rainy"), + WINDY("Windy"), + COLD("Cold"); + + private final String description; + + WeatherType(String description) { + this.description = description; + } + + public String getDescription() { + return this.description; + } @Override public String toString() { 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 7a555d850..90fd4e300 100644 --- a/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java @@ -36,21 +36,6 @@ public class GHobbits implements Race { @Override public void update(GWeather weather, WeatherType weatherType) { - switch (weatherType) { - case COLD: - LOGGER.info("The hobbits are shivering in the cold weather."); - break; - case RAINY: - LOGGER.info("The hobbits look for cover from the rain."); - break; - case SUNNY: - LOGGER.info("The happy hobbits bade in the warm sun."); - break; - case WINDY: - LOGGER.info("The hobbits hold their hats tightly in the windy weather."); - break; - default: - break; - } + LOGGER.info("The hobbits are facing " + weatherType.getDescription() + " weather now"); } } 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 d9adbf116..bc49c4e30 100644 --- a/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java @@ -36,21 +36,6 @@ public class GOrcs implements Race { @Override public void update(GWeather weather, WeatherType weatherType) { - switch (weatherType) { - case COLD: - LOGGER.info("The orcs are freezing cold."); - break; - case RAINY: - LOGGER.info("The orcs are dripping wet."); - break; - case SUNNY: - LOGGER.info("The sun hurts the orcs' eyes."); - break; - case WINDY: - LOGGER.info("The orc smell almost vanishes in the wind."); - break; - default: - break; - } + LOGGER.info("The orcs are facing " + weatherType.getDescription() + " weather now"); } } diff --git a/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java b/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java index 66ec45fdb..345b8e331 100644 --- a/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java @@ -36,10 +36,10 @@ public class HobbitsTest extends WeatherObserverTest { @Override public Collection dataProvider() { return List.of( - new Object[]{WeatherType.SUNNY, "The happy hobbits bade in the warm sun."}, - new Object[]{WeatherType.RAINY, "The hobbits look for cover from the rain."}, - new Object[]{WeatherType.WINDY, "The hobbits hold their hats tightly in the windy weather."}, - new Object[]{WeatherType.COLD, "The hobbits are shivering in the cold weather."}); + new Object[]{WeatherType.SUNNY, "The hobbits are facing Sunny weather now"}, + new Object[]{WeatherType.RAINY, "The hobbits are facing Rainy weather now"}, + new Object[]{WeatherType.WINDY, "The hobbits are facing Windy weather now"}, + new Object[]{WeatherType.COLD, "The hobbits are facing Cold weather now"}); } /** diff --git a/observer/src/test/java/com/iluwatar/observer/OrcsTest.java b/observer/src/test/java/com/iluwatar/observer/OrcsTest.java index ff615df3c..65beeaf0e 100644 --- a/observer/src/test/java/com/iluwatar/observer/OrcsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/OrcsTest.java @@ -36,10 +36,10 @@ public class OrcsTest extends WeatherObserverTest { @Override public Collection dataProvider() { return List.of( - new Object[]{WeatherType.SUNNY, "The sun hurts the orcs' eyes."}, - new Object[]{WeatherType.RAINY, "The orcs are dripping wet."}, - new Object[]{WeatherType.WINDY, "The orc smell almost vanishes in the wind."}, - new Object[]{WeatherType.COLD, "The orcs are freezing cold."}); + new Object[]{WeatherType.SUNNY, "The orcs are facing Sunny weather now"}, + new Object[]{WeatherType.RAINY, "The orcs are facing Rainy weather now"}, + new Object[]{WeatherType.WINDY, "The orcs are facing Windy weather now"}, + new Object[]{WeatherType.COLD, "The orcs are facing Cold weather now"}); } /** 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 dd0e6d6bf..756d72239 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java @@ -38,10 +38,10 @@ public class GHobbitsTest extends ObserverTest { @Override public Collection dataProvider() { return List.of( - new Object[]{WeatherType.SUNNY, "The happy hobbits bade in the warm sun."}, - new Object[]{WeatherType.RAINY, "The hobbits look for cover from the rain."}, - new Object[]{WeatherType.WINDY, "The hobbits hold their hats tightly in the windy weather."}, - new Object[]{WeatherType.COLD, "The hobbits are shivering in the cold weather."} + new Object[]{WeatherType.SUNNY, "The hobbits are facing Sunny weather now"}, + new Object[]{WeatherType.RAINY, "The hobbits are facing Rainy weather now"}, + new Object[]{WeatherType.WINDY, "The hobbits are facing Windy weather now"}, + new Object[]{WeatherType.COLD, "The hobbits are facing Cold weather now"} ); } 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 396de4456..523678288 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java @@ -38,10 +38,10 @@ public class OrcsTest extends ObserverTest { @Override public Collection dataProvider() { return List.of( - new Object[]{WeatherType.SUNNY, "The sun hurts the orcs' eyes."}, - new Object[]{WeatherType.RAINY, "The orcs are dripping wet."}, - new Object[]{WeatherType.WINDY, "The orc smell almost vanishes in the wind."}, - new Object[]{WeatherType.COLD, "The orcs are freezing cold."} + new Object[]{WeatherType.SUNNY, "The orcs are facing Sunny weather now"}, + new Object[]{WeatherType.RAINY, "The orcs are facing Rainy weather now"}, + new Object[]{WeatherType.WINDY, "The orcs are facing Windy weather now"}, + new Object[]{WeatherType.COLD, "The orcs are facing Cold weather now"} ); } From b0ac4c1ca3758beee3e15343c14e280d78884e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Fri, 7 Aug 2020 19:10:50 +0300 Subject: [PATCH 205/225] #590 explanation for Arrange/Act/Assert --- arrange-act-assert/README.md | 119 ++++++++++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 2 deletions(-) diff --git a/arrange-act-assert/README.md b/arrange-act-assert/README.md index 02b7ee8b7..6b3cb4058 100644 --- a/arrange-act-assert/README.md +++ b/arrange-act-assert/README.md @@ -9,22 +9,137 @@ tags: --- ## Also known as + Given/When/Then ## Intent -The Arrange/Act/Assert (AAA) is a pattern for organizing unit tests. + +Arrange/Act/Assert (AAA) is a pattern for organizing unit tests. It breaks tests down into three clear and distinct steps: + 1. Arrange: Perform the setup and initialization required for the test. 2. Act: Take action(s) required for the test. 3. Assert: Verify the outcome(s) of the test. +## Explanation + +This pattern has several significant benefits. It creates a clear separation between a test's +setup, operations, and results. This structure makes the code easier to read and understand. If +you place the steps in order and format your code to separate them, you can scan a test and +quickly comprehend what it does. + +It also enforces a certain degree of discipline when you write your tests. You have to think +clearly about the three steps your test will perform. It makes tests more natural to write at +the same time since you already have an outline. + +Real world example + +> We need to write comprehensive and clear unit test suite for a class. + +In plain words + +> Arrange/Act/Assert is a testing pattern that organizes tests into three clear steps for easy +> maintenance. + +WikiWikiWeb says + +> Arrange/Act/Assert is a pattern for arranging and formatting code in UnitTest methods. + +**Programmatic Example** + +Let's first introduce our `Cash` class to be unit tested. + +```java +public class Cash { + + private int amount; + + Cash(int amount) { + this.amount = amount; + } + + void plus(int addend) { + amount += addend; + } + + boolean minus(int subtrahend) { + if (amount >= subtrahend) { + amount -= subtrahend; + return true; + } else { + return false; + } + } + + int count() { + return amount; + } +} +``` + +Then we write our unit tests according to Arrange/Act/Assert pattern. Notice the clearly +separated steps for each unit test. + +```java +public class CashAAATest { + + @Test + public void testPlus() { + //Arrange + var cash = new Cash(3); + //Act + cash.plus(4); + //Assert + assertEquals(7, cash.count()); + } + + @Test + public void testMinus() { + //Arrange + var cash = new Cash(8); + //Act + var result = cash.minus(5); + //Assert + assertTrue(result); + assertEquals(3, cash.count()); + } + + @Test + public void testInsufficientMinus() { + //Arrange + var cash = new Cash(1); + //Act + var result = cash.minus(6); + //Assert + assertFalse(result); + assertEquals(1, cash.count()); + } + + @Test + public void testUpdate() { + //Arrange + var cash = new Cash(5); + //Act + cash.plus(6); + var result = cash.minus(3); + //Assert + assertTrue(result); + assertEquals(8, cash.count()); + } +} +``` + ## Applicability + Use Arrange/Act/Assert pattern when -* you need to structure your unit tests so they're easier to read, maintain, and enhance. +* You need to structure your unit tests so that they're easier to read, maintain, and enhance. ## Credits * [Arrange, Act, Assert: What is AAA Testing?](https://blog.ncrunch.net/post/arrange-act-assert-aaa-testing.aspx) * [Bill Wake: 3A – Arrange, Act, Assert](https://xp123.com/articles/3a-arrange-act-assert/) * [Martin Fowler: GivenWhenThen](https://martinfowler.com/bliki/GivenWhenThen.html) +* [xUnit Test Patterns: Refactoring Test Code](https://www.amazon.com/gp/product/0131495054/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=0131495054&linkId=99701e8f4af2f7e8dd50d720c9b63dbf) +* [Unit Testing Principles, Practices, and Patterns](https://www.amazon.com/gp/product/1617296279/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=1617296279&linkId=74c75cf22a63c3e4758ae08aa0a0cc35) +* [Test Driven Development: By Example](https://www.amazon.com/gp/product/0321146530/ref=as_li_qf_asin_il_tl?ie=UTF8&tag=javadesignpat-20&creative=9325&linkCode=as2&creativeASIN=0321146530&linkId=5c63a93d8c1175b84ca5087472ef0e05) From a5038c432963eecc876baf65734e53df78b94e26 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sat, 8 Aug 2020 00:41:58 +0000 Subject: [PATCH 206/225] Uses java-11 in naked objects --- naked-objects/dom/pom.xml | 2 +- .../homepage/HomePageViewModel.layout.json | 16 ----- .../dom/modules/simple/SimpleObject.java | 4 +- .../modules/simple/SimpleObject.layout.json | 16 ----- .../dom/modules/simple/SimpleObjectTest.java | 4 +- .../dom/modules/simple/SimpleObjectsTest.java | 6 +- .../modules/simple/SimpleObjectCreate.java | 3 +- .../scenarios/RecreateSimpleObjects.java | 21 +++++-- .../bootstrap/SimpleAppSystemInitializer.java | 7 +-- .../specglue/CatalogOfFixturesGlue.java | 5 +- .../modules/simple/SimpleObjectGlue.java | 8 +-- .../modules/simple/SimpleObjectIntegTest.java | 28 ++++----- .../simple/SimpleObjectsIntegTest.java | 60 +++++++++---------- .../webapp/ide/eclipse/launch/.gitignore | 4 -- naked-objects/webapp/pom.xml | 2 +- .../domainapp/webapp/SimpleApplication.java | 26 ++++---- .../webapp/src/main/webapp/about/index.html | 4 +- 17 files changed, 84 insertions(+), 132 deletions(-) diff --git a/naked-objects/dom/pom.xml b/naked-objects/dom/pom.xml index dffc1650c..0437c2da5 100644 --- a/naked-objects/dom/pom.xml +++ b/naked-objects/dom/pom.xml @@ -127,7 +127,7 @@ - + diff --git a/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.layout.json b/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.layout.json index 638473eee..fe39b5b42 100644 --- a/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.layout.json +++ b/naked-objects/dom/src/main/java/domainapp/dom/app/homepage/HomePageViewModel.layout.json @@ -1,19 +1,3 @@ -/** - * 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. - */ { "columns": [ { diff --git a/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java b/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java index 809da6d31..43d96f280 100644 --- a/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java +++ b/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.java @@ -50,9 +50,9 @@ import org.apache.isis.applib.util.ObjectContracts; strategy = javax.jdo.annotations.IdGeneratorStrategy.IDENTITY, column = "id") @javax.jdo.annotations.Version(strategy = VersionStrategy.VERSION_NUMBER, column = "version") @javax.jdo.annotations.Queries({ - @javax.jdo.annotations.Query(name = "find", language = "JDOQL", value = "SELECT " + @javax.jdo.annotations.Query(name = "find", value = "SELECT " + "FROM domainapp.dom.modules.simple.SimpleObject "), - @javax.jdo.annotations.Query(name = "findByName", language = "JDOQL", value = "SELECT " + @javax.jdo.annotations.Query(name = "findByName", value = "SELECT " + "FROM domainapp.dom.modules.simple.SimpleObject " + "WHERE name.indexOf(:name) >= 0 ")}) @javax.jdo.annotations.Unique(name = "SimpleObject_name_UNQ", members = {"name"}) @DomainObject diff --git a/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json b/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json index 78b2ac096..998c419f2 100644 --- a/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json +++ b/naked-objects/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json @@ -1,19 +1,3 @@ -/** - * 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. - */ { "columns": [ { diff --git a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java index 03ab30f75..5435325cf 100644 --- a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java +++ b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java @@ -37,12 +37,12 @@ public class SimpleObjectTest { SimpleObject simpleObject; @Before - public void setUp() throws Exception { + public void setUp() { simpleObject = new SimpleObject(); } @Test - public void testName() throws Exception { + public void testName() { // given String name = "Foobar"; assertNull(simpleObject.getName()); diff --git a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java index a95ad5aa3..5fbcfde2b 100644 --- a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java +++ b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java @@ -52,13 +52,13 @@ public class SimpleObjectsTest { SimpleObjects simpleObjects; @Before - public void setUp() throws Exception { + public void setUp() { simpleObjects = new SimpleObjects(); simpleObjects.container = mockContainer; } @Test - public void testCreate() throws Exception { + public void testCreate() { // given final SimpleObject simpleObject = new SimpleObject(); @@ -85,7 +85,7 @@ public class SimpleObjectsTest { } @Test - public void testListAll() throws Exception { + public void testListAll() { // given final List all = Lists.newArrayList(); diff --git a/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java b/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java index dc19195ac..0df939678 100644 --- a/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java +++ b/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java @@ -67,8 +67,7 @@ public class SimpleObjectCreate extends FixtureScript { @Override protected void execute(final ExecutionContext ec) { - - String paramName = checkParam("name", ec, String.class); + var paramName = checkParam("name", ec, String.class); this.simpleObject = wrap(simpleObjects).create(paramName); diff --git a/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java b/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java index 847f15d01..5dc9a4785 100644 --- a/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java +++ b/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java @@ -27,7 +27,6 @@ import com.google.common.collect.Lists; import domainapp.dom.modules.simple.SimpleObject; import domainapp.fixture.modules.simple.SimpleObjectCreate; import domainapp.fixture.modules.simple.SimpleObjectsTearDown; -import java.util.Collections; import java.util.List; import org.apache.isis.applib.fixturescripts.FixtureScript; @@ -37,8 +36,18 @@ import org.apache.isis.applib.fixturescripts.FixtureScript; */ public class RecreateSimpleObjects extends FixtureScript { - public final List names = Collections.unmodifiableList(List.of("Foo", "Bar", "Baz", - "Frodo", "Froyo", "Fizz", "Bip", "Bop", "Bang", "Boo")); + public final List names = List.of( + "Foo", + "Bar", + "Baz", + "Frodo", + "Froyo", + "Fizz", + "Bip", + "Bop", + "Bang", + "Boo" + ); // region > number (optional input) private Integer number; @@ -77,7 +86,7 @@ public class RecreateSimpleObjects extends FixtureScript { protected void execute(final ExecutionContext ec) { // defaults - final int paramNumber = defaultParam("number", ec, 3); + final var paramNumber = defaultParam("number", ec, 3); // validate if (paramNumber < 0 || paramNumber > names.size()) { @@ -90,8 +99,8 @@ public class RecreateSimpleObjects extends FixtureScript { // ec.executeChild(this, new SimpleObjectsTearDown()); - for (int i = 0; i < paramNumber; i++) { - final SimpleObjectCreate fs = new SimpleObjectCreate().setName(names.get(i)); + for (var i = 0; i < paramNumber; i++) { + final var fs = new SimpleObjectCreate().setName(names.get(i)); ec.executeChild(this, fs.getName(), fs); simpleObjects.add(fs.getSimpleObject()); } diff --git a/naked-objects/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java b/naked-objects/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java index f67c26876..12a187cb5 100644 --- a/naked-objects/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java +++ b/naked-objects/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java @@ -25,7 +25,6 @@ package domainapp.integtests.bootstrap; import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.integtestsupport.IsisSystemForTest; -import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller; import org.apache.isis.objectstore.jdo.datanucleus.IsisConfigurationForJdoIntegTests; /** @@ -40,7 +39,7 @@ public final class SimpleAppSystemInitializer { * Init test system */ public static void initIsft() { - IsisSystemForTest isft = IsisSystemForTest.getElseNull(); + var isft = IsisSystemForTest.getElseNull(); if (isft == null) { isft = new SimpleAppSystemBuilder().build().setUpSystem(); IsisSystemForTest.set(isft); @@ -51,15 +50,13 @@ public final class SimpleAppSystemInitializer { public SimpleAppSystemBuilder() { with(testConfiguration()); - with(new DataNucleusPersistenceMechanismInstaller()); // services annotated with @DomainService withServicesIn("domainapp"); } private static IsisConfiguration testConfiguration() { - final IsisConfigurationForJdoIntegTests testConfiguration = - new IsisConfigurationForJdoIntegTests(); + final var testConfiguration = new IsisConfigurationForJdoIntegTests(); testConfiguration.addRegisterEntitiesPackagePrefix("domainapp.dom.modules"); return testConfiguration; diff --git a/naked-objects/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java b/naked-objects/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java index 025c6724a..142b0e9fb 100644 --- a/naked-objects/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java +++ b/naked-objects/integtests/src/test/java/domainapp/integtests/specglue/CatalogOfFixturesGlue.java @@ -23,10 +23,9 @@ package domainapp.integtests.specglue; -import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; - import cucumber.api.java.Before; import domainapp.fixture.scenarios.RecreateSimpleObjects; +import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; /** * Test Execution to append a fixture of SimpleObjects @@ -34,7 +33,7 @@ import domainapp.fixture.scenarios.RecreateSimpleObjects; public class CatalogOfFixturesGlue extends CukeGlueAbstract { @Before(value = {"@integration", "@SimpleObjectsFixture"}, order = 20000) - public void integrationFixtures() throws Throwable { + public void integrationFixtures() { scenarioExecution().install(new RecreateSimpleObjects()); } } diff --git a/naked-objects/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java b/naked-objects/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java index 7b508faf3..51253b667 100644 --- a/naked-objects/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java +++ b/naked-objects/integtests/src/test/java/domainapp/integtests/specglue/modules/simple/SimpleObjectGlue.java @@ -28,9 +28,7 @@ import static org.junit.Assert.assertThat; import cucumber.api.java.en.Given; import cucumber.api.java.en.When; -import domainapp.dom.modules.simple.SimpleObject; import domainapp.dom.modules.simple.SimpleObjects; -import java.util.List; import java.util.UUID; import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; @@ -40,9 +38,9 @@ import org.apache.isis.core.specsupport.specs.CukeGlueAbstract; public class SimpleObjectGlue extends CukeGlueAbstract { @Given("^there are.* (\\d+) simple objects$") - public void thereAreNumSimpleObjects(int n) throws Throwable { + public void thereAreNumSimpleObjects(int n) { try { - final List findAll = service(SimpleObjects.class).listAll(); + final var findAll = service(SimpleObjects.class).listAll(); assertThat(findAll.size(), is(n)); putVar("list", "all", findAll); @@ -52,7 +50,7 @@ public class SimpleObjectGlue extends CukeGlueAbstract { } @When("^I create a new simple object$") - public void createNewSimpleObject() throws Throwable { + public void createNewSimpleObject() { service(SimpleObjects.class).create(UUID.randomUUID().toString()); } diff --git a/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java b/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java index 11ff6a47d..819220344 100644 --- a/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java +++ b/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java @@ -26,8 +26,10 @@ package domainapp.integtests.tests.modules.simple; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import domainapp.dom.modules.simple.SimpleObject; +import domainapp.fixture.scenarios.RecreateSimpleObjects; +import domainapp.integtests.tests.SimpleAppIntegTest; import javax.inject.Inject; - import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.applib.fixturescripts.FixtureScripts; import org.apache.isis.applib.services.wrapper.DisabledException; @@ -35,10 +37,6 @@ import org.apache.isis.applib.services.wrapper.InvalidException; import org.junit.Before; import org.junit.Test; -import domainapp.dom.modules.simple.SimpleObject; -import domainapp.fixture.scenarios.RecreateSimpleObjects; -import domainapp.integtests.tests.SimpleAppIntegTest; - /** * Test Fixtures with Simple Objects */ @@ -56,7 +54,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest { private static final String NEW_NAME = "new name"; @Before - public void setUp() throws Exception { + public void setUp() { // given fs = new RecreateSimpleObjects().setNumber(1); fixtureScripts.runFixtureScript(fs, null); @@ -68,15 +66,15 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest { } @Test - public void testNameAccessible() throws Exception { - // when - final String name = simpleObjectWrapped.getName(); + public void testNameAccessible() { + /* when */ + final var name = simpleObjectWrapped.getName(); // then assertEquals(fs.names.get(0), name); } @Test - public void testNameCannotBeUpdatedDirectly() throws Exception { + public void testNameCannotBeUpdatedDirectly() { // expect expectedExceptions.expect(DisabledException.class); @@ -86,7 +84,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest { } @Test - public void testUpdateName() throws Exception { + public void testUpdateName() { // when simpleObjectWrapped.updateName(NEW_NAME); @@ -96,7 +94,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest { } @Test - public void testUpdateNameFailsValidation() throws Exception { + public void testUpdateNameFailsValidation() { // expect expectedExceptions.expect(InvalidException.class); @@ -107,13 +105,13 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest { } @Test - public void testInterpolatesName() throws Exception { + public void testInterpolatesName() { // given - final String name = simpleObjectWrapped.getName(); + final var name = simpleObjectWrapped.getName(); // when - final String title = container.titleOf(simpleObjectWrapped); + final var title = container.titleOf(simpleObjectWrapped); // then assertEquals("Object: " + name, title); diff --git a/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java b/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java index c762dd88f..11d108277 100644 --- a/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java +++ b/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java @@ -25,11 +25,13 @@ package domainapp.integtests.tests.modules.simple; import static org.junit.Assert.assertEquals; +import com.google.common.base.Throwables; +import domainapp.dom.modules.simple.SimpleObjects; +import domainapp.fixture.modules.simple.SimpleObjectsTearDown; +import domainapp.fixture.scenarios.RecreateSimpleObjects; +import domainapp.integtests.tests.SimpleAppIntegTest; import java.sql.SQLIntegrityConstraintViolationException; -import java.util.List; - import javax.inject.Inject; - import org.apache.isis.applib.fixturescripts.FixtureScript; import org.apache.isis.applib.fixturescripts.FixtureScripts; import org.hamcrest.Description; @@ -37,14 +39,6 @@ import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; import org.junit.Test; -import com.google.common.base.Throwables; - -import domainapp.dom.modules.simple.SimpleObject; -import domainapp.dom.modules.simple.SimpleObjects; -import domainapp.fixture.modules.simple.SimpleObjectsTearDown; -import domainapp.fixture.scenarios.RecreateSimpleObjects; -import domainapp.integtests.tests.SimpleAppIntegTest; - /** * Fixture Pattern Integration Test */ @@ -56,25 +50,25 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest { SimpleObjects simpleObjects; @Test - public void testListAll() throws Exception { + public void testListAll() { // given - RecreateSimpleObjects fs = new RecreateSimpleObjects(); + var fs = new RecreateSimpleObjects(); fixtureScripts.runFixtureScript(fs, null); nextTransaction(); // when - final List all = wrap(simpleObjects).listAll(); + final var all = wrap(simpleObjects).listAll(); // then assertEquals(fs.getSimpleObjects().size(), all.size()); - SimpleObject simpleObject = wrap(all.get(0)); + var simpleObject = wrap(all.get(0)); assertEquals(fs.getSimpleObjects().get(0).getName(), simpleObject.getName()); } - + @Test - public void testListAllWhenNone() throws Exception { + public void testListAllWhenNone() { // given FixtureScript fs = new SimpleObjectsTearDown(); @@ -82,14 +76,14 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest { nextTransaction(); // when - final List all = wrap(simpleObjects).listAll(); + final var all = wrap(simpleObjects).listAll(); // then assertEquals(0, all.size()); } - + @Test - public void testCreate() throws Exception { + public void testCreate() { // given FixtureScript fs = new SimpleObjectsTearDown(); @@ -100,12 +94,12 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest { wrap(simpleObjects).create("Faz"); // then - final List all = wrap(simpleObjects).listAll(); + final var all = wrap(simpleObjects).listAll(); assertEquals(1, all.size()); } - + @Test - public void testCreateWhenAlreadyExists() throws Exception { + public void testCreateWhenAlreadyExists() { // given FixtureScript fs = new SimpleObjectsTearDown(); @@ -115,24 +109,24 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest { nextTransaction(); // then - expectedExceptions.expectCause(causalChainContains(SQLIntegrityConstraintViolationException.class)); + expectedExceptions + .expectCause(causalChainContains(SQLIntegrityConstraintViolationException.class)); // when wrap(simpleObjects).create("Faz"); nextTransaction(); } - + + @SuppressWarnings("SameParameterValue") private static Matcher causalChainContains(final Class cls) { - return new TypeSafeMatcher() { + return new TypeSafeMatcher<>() { @Override + @SuppressWarnings("UnstableApiUsage") protected boolean matchesSafely(Throwable item) { - final List causalChain = Throwables.getCausalChain(item); - for (Throwable throwable : causalChain) { - if (cls.isAssignableFrom(throwable.getClass())) { - return true; - } - } - return false; + final var causalChain = Throwables.getCausalChain(item); + return causalChain.stream() + .map(Throwable::getClass) + .allMatch(cls::isAssignableFrom); } @Override diff --git a/naked-objects/webapp/ide/eclipse/launch/.gitignore b/naked-objects/webapp/ide/eclipse/launch/.gitignore index 3d9734548..3cefd2567 100644 --- a/naked-objects/webapp/ide/eclipse/launch/.gitignore +++ b/naked-objects/webapp/ide/eclipse/launch/.gitignore @@ -2,7 +2,3 @@ /SimpleApp-PROTOTYPE-no-fixtures.launch /SimpleApp-PROTOTYPE-with-fixtures.launch /SimpleApp-SERVER-no-fixtures.launch -/SimpleApp-PROTOTYPE-jrebel.launch -/SimpleApp-PROTOTYPE-no-fixtures.launch -/SimpleApp-PROTOTYPE-with-fixtures.launch -/SimpleApp-SERVER-no-fixtures.launch diff --git a/naked-objects/webapp/pom.xml b/naked-objects/webapp/pom.xml index bdf638cba..bbddeb791 100644 --- a/naked-objects/webapp/pom.xml +++ b/naked-objects/webapp/pom.xml @@ -129,7 +129,7 @@ - + diff --git a/naked-objects/webapp/src/main/java/domainapp/webapp/SimpleApplication.java b/naked-objects/webapp/src/main/java/domainapp/webapp/SimpleApplication.java index 8425712dc..780e4027e 100644 --- a/naked-objects/webapp/src/main/java/domainapp/webapp/SimpleApplication.java +++ b/naked-objects/webapp/src/main/java/domainapp/webapp/SimpleApplication.java @@ -31,18 +31,15 @@ import com.google.inject.name.Names; import com.google.inject.util.Modules; import com.google.inject.util.Providers; import de.agilecoders.wicket.core.Bootstrap; -import de.agilecoders.wicket.core.settings.IBootstrapSettings; import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme; import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; -import java.util.List; import javax.servlet.http.HttpServletRequest; import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication; import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis; import org.apache.wicket.Session; -import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; import org.apache.wicket.request.http.WebRequest; @@ -85,7 +82,7 @@ public class SimpleApplication extends IsisWicketApplication { protected void init() { super.init(); - IBootstrapSettings settings = Bootstrap.getSettings(); + var settings = Bootstrap.getSettings(); settings.setThemeProvider(new BootswatchThemeProvider(BootswatchTheme.Flatly)); } @@ -96,13 +93,10 @@ public class SimpleApplication extends IsisWicketApplication { } // else demo mode - final AuthenticatedWebSessionForIsis s = - (AuthenticatedWebSessionForIsis) super.newSession(request, response); - IRequestParameters requestParameters = request.getRequestParameters(); - final org.apache.wicket.util.string.StringValue user = - requestParameters.getParameterValue("user"); - final org.apache.wicket.util.string.StringValue password = - requestParameters.getParameterValue("pass"); + final var s = (AuthenticatedWebSessionForIsis) super.newSession(request, response); + var requestParameters = request.getRequestParameters(); + final var user = requestParameters.getParameterValue("user"); + final var password = requestParameters.getParameterValue("pass"); s.signIn(user.toString(), password.toString()); return s; } @@ -115,7 +109,7 @@ public class SimpleApplication extends IsisWicketApplication { // else demo mode try { - String uname = servletRequest.getParameter("user"); + var uname = servletRequest.getParameter("user"); if (uname != null) { servletRequest.getSession().invalidate(); } @@ -127,7 +121,7 @@ public class SimpleApplication extends IsisWicketApplication { @Override protected Module newIsisWicketModule() { - final Module isisDefaults = super.newIsisWicketModule(); + final var isisDefaults = super.newIsisWicketModule(); final Module overrides = new AbstractModule() { @Override @@ -148,11 +142,11 @@ public class SimpleApplication extends IsisWicketApplication { return Modules.override(isisDefaults).with(overrides); } + @SuppressWarnings({"UnstableApiUsage", "SameParameterValue"}) private static String readLines(final Class contextClass, final String resourceName) { try { - List readLines = - Resources.readLines(Resources.getResource(contextClass, resourceName), - Charset.defaultCharset()); + var resource = Resources.getResource(contextClass, resourceName); + var readLines = Resources.readLines(resource, Charset.defaultCharset()); return Joiner.on("\n").join(readLines); } catch (IOException e) { return "This is a simple app"; diff --git a/naked-objects/webapp/src/main/webapp/about/index.html b/naked-objects/webapp/src/main/webapp/about/index.html index e929c5b6d..4579f3d0b 100644 --- a/naked-objects/webapp/src/main/webapp/about/index.html +++ b/naked-objects/webapp/src/main/webapp/about/index.html @@ -110,8 +110,8 @@ th, td {

provides access to a RESTful API conformant with the - Restful Objects spec. This is part of Apache Isis Core. The - implementation technology is JBoss RestEasy. + Restful Objects spec. This is part of Apache Isis Core. + The implementation technology is JBoss RestEasy.

From 8e060ad0adafb059108820bb4af3b528374eece7 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sat, 8 Aug 2020 00:46:08 +0000 Subject: [PATCH 207/225] Refactors null object pattern to java-11 --- .../java/com/iluwatar/nullobject/App.java | 16 ++++--- .../java/com/iluwatar/nullobject/AppTest.java | 6 +-- .../com/iluwatar/nullobject/NullNodeTest.java | 4 +- .../com/iluwatar/nullobject/TreeTest.java | 45 +++++++++---------- 4 files changed, 35 insertions(+), 36 deletions(-) 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 2826bafd0..00cff9fc9 100644 --- a/null-object/src/main/java/com/iluwatar/nullobject/App.java +++ b/null-object/src/main/java/com/iluwatar/nullobject/App.java @@ -37,12 +37,16 @@ public class App { * @param args command line args */ public static void main(String[] args) { - - Node root = - new NodeImpl("1", new NodeImpl("11", new NodeImpl("111", NullNode.getInstance(), - NullNode.getInstance()), NullNode.getInstance()), new NodeImpl("12", - NullNode.getInstance(), new NodeImpl("122", NullNode.getInstance(), - NullNode.getInstance()))); + Node root = new NodeImpl("1", + new NodeImpl("11", + new NodeImpl("111", NullNode.getInstance(), NullNode.getInstance()), + NullNode.getInstance() + ), + new NodeImpl("12", + NullNode.getInstance(), + new NodeImpl("122", NullNode.getInstance(), NullNode.getInstance()) + ) + ); root.walk(); } 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 97d6b5eef..754aadc80 100644 --- a/null-object/src/test/java/com/iluwatar/nullobject/AppTest.java +++ b/null-object/src/test/java/com/iluwatar/nullobject/AppTest.java @@ -26,15 +26,11 @@ package com.iluwatar.nullobject; import org.junit.jupiter.api.Test; /** - * * Application test - * */ public class AppTest { - @Test public void test() { - String[] args = {}; - App.main(args); + App.main(new String[]{}); } } 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 b4d9f72d0..aeec371ff 100644 --- a/null-object/src/test/java/com/iluwatar/nullobject/NullNodeTest.java +++ b/null-object/src/test/java/com/iluwatar/nullobject/NullNodeTest.java @@ -42,14 +42,14 @@ public class NullNodeTest { */ @Test public void testGetInstance() { - final NullNode instance = NullNode.getInstance(); + final var instance = NullNode.getInstance(); assertNotNull(instance); assertSame(instance, NullNode.getInstance()); } @Test public void testFields() { - final NullNode node = NullNode.getInstance(); + final var node = NullNode.getInstance(); assertEquals(0, node.getTreeSize()); assertNull(node.getName()); assertNull(node.getLeft()); 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 3fe584425..9a2b485d0 100644 --- a/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java +++ b/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java @@ -23,22 +23,21 @@ 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.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; - -import java.util.LinkedList; -import java.util.List; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.AppenderBase; +import java.util.LinkedList; +import java.util.List; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.slf4j.LoggerFactory; + /** * Date: 12/26/15 - 11:44 PM * @@ -75,12 +74,12 @@ public class TreeTest { private static final Node TREE_ROOT; static { - final NodeImpl level1B = new NodeImpl("level1_b", NullNode.getInstance(), NullNode.getInstance()); - final NodeImpl level2B = new NodeImpl("level2_b", NullNode.getInstance(), NullNode.getInstance()); - final NodeImpl level3A = new NodeImpl("level3_a", NullNode.getInstance(), NullNode.getInstance()); - final NodeImpl level3B = new NodeImpl("level3_b", NullNode.getInstance(), NullNode.getInstance()); - final NodeImpl level2A = new NodeImpl("level2_a", level3A, level3B); - final NodeImpl level1A = new NodeImpl("level1_a", level2A, level2B); + final var level1B = new NodeImpl("level1_b", NullNode.getInstance(), NullNode.getInstance()); + final var level2B = new NodeImpl("level2_b", NullNode.getInstance(), NullNode.getInstance()); + final var level3A = new NodeImpl("level3_a", NullNode.getInstance(), NullNode.getInstance()); + final var level3B = new NodeImpl("level3_b", NullNode.getInstance(), NullNode.getInstance()); + final var level2A = new NodeImpl("level2_a", level3A, level3B); + final var level1A = new NodeImpl("level1_a", level2A, level2B); TREE_ROOT = new NodeImpl("root", level1A, level1B); } @@ -112,17 +111,17 @@ public class TreeTest { @Test public void testGetLeft() { - final Node level1 = TREE_ROOT.getLeft(); + final var level1 = TREE_ROOT.getLeft(); assertNotNull(level1); assertEquals("level1_a", level1.getName()); assertEquals(5, level1.getTreeSize()); - final Node level2 = level1.getLeft(); + final var level2 = level1.getLeft(); assertNotNull(level2); assertEquals("level2_a", level2.getName()); assertEquals(3, level2.getTreeSize()); - final Node level3 = level2.getLeft(); + final var level3 = level2.getLeft(); assertNotNull(level3); assertEquals("level3_a", level3.getName()); assertEquals(1, level3.getTreeSize()); @@ -132,7 +131,7 @@ public class TreeTest { @Test public void testGetRight() { - final Node level1 = TREE_ROOT.getRight(); + final var level1 = TREE_ROOT.getRight(); assertNotNull(level1); assertEquals("level1_b", level1.getName()); assertEquals(1, level1.getTreeSize()); @@ -140,7 +139,7 @@ public class TreeTest { assertSame(NullNode.getInstance(), level1.getLeft()); } - private class InMemoryAppender extends AppenderBase { + private static class InMemoryAppender extends AppenderBase { private final List log = new LinkedList<>(); public InMemoryAppender() { @@ -154,7 +153,7 @@ public class TreeTest { } public boolean logContains(String message) { - return log.stream().anyMatch(event -> event.getMessage().equals(message)); + return log.stream().map(ILoggingEvent::getMessage).anyMatch(message::equals); } public int getLogSize() { From 8b92bc6bb6ea58a2eaa1a14bb5b3eb66bd82b6cc Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sat, 8 Aug 2020 00:53:30 +0000 Subject: [PATCH 208/225] Corrects README.md --- null-object/README.md | 15 ++++++++++----- .../main/java/com/iluwatar/nullobject/App.java | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/null-object/README.md b/null-object/README.md index 5b943630e..f5d92a7fc 100644 --- a/null-object/README.md +++ b/null-object/README.md @@ -141,11 +141,16 @@ public final class NullNode implements Node { Then we can construct and traverse the binary tree without errors as follows. ```java - Node root = - new NodeImpl("1", new NodeImpl("11", new NodeImpl("111", NullNode.getInstance(), - NullNode.getInstance()), NullNode.getInstance()), new NodeImpl("12", - NullNode.getInstance(), new NodeImpl("122", NullNode.getInstance(), - NullNode.getInstance()))); + var root = new NodeImpl("1", + new NodeImpl("11", + new NodeImpl("111", NullNode.getInstance(), NullNode.getInstance()), + NullNode.getInstance() + ), + new NodeImpl("12", + NullNode.getInstance(), + new NodeImpl("122", NullNode.getInstance(), NullNode.getInstance()) + ) + ); root.walk(); // 1 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 00cff9fc9..cd35a3042 100644 --- a/null-object/src/main/java/com/iluwatar/nullobject/App.java +++ b/null-object/src/main/java/com/iluwatar/nullobject/App.java @@ -37,7 +37,7 @@ public class App { * @param args command line args */ public static void main(String[] args) { - Node root = new NodeImpl("1", + var root = new NodeImpl("1", new NodeImpl("11", new NodeImpl("111", NullNode.getInstance(), NullNode.getInstance()), NullNode.getInstance() From 134ccdb5a1a7f870ced8b1a15c33949df2d121d1 Mon Sep 17 00:00:00 2001 From: Anurag Agarwal Date: Sat, 8 Aug 2020 11:56:34 +0000 Subject: [PATCH 209/225] Corrects condition --- .../integtests/bootstrap/SimpleAppSystemInitializer.java | 2 ++ .../tests/modules/simple/SimpleObjectsIntegTest.java | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/naked-objects/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java b/naked-objects/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java index 12a187cb5..ad186d706 100644 --- a/naked-objects/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java +++ b/naked-objects/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java @@ -25,6 +25,7 @@ package domainapp.integtests.bootstrap; import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.integtestsupport.IsisSystemForTest; +import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller; import org.apache.isis.objectstore.jdo.datanucleus.IsisConfigurationForJdoIntegTests; /** @@ -50,6 +51,7 @@ public final class SimpleAppSystemInitializer { public SimpleAppSystemBuilder() { with(testConfiguration()); + with(new DataNucleusPersistenceMechanismInstaller()); // services annotated with @DomainService withServicesIn("domainapp"); diff --git a/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java b/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java index 11d108277..2699c5aad 100644 --- a/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java +++ b/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java @@ -124,9 +124,7 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest { @SuppressWarnings("UnstableApiUsage") protected boolean matchesSafely(Throwable item) { final var causalChain = Throwables.getCausalChain(item); - return causalChain.stream() - .map(Throwable::getClass) - .allMatch(cls::isAssignableFrom); + return causalChain.stream().map(Throwable::getClass).anyMatch(cls::isAssignableFrom); } @Override From 9f190c59c4615b50374e511f9a0de0aeb0033539 Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Sun, 9 Aug 2020 00:51:28 +0530 Subject: [PATCH 210/225] Update transaction-script/Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ilkka Seppälä --- transaction-script/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transaction-script/Readme.md b/transaction-script/Readme.md index 87cd138f6..ed010f919 100644 --- a/transaction-script/Readme.md +++ b/transaction-script/Readme.md @@ -1,6 +1,6 @@ --- layout: pattern -title: Transaction script +title: Transaction Script folder: transaction-script permalink: /patterns/transaction-script/ categories: Domain logic From c0acaf073be6abd861ac76d66ce151a1572464eb Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Sun, 9 Aug 2020 00:51:36 +0530 Subject: [PATCH 211/225] Update transaction-script/Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ilkka Seppälä --- transaction-script/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transaction-script/Readme.md b/transaction-script/Readme.md index ed010f919..6fcae7791 100644 --- a/transaction-script/Readme.md +++ b/transaction-script/Readme.md @@ -3,7 +3,7 @@ layout: pattern title: Transaction Script folder: transaction-script permalink: /patterns/transaction-script/ -categories: Domain logic +categories: Behavioral tags: - Data access --- From 5bfaeffecf4a66563a2a23f6fee889a180e26c3c Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Sun, 9 Aug 2020 00:51:44 +0530 Subject: [PATCH 212/225] Update transaction-script/Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ilkka Seppälä --- transaction-script/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transaction-script/Readme.md b/transaction-script/Readme.md index 6fcae7791..0b7f209c2 100644 --- a/transaction-script/Readme.md +++ b/transaction-script/Readme.md @@ -9,7 +9,7 @@ tags: --- ## Intent -Transaction script(TS) is mainly used in small applications where nothing complex is done and bigger architecture's are not needed. +Transaction Script organizes business logic by procedures where each procedure handles a single request from the presentation. ## Explanation Real world example From 7acc5fbf957ae6143890097e11f2f4ef683d3f6d Mon Sep 17 00:00:00 2001 From: Ashish_Trivedi Date: Sun, 9 Aug 2020 01:33:19 +0530 Subject: [PATCH 213/225] #1321 Resolved conflicts and used var wherever possible --- pom.xml | 1 + .../transactionscript/Hotel.java | 10 +++--- .../transactionscript/HotelDaoImpl.java | 33 +++++++++---------- ...CustomException.java => SqlException.java} | 8 ++--- .../TransactionScriptApp.java | 11 +++---- .../transactionscript/HotelTest.java | 5 ++- 6 files changed, 33 insertions(+), 35 deletions(-) rename transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/{CustomException.java => SqlException.java} (88%) diff --git a/pom.xml b/pom.xml index 38d8e97db..3c909312b 100644 --- a/pom.xml +++ b/pom.xml @@ -372,6 +372,7 @@ 11 11 + 3.0.0-M3 org.apache.maven.plugins diff --git a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/Hotel.java b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/Hotel.java index 58705e5e6..8a756f99c 100644 --- a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/Hotel.java +++ b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/Hotel.java @@ -44,7 +44,7 @@ public class Hotel { */ public void bookRoom(int roomNumber) throws Exception { - Optional room = hotelDao.getById(roomNumber); + var room = hotelDao.getById(roomNumber); if (room.isEmpty()) { throw new Exception("Room number: " + roomNumber + " does not exist"); @@ -52,7 +52,7 @@ public class Hotel { if (room.get().isBooked()) { throw new Exception("Room already booked!"); } else { - Room updateRoomBooking = room.get(); + var updateRoomBooking = room.get(); updateRoomBooking.setBooked(true); hotelDao.update(updateRoomBooking); } @@ -66,14 +66,14 @@ public class Hotel { * @throws Exception if any error */ public void cancelRoomBooking(int roomNumber) throws Exception { - - Optional room = hotelDao.getById(roomNumber); + + var room = hotelDao.getById(roomNumber); if (room.isEmpty()) { throw new Exception("Room number: " + roomNumber + " does not exist"); } else { if (room.get().isBooked()) { - Room updateRoomBooking = room.get(); + var updateRoomBooking = room.get(); updateRoomBooking.setBooked(false); int refundAmount = updateRoomBooking.getPrice(); hotelDao.update(updateRoomBooking); diff --git a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/HotelDaoImpl.java b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/HotelDaoImpl.java index f1b509416..e95363fb5 100644 --- a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/HotelDaoImpl.java +++ b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/HotelDaoImpl.java @@ -26,7 +26,6 @@ package com.ashishtrivedi16.transactionscript; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.util.Optional; import java.util.Spliterator; import java.util.Spliterators; @@ -48,7 +47,7 @@ public class HotelDaoImpl implements HotelDao { try { var connection = getConnection(); var statement = connection.prepareStatement("SELECT * FROM ROOMS"); - ResultSet resultSet = statement.executeQuery(); // NOSONAR + var resultSet = statement.executeQuery(); // NOSONAR return StreamSupport.stream(new Spliterators.AbstractSpliterator(Long.MAX_VALUE, Spliterator.ORDERED) { @@ -60,7 +59,7 @@ public class HotelDaoImpl implements HotelDao { } action.accept(createRoom(resultSet)); return true; - } catch (SQLException e) { + } catch (Exception e) { throw new RuntimeException(e); // NOSONAR } } @@ -71,8 +70,8 @@ public class HotelDaoImpl implements HotelDao { e.printStackTrace(); } }); - } catch (SQLException e) { - throw new CustomException(e.getMessage(), e); + } catch (Exception e) { + throw new SqlException(e.getMessage(), e); } } @@ -90,8 +89,8 @@ public class HotelDaoImpl implements HotelDao { } else { return Optional.empty(); } - } catch (SQLException ex) { - throw new CustomException(ex.getMessage(), ex); + } catch (Exception ex) { + throw new SqlException(ex.getMessage(), ex); } finally { if (resultSet != null) { resultSet.close(); @@ -113,8 +112,8 @@ public class HotelDaoImpl implements HotelDao { statement.setBoolean(4, room.isBooked()); statement.execute(); return true; - } catch (SQLException ex) { - throw new CustomException(ex.getMessage(), ex); + } catch (Exception ex) { + throw new SqlException(ex.getMessage(), ex); } } @@ -130,8 +129,8 @@ public class HotelDaoImpl implements HotelDao { statement.setBoolean(3, room.isBooked()); statement.setInt(4, room.getId()); return statement.executeUpdate() > 0; - } catch (SQLException ex) { - throw new CustomException(ex.getMessage(), ex); + } catch (Exception ex) { + throw new SqlException(ex.getMessage(), ex); } } @@ -141,12 +140,12 @@ public class HotelDaoImpl implements HotelDao { var statement = connection.prepareStatement("DELETE FROM ROOMS WHERE ID = ?")) { statement.setInt(1, room.getId()); return statement.executeUpdate() > 0; - } catch (SQLException ex) { - throw new CustomException(ex.getMessage(), ex); + } catch (Exception ex) { + throw new SqlException(ex.getMessage(), ex); } } - private Connection getConnection() throws SQLException { + private Connection getConnection() throws Exception { return dataSource.getConnection(); } @@ -156,12 +155,12 @@ public class HotelDaoImpl implements HotelDao { resultSet.close(); statement.close(); connection.close(); - } catch (SQLException e) { - throw new CustomException(e.getMessage(), e); + } catch (Exception e) { + throw new SqlException(e.getMessage(), e); } } - private Room createRoom(ResultSet resultSet) throws SQLException { + private Room createRoom(ResultSet resultSet) throws Exception { return new Room(resultSet.getInt("ID"), resultSet.getString("ROOM_TYPE"), resultSet.getInt("PRICE"), diff --git a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/CustomException.java b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/SqlException.java similarity index 88% rename from transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/CustomException.java rename to transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/SqlException.java index 002ea79aa..369eb259d 100644 --- a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/CustomException.java +++ b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/SqlException.java @@ -26,18 +26,18 @@ package com.ashishtrivedi16.transactionscript; /** * Custom exception. */ -public class CustomException extends Exception { +public class SqlException extends Exception { private static final long serialVersionUID = 1L; - public CustomException() { + public SqlException() { } - public CustomException(String message) { + public SqlException(String message) { super(message); } - public CustomException(String message, Throwable cause) { + public SqlException(String message, Throwable cause) { super(message, cause); } } diff --git a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/TransactionScriptApp.java b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/TransactionScriptApp.java index 13a19dd48..e49e1d501 100644 --- a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/TransactionScriptApp.java +++ b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/TransactionScriptApp.java @@ -23,7 +23,6 @@ package com.ashishtrivedi16.transactionscript; -import java.sql.SQLException; import java.util.List; import javax.sql.DataSource; import org.h2.jdbcx.JdbcDataSource; @@ -51,8 +50,8 @@ public class TransactionScriptApp { addRooms(dao); getRoomStatus(dao); - - Hotel hotel = new Hotel(dao); + + var hotel = new Hotel(dao); hotel.bookRoom(1); hotel.bookRoom(2); @@ -77,7 +76,7 @@ public class TransactionScriptApp { } } - private static void deleteSchema(DataSource dataSource) throws SQLException { + private static void deleteSchema(DataSource dataSource) throws java.sql.SQLException { try (var connection = dataSource.getConnection(); var statement = connection.createStatement()) { statement.execute(RoomSchemaSql.DELETE_SCHEMA_SQL); @@ -89,7 +88,7 @@ public class TransactionScriptApp { var statement = connection.createStatement()) { statement.execute(RoomSchemaSql.CREATE_SCHEMA_SQL); } catch (Exception e) { - throw new CustomException(e.getMessage(), e); + throw new SqlException(e.getMessage(), e); } } @@ -99,7 +98,7 @@ public class TransactionScriptApp { * @return h2 datasource */ private static DataSource createDataSource() { - JdbcDataSource dataSource = new JdbcDataSource(); + var dataSource = new JdbcDataSource(); dataSource.setUrl(H2_DB_URL); return dataSource; } diff --git a/transaction-script/src/test/java/com/ashishtrivedi16/transactionscript/HotelTest.java b/transaction-script/src/test/java/com/ashishtrivedi16/transactionscript/HotelTest.java index 62aad9527..86f4605b3 100644 --- a/transaction-script/src/test/java/com/ashishtrivedi16/transactionscript/HotelTest.java +++ b/transaction-script/src/test/java/com/ashishtrivedi16/transactionscript/HotelTest.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import javax.sql.DataSource; -import java.sql.SQLException; import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -103,7 +102,7 @@ public class HotelTest { } - private static void deleteSchema(DataSource dataSource) throws SQLException { + private static void deleteSchema(DataSource dataSource) throws java.sql.SQLException { try (var connection = dataSource.getConnection(); var statement = connection.createStatement()) { statement.execute(RoomSchemaSql.DELETE_SCHEMA_SQL); @@ -115,7 +114,7 @@ public class HotelTest { var statement = connection.createStatement()) { statement.execute(RoomSchemaSql.CREATE_SCHEMA_SQL); } catch (Exception e) { - throw new CustomException(e.getMessage(), e); + throw new SqlException(e.getMessage(), e); } } From a59c9bba97a2af0d175da0929fa7295371ddaadf Mon Sep 17 00:00:00 2001 From: Ashish_Trivedi Date: Sun, 9 Aug 2020 01:39:51 +0530 Subject: [PATCH 214/225] #1321 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c909312b..4853d762f 100644 --- a/pom.xml +++ b/pom.xml @@ -367,7 +367,6 @@ org.apache.maven.plugins maven-compiler-plugin - ${compiler.version} 11 11 From e09de2fb360b65b6c0438cd328a616ccf67f3b76 Mon Sep 17 00:00:00 2001 From: Ashish_Trivedi Date: Sun, 9 Aug 2020 01:58:19 +0530 Subject: [PATCH 215/225] #1321 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4853d762f..38d8e97db 100644 --- a/pom.xml +++ b/pom.xml @@ -367,11 +367,11 @@ org.apache.maven.plugins maven-compiler-plugin + ${compiler.version} 11 11 - 3.0.0-M3 org.apache.maven.plugins From 5eb9b98e784ba9f5a37b342e804cc5a361927eb0 Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 00:24:20 +0530 Subject: [PATCH 216/225] Update transaction-script/Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ilkka Seppälä --- transaction-script/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transaction-script/Readme.md b/transaction-script/Readme.md index 0b7f209c2..5c35e8734 100644 --- a/transaction-script/Readme.md +++ b/transaction-script/Readme.md @@ -76,7 +76,7 @@ public class Hotel { } ``` -This class has two methods, one for booking and cancelling a room respectively. +The `Hotel` class has two methods, one for booking and cancelling a room respectively. Each one of them handles a single transaction in the system, making `Hotel` implement the Transaction Script pattern. ``` public void bookRoom(int roomNumber); From 94c131f7e929ab775dbcc7f3c138f0be199063a7 Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 00:24:33 +0530 Subject: [PATCH 217/225] Update transaction-script/Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ilkka Seppälä --- transaction-script/Readme.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/transaction-script/Readme.md b/transaction-script/Readme.md index 5c35e8734..b3740862b 100644 --- a/transaction-script/Readme.md +++ b/transaction-script/Readme.md @@ -13,8 +13,7 @@ Transaction Script organizes business logic by procedures where each procedure h ## Explanation Real world example -> Your need is to be able to book a hotel room and also be able to cancel that booking. -> +> You need to create a hotel room booking system. Since the requirements are quite simple we intend to use the Transaction Script pattern here. In plain words > All logic related to booking a hotel room like checking room availability, From 45e416928d04e95fdbef4a63f3009393945fe5ad Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 00:24:44 +0530 Subject: [PATCH 218/225] Update transaction-script/Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ilkka Seppälä --- transaction-script/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transaction-script/Readme.md b/transaction-script/Readme.md index b3740862b..c8e934a1b 100644 --- a/transaction-script/Readme.md +++ b/transaction-script/Readme.md @@ -23,7 +23,7 @@ In plain words Programmatic example -The Hotel class takes care of booking and cancelling a room in a hotel. +The `Hotel` class takes care of booking and cancelling room reservations. ```java public class Hotel { From 6cef98d41e440dd002b3f6152e8f5ee07183036e Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 00:25:01 +0530 Subject: [PATCH 219/225] Update transaction-script/Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ilkka Seppälä --- transaction-script/Readme.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/transaction-script/Readme.md b/transaction-script/Readme.md index c8e934a1b..4315c0475 100644 --- a/transaction-script/Readme.md +++ b/transaction-script/Readme.md @@ -93,8 +93,7 @@ if booked then calculates the refund amount and updates the database using the D ![alt text](./etc/transaction-script.png "Transaction script model") ## Applicability -Use the transaction script model when the application has only a small amount of logic and that -logic won't be extended in the future. +Use the Transaction Script pattern when the application has only a small amount of logic and that logic won't be extended in the future. ## Known uses From 31d753e59dfdad59a29b9992d706cb2987860984 Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 00:25:43 +0530 Subject: [PATCH 220/225] Update transaction-script/Readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ilkka Seppälä --- transaction-script/Readme.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/transaction-script/Readme.md b/transaction-script/Readme.md index 4315c0475..1c1d789ec 100644 --- a/transaction-script/Readme.md +++ b/transaction-script/Readme.md @@ -16,10 +16,7 @@ Real world example > You need to create a hotel room booking system. Since the requirements are quite simple we intend to use the Transaction Script pattern here. In plain words -> All logic related to booking a hotel room like checking room availability, -> calculate rates and update the database is done inside a single transaction script. -> Similar procedure is also needed for cancelling a room booking and all -> that logic will be in another transaction script. +> Transaction Script organizes business logic into transactions that the system needs to carry out. Programmatic example From 87f3a4d95623476931716ed901b5a529a7f19b68 Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 12:48:55 +0530 Subject: [PATCH 221/225] Delete module-info.java --- dao/src/main/java/module-info.java | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 dao/src/main/java/module-info.java diff --git a/dao/src/main/java/module-info.java b/dao/src/main/java/module-info.java deleted file mode 100644 index 08e4f662e..000000000 --- a/dao/src/main/java/module-info.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * The MIT License - * Copyright © 2014-2019 Ilkka Seppälä - * - * 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. - */ - -module com.iluwatar.dao { - requires org.slf4j; - requires java.sql; - requires h2; - requires java.naming; -} \ No newline at end of file From 5441db658270247b0e326fd52265add87adafbfc Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 12:52:15 +0530 Subject: [PATCH 222/225] Update pom.xml --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 38d8e97db..9b3382795 100644 --- a/pom.xml +++ b/pom.xml @@ -376,10 +376,6 @@ org.apache.maven.plugins maven-surefire-plugin - - - -Xmx1024M ${argLine} - 3.0.0-M5 From f5c337981b06cf3a392f761097e4ccf6dde24575 Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 12:52:37 +0530 Subject: [PATCH 223/225] Rename Readme.md to README.md --- transaction-script/{Readme.md => README.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename transaction-script/{Readme.md => README.md} (100%) diff --git a/transaction-script/Readme.md b/transaction-script/README.md similarity index 100% rename from transaction-script/Readme.md rename to transaction-script/README.md From c0edac0046a86ae108e5c9789a3e67c681b6e9f2 Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 12:53:13 +0530 Subject: [PATCH 224/225] Rename TransactionScriptApp.java to App.java --- .../transactionscript/{TransactionScriptApp.java => App.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/{TransactionScriptApp.java => App.java} (100%) diff --git a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/TransactionScriptApp.java b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/App.java similarity index 100% rename from transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/TransactionScriptApp.java rename to transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/App.java From 24126edd86295d0bbf94cc46090168027885f365 Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Mon, 10 Aug 2020 12:54:46 +0530 Subject: [PATCH 225/225] Update Hotel.java --- .../main/java/com/ashishtrivedi16/transactionscript/Hotel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/Hotel.java b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/Hotel.java index 8a756f99c..3a73c78ab 100644 --- a/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/Hotel.java +++ b/transaction-script/src/main/java/com/ashishtrivedi16/transactionscript/Hotel.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; public class Hotel { private static final Logger LOGGER = LoggerFactory.getLogger(TransactionScriptApp.class); - private HotelDaoImpl hotelDao; + private final HotelDaoImpl hotelDao; public Hotel(HotelDaoImpl hotelDao) { this.hotelDao = hotelDao;