Java 11 migrate 7 remaining f

facade/README.md

@@ -77,9 +77,7 @@ public abstract class DwarvenMineWorker {
   }
 
   public void action(Action... actions) {
-    for (Action action : actions) {
-      action(action);
-    }
+    Arrays.stream(actions).forEach(this::action);
   }
 
   public abstract void work();
@@ -166,9 +164,7 @@ public class DwarvenGoldmineFacade {
 
   private static void makeActions(Collection<DwarvenMineWorker> workers,
       DwarvenMineWorker.Action... actions) {
-    for (DwarvenMineWorker worker : workers) {
-      worker.action(actions);
-    }
+    workers.forEach(worker -> worker.action(actions));
   }
 }
 ```

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

@@ -42,7 +42,7 @@ public class App {
    * @param args command line args
    */
   public static void main(String[] args) {
-    DwarvenGoldmineFacade facade = new DwarvenGoldmineFacade();
+    var facade = new DwarvenGoldmineFacade();
     facade.startNewDay();
     facade.digOutGold();
     facade.endDay();

facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java

@@ -63,8 +63,6 @@ private static void makeActions(
       Collection<DwarvenMineWorker> workers,
       DwarvenMineWorker.Action... actions
   ) {
-    for (DwarvenMineWorker worker : workers) {
-      worker.action(actions);
-    }
+    workers.forEach(worker -> worker.action(actions));
   }
 }

facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java

@@ -23,6 +23,7 @@
 
 package com.iluwatar.facade;
 
+import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,9 +77,7 @@ private void action(Action action) {
    * Perform actions.
    */
   public void action(Action... actions) {
-    for (Action action : actions) {
-      action(action);
-    }
+    Arrays.stream(actions).forEach(this::action);
   }
 
   public abstract void work();

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

@@ -26,15 +26,12 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * 
  * Application test
- *
  */
 public class AppTest {
 
   @Test
   public void test() {
-    String[] args = {};
-    App.main(args);
+    App.main(new String[]{});
   }
 }

facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java

@@ -23,20 +23,19 @@
 
 package com.iluwatar.facade;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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;
 
-import java.util.LinkedList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 /**
  * Date: 12/9/15 - 9:40 PM
  *
@@ -56,16 +55,16 @@ public void tearDown() {
     appender.stop();
   }
 
-   /**
+  /**
    * Test a complete day cycle in the gold mine by executing all three different steps: {@link
    * DwarvenGoldmineFacade#startNewDay()}, {@link DwarvenGoldmineFacade#digOutGold()} and {@link
    * DwarvenGoldmineFacade#endDay()}.
-   *
+   * <p>
    * See if the workers are doing what's expected from them on each step.
    */
   @Test
   public void testFullWorkDay() {
-    final DwarvenGoldmineFacade goldMine = new DwarvenGoldmineFacade();
+    final var goldMine = new DwarvenGoldmineFacade();
     goldMine.startNewDay();
 
     // On the start of a day, all workers should wake up ...
@@ -128,7 +127,9 @@ public int getLogSize() {
     }
 
     public boolean logContains(String message) {
-      return log.stream().anyMatch(event -> event.getFormattedMessage().equals(message));
+      return log.stream()
+          .map(ILoggingEvent::getFormattedMessage)
+          .anyMatch(message::equals);
     }
   }
 

factory-kit/src/main/java/com/iluwatar/factorykit/App.java

@@ -48,13 +48,13 @@ public class App {
    * @param args command line args
    */
   public static void main(String[] args) {
-    WeaponFactory factory = WeaponFactory.factory(builder -> {
+    var factory = WeaponFactory.factory(builder -> {
       builder.add(WeaponType.SWORD, Sword::new);
       builder.add(WeaponType.AXE, Axe::new);
       builder.add(WeaponType.SPEAR, Spear::new);
       builder.add(WeaponType.BOW, Bow::new);
     });
-    Weapon axe = factory.create(WeaponType.AXE);
+    var axe = factory.create(WeaponType.AXE);
     LOGGER.info(axe.toString());
   }
 }

factory-kit/src/main/java/com/iluwatar/factorykit/WeaponFactory.java

@@ -24,7 +24,6 @@
 package com.iluwatar.factorykit;
 
 import java.util.HashMap;
-import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -52,7 +51,7 @@ public interface WeaponFactory {
    * @return factory with specified {@link Builder}s
    */
   static WeaponFactory factory(Consumer<Builder> consumer) {
-    Map<WeaponType, Supplier<Weapon>> map = new HashMap<>();
+    var map = new HashMap<WeaponType, Supplier<Weapon>>();
     consumer.accept(map::put);
     return name -> map.get(name).get();
   }

factory-kit/src/test/java/com/iluwatar/factorykit/app/AppTest.java

@@ -33,8 +33,7 @@ public class AppTest {
 
   @Test
   public void test() {
-    String[] args = {};
-    App.main(args);
+    App.main(new String[]{});
   }
 }
 

factory-kit/src/test/java/com/iluwatar/factorykit/factorykit/FactoryKitTest.java

@@ -23,6 +23,8 @@
 
 package com.iluwatar.factorykit.factorykit;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.iluwatar.factorykit.Axe;
 import com.iluwatar.factorykit.Spear;
 import com.iluwatar.factorykit.Sword;
@@ -32,10 +34,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-  /**
- *  Test Factory Kit Pattern
+/**
+ * Test Factory Kit Pattern
  */
 public class FactoryKitTest {
 
@@ -51,30 +51,33 @@ public void init() {
   }
 
   /**
-   * Testing {@link WeaponFactory} to produce a SPEAR asserting that the Weapon is an instance of {@link Spear}
+   * Testing {@link WeaponFactory} to produce a SPEAR asserting that the Weapon is an instance of
+   * {@link Spear}
    */
   @Test
   public void testSpearWeapon() {
-    Weapon weapon = factory.create(WeaponType.SPEAR);
+    var weapon = factory.create(WeaponType.SPEAR);
     verifyWeapon(weapon, Spear.class);
   }
 
   /**
-   * Testing {@link WeaponFactory} to produce a AXE asserting that the Weapon is an instance of {@link Axe}
+   * Testing {@link WeaponFactory} to produce a AXE asserting that the Weapon is an instance of
+   * {@link Axe}
    */
   @Test
   public void testAxeWeapon() {
-    Weapon weapon = factory.create(WeaponType.AXE);
+    var weapon = factory.create(WeaponType.AXE);
     verifyWeapon(weapon, Axe.class);
   }
 
 
   /**
-   * Testing {@link WeaponFactory} to produce a SWORD asserting that the Weapon is an instance of {@link Sword}
+   * Testing {@link WeaponFactory} to produce a SWORD asserting that the Weapon is an instance of
+   * {@link Sword}
    */
   @Test
   public void testWeapon() {
-    Weapon weapon = factory.create(WeaponType.SWORD);
+    var weapon = factory.create(WeaponType.SWORD);
     verifyWeapon(weapon, Sword.class);
   }
 

factory-method/README.md

@@ -56,7 +56,7 @@ public class OrcBlacksmith implements Blacksmith {
 Now as the customers come the correct type of blacksmith is summoned and requested weapons are manufactured
 
 ```java
-Blacksmith blacksmith = new ElfBlacksmith();
+var blacksmith = new ElfBlacksmith();
 blacksmith.manufactureWeapon(WeaponType.SPEAR);
 blacksmith.manufactureWeapon(WeaponType.AXE);
 // Elvish weapons are created

factory-method/src/main/java/com/iluwatar/factory/method/App.java

@@ -64,7 +64,7 @@ public App(Blacksmith blacksmith) {
    */
   public static void main(String[] args) {
     // Lets go to war with Orc weapons
-    App app = new App(new OrcBlacksmith());
+    var app = new App(new OrcBlacksmith());
     app.manufactureWeapons();
 
     // Lets go to war with Elf weapons
@@ -73,8 +73,7 @@ public static void main(String[] args) {
   }
 
   private void manufactureWeapons() {
-    Weapon weapon;
-    weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
+    var weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
     LOGGER.info(weapon.toString());
     weapon = blacksmith.manufactureWeapon(WeaponType.AXE);
     LOGGER.info(weapon.toString());

factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java

@@ -23,6 +23,7 @@
 
 package com.iluwatar.factory.method;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,14 +36,12 @@ public class ElfBlacksmith implements Blacksmith {
 
   static {
     ELFARSENAL = new HashMap<>(WeaponType.values().length);
-    for (WeaponType type : WeaponType.values()) {
-      ELFARSENAL.put(type, new ElfWeapon(type));
-    }
+    Arrays.stream(WeaponType.values()).forEach(type -> ELFARSENAL.put(type, new ElfWeapon(type)));
   }
-  
+
   @Override
   public Weapon manufactureWeapon(WeaponType weaponType) {
     return ELFARSENAL.get(weaponType);
   }
-  
+
 }

factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java

@@ -23,6 +23,7 @@
 
 package com.iluwatar.factory.method;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,9 +36,7 @@ public class OrcBlacksmith implements Blacksmith {
 
   static {
     ORCARSENAL = new HashMap<>(WeaponType.values().length);
-    for (WeaponType type : WeaponType.values()) {
-      ORCARSENAL.put(type, new OrcWeapon(type));
-    }
+    Arrays.stream(WeaponType.values()).forEach(type -> ORCARSENAL.put(type, new OrcWeapon(type)));
   }
 
   @Override

factory-method/src/test/java/com/iluwatar/factory/method/AppTest.java

@@ -25,15 +25,12 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
 /**
  * Tests that Factory Method example runs without errors.
  */
 public class AppTest {
   @Test
-  public void test() throws IOException {
-    String[] args = {};
-    App.main(args);
+  public void test() {
+    App.main(new String[]{});
   }
 }