X Tutup
Skip to content

Commit dd971d8

Browse files
leonmakiluwatar
leonmak
authored and
iluwatar
committed
Use java 11 (iluwatar#1050)
1 parent 6bb3438 commit dd971d8

File tree

12 files changed

+102
-141
lines changed

12 files changed

+102
-141
lines changed

‎hexagonal/src/main/java/com/iluwatar/hexagonal/sampledata/SampleData.java‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import com.iluwatar.hexagonal.domain.LotteryTicketId;
3232
import com.iluwatar.hexagonal.domain.PlayerDetails;
3333

34-
import java.util.ArrayList;
3534
import java.util.List;
3635
import java.util.Random;
3736

@@ -44,46 +43,47 @@ public class SampleData {
4443
private static final Random RANDOM = new Random();
4544

4645
static {
47-
PLAYERS = new ArrayList<>();
48-
PLAYERS.add(new PlayerDetails("john@google.com", "312-342", "+3242434242"));
49-
PLAYERS.add(new PlayerDetails("mary@google.com", "234-987", "+23452346"));
50-
PLAYERS.add(new PlayerDetails("steve@google.com", "833-836", "+63457543"));
51-
PLAYERS.add(new PlayerDetails("wayne@google.com", "319-826", "+24626"));
52-
PLAYERS.add(new PlayerDetails("johnie@google.com", "983-322", "+3635635"));
53-
PLAYERS.add(new PlayerDetails("andy@google.com", "934-734", "+0898245"));
54-
PLAYERS.add(new PlayerDetails("richard@google.com", "536-738", "+09845325"));
55-
PLAYERS.add(new PlayerDetails("kevin@google.com", "453-936", "+2423532"));
56-
PLAYERS.add(new PlayerDetails("arnold@google.com", "114-988", "+5646346524"));
57-
PLAYERS.add(new PlayerDetails("ian@google.com", "663-765", "+928394235"));
58-
PLAYERS.add(new PlayerDetails("robin@google.com", "334-763", "+35448"));
59-
PLAYERS.add(new PlayerDetails("ted@google.com", "735-964", "+98752345"));
60-
PLAYERS.add(new PlayerDetails("larry@google.com", "734-853", "+043842423"));
61-
PLAYERS.add(new PlayerDetails("calvin@google.com", "334-746", "+73294135"));
62-
PLAYERS.add(new PlayerDetails("jacob@google.com", "444-766", "+358042354"));
63-
PLAYERS.add(new PlayerDetails("edwin@google.com", "895-345", "+9752435"));
64-
PLAYERS.add(new PlayerDetails("mary@google.com", "760-009", "+34203542"));
65-
PLAYERS.add(new PlayerDetails("lolita@google.com", "425-907", "+9872342"));
66-
PLAYERS.add(new PlayerDetails("bruno@google.com", "023-638", "+673824122"));
67-
PLAYERS.add(new PlayerDetails("peter@google.com", "335-886", "+5432503945"));
68-
PLAYERS.add(new PlayerDetails("warren@google.com", "225-946", "+9872341324"));
69-
PLAYERS.add(new PlayerDetails("monica@google.com", "265-748", "+134124"));
70-
PLAYERS.add(new PlayerDetails("ollie@google.com", "190-045", "+34453452"));
71-
PLAYERS.add(new PlayerDetails("yngwie@google.com", "241-465", "+9897641231"));
72-
PLAYERS.add(new PlayerDetails("lars@google.com", "746-936", "+42345298345"));
73-
PLAYERS.add(new PlayerDetails("bobbie@google.com", "946-384", "+79831742"));
74-
PLAYERS.add(new PlayerDetails("tyron@google.com", "310-992", "+0498837412"));
75-
PLAYERS.add(new PlayerDetails("tyrell@google.com", "032-045", "+67834134"));
76-
PLAYERS.add(new PlayerDetails("nadja@google.com", "000-346", "+498723"));
77-
PLAYERS.add(new PlayerDetails("wendy@google.com", "994-989", "+987324454"));
78-
PLAYERS.add(new PlayerDetails("luke@google.com", "546-634", "+987642435"));
79-
PLAYERS.add(new PlayerDetails("bjorn@google.com", "342-874", "+7834325"));
80-
PLAYERS.add(new PlayerDetails("lisa@google.com", "024-653", "+980742154"));
81-
PLAYERS.add(new PlayerDetails("anton@google.com", "834-935", "+876423145"));
82-
PLAYERS.add(new PlayerDetails("bruce@google.com", "284-936", "+09843212345"));
83-
PLAYERS.add(new PlayerDetails("ray@google.com", "843-073", "+678324123"));
84-
PLAYERS.add(new PlayerDetails("ron@google.com", "637-738", "+09842354"));
85-
PLAYERS.add(new PlayerDetails("xavier@google.com", "143-947", "+375245"));
86-
PLAYERS.add(new PlayerDetails("harriet@google.com", "842-404", "+131243252"));
46+
PLAYERS = List.of(
47+
new PlayerDetails("john@google.com", "312-342", "+3242434242"),
48+
new PlayerDetails("mary@google.com", "234-987", "+23452346"),
49+
new PlayerDetails("steve@google.com", "833-836", "+63457543"),
50+
new PlayerDetails("wayne@google.com", "319-826", "+24626"),
51+
new PlayerDetails("johnie@google.com", "983-322", "+3635635"),
52+
new PlayerDetails("andy@google.com", "934-734", "+0898245"),
53+
new PlayerDetails("richard@google.com", "536-738", "+09845325"),
54+
new PlayerDetails("kevin@google.com", "453-936", "+2423532"),
55+
new PlayerDetails("arnold@google.com", "114-988", "+5646346524"),
56+
new PlayerDetails("ian@google.com", "663-765", "+928394235"),
57+
new PlayerDetails("robin@google.com", "334-763", "+35448"),
58+
new PlayerDetails("ted@google.com", "735-964", "+98752345"),
59+
new PlayerDetails("larry@google.com", "734-853", "+043842423"),
60+
new PlayerDetails("calvin@google.com", "334-746", "+73294135"),
61+
new PlayerDetails("jacob@google.com", "444-766", "+358042354"),
62+
new PlayerDetails("edwin@google.com", "895-345", "+9752435"),
63+
new PlayerDetails("mary@google.com", "760-009", "+34203542"),
64+
new PlayerDetails("lolita@google.com", "425-907", "+9872342"),
65+
new PlayerDetails("bruno@google.com", "023-638", "+673824122"),
66+
new PlayerDetails("peter@google.com", "335-886", "+5432503945"),
67+
new PlayerDetails("warren@google.com", "225-946", "+9872341324"),
68+
new PlayerDetails("monica@google.com", "265-748", "+134124"),
69+
new PlayerDetails("ollie@google.com", "190-045", "+34453452"),
70+
new PlayerDetails("yngwie@google.com", "241-465", "+9897641231"),
71+
new PlayerDetails("lars@google.com", "746-936", "+42345298345"),
72+
new PlayerDetails("bobbie@google.com", "946-384", "+79831742"),
73+
new PlayerDetails("tyron@google.com", "310-992", "+0498837412"),
74+
new PlayerDetails("tyrell@google.com", "032-045", "+67834134"),
75+
new PlayerDetails("nadja@google.com", "000-346", "+498723"),
76+
new PlayerDetails("wendy@google.com", "994-989", "+987324454"),
77+
new PlayerDetails("luke@google.com", "546-634", "+987642435"),
78+
new PlayerDetails("bjorn@google.com", "342-874", "+7834325"),
79+
new PlayerDetails("lisa@google.com", "024-653", "+980742154"),
80+
new PlayerDetails("anton@google.com", "834-935", "+876423145"),
81+
new PlayerDetails("bruce@google.com", "284-936", "+09843212345"),
82+
new PlayerDetails("ray@google.com", "843-073", "+678324123"),
83+
new PlayerDetails("ron@google.com", "637-738", "+09842354"),
84+
new PlayerDetails("xavier@google.com", "143-947", "+375245"),
85+
new PlayerDetails("harriet@google.com", "842-404", "+131243252")
86+
);
8787
InMemoryBank wireTransfers = new InMemoryBank();
8888
for (PlayerDetails player : PLAYERS) {
8989
wireTransfers.setFunds(player.getBankAccount(),

‎hexagonal/src/main/java/com/iluwatar/hexagonal/service/LotteryConsoleServiceImpl.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@
2727
import com.iluwatar.hexagonal.domain.*;
2828
import org.slf4j.Logger;
2929

30-
import java.util.HashSet;
31-
import java.util.Optional;
32-
import java.util.Scanner;
33-
import java.util.Set;
30+
import java.util.*;
31+
import java.util.stream.Collectors;
32+
import java.util.stream.IntStream;
3433

3534
/**
3635
* Console implementation for lottery console service
@@ -88,10 +87,7 @@ public void submitTicket(LotteryService service, Scanner scanner) {
8887
String numbers = readString( scanner );
8988
try {
9089
String[] parts = numbers.split( "," );
91-
Set<Integer> chosen = new HashSet<>();
92-
for (int i = 0; i < 4; i++) {
93-
chosen.add( Integer.parseInt( parts[i] ) );
94-
}
90+
Set<Integer> chosen = Arrays.stream(parts).map(Integer::parseInt).collect(Collectors.toSet());
9591
LotteryNumbers lotteryNumbers = LotteryNumbers.create( chosen );
9692
LotteryTicket lotteryTicket = new LotteryTicket( new LotteryTicketId(), details, lotteryNumbers );
9793
Optional<LotteryTicketId> id = service.submitTicket( lotteryTicket );

‎hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryNumbersTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import java.util.Arrays;
2929
import java.util.HashSet;
30+
import java.util.Set;
3031

3132
import static org.junit.jupiter.api.Assertions.assertEquals;
3233
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -43,7 +44,7 @@ class LotteryNumbersTest {
4344
@Test
4445
void testGivenNumbers() {
4546
LotteryNumbers numbers = LotteryNumbers.create(
46-
new HashSet<>(Arrays.asList(1, 2, 3, 4)));
47+
Set.of(1, 2, 3, 4));
4748
assertEquals(numbers.getNumbers().size(), 4);
4849
assertTrue(numbers.getNumbers().contains(1));
4950
assertTrue(numbers.getNumbers().contains(2));
@@ -54,7 +55,7 @@ void testGivenNumbers() {
5455
@Test
5556
void testNumbersCantBeModified() {
5657
LotteryNumbers numbers = LotteryNumbers.create(
57-
new HashSet<>(Arrays.asList(1, 2, 3, 4)));
58+
Set.of(1, 2, 3, 4));
5859
assertThrows(UnsupportedOperationException.class, () -> numbers.getNumbers().add(5));
5960
}
6061

@@ -67,12 +68,12 @@ void testRandomNumbers() {
6768
@Test
6869
void testEquals() {
6970
LotteryNumbers numbers1 = LotteryNumbers.create(
70-
new HashSet<>(Arrays.asList(1, 2, 3, 4)));
71+
Set.of(1, 2, 3, 4));
7172
LotteryNumbers numbers2 = LotteryNumbers.create(
72-
new HashSet<>(Arrays.asList(1, 2, 3, 4)));
73+
Set.of(1, 2, 3, 4));
7374
assertEquals(numbers1, numbers2);
7475
LotteryNumbers numbers3 = LotteryNumbers.create(
75-
new HashSet<>(Arrays.asList(11, 12, 13, 14)));
76+
Set.of(11, 12, 13, 14));
7677
assertNotEquals(numbers1, numbers3);
7778
}
7879
}

‎hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@
3333
import org.junit.jupiter.api.BeforeEach;
3434
import org.junit.jupiter.api.Test;
3535

36-
import java.util.Arrays;
37-
import java.util.HashSet;
38-
import java.util.Map;
39-
import java.util.Optional;
36+
import java.util.*;
4037

4138
import static org.junit.jupiter.api.Assertions.assertEquals;
4239
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -76,13 +73,13 @@ void testLottery() {
7673

7774
// players submit the lottery tickets
7875
Optional<LotteryTicketId> ticket1 = service.submitTicket(LotteryTestUtils.createLotteryTicket("cvt@bbb.com",
79-
"123-12312", "+32425255", new HashSet<>(Arrays.asList(1, 2, 3, 4))));
76+
"123-12312", "+32425255", Set.of(1, 2, 3, 4)));
8077
assertTrue(ticket1.isPresent());
8178
Optional<LotteryTicketId> ticket2 = service.submitTicket(LotteryTestUtils.createLotteryTicket("ant@bac.com",
82-
"123-12312", "+32423455", new HashSet<>(Arrays.asList(11, 12, 13, 14))));
79+
"123-12312", "+32423455", Set.of(11, 12, 13, 14)));
8380
assertTrue(ticket2.isPresent());
8481
Optional<LotteryTicketId> ticket3 = service.submitTicket(LotteryTestUtils.createLotteryTicket("arg@boo.com",
85-
"123-12312", "+32421255", new HashSet<>(Arrays.asList(6, 8, 13, 19))));
82+
"123-12312", "+32421255", Set.of(6, 8, 13, 19)));
8683
assertTrue(ticket3.isPresent());
8784
assertEquals(3, administration.getAllSubmittedTickets().size());
8885

‎hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import java.util.Arrays;
2929
import java.util.HashSet;
30+
import java.util.Set;
3031

3132
import static org.junit.jupiter.api.Assertions.assertEquals;
3233
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -39,14 +40,14 @@ class LotteryTicketTest {
3940
@Test
4041
void testEquals() {
4142
PlayerDetails details1 = new PlayerDetails("bob@foo.bar", "1212-121212", "+34332322");
42-
LotteryNumbers numbers1 = LotteryNumbers.create(new HashSet<>(Arrays.asList(1, 2, 3, 4)));
43+
LotteryNumbers numbers1 = LotteryNumbers.create(Set.of(1, 2, 3, 4));
4344
LotteryTicket ticket1 = new LotteryTicket(new LotteryTicketId(), details1, numbers1);
4445
PlayerDetails details2 = new PlayerDetails("bob@foo.bar", "1212-121212", "+34332322");
45-
LotteryNumbers numbers2 = LotteryNumbers.create(new HashSet<>(Arrays.asList(1, 2, 3, 4)));
46+
LotteryNumbers numbers2 = LotteryNumbers.create(Set.of(1, 2, 3, 4));
4647
LotteryTicket ticket2 = new LotteryTicket(new LotteryTicketId(), details2, numbers2);
4748
assertEquals(ticket1, ticket2);
4849
PlayerDetails details3 = new PlayerDetails("elsa@foo.bar", "1223-121212", "+49332322");
49-
LotteryNumbers numbers3 = LotteryNumbers.create(new HashSet<>(Arrays.asList(1, 2, 3, 8)));
50+
LotteryNumbers numbers3 = LotteryNumbers.create(Set.of(1, 2, 3, 8));
5051
LotteryTicket ticket3 = new LotteryTicket(new LotteryTicketId(), details3, numbers3);
5152
assertNotEquals(ticket1, ticket3);
5253
}

‎hexagonal/src/test/java/com/iluwatar/hexagonal/test/LotteryTestUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class LotteryTestUtils {
4343
* @return lottery ticket
4444
*/
4545
public static LotteryTicket createLotteryTicket() {
46-
return createLotteryTicket("foo@bar.com", "12231-213132", "+99324554", new HashSet<>(Arrays.asList(1, 2, 3, 4)));
46+
return createLotteryTicket("foo@bar.com", "12231-213132", "+99324554", Set.of(1, 2, 3, 4));
4747
}
4848

4949
/**

‎iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ public class TreasureChest {
4040
* Constructor
4141
*/
4242
public TreasureChest() {
43-
items = new ArrayList<>();
44-
items.add(new Item(ItemType.POTION, "Potion of courage"));
45-
items.add(new Item(ItemType.RING, "Ring of shadows"));
46-
items.add(new Item(ItemType.POTION, "Potion of wisdom"));
47-
items.add(new Item(ItemType.POTION, "Potion of blood"));
48-
items.add(new Item(ItemType.WEAPON, "Sword of silver +1"));
49-
items.add(new Item(ItemType.POTION, "Potion of rust"));
50-
items.add(new Item(ItemType.POTION, "Potion of healing"));
51-
items.add(new Item(ItemType.RING, "Ring of armor"));
52-
items.add(new Item(ItemType.WEAPON, "Steel halberd"));
53-
items.add(new Item(ItemType.WEAPON, "Dagger of poison"));
43+
items = List.of(
44+
new Item(ItemType.POTION, "Potion of courage"),
45+
new Item(ItemType.RING, "Ring of shadows"),
46+
new Item(ItemType.POTION, "Potion of wisdom"),
47+
new Item(ItemType.POTION, "Potion of blood"),
48+
new Item(ItemType.WEAPON, "Sword of silver +1"),
49+
new Item(ItemType.POTION, "Potion of rust"),
50+
new Item(ItemType.POTION, "Potion of healing"),
51+
new Item(ItemType.RING, "Ring of armor"),
52+
new Item(ItemType.WEAPON, "Steel halberd"),
53+
new Item(ItemType.WEAPON, "Dagger of poison"));
5454
}
5555

5656
public Iterator<Item> iterator(ItemType itemType) {

‎iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import static org.junit.jupiter.api.Assertions.fail;
2929

3030
import com.iluwatar.iterator.Iterator;
31-
import java.util.ArrayList;
3231
import java.util.List;
3332
import org.junit.jupiter.params.ParameterizedTest;
3433
import org.junit.jupiter.params.provider.MethodSource;
@@ -46,18 +45,18 @@ public class TreasureChestTest {
4645
* @return The set of all expected items in the chest
4746
*/
4847
public static List<Object[]> dataProvider() {
49-
final List<Object[]> parameters = new ArrayList<>();
50-
parameters.add(new Object[]{new Item(ItemType.POTION, "Potion of courage")});
51-
parameters.add(new Object[]{new Item(ItemType.RING, "Ring of shadows")});
52-
parameters.add(new Object[]{new Item(ItemType.POTION, "Potion of wisdom")});
53-
parameters.add(new Object[]{new Item(ItemType.POTION, "Potion of blood")});
54-
parameters.add(new Object[]{new Item(ItemType.WEAPON, "Sword of silver +1")});
55-
parameters.add(new Object[]{new Item(ItemType.POTION, "Potion of rust")});
56-
parameters.add(new Object[]{new Item(ItemType.POTION, "Potion of healing")});
57-
parameters.add(new Object[]{new Item(ItemType.RING, "Ring of armor")});
58-
parameters.add(new Object[]{new Item(ItemType.WEAPON, "Steel halberd")});
59-
parameters.add(new Object[]{new Item(ItemType.WEAPON, "Dagger of poison")});
60-
return parameters;
48+
return List.of(
49+
new Object[]{new Item(ItemType.POTION, "Potion of courage")},
50+
new Object[]{new Item(ItemType.RING, "Ring of shadows")},
51+
new Object[]{new Item(ItemType.POTION, "Potion of wisdom")},
52+
new Object[]{new Item(ItemType.POTION, "Potion of blood")},
53+
new Object[]{new Item(ItemType.WEAPON, "Sword of silver +1")},
54+
new Object[]{new Item(ItemType.POTION, "Potion of rust")},
55+
new Object[]{new Item(ItemType.POTION, "Potion of healing")},
56+
new Object[]{new Item(ItemType.RING, "Ring of armor")},
57+
new Object[]{new Item(ItemType.WEAPON, "Steel halberd")},
58+
new Object[]{new Item(ItemType.WEAPON, "Dagger of poison")}
59+
);
6160
}
6261

6362
/**

‎layers/src/test/java/com/iluwatar/layers/CakeTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,10 @@ public void testSetLayers() {
6666
assertNotNull(cake.getLayers());
6767
assertTrue(cake.getLayers().isEmpty());
6868

69-
final Set<CakeLayer> expectedLayers = new HashSet<>();
70-
expectedLayers.add(new CakeLayer("layer1", 1000));
71-
expectedLayers.add(new CakeLayer("layer2", 2000));
72-
expectedLayers.add(new CakeLayer("layer3", 3000));
73-
69+
final Set<CakeLayer> expectedLayers = Set.of(
70+
new CakeLayer("layer1", 1000),
71+
new CakeLayer("layer2", 2000),
72+
new CakeLayer("layer3", 3000));
7473
cake.setLayers(expectedLayers);
7574
assertEquals(expectedLayers, cake.getLayers());
7675
}
@@ -111,7 +110,7 @@ public void testToString() {
111110
cake.setTopping(topping);
112111
cake.addLayer(layer);
113112

114-
final String expected = "id=1234 topping=id=2345 name=topping calories=20 "
113+
final String expected = "id=1234 topping=id=2345 name=topping calories=20 "
115114
+ "layers=[id=3456 name=layer calories=100]";
116115
assertEquals(expected, cake.toString());
117116

‎layers/src/test/java/com/iluwatar/layers/CakeViewImplTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.junit.jupiter.api.Test;
3232
import org.slf4j.LoggerFactory;
3333

34-
import java.util.ArrayList;
3534
import java.util.LinkedList;
3635
import java.util.List;
3736

@@ -64,14 +63,13 @@ public void tearDown() {
6463
@Test
6564
public void testRender() {
6665

67-
final List<CakeLayerInfo> layers = new ArrayList<>();
68-
layers.add(new CakeLayerInfo("layer1", 1000));
69-
layers.add(new CakeLayerInfo("layer2", 2000));
70-
layers.add(new CakeLayerInfo("layer3", 3000));
66+
final List<CakeLayerInfo> layers = List.of(
67+
new CakeLayerInfo("layer1", 1000),
68+
new CakeLayerInfo("layer2", 2000),
69+
new CakeLayerInfo("layer3", 3000));
7170

72-
final List<CakeInfo> cakes = new ArrayList<>();
7371
final CakeInfo cake = new CakeInfo(new CakeToppingInfo("topping", 1000), layers);
74-
cakes.add(cake);
72+
final List<CakeInfo> cakes = List.of(cake);
7573

7674
final CakeBakingService bakingService = mock(CakeBakingService.class);
7775
when(bakingService.getAllCakes()).thenReturn(cakes);

0 commit comments

Comments
 (0)
X Tutup