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

Merge branch 'master' of https://github.com/fluxw42/java-design-patterns into fluxw42-master

Browse Source 
Conflicts:
	monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java
This commit is contained in:
Ilkka Seppala
2015-12-26 12:36:38 +02:00
parent 6b1356a160 e3e0e32e92
commit 30bc25b5bf
31 changed files with 1104 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
View File

@@ -30,9 +30,9 @@ public class CakeBakingServiceImpl implements CakeBakingService {
@Override
public void bakeNewCake(CakeInfo cakeInfo) throws CakeBakingException {
List<CakeToppingInfo> allToppings = getAvailableToppings();
List<CakeToppingInfo> matchingToppings =
allToppings.stream().filter((t) -> t.name.equals(cakeInfo.cakeToppingInfo.name))
List<CakeTopping> allToppings = getAvailableToppingEntities();
List<CakeTopping> matchingToppings =
allToppings.stream().filter((t) -> t.getName().equals(cakeInfo.cakeToppingInfo.name))
.collect(Collectors.toList());
if (matchingToppings.isEmpty()) {
throw new CakeBakingException(String.format("Topping %s is not available",
@@ -50,7 +50,7 @@ public class CakeBakingServiceImpl implements CakeBakingService {
}
}
CakeToppingDao toppingBean = context.getBean(CakeToppingDao.class);
CakeTopping topping = toppingBean.findOne(matchingToppings.iterator().next().id.get());
CakeTopping topping = toppingBean.findOne(matchingToppings.iterator().next().getId());
CakeDao cakeBean = context.getBean(CakeDao.class);
Cake cake = new Cake();
cake.setTopping(topping);

2
layers/src/main/java/com/iluwatar/layers/CakeInfo.java
View File

@@ -43,7 +43,7 @@ public class CakeInfo {
@Override
public String toString() {
return String.format("CakeInfo id=%d topping=%s layers=%s totalCalories=%d", id.get(),
return String.format("CakeInfo id=%d topping=%s layers=%s totalCalories=%d", id.orElse(-1L),
cakeToppingInfo, cakeLayerInfos, calculateTotalCalories());
}
}

2
layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
View File

@@ -33,6 +33,6 @@ public class CakeLayerInfo {
@Override
public String toString() {
return String.format("CakeLayerInfo id=%d name=%s calories=%d", id.get(), name, calories);
return String.format("CakeLayerInfo id=%d name=%s calories=%d", id.orElse(-1L), name, calories);
}
}

2
layers/src/main/java/com/iluwatar/layers/CakeTopping.java
View File

@@ -58,7 +58,7 @@ public class CakeTopping {
@Override
public String toString() {
return String.format("id=%s name=%s calories=%d", name, calories);
return String.format("id=%s name=%s calories=%d", id, name, calories);
}
public Cake getCake() {

2
layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
View File

@@ -33,6 +33,6 @@ public class CakeToppingInfo {
@Override
public String toString() {
return String.format("CakeToppingInfo id=%d name=%s calories=%d", id.get(), name, calories);
return String.format("CakeToppingInfo id=%d name=%s calories=%d", id.orElse(-1L), name, calories);
}
}