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

Add java 11 support for #987 (o-t) (#1051)

Browse Source 
* Use java 11

* Use .of
- Replace Arrays.asList with List.of
- Replace HashSet<>(List.of()) with Set.of

* Formatting
This commit is contained in:
Leon Mak
2019-10-29 14:37:40 +08:00
committed by Ilkka Seppälä
parent dd971d8c19
commit c8a481bb77
37 changed files with 176 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
layers/src/main/java/com/iluwatar/layers/App.java
View File

@ -23,7 +23,7 @@
package com.iluwatar.layers;
import java.util.Arrays;
import java.util.List;
/**
*
@ -99,16 +99,18 @@ public class App {
cakeBakingService.saveNewTopping(new CakeToppingInfo("cherry", 350));
CakeInfo cake1 =
new CakeInfo(new CakeToppingInfo("candies", 0), Arrays.asList(new CakeLayerInfo(
"chocolate", 0), new CakeLayerInfo("banana", 0), new CakeLayerInfo("strawberry", 0)));
new CakeInfo(new CakeToppingInfo("candies", 0), List.of(
new CakeLayerInfo("chocolate", 0),
new CakeLayerInfo("banana", 0),
new CakeLayerInfo("strawberry", 0)));
try {
cakeBakingService.bakeNewCake(cake1);
} catch (CakeBakingException e) {
e.printStackTrace();
}
CakeInfo cake2 =
new CakeInfo(new CakeToppingInfo("cherry", 0), Arrays.asList(
new CakeLayerInfo("vanilla", 0), new CakeLayerInfo("lemon", 0), new CakeLayerInfo(
new CakeInfo(new CakeToppingInfo("cherry", 0), List.of(
new CakeLayerInfo("vanilla", 0), new CakeLayerInfo("lemon", 0), new CakeLayerInfo(
"strawberry", 0)));
try {
cakeBakingService.bakeNewCake(cake2);

15
layers/src/test/java/com/iluwatar/layers/CakeBakingServiceImplTest.java
View File

@ -25,15 +25,10 @@ package com.iluwatar.layers;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
/**
* Date: 12/15/15 - 9:55 PM
@ -108,7 +103,7 @@ public class CakeBakingServiceImplTest {
service.saveNewLayer(layer2);
service.saveNewLayer(layer3);
service.bakeNewCake(new CakeInfo(topping1, Arrays.asList(layer1, layer2)));
service.bakeNewCake(new CakeInfo(topping1, List.of(layer1, layer2)));
service.bakeNewCake(new CakeInfo(topping2, Collections.singletonList(layer3)));
final List<CakeInfo> allCakes = service.getAllCakes();
@ -136,7 +131,7 @@ public class CakeBakingServiceImplTest {
final CakeToppingInfo missingTopping = new CakeToppingInfo("Topping1", 1000);
assertThrows(CakeBakingException.class, () -> {
service.bakeNewCake(new CakeInfo(missingTopping, Arrays.asList(layer1, layer2)));
service.bakeNewCake(new CakeInfo(missingTopping, List.of(layer1, layer2)));
});
}
@ -156,7 +151,7 @@ public class CakeBakingServiceImplTest {
final CakeLayerInfo missingLayer = new CakeLayerInfo("Layer2", 2000);
assertThrows(CakeBakingException.class, () -> {
service.bakeNewCake(new CakeInfo(topping1, Arrays.asList(layer1, missingLayer)));
service.bakeNewCake(new CakeInfo(topping1, List.of(layer1, missingLayer)));
});
}
@ -178,7 +173,7 @@ public class CakeBakingServiceImplTest {
service.saveNewLayer(layer1);
service.saveNewLayer(layer2);
service.bakeNewCake(new CakeInfo(topping1, Arrays.asList(layer1, layer2)));
service.bakeNewCake(new CakeInfo(topping1, List.of(layer1, layer2)));
assertThrows(CakeBakingException.class, () -> {
service.bakeNewCake(new CakeInfo(topping2, Collections.singletonList(layer2)));
});