Skip to content

Commit c8a481b

Browse files
leonmakiluwatar
leonmak
authored and
iluwatar
committed
Add java 11 support for iluwatar#987 (o-t) (iluwatar#1051)
* Use java 11 * Use .of - Replace Arrays.asList with List.of - Replace HashSet<>(List.of()) with Set.of * Formatting
1 parent dd971d8 commit c8a481b

File tree

37 files changed

+176
-257
lines changed

37 files changed

+176
-257
lines changed

‎abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import org.junit.jupiter.api.Test;
2727

28-
import java.util.Arrays;
2928
import java.util.HashMap;
3029
import java.util.List;
3130
import java.util.Map;

‎abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.iluwatar.abstractdocument.domain.enums.Property;
2929
import org.junit.jupiter.api.Test;
3030

31-
import java.util.HashMap;
3231
import java.util.List;
3332
import java.util.Map;
3433

@@ -64,7 +63,7 @@ public void shouldConstructCar() {
6463
Map<String, Object> carProperties = Map.of(
6564
Property.MODEL.toString(), TEST_CAR_MODEL,
6665
Property.PRICE.toString(), TEST_CAR_PRICE,
67-
Property.PARTS.toString(), List.of(new HashMap<>(), new HashMap<>()));
66+
Property.PARTS.toString(), List.of(Map.of(), Map.of()));
6867
Car car = new Car(carProperties);
6968

7069
assertEquals(TEST_CAR_MODEL, car.getModel().get());

‎collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/App.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323

2424
package com.iluwatar.collectionpipeline;
2525

26-
import java.util.Arrays;
27-
import java.util.List;
28-
import java.util.Map;
29-
3026
import org.slf4j.Logger;
3127
import org.slf4j.LoggerFactory;
3228

29+
import java.util.List;
30+
import java.util.Map;
31+
3332
/**
3433
* In imperative-style programming, it is common to use for and while loops for
3534
* most kinds of data processing. Function composition is a simple technique
@@ -67,11 +66,11 @@ public static void main(String[] args) {
6766
LOGGER.info(groupingByCategoryFunctional.toString());
6867

6968
Person john = new Person(cars);
70-
71-
List<Car> sedansOwnedImperative = ImperativeProgramming.getSedanCarsOwnedSortedByDate(Arrays.asList(john));
69+
70+
List<Car> sedansOwnedImperative = ImperativeProgramming.getSedanCarsOwnedSortedByDate(List.of(john));
7271
LOGGER.info(sedansOwnedImperative.toString());
7372

74-
List<Car> sedansOwnedFunctional = FunctionalProgramming.getSedanCarsOwnedSortedByDate(Arrays.asList(john));
73+
List<Car> sedansOwnedFunctional = FunctionalProgramming.getSedanCarsOwnedSortedByDate(List.of(john));
7574
LOGGER.info(sedansOwnedFunctional.toString());
7675
}
7776
}

‎collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/CarFactory.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
package com.iluwatar.collectionpipeline;
2525

26-
import java.util.Arrays;
2726
import java.util.List;
2827

2928
/**
@@ -38,7 +37,7 @@ private CarFactory() {
3837
* @return {@link List} of {@link Car}
3938
*/
4039
public static List<Car> createCars() {
41-
return Arrays.asList(new Car("Jeep", "Wrangler", 2011, Category.JEEP),
40+
return List.of(new Car("Jeep", "Wrangler", 2011, Category.JEEP),
4241
new Car("Jeep", "Comanche", 1990, Category.JEEP),
4342
new Car("Dodge", "Avenger", 2010, Category.SEDAN),
4443
new Car("Buick", "Cascada", 2016, Category.CONVERTIBLE),

‎commander/src/main/java/com/iluwatar/commander/Service.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public abstract class Service {
4343
public ArrayList<Exception> exceptionsList;
4444
private static final Random RANDOM = new Random();
4545
private static final String ALL_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
46-
private static final Hashtable<String, Boolean> USED_IDS = new Hashtable<String, Boolean>();
46+
private static final Hashtable<String, Boolean> USED_IDS = new Hashtable<>();
4747

4848
protected Service(Database db, Exception...exc) {
4949
this.database = db;

‎commander/src/test/java/com/iluwatar/commander/RetryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ void performTest() {
4545
Retry.HandleErrorIssue<Order> handleError = (o,e) -> {
4646
return;
4747
};
48-
Retry<Order> r1 = new Retry<Order>(op, handleError, 3, 30000,
48+
Retry<Order> r1 = new Retry<>(op, handleError, 3, 30000,
4949
e -> DatabaseUnavailableException.class.isAssignableFrom(e.getClass()));
50-
Retry<Order> r2 = new Retry<Order>(op, handleError, 3, 30000,
50+
Retry<Order> r2 = new Retry<>(op, handleError, 3, 30000,
5151
e -> DatabaseUnavailableException.class.isAssignableFrom(e.getClass()));
5252
User user = new User("Jim", "ABCD");
5353
Order order = new Order(user, "book", 10f);

‎fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,20 @@
2323

2424
package com.iluwatar.fluentinterface.app;
2525

26-
import static java.lang.String.valueOf;
26+
import com.iluwatar.fluentinterface.fluentiterable.FluentIterable;
27+
import com.iluwatar.fluentinterface.fluentiterable.lazy.LazyFluentIterable;
28+
import com.iluwatar.fluentinterface.fluentiterable.simple.SimpleFluentIterable;
29+
import org.slf4j.Logger;
30+
import org.slf4j.LoggerFactory;
2731

2832
import java.util.ArrayList;
29-
import java.util.Arrays;
3033
import java.util.Iterator;
3134
import java.util.List;
3235
import java.util.StringJoiner;
3336
import java.util.function.Function;
3437
import java.util.function.Predicate;
3538

36-
import com.iluwatar.fluentinterface.fluentiterable.FluentIterable;
37-
import com.iluwatar.fluentinterface.fluentiterable.lazy.LazyFluentIterable;
38-
import com.iluwatar.fluentinterface.fluentiterable.simple.SimpleFluentIterable;
39-
import org.slf4j.Logger;
40-
import org.slf4j.LoggerFactory;
39+
import static java.lang.String.valueOf;
4140

4241
/**
4342
* The Fluent Interface pattern is useful when you want to provide an easy readable, flowing API.
@@ -61,7 +60,7 @@ public class App {
6160
public static void main(String[] args) {
6261

6362
List<Integer> integerList = new ArrayList<>();
64-
integerList.addAll(Arrays.asList(1, -61, 14, -22, 18, -87, 6, 64, -82, 26, -98, 97, 45, 23, 2,
63+
integerList.addAll(List.of(1, -61, 14, -22, 18, -87, 6, 64, -82, 26, -98, 97, 45, 23, 2,
6564
-68, 45));
6665

6766
prettyPrint("The initial list contains: ", integerList);

‎fluentinterface/src/test/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterableTest.java‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,14 @@
2525

2626
import org.junit.jupiter.api.Test;
2727

28-
import java.util.Arrays;
2928
import java.util.Collections;
3029
import java.util.List;
3130
import java.util.Optional;
3231
import java.util.Spliterator;
3332
import java.util.function.Consumer;
3433

35-
import static org.junit.jupiter.api.Assertions.assertEquals;
36-
import static org.junit.jupiter.api.Assertions.assertFalse;
37-
import static org.junit.jupiter.api.Assertions.assertNotNull;
38-
import static org.junit.jupiter.api.Assertions.assertTrue;
39-
import static org.mockito.Mockito.mock;
40-
import static org.mockito.Mockito.times;
41-
import static org.mockito.Mockito.verify;
42-
import static org.mockito.Mockito.verifyNoMoreInteractions;
34+
import static org.junit.jupiter.api.Assertions.*;
35+
import static org.mockito.Mockito.*;
4336

4437
/**
4538
* Date: 12/12/15 - 7:00 PM
@@ -58,7 +51,7 @@ public abstract class FluentIterableTest {
5851

5952
@Test
6053
public void testFirst() throws Exception {
61-
final List<Integer> integers = Arrays.asList(1, 2, 3, 10, 9, 8);
54+
final List<Integer> integers = List.of(1, 2, 3, 10, 9, 8);
6255
final Optional<Integer> first = createFluentIterable(integers).first();
6356
assertNotNull(first);
6457
assertTrue(first.isPresent());
@@ -75,7 +68,7 @@ public void testFirstEmptyCollection() throws Exception {
7568

7669
@Test
7770
public void testFirstCount() throws Exception {
78-
final List<Integer> integers = Arrays.asList(1, 2, 3, 10, 9, 8);
71+
final List<Integer> integers = List.of(1, 2, 3, 10, 9, 8);
7972
final List<Integer> first4 = createFluentIterable(integers)
8073
.first(4)
8174
.asList();
@@ -91,7 +84,7 @@ public void testFirstCount() throws Exception {
9184

9285
@Test
9386
public void testFirstCountLessItems() throws Exception {
94-
final List<Integer> integers = Arrays.asList(1, 2, 3);
87+
final List<Integer> integers = List.of(1, 2, 3);
9588
final List<Integer> first4 = createFluentIterable(integers)
9689
.first(4)
9790
.asList();
@@ -106,7 +99,7 @@ public void testFirstCountLessItems() throws Exception {
10699

107100
@Test
108101
public void testLast() throws Exception {
109-
final List<Integer> integers = Arrays.asList(1, 2, 3, 10, 9, 8);
102+
final List<Integer> integers = List.of(1, 2, 3, 10, 9, 8);
110103
final Optional<Integer> last = createFluentIterable(integers).last();
111104
assertNotNull(last);
112105
assertTrue(last.isPresent());
@@ -123,7 +116,7 @@ public void testLastEmptyCollection() throws Exception {
123116

124117
@Test
125118
public void testLastCount() throws Exception {
126-
final List<Integer> integers = Arrays.asList(1, 2, 3, 10, 9, 8);
119+
final List<Integer> integers = List.of(1, 2, 3, 10, 9, 8);
127120
final List<Integer> last4 = createFluentIterable(integers)
128121
.last(4)
129122
.asList();
@@ -138,7 +131,7 @@ public void testLastCount() throws Exception {
138131

139132
@Test
140133
public void testLastCountLessItems() throws Exception {
141-
final List<Integer> integers = Arrays.asList(1, 2, 3);
134+
final List<Integer> integers = List.of(1, 2, 3);
142135
final List<Integer> last4 = createFluentIterable(integers)
143136
.last(4)
144137
.asList();
@@ -153,7 +146,7 @@ public void testLastCountLessItems() throws Exception {
153146

154147
@Test
155148
public void testFilter() throws Exception {
156-
final List<Integer> integers = Arrays.asList(1, 2, 3, 10, 9, 8);
149+
final List<Integer> integers = List.of(1, 2, 3, 10, 9, 8);
157150
final List<Integer> evenItems = createFluentIterable(integers)
158151
.filter(i -> i % 2 == 0)
159152
.asList();
@@ -167,7 +160,7 @@ public void testFilter() throws Exception {
167160

168161
@Test
169162
public void testMap() throws Exception {
170-
final List<Integer> integers = Arrays.asList(1, 2, 3);
163+
final List<Integer> integers = List.of(1, 2, 3);
171164
final List<Long> longs = createFluentIterable(integers)
172165
.map(Integer::longValue)
173166
.asList();
@@ -181,7 +174,7 @@ public void testMap() throws Exception {
181174

182175
@Test
183176
public void testForEach() {
184-
final List<Integer> integers = Arrays.asList(1, 2, 3);
177+
final List<Integer> integers = List.of(1, 2, 3);
185178

186179
final Consumer<Integer> consumer = mock(Consumer.class);
187180
createFluentIterable(integers).forEach(consumer);
@@ -195,7 +188,7 @@ public void testForEach() {
195188

196189
@Test
197190
public void testSpliterator() throws Exception {
198-
final List<Integer> integers = Arrays.asList(1, 2, 3);
191+
final List<Integer> integers = List.of(1, 2, 3);
199192
final Spliterator<Integer> split = createFluentIterable(integers).spliterator();
200193
assertNotNull(split);
201194
}

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

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,9 @@
2525

2626
import org.junit.jupiter.api.Test;
2727

28-
import java.util.Arrays;
29-
import java.util.HashSet;
3028
import java.util.Set;
3129

32-
import static org.junit.jupiter.api.Assertions.assertEquals;
33-
import static org.junit.jupiter.api.Assertions.assertNotEquals;
34-
import static org.junit.jupiter.api.Assertions.assertThrows;
35-
import static org.junit.jupiter.api.Assertions.assertTrue;
30+
import static org.junit.jupiter.api.Assertions.*;
3631

3732
/**
3833
*
@@ -43,8 +38,7 @@ class LotteryNumbersTest {
4338

4439
@Test
4540
void testGivenNumbers() {
46-
LotteryNumbers numbers = LotteryNumbers.create(
47-
Set.of(1, 2, 3, 4));
41+
LotteryNumbers numbers = LotteryNumbers.create(Set.of(1, 2, 3, 4));
4842
assertEquals(numbers.getNumbers().size(), 4);
4943
assertTrue(numbers.getNumbers().contains(1));
5044
assertTrue(numbers.getNumbers().contains(2));
@@ -54,8 +48,7 @@ void testGivenNumbers() {
5448

5549
@Test
5650
void testNumbersCantBeModified() {
57-
LotteryNumbers numbers = LotteryNumbers.create(
58-
Set.of(1, 2, 3, 4));
51+
LotteryNumbers numbers = LotteryNumbers.create(Set.of(1, 2, 3, 4));
5952
assertThrows(UnsupportedOperationException.class, () -> numbers.getNumbers().add(5));
6053
}
6154

@@ -67,13 +60,10 @@ void testRandomNumbers() {
6760

6861
@Test
6962
void testEquals() {
70-
LotteryNumbers numbers1 = LotteryNumbers.create(
71-
Set.of(1, 2, 3, 4));
72-
LotteryNumbers numbers2 = LotteryNumbers.create(
73-
Set.of(1, 2, 3, 4));
63+
LotteryNumbers numbers1 = LotteryNumbers.create(Set.of(1, 2, 3, 4));
64+
LotteryNumbers numbers2 = LotteryNumbers.create(Set.of(1, 2, 3, 4));
7465
assertEquals(numbers1, numbers2);
75-
LotteryNumbers numbers3 = LotteryNumbers.create(
76-
Set.of(11, 12, 13, 14));
66+
LotteryNumbers numbers3 = LotteryNumbers.create(Set.of(11, 12, 13, 14));
7767
assertNotEquals(numbers1, numbers3);
7868
}
7969
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535

3636
import java.util.*;
3737

38-
import static org.junit.jupiter.api.Assertions.assertEquals;
39-
import static org.junit.jupiter.api.Assertions.assertNotEquals;
40-
import static org.junit.jupiter.api.Assertions.assertTrue;
38+
import static org.junit.jupiter.api.Assertions.*;
4139

4240
/**
4341
*

0 commit comments

Comments
 (0)