add java 11 support (o) (iluwatar#1222)

Author: npczwh

object-mother/src/main/java/com/iluwatar/objectmother/King.java

@@ -60,7 +60,7 @@ public boolean isHappy() {
    * @param queen Queen which should be flirted.
    */
   public void flirt(Queen queen) {
-    boolean flirtStatus = queen.getFlirted(this);
+    var flirtStatus = queen.getFlirted(this);
     if (!flirtStatus) {
       this.makeUnhappy();
     } else {

object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java

@@ -43,7 +43,7 @@ public static King createSoberUnhappyKing() {
    * @return A drunk {@link com.iluwatar.objectmother.King}.
    */
   public static King createDrunkKing() {
-    King king = new King();
+    var king = new King();
     king.makeDrunk();
     return king;
   }
@@ -54,7 +54,7 @@ public static King createDrunkKing() {
    * @return A happy {@link com.iluwatar.objectmother.King}.
    */
   public static King createHappyKing() {
-    King king = new King();
+    var king = new King();
     king.makeHappy();
     return king;
   }
@@ -65,7 +65,7 @@ public static King createHappyKing() {
    * @return A drunk and happy {@link com.iluwatar.objectmother.King}.
    */
   public static King createHappyDrunkKing() {
-    King king = new King();
+    var king = new King();
     king.makeHappy();
     king.makeDrunk();
     return king;
@@ -77,7 +77,7 @@ public static King createHappyDrunkKing() {
    * @return A flirty {@link com.iluwatar.objectmother.Queen}.
    */
   public static Queen createFlirtyQueen() {
-    Queen queen = new Queen();
+    var queen = new Queen();
     queen.setFlirtiness(true);
     return queen;
   }

object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java

@@ -40,50 +40,50 @@ public class RoyaltyObjectMotherTest {
 
   @Test
   public void unsuccessfulKingFlirt() {
-    King soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
-    Queen flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
+    var soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
+    var flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
     soberUnhappyKing.flirt(flirtyQueen);
     assertFalse(soberUnhappyKing.isHappy());
   }
 
   @Test
   public void queenIsBlockingFlirtCauseDrunkKing() {
-    King drunkUnhappyKing = RoyaltyObjectMother.createDrunkKing();
-    Queen notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
+    var drunkUnhappyKing = RoyaltyObjectMother.createDrunkKing();
+    var notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
     drunkUnhappyKing.flirt(notFlirtyQueen);
     assertFalse(drunkUnhappyKing.isHappy());
   }
 
   @Test
   public void queenIsBlockingFlirt() {
-    King soberHappyKing = RoyaltyObjectMother.createHappyKing();
-    Queen notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
+    var soberHappyKing = RoyaltyObjectMother.createHappyKing();
+    var notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
     soberHappyKing.flirt(notFlirtyQueen);
     assertFalse(soberHappyKing.isHappy());
   }
 
   @Test
   public void successfullKingFlirt() {
-    King soberHappyKing = RoyaltyObjectMother.createHappyKing();
-    Queen flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
+    var soberHappyKing = RoyaltyObjectMother.createHappyKing();
+    var flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
     soberHappyKing.flirt(flirtyQueen);
     assertTrue(soberHappyKing.isHappy());
   }
 
   @Test
   public void testQueenType() {
-    Royalty flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
-    Royalty notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
+    var flirtyQueen = RoyaltyObjectMother.createFlirtyQueen();
+    var notFlirtyQueen = RoyaltyObjectMother.createNotFlirtyQueen();
     assertEquals(flirtyQueen.getClass(), Queen.class);
     assertEquals(notFlirtyQueen.getClass(), Queen.class);
   }
 
   @Test
   public void testKingType() {
-    Royalty drunkKing = RoyaltyObjectMother.createDrunkKing();
-    Royalty happyDrunkKing = RoyaltyObjectMother.createHappyDrunkKing();
-    Royalty happyKing = RoyaltyObjectMother.createHappyKing();
-    Royalty soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
+    var drunkKing = RoyaltyObjectMother.createDrunkKing();
+    var happyDrunkKing = RoyaltyObjectMother.createHappyDrunkKing();
+    var happyKing = RoyaltyObjectMother.createHappyKing();
+    var soberUnhappyKing = RoyaltyObjectMother.createSoberUnhappyKing();
     assertEquals(drunkKing.getClass(), King.class);
     assertEquals(happyDrunkKing.getClass(), King.class);
     assertEquals(happyKing.getClass(), King.class);

object-pool/src/main/java/com/iluwatar/object/pool/App.java

@@ -54,24 +54,24 @@ public class App {
    * @param args command line args
    */
   public static void main(String[] args) {
-    OliphauntPool pool = new OliphauntPool();
+    var pool = new OliphauntPool();
     LOGGER.info(pool.toString());
-    Oliphaunt oliphaunt1 = pool.checkOut();
+    var oliphaunt1 = pool.checkOut();
     LOGGER.info("Checked out {}", oliphaunt1);
     LOGGER.info(pool.toString());
-    Oliphaunt oliphaunt2 = pool.checkOut();
+    var oliphaunt2 = pool.checkOut();
     LOGGER.info("Checked out {}", oliphaunt2);
-    Oliphaunt oliphaunt3 = pool.checkOut();
+    var oliphaunt3 = pool.checkOut();
     LOGGER.info("Checked out {}", oliphaunt3);
     LOGGER.info(pool.toString());
     LOGGER.info("Checking in {}", oliphaunt1);
     pool.checkIn(oliphaunt1);
     LOGGER.info("Checking in {}", oliphaunt2);
     pool.checkIn(oliphaunt2);
     LOGGER.info(pool.toString());
-    Oliphaunt oliphaunt4 = pool.checkOut();
+    var oliphaunt4 = pool.checkOut();
     LOGGER.info("Checked out {}", oliphaunt4);
-    Oliphaunt oliphaunt5 = pool.checkOut();
+    var oliphaunt5 = pool.checkOut();
     LOGGER.info("Checked out {}", oliphaunt5);
     LOGGER.info(pool.toString());
   }

object-pool/src/main/java/com/iluwatar/object/pool/ObjectPool.java

@@ -45,7 +45,7 @@ public synchronized T checkOut() {
     if (available.isEmpty()) {
       available.add(create());
     }
-    T instance = available.iterator().next();
+    var instance = available.iterator().next();
     available.remove(instance);
     inUse.add(instance);
     return instance;

object-pool/src/test/java/com/iluwatar/object/pool/OliphauntPoolTest.java

@@ -44,17 +44,17 @@ public class OliphauntPoolTest {
   @Test
   public void testSubsequentCheckinCheckout() {
     assertTimeout(ofMillis(5000), () -> {
-      final OliphauntPool pool = new OliphauntPool();
+      final var pool = new OliphauntPool();
       assertEquals("Pool available=0 inUse=0", pool.toString());
 
-      final Oliphaunt expectedOliphaunt = pool.checkOut();
+      final var expectedOliphaunt = pool.checkOut();
       assertEquals("Pool available=0 inUse=1", pool.toString());
 
       pool.checkIn(expectedOliphaunt);
       assertEquals("Pool available=1 inUse=0", pool.toString());
 
       for (int i = 0; i < 100; i++) {
-        final Oliphaunt oliphaunt = pool.checkOut();
+        final var oliphaunt = pool.checkOut();
         assertEquals("Pool available=0 inUse=1", pool.toString());
         assertSame(expectedOliphaunt, oliphaunt);
         assertEquals(expectedOliphaunt.getId(), oliphaunt.getId());
@@ -73,13 +73,13 @@ public void testSubsequentCheckinCheckout() {
   @Test
   public void testConcurrentCheckinCheckout() {
     assertTimeout(ofMillis(5000), () -> {
-      final OliphauntPool pool = new OliphauntPool();
+      final var pool = new OliphauntPool();
       assertEquals(pool.toString(), "Pool available=0 inUse=0");
 
-      final Oliphaunt firstOliphaunt = pool.checkOut();
+      final var firstOliphaunt = pool.checkOut();
       assertEquals(pool.toString(), "Pool available=0 inUse=1");
 
-      final Oliphaunt secondOliphaunt = pool.checkOut();
+      final var secondOliphaunt = pool.checkOut();
       assertEquals(pool.toString(), "Pool available=0 inUse=2");
 
       assertNotSame(firstOliphaunt, secondOliphaunt);
@@ -89,15 +89,15 @@ public void testConcurrentCheckinCheckout() {
       pool.checkIn(secondOliphaunt);
       assertEquals(pool.toString(), "Pool available=1 inUse=1");
 
-      final Oliphaunt oliphaunt3 = pool.checkOut();
+      final var oliphaunt3 = pool.checkOut();
       assertEquals(pool.toString(), "Pool available=0 inUse=2");
       assertSame(secondOliphaunt, oliphaunt3);
 
       // ... and the same applies for the first one
       pool.checkIn(firstOliphaunt);
       assertEquals(pool.toString(), "Pool available=1 inUse=1");
 
-      final Oliphaunt oliphaunt4 = pool.checkOut();
+      final var oliphaunt4 = pool.checkOut();
       assertEquals(pool.toString(), "Pool available=0 inUse=2");
       assertSame(firstOliphaunt, oliphaunt4);
 
@@ -110,7 +110,7 @@ public void testConcurrentCheckinCheckout() {
 
       // The order of the returned instances is not determined, so just put them in a list
       // and verify if both expected instances are in there.
-      final List<Oliphaunt> oliphaunts = List.of(pool.checkOut(), pool.checkOut());
+      final var oliphaunts = List.of(pool.checkOut(), pool.checkOut());
       assertEquals(pool.toString(), "Pool available=0 inUse=2");
       assertTrue(oliphaunts.contains(firstOliphaunt));
       assertTrue(oliphaunts.contains(secondOliphaunt));

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

@@ -51,7 +51,7 @@ public class App {
    */
   public static void main(String[] args) {
 
-    Weather weather = new Weather();
+    var weather = new Weather();
     weather.addObserver(new Orcs());
     weather.addObserver(new Hobbits());
 
@@ -62,7 +62,7 @@ public static void main(String[] args) {
 
     // Generic observer inspired by Java Generics and Collection by Naftalin & Wadler
     LOGGER.info("--Running generic version--");
-    GWeather genericWeather = new GWeather();
+    var genericWeather = new GWeather();
     genericWeather.addObserver(new GOrcs());
     genericWeather.addObserver(new GHobbits());
 

observer/src/main/java/com/iluwatar/observer/Weather.java

@@ -56,14 +56,14 @@ public void removeObserver(WeatherObserver obs) {
    * Makes time pass for weather.
    */
   public void timePasses() {
-    WeatherType[] enumValues = WeatherType.values();
+    var enumValues = WeatherType.values();
     currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length];
     LOGGER.info("The weather changed to {}.", currentWeather);
     notifyObservers();
   }
 
   private void notifyObservers() {
-    for (WeatherObserver obs : observers) {
+    for (var obs : observers) {
       obs.update(currentWeather);
     }
   }

observer/src/main/java/com/iluwatar/observer/generic/GWeather.java

@@ -44,7 +44,7 @@ public GWeather() {
    * Makes time pass for weather.
    */
   public void timePasses() {
-    WeatherType[] enumValues = WeatherType.values();
+    var enumValues = WeatherType.values();
     currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length];
     LOGGER.info("The weather changed to {}.", currentWeather);
     notifyObservers(currentWeather);

observer/src/main/java/com/iluwatar/observer/generic/Observable.java

@@ -54,7 +54,7 @@ public void removeObserver(O observer) {
    */
   @SuppressWarnings("unchecked")
   public void notifyObservers(A argument) {
-    for (O observer : observers) {
+    for (var observer : observers) {
       observer.update((S) this, argument);
     }
   }

observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java

@@ -80,7 +80,7 @@ public void tearDown() {
   @ParameterizedTest
   @MethodSource("dataProvider")
   public void testObserver(WeatherType weather, String response) {
-    final O observer = this.factory.get();
+    final var observer = this.factory.get();
     assertEquals(0, appender.getLogSize());
 
     observer.update(weather);

observer/src/test/java/com/iluwatar/observer/WeatherTest.java

@@ -61,9 +61,9 @@ public void tearDown() {
    */
   @Test
   public void testAddRemoveObserver() {
-    final WeatherObserver observer = mock(WeatherObserver.class);
+    final var observer = mock(WeatherObserver.class);
 
-    final Weather weather = new Weather();
+    final var weather = new Weather();
     weather.addObserver(observer);
     verifyZeroInteractions(observer);
 
@@ -84,13 +84,13 @@ public void testAddRemoveObserver() {
    */
   @Test
   public void testTimePasses() {
-    final WeatherObserver observer = mock(WeatherObserver.class);
-    final Weather weather = new Weather();
+    final var observer = mock(WeatherObserver.class);
+    final var weather = new Weather();
     weather.addObserver(observer);
 
-    final InOrder inOrder = inOrder(observer);
-    final WeatherType[] weatherTypes = WeatherType.values();
-    for (int i = 1; i < 20; i++) {
+    final var inOrder = inOrder(observer);
+    final var weatherTypes = WeatherType.values();
+    for (var i = 1; i < 20; i++) {
       weather.timePasses();
       inOrder.verify(observer).update(weatherTypes[i % weatherTypes.length]);
     }

observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java

@@ -59,9 +59,9 @@ public void tearDown() {
    */
   @Test
   public void testAddRemoveObserver() {
-    final Race observer = mock(Race.class);
+    final var observer = mock(Race.class);
 
-    final GWeather weather = new GWeather();
+    final var weather = new GWeather();
     weather.addObserver(observer);
     verifyZeroInteractions(observer);
 
@@ -82,13 +82,13 @@ public void testAddRemoveObserver() {
    */
   @Test
   public void testTimePasses() {
-    final Race observer = mock(Race.class);
-    final GWeather weather = new GWeather();
+    final var observer = mock(Race.class);
+    final var weather = new GWeather();
     weather.addObserver(observer);
 
-    final InOrder inOrder = inOrder(observer);
-    final WeatherType[] weatherTypes = WeatherType.values();
-    for (int i = 1; i < 20; i++) {
+    final var inOrder = inOrder(observer);
+    final var weatherTypes = WeatherType.values();
+    for (var i = 1; i < 20; i++) {
       weather.timePasses();
       inOrder.verify(observer).update(weather, weatherTypes[i % weatherTypes.length]);
     }

observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java

@@ -79,7 +79,7 @@ public void tearDown() {
   @ParameterizedTest
   @MethodSource("dataProvider")
   public void testObserver(WeatherType weather, String response) {
-    final O observer = this.factory.get();
+    final var observer = this.factory.get();
     assertEquals(0, appender.getLogSize());
 
     observer.update(null, weather);