From 845da1fa16b0be48e2cf1859e4d46367b1780d33 Mon Sep 17 00:00:00 2001 From: Zhang WH Date: Sun, 26 Apr 2020 20:06:09 +0800 Subject: [PATCH] add java 11 support (o) (#1222) --- .../java/com/iluwatar/objectmother/King.java | 2 +- .../objectmother/RoyaltyObjectMother.java | 8 +++--- .../test/RoyaltyObjectMotherTest.java | 28 +++++++++---------- .../java/com/iluwatar/object/pool/App.java | 12 ++++---- .../com/iluwatar/object/pool/ObjectPool.java | 2 +- .../object/pool/OliphauntPoolTest.java | 18 ++++++------ .../main/java/com/iluwatar/observer/App.java | 4 +-- .../java/com/iluwatar/observer/Weather.java | 4 +-- .../iluwatar/observer/generic/GWeather.java | 2 +- .../iluwatar/observer/generic/Observable.java | 2 +- .../observer/WeatherObserverTest.java | 2 +- .../com/iluwatar/observer/WeatherTest.java | 14 +++++----- .../observer/generic/GWeatherTest.java | 14 +++++----- .../observer/generic/ObserverTest.java | 2 +- 14 files changed, 57 insertions(+), 57 deletions(-) diff --git a/object-mother/src/main/java/com/iluwatar/objectmother/King.java b/object-mother/src/main/java/com/iluwatar/objectmother/King.java index 314d152fd..2bd6a39cd 100644 --- a/object-mother/src/main/java/com/iluwatar/objectmother/King.java +++ b/object-mother/src/main/java/com/iluwatar/objectmother/King.java @@ -60,7 +60,7 @@ public class King implements Royalty { * @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 { diff --git a/object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java b/object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java index 5650e5f48..ff4c8bf39 100644 --- a/object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java +++ b/object-mother/src/main/java/com/iluwatar/objectmother/RoyaltyObjectMother.java @@ -43,7 +43,7 @@ public final class RoyaltyObjectMother { * @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 final class RoyaltyObjectMother { * @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 final class RoyaltyObjectMother { * @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 final class RoyaltyObjectMother { * @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; } diff --git a/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java b/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java index b9b211d96..525b8e24e 100644 --- a/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java +++ b/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); diff --git a/object-pool/src/main/java/com/iluwatar/object/pool/App.java b/object-pool/src/main/java/com/iluwatar/object/pool/App.java index 3c1774fac..cbfc7dea5 100644 --- a/object-pool/src/main/java/com/iluwatar/object/pool/App.java +++ b/object-pool/src/main/java/com/iluwatar/object/pool/App.java @@ -54,14 +54,14 @@ 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); @@ -69,9 +69,9 @@ public class App { 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()); } 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 37009d44b..b8ce3cc05 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 @@ -45,7 +45,7 @@ public abstract class ObjectPool { if (available.isEmpty()) { available.add(create()); } - T instance = available.iterator().next(); + var instance = available.iterator().next(); available.remove(instance); inUse.add(instance); return instance; diff --git a/object-pool/src/test/java/com/iluwatar/object/pool/OliphauntPoolTest.java b/object-pool/src/test/java/com/iluwatar/object/pool/OliphauntPoolTest.java index d4ca42948..880009f86 100644 --- a/object-pool/src/test/java/com/iluwatar/object/pool/OliphauntPoolTest.java +++ b/object-pool/src/test/java/com/iluwatar/object/pool/OliphauntPoolTest.java @@ -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 class OliphauntPoolTest { @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,7 +89,7 @@ public class OliphauntPoolTest { 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); @@ -97,7 +97,7 @@ public class OliphauntPoolTest { 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 class OliphauntPoolTest { // 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 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)); diff --git a/observer/src/main/java/com/iluwatar/observer/App.java b/observer/src/main/java/com/iluwatar/observer/App.java index d0994b65c..b8fd01f32 100644 --- a/observer/src/main/java/com/iluwatar/observer/App.java +++ b/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 class App { // 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()); diff --git a/observer/src/main/java/com/iluwatar/observer/Weather.java b/observer/src/main/java/com/iluwatar/observer/Weather.java index 3369e8f63..778858107 100644 --- a/observer/src/main/java/com/iluwatar/observer/Weather.java +++ b/observer/src/main/java/com/iluwatar/observer/Weather.java @@ -56,14 +56,14 @@ public class Weather { * 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); } } diff --git a/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java b/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java index 13ba25534..c8f7bc701 100644 --- a/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java @@ -44,7 +44,7 @@ public class GWeather extends Observable { * 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); diff --git a/observer/src/main/java/com/iluwatar/observer/generic/Observable.java b/observer/src/main/java/com/iluwatar/observer/generic/Observable.java index 29d350154..fbb078941 100644 --- a/observer/src/main/java/com/iluwatar/observer/generic/Observable.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/Observable.java @@ -54,7 +54,7 @@ public abstract class Observable, O extends Observ */ @SuppressWarnings("unchecked") public void notifyObservers(A argument) { - for (O observer : observers) { + for (var observer : observers) { observer.update((S) this, argument); } } diff --git a/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java b/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java index fbaceb02b..7f9b3a790 100644 --- a/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java +++ b/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java @@ -80,7 +80,7 @@ public abstract class WeatherObserverTest { @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); diff --git a/observer/src/test/java/com/iluwatar/observer/WeatherTest.java b/observer/src/test/java/com/iluwatar/observer/WeatherTest.java index c00357153..90e090c8d 100644 --- a/observer/src/test/java/com/iluwatar/observer/WeatherTest.java +++ b/observer/src/test/java/com/iluwatar/observer/WeatherTest.java @@ -61,9 +61,9 @@ public class WeatherTest { */ @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 class WeatherTest { */ @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]); } diff --git a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java index 7450a00b9..e45dd5c28 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java @@ -59,9 +59,9 @@ public class GWeatherTest { */ @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 class GWeatherTest { */ @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]); } diff --git a/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java b/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java index b5ef7ec0d..f358c88e1 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java @@ -79,7 +79,7 @@ public abstract class ObserverTest> { @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);