mirror of
https://github.com/tiennm99/java-design-patterns.git
synced 2026-05-16 14:59:21 +00:00
* #2449 bump maven-checkstyle-plugin from 3.1.0 to 3.2.0 + resolve checkstyle issues * remove FileSelectorJFrame.java to resolve checkstyle issue * remove FileSelectorJFrame.java to resolve checkstyle issue * remove FileSelectorJFrame.java to resolve checkstyle issue * add refactored file with correct filename to resolve checkstyle issue * add the test data * change filenames from JFrame to Jframe for checkstyle * fix code smell from sonar report * add new testcases to improve the test coverage * remove code smell
This commit is contained in:
@@ -24,9 +24,9 @@
|
||||
*/
|
||||
package com.iluwatar.observer;
|
||||
|
||||
import com.iluwatar.observer.generic.GHobbits;
|
||||
import com.iluwatar.observer.generic.GOrcs;
|
||||
import com.iluwatar.observer.generic.GWeather;
|
||||
import com.iluwatar.observer.generic.GenHobbits;
|
||||
import com.iluwatar.observer.generic.GenOrcs;
|
||||
import com.iluwatar.observer.generic.GenWeather;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
/**
|
||||
@@ -61,9 +61,9 @@ public class App {
|
||||
|
||||
// Generic observer inspired by Java Generics and Collections by Naftalin & Wadler
|
||||
LOGGER.info("--Running generic version--");
|
||||
var genericWeather = new GWeather();
|
||||
genericWeather.addObserver(new GOrcs());
|
||||
genericWeather.addObserver(new GHobbits());
|
||||
var genericWeather = new GenWeather();
|
||||
genericWeather.addObserver(new GenOrcs());
|
||||
genericWeather.addObserver(new GenHobbits());
|
||||
|
||||
genericWeather.timePasses();
|
||||
genericWeather.timePasses();
|
||||
|
||||
+2
-2
@@ -31,10 +31,10 @@ import lombok.extern.slf4j.Slf4j;
|
||||
* GHobbits.
|
||||
*/
|
||||
@Slf4j
|
||||
public class GHobbits implements Race {
|
||||
public class GenHobbits implements Race {
|
||||
|
||||
@Override
|
||||
public void update(GWeather weather, WeatherType weatherType) {
|
||||
public void update(GenWeather weather, WeatherType weatherType) {
|
||||
LOGGER.info("The hobbits are facing " + weatherType.getDescription() + " weather now");
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -31,10 +31,10 @@ import lombok.extern.slf4j.Slf4j;
|
||||
* GOrcs.
|
||||
*/
|
||||
@Slf4j
|
||||
public class GOrcs implements Race {
|
||||
public class GenOrcs implements Race {
|
||||
|
||||
@Override
|
||||
public void update(GWeather weather, WeatherType weatherType) {
|
||||
public void update(GenWeather weather, WeatherType weatherType) {
|
||||
LOGGER.info("The orcs are facing " + weatherType.getDescription() + " weather now");
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -31,11 +31,11 @@ import lombok.extern.slf4j.Slf4j;
|
||||
* GWeather.
|
||||
*/
|
||||
@Slf4j
|
||||
public class GWeather extends Observable<GWeather, Race, WeatherType> {
|
||||
public class GenWeather extends Observable<GenWeather, Race, WeatherType> {
|
||||
|
||||
private WeatherType currentWeather;
|
||||
|
||||
public GWeather() {
|
||||
public GenWeather() {
|
||||
currentWeather = WeatherType.SUNNY;
|
||||
}
|
||||
|
||||
@@ -29,5 +29,5 @@ import com.iluwatar.observer.WeatherType;
|
||||
/**
|
||||
* Race.
|
||||
*/
|
||||
public interface Race extends Observer<GWeather, Race, WeatherType> {
|
||||
public interface Race extends Observer<GenWeather, Race, WeatherType> {
|
||||
}
|
||||
|
||||
@@ -28,7 +28,6 @@ import com.iluwatar.observer.utils.InMemoryAppender;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
package com.iluwatar.observer.generic;
|
||||
|
||||
import com.iluwatar.observer.WeatherType;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
@@ -34,7 +33,7 @@ import java.util.List;
|
||||
*
|
||||
* @author Jeroen Meulemeester
|
||||
*/
|
||||
class GHobbitsTest extends ObserverTest<GHobbits> {
|
||||
class GHobbitsTest extends ObserverTest<GenHobbits> {
|
||||
|
||||
@Override
|
||||
public Collection<Object[]> dataProvider() {
|
||||
@@ -50,7 +49,7 @@ class GHobbitsTest extends ObserverTest<GHobbits> {
|
||||
* Create a new test with the given weather and expected response
|
||||
*/
|
||||
public GHobbitsTest() {
|
||||
super(GHobbits::new);
|
||||
super(GenHobbits::new);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ class GWeatherTest {
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
appender = new InMemoryAppender(GWeather.class);
|
||||
appender = new InMemoryAppender(GenWeather.class);
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
@@ -64,7 +64,7 @@ class GWeatherTest {
|
||||
void testAddRemoveObserver() {
|
||||
final var observer = mock(Race.class);
|
||||
|
||||
final var weather = new GWeather();
|
||||
final var weather = new GenWeather();
|
||||
weather.addObserver(observer);
|
||||
verifyNoMoreInteractions(observer);
|
||||
|
||||
@@ -86,7 +86,7 @@ class GWeatherTest {
|
||||
@Test
|
||||
void testTimePasses() {
|
||||
final var observer = mock(Race.class);
|
||||
final var weather = new GWeather();
|
||||
final var weather = new GenWeather();
|
||||
weather.addObserver(observer);
|
||||
|
||||
final var inOrder = inOrder(observer);
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
package com.iluwatar.observer.generic;
|
||||
|
||||
import com.iluwatar.observer.WeatherType;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
@@ -34,7 +33,7 @@ import java.util.List;
|
||||
*
|
||||
* @author Jeroen Meulemeester
|
||||
*/
|
||||
class OrcsTest extends ObserverTest<GOrcs> {
|
||||
class OrcsTest extends ObserverTest<GenOrcs> {
|
||||
|
||||
@Override
|
||||
public Collection<Object[]> dataProvider() {
|
||||
@@ -50,7 +49,7 @@ class OrcsTest extends ObserverTest<GOrcs> {
|
||||
* Create a new test with the given weather and expected response
|
||||
*/
|
||||
public OrcsTest() {
|
||||
super(GOrcs::new);
|
||||
super(GenOrcs::new);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -28,7 +28,6 @@ import ch.qos.logback.classic.Logger;
|
||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
||||
import ch.qos.logback.core.AppenderBase;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user