Merge

LICENSE.md

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

abstract-document/src/main/java/com/iluwatar/abstractdocument/module-info.java

@@ -0,0 +1,26 @@
+/*
+ * 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;
+}

caching/pom.xml

@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.mongodb</groupId>
       <artifactId>mongodb-driver</artifactId>
-      <version>3.0.4</version>
+      <version>3.12.0</version>
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>

master-worker-pattern/src/main/java/com/iluwatar/masterworker/App.java

@@ -24,6 +24,11 @@
 package com.iluwatar.masterworker;
 
 import com.iluwatar.masterworker.system.ArrayTransposeMasterWorker;
+import com.iluwatar.masterworker.system.MasterWorker;
+import com.iluwatar.masterworker.system.systemmaster.ArrayTransposeMaster;
+import com.iluwatar.masterworker.system.systemmaster.Master;
+import com.iluwatar.masterworker.system.systemworkers.ArrayTransposeWorker;
+import com.iluwatar.masterworker.system.systemworkers.Worker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

mutex/README.md

@@ -27,5 +27,5 @@ Use a Mutex when
 
 ## Credits
 
-* [Lock (computer science)] (http://en.wikipedia.org/wiki/Lock_(computer_science))
-* [Semaphores] (http://tutorials.jenkov.com/java-concurrency/semaphores.html)
+* [Lock (computer science)](http://en.wikipedia.org/wiki/Lock_(computer_science))
+* [Semaphores](http://tutorials.jenkov.com/java-concurrency/semaphores.html)

page-object/pom.xml

@@ -26,6 +26,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
     <parent>
         <groupId>com.iluwatar</groupId>
         <artifactId>java-design-patterns</artifactId>

page-object/sample-application/src/main/java/com/iluwatar/pageobject/App.java

@@ -71,8 +71,8 @@ private App() {
   public static void main(String[] args) {
 
     try {
-      File applicationFile =
-          new File(App.class.getClassLoader().getResource("sample-ui/login.html").getPath());
+      var classLoader = App.class.getClassLoader();
+      var applicationFile = new File(classLoader.getResource("sample-ui/login.html").getPath());
 
       // should work for unix like OS (mac, unix etc...)
       if (Desktop.isDesktopSupported()) {

page-object/src/main/java/com/iluwatar/pageobject/App.java

@@ -67,8 +67,8 @@ private App() {
   public static void main(String[] args) {
 
     try {
-      File applicationFile =
-          new File(App.class.getClassLoader().getResource("sample-ui/login.html").getPath());
+      var classLoader = App.class.getClassLoader();
+      var applicationFile = new File(classLoader.getResource("sample-ui/login.html").getPath());
 
       // Should work for unix like OS (mac, unix etc...)
       if (Desktop.isDesktopSupported()) {

page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java

@@ -23,14 +23,14 @@
 
 package com.iluwatar.pageobject;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.iluwatar.pageobject.pages.AlbumListPage;
 import com.iluwatar.pageobject.pages.AlbumPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 /**
  * Test Album Selection and Album Listing
  */
@@ -45,7 +45,7 @@ public void setUp() {
 
   @Test
   public void testSelectAlbum() {
-    AlbumPage albumPage = albumListPage.selectAlbum("21");
+    var albumPage = albumListPage.selectAlbum("21");
     albumPage.navigateToPage();
     assertTrue(albumPage.isAt());
   }

page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java

@@ -23,14 +23,14 @@
 
 package com.iluwatar.pageobject;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.iluwatar.pageobject.pages.AlbumListPage;
 import com.iluwatar.pageobject.pages.AlbumPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 /**
  * Test Album Page Operations
  */
@@ -46,7 +46,7 @@ public void setUp() {
   @Test
   public void testSaveAlbum() {
 
-    AlbumPage albumPageAfterChanges = albumPage
+    var albumPageAfterChanges = albumPage
         .changeAlbumTitle("25")
         .changeArtist("Adele Laurie Blue Adkins")
         .changeAlbumYear(2015)
@@ -60,7 +60,7 @@ public void testSaveAlbum() {
 
   @Test
   public void testCancelChanges() {
-    AlbumListPage albumListPage = albumPage.cancelChanges();
+    var albumListPage = albumPage.cancelChanges();
     albumListPage.navigateToPage();
     assertTrue(albumListPage.isAt());
   }

page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java

@@ -23,14 +23,14 @@
 
 package com.iluwatar.pageobject;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.iluwatar.pageobject.pages.AlbumListPage;
 import com.iluwatar.pageobject.pages.LoginPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 /**
  * Test Login Page Object
  */
@@ -45,7 +45,7 @@ public void setUp() {
 
   @Test
   public void testLogin() {
-    AlbumListPage albumListPage = loginPage
+    var albumListPage = loginPage
         .enterUsername("admin")
         .enterPassword("password")
         .login();

page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumListPage.java

@@ -26,7 +26,6 @@
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
 import java.io.IOException;
 import java.util.List;
 
@@ -79,8 +78,8 @@ public boolean isAt() {
    */
   public AlbumPage selectAlbum(String albumTitle) {
     // uses XPath to find list of html anchor tags with the class album in it
-    List<HtmlAnchor> albumLinks = (List<HtmlAnchor>) page.getByXPath("//tr[@class='album']//a");
-    for (HtmlAnchor anchor : albumLinks) {
+    var albumLinks = (List<HtmlAnchor>) page.getByXPath("//tr[@class='album']//a");
+    for (var anchor : albumLinks) {
       if (anchor.getTextContent().equals(albumTitle)) {
         try {
           anchor.click();

page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumPage.java

@@ -30,7 +30,6 @@
 import com.gargoylesoftware.htmlunit.html.HtmlSelect;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
-
 import java.io.IOException;
 
 /**
@@ -83,7 +82,7 @@ public boolean isAt() {
    * @return {@link AlbumPage}
    */
   public AlbumPage changeAlbumTitle(String albumTitle) {
-    HtmlTextInput albumTitleInputTextField = (HtmlTextInput) page.getElementById("albumTitle");
+    var albumTitleInputTextField = (HtmlTextInput) page.getElementById("albumTitle");
     albumTitleInputTextField.setText(albumTitle);
     return this;
   }
@@ -96,7 +95,7 @@ public AlbumPage changeAlbumTitle(String albumTitle) {
    * @return {@link AlbumPage}
    */
   public AlbumPage changeArtist(String artist) {
-    HtmlTextInput artistInputTextField = (HtmlTextInput) page.getElementById("albumArtist");
+    var artistInputTextField = (HtmlTextInput) page.getElementById("albumArtist");
     artistInputTextField.setText(artist);
     return this;
   }
@@ -109,8 +108,8 @@ public AlbumPage changeArtist(String artist) {
    * @return {@link AlbumPage}
    */
   public AlbumPage changeAlbumYear(int year) {
-    HtmlSelect albumYearSelectOption = (HtmlSelect) page.getElementById("albumYear");
-    HtmlOption yearOption = albumYearSelectOption.getOptionByValue(Integer.toString(year));
+    var albumYearSelectOption = (HtmlSelect) page.getElementById("albumYear");
+    var yearOption = albumYearSelectOption.getOptionByValue(Integer.toString(year));
     albumYearSelectOption.setSelectedAttribute(yearOption, true);
     return this;
   }
@@ -123,7 +122,7 @@ public AlbumPage changeAlbumYear(int year) {
    * @return {@link AlbumPage}
    */
   public AlbumPage changeAlbumRating(String albumRating) {
-    HtmlTextInput albumRatingInputTextField = (HtmlTextInput) page.getElementById("albumRating");
+    var albumRatingInputTextField = (HtmlTextInput) page.getElementById("albumRating");
     albumRatingInputTextField.setText(albumRating);
     return this;
   }
@@ -135,7 +134,7 @@ public AlbumPage changeAlbumRating(String albumRating) {
    * @return {@link AlbumPage}
    */
   public AlbumPage changeNumberOfSongs(int numberOfSongs) {
-    HtmlNumberInput numberOfSongsNumberField = (HtmlNumberInput) page.getElementById("numberOfSongs");
+    var numberOfSongsNumberField = (HtmlNumberInput) page.getElementById("numberOfSongs");
     numberOfSongsNumberField.setText(Integer.toString(numberOfSongs));
     return this;
   }
@@ -147,7 +146,7 @@ public AlbumPage changeNumberOfSongs(int numberOfSongs) {
    * @return {@link AlbumListPage}
    */
   public AlbumListPage cancelChanges() {
-    HtmlSubmitInput cancelButton = (HtmlSubmitInput) page.getElementById("cancelButton");
+    var cancelButton = (HtmlSubmitInput) page.getElementById("cancelButton");
     try {
       cancelButton.click();
     } catch (IOException e) {
@@ -163,7 +162,7 @@ public AlbumListPage cancelChanges() {
    * @return {@link AlbumPage}
    */
   public AlbumPage saveChanges() {
-    HtmlSubmitInput saveButton = (HtmlSubmitInput) page.getElementById("saveButton");
+    var saveButton = (HtmlSubmitInput) page.getElementById("saveButton");
     try {
       saveButton.click();
     } catch (IOException e) {

page-object/src/test/java/com/iluwatar/pageobject/pages/LoginPage.java

@@ -79,7 +79,7 @@ public boolean isAt() {
    * @return {@link LoginPage}
    */
   public LoginPage enterUsername(String username) {
-    HtmlTextInput usernameInputTextField = (HtmlTextInput) page.getElementById("username");
+    var usernameInputTextField = (HtmlTextInput) page.getElementById("username");
     usernameInputTextField.setText(username);
     return this;
   }
@@ -92,7 +92,7 @@ public LoginPage enterUsername(String username) {
    * @return {@link LoginPage}
    */
   public LoginPage enterPassword(String password) {
-    HtmlPasswordInput passwordInputPasswordField = (HtmlPasswordInput) page.getElementById("password");
+    var passwordInputPasswordField = (HtmlPasswordInput) page.getElementById("password");
     passwordInputPasswordField.setText(password);
     return this;
   }
@@ -101,11 +101,11 @@ public LoginPage enterPassword(String password) {
   /**
    * Clicking on the login button to 'login'
    *
-   * @return {@link AlbumListPage}
-   *        - this is the page that user gets navigated to once successfully logged in
+   * @return {@link AlbumListPage} - this is the page that user gets navigated to once successfully
+   *     logged in
    */
   public AlbumListPage login() {
-    HtmlSubmitInput loginButton = (HtmlSubmitInput) page.getElementById("loginButton");
+    var loginButton = (HtmlSubmitInput) page.getElementById("loginButton");
     try {
       loginButton.click();
     } catch (IOException e) {

page-object/src/test/java/com/iluwatar/pageobject/pages/Page.java

@@ -31,8 +31,7 @@
 public abstract class Page {
 
   /**
-   * Application Under Test path
-   * This directory location is where html web pages are located
+   * Application Under Test path This directory location is where html web pages are located
    */
   public static final String AUT_PATH = "src/main/resources/sample-ui/";
 

page-object/test-automation/src/main/java/com/iluwatar/pageobject/AlbumListPage.java

@@ -81,8 +81,8 @@ public boolean isAt() {
    */
   public AlbumPage selectAlbum(String albumTitle) {
     // uses XPath to find list of html anchor tags with the class album in it
-    List<HtmlAnchor> albumLinks = (List<HtmlAnchor>) page.getByXPath("//tr[@class='album']//a");
-    for (HtmlAnchor anchor : albumLinks) {
+    var albumLinks = (List<HtmlAnchor>) page.getByXPath("//tr[@class='album']//a");
+    for (var anchor : albumLinks) {
       if (anchor.getTextContent().equals(albumTitle)) {
         try {
           anchor.click();