gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add java 11 support (o) (#1222)

Browse Source
This commit is contained in:
Zhang WH
2020-04-26 20:06:09 +08:00
committed by GitHub
parent 751b3b9452
commit 845da1fa16
14 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
observer/src/main/java/com/iluwatar/observer/App.java
View File

@ -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());

4
observer/src/main/java/com/iluwatar/observer/Weather.java
View File

@ -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);
}
}

2
observer/src/main/java/com/iluwatar/observer/generic/GWeather.java
View File

@ -44,7 +44,7 @@ public class GWeather extends Observable<GWeather, Race, WeatherType> {
* 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);

2
observer/src/main/java/com/iluwatar/observer/generic/Observable.java
View File

@ -54,7 +54,7 @@ public abstract class Observable<S extends Observable<S, O, A>, O extends Observ
*/
@SuppressWarnings("unchecked")
public void notifyObservers(A argument) {
for (O observer : observers) {
for (var observer : observers) {
observer.update((S) this, argument);
}
}

2
observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java
View File

@ -80,7 +80,7 @@ public abstract class WeatherObserverTest<O extends WeatherObserver> {
@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);

14
observer/src/test/java/com/iluwatar/observer/WeatherTest.java
View File

@ -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]);
}

14
observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java
View File

@ -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]);
}

2
observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java
View File

@ -79,7 +79,7 @@ public abstract class ObserverTest<O extends Observer<?, ?, WeatherType>> {
@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);