Skip to content

Commit 93e5570

Browse files
altaiezioraltaiezior
committed
Java 11 migraiton: mediator pattern
1 parent 59e050b commit 93e5570

6 files changed

Lines changed: 37 additions & 41 deletions

File tree

‎mediator/src/main/java/com/iluwatar/mediator/Action.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public enum Action {
3434
ENEMY("spotted enemies", "runs for cover"),
3535
NONE("", "");
3636

37-
private String title;
38-
private String description;
37+
private final String title;
38+
private final String description;
3939

4040
Action(String title, String description) {
4141
this.title = title;

‎mediator/src/main/java/com/iluwatar/mediator/App.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ public static void main(String[] args) {
5555

5656
// create party and members
5757
Party party = new PartyImpl();
58-
Hobbit hobbit = new Hobbit();
59-
Wizard wizard = new Wizard();
60-
Rogue rogue = new Rogue();
61-
Hunter hunter = new Hunter();
58+
var hobbit = new Hobbit();
59+
var wizard = new Wizard();
60+
var rogue = new Rogue();
61+
var hunter = new Hunter();
6262

6363
// add party members
6464
party.addMember(hobbit);

‎mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public PartyImpl() {
3939

4040
@Override
4141
public void act(PartyMember actor, Action action) {
42-
for (PartyMember member : members) {
42+
for (var member : members) {
4343
if (!member.equals(actor)) {
4444
member.partyAction(action);
4545
}

‎mediator/src/test/java/com/iluwatar/mediator/AppTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,12 @@
2626
import org.junit.jupiter.api.Test;
2727

2828
/**
29-
*
3029
* Application test
31-
*
3230
*/
3331
public class AppTest {
3432

3533
@Test
3634
public void test() {
37-
String[] args = {};
38-
App.main(args);
35+
App.main(new String[]{});
3936
}
4037
}

‎mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ public class PartyImplTest {
4343
*/
4444
@Test
4545
public void testPartyAction() {
46-
final PartyMember partyMember1 = mock(PartyMember.class);
47-
final PartyMember partyMember2 = mock(PartyMember.class);
46+
final var partyMember1 = mock(PartyMember.class);
47+
final var partyMember2 = mock(PartyMember.class);
4848

49-
final PartyImpl party = new PartyImpl();
49+
final var party = new PartyImpl();
5050
party.addMember(partyMember1);
5151
party.addMember(partyMember2);
5252

@@ -58,7 +58,6 @@ public void testPartyAction() {
5858
verify(partyMember2).partyAction(Action.GOLD);
5959

6060
verifyNoMoreInteractions(partyMember1, partyMember2);
61-
6261
}
6362

6463
}

‎mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,37 @@
2323

2424
package com.iluwatar.mediator;
2525

26+
import static org.junit.jupiter.api.Assertions.assertEquals;
27+
import static org.mockito.Mockito.mock;
28+
import static org.mockito.Mockito.verify;
29+
2630
import ch.qos.logback.classic.Logger;
2731
import ch.qos.logback.classic.spi.ILoggingEvent;
2832
import ch.qos.logback.core.AppenderBase;
33+
import java.util.LinkedList;
34+
import java.util.List;
35+
import java.util.function.Supplier;
36+
import java.util.stream.Stream;
2937
import org.junit.jupiter.api.AfterEach;
3038
import org.junit.jupiter.api.BeforeEach;
3139
import org.junit.jupiter.params.ParameterizedTest;
40+
import org.junit.jupiter.params.provider.Arguments;
3241
import org.junit.jupiter.params.provider.MethodSource;
3342
import org.slf4j.LoggerFactory;
3443

35-
import java.util.Collection;
36-
import java.util.LinkedList;
37-
import java.util.List;
38-
import java.util.function.Supplier;
39-
40-
import static org.junit.jupiter.api.Assertions.assertEquals;
41-
import static org.mockito.Mockito.mock;
42-
import static org.mockito.Mockito.verify;
43-
4444
/**
4545
* Date: 12/19/15 - 10:13 PM
4646
*
4747
* @author Jeroen Meulemeester
4848
*/
4949
public class PartyMemberTest {
5050

51-
static Collection<Supplier<PartyMember>[]> dataProvider() {
52-
return List.of(
53-
new Supplier[]{Hobbit::new},
54-
new Supplier[]{Hunter::new},
55-
new Supplier[]{Rogue::new},
56-
new Supplier[]{Wizard::new}
51+
static Stream<Arguments> dataProvider() {
52+
return Stream.of(
53+
Arguments.of((Supplier<PartyMember>) Hobbit::new),
54+
Arguments.of((Supplier<PartyMember>) Hunter::new),
55+
Arguments.of((Supplier<PartyMember>) Rogue::new),
56+
Arguments.of((Supplier<PartyMember>) Wizard::new)
5757
);
5858
}
5959

@@ -75,9 +75,9 @@ public void tearDown() {
7575
@ParameterizedTest
7676
@MethodSource("dataProvider")
7777
public void testPartyAction(Supplier<PartyMember> memberSupplier) {
78-
final PartyMember member = memberSupplier.get();
78+
final var member = memberSupplier.get();
7979

80-
for (final Action action : Action.values()) {
80+
for (final var action : Action.values()) {
8181
member.partyAction(action);
8282
assertEquals(member.toString() + " " + action.getDescription(), appender.getLastMessage());
8383
}
@@ -91,16 +91,16 @@ public void testPartyAction(Supplier<PartyMember> memberSupplier) {
9191
@ParameterizedTest
9292
@MethodSource("dataProvider")
9393
public void testAct(Supplier<PartyMember> memberSupplier) {
94-
final PartyMember member = memberSupplier.get();
94+
final var member = memberSupplier.get();
9595

9696
member.act(Action.GOLD);
9797
assertEquals(0, appender.getLogSize());
9898

99-
final Party party = mock(Party.class);
99+
final var party = mock(Party.class);
100100
member.joinedParty(party);
101101
assertEquals(member.toString() + " joins the party", appender.getLastMessage());
102102

103-
for (final Action action : Action.values()) {
103+
for (final var action : Action.values()) {
104104
member.act(action);
105105
assertEquals(member.toString() + " " + action.toString(), appender.getLastMessage());
106106
verify(party).act(member, action);
@@ -114,16 +114,16 @@ public void testAct(Supplier<PartyMember> memberSupplier) {
114114
*/
115115
@ParameterizedTest
116116
@MethodSource("dataProvider")
117-
public void testToString(Supplier<PartyMember> memberSupplier) throws Exception {
118-
final PartyMember member = memberSupplier.get();
119-
final Class<? extends PartyMember> memberClass = member.getClass();
117+
public void testToString(Supplier<PartyMember> memberSupplier) {
118+
final var member = memberSupplier.get();
119+
final var memberClass = member.getClass();
120120
assertEquals(memberClass.getSimpleName(), member.toString());
121121
}
122122

123-
private class InMemoryAppender extends AppenderBase<ILoggingEvent> {
124-
private List<ILoggingEvent> log = new LinkedList<>();
123+
private static class InMemoryAppender extends AppenderBase<ILoggingEvent> {
124+
private final List<ILoggingEvent> log = new LinkedList<>();
125125

126-
public InMemoryAppender(Class clazz) {
126+
public InMemoryAppender(Class<?> clazz) {
127127
((Logger) LoggerFactory.getLogger(clazz)).addAppender(this);
128128
start();
129129
}

0 commit comments

Comments
 (0)