From 2494eacfb14f86fab5e307bcf97e4584338abcdd Mon Sep 17 00:00:00 2001
From: txidol <love_xiang21@foxmail.com>
Date: Tue, 8 Sep 2020 18:02:41 +0800
Subject: [PATCH] mod bug

---
 .../chap10/OperationsWithOptional.java              |  6 ++----
 .../java/lambdasinaction/chap10/OptionalMain.java   | 13 +++++++------
 src/main/java/lambdasinaction/chap6/Grouping.java   |  7 ++++---
 .../chap6/PartitionPrimeNumbers.java                |  3 ++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/lambdasinaction/chap10/OperationsWithOptional.java b/src/main/java/lambdasinaction/chap10/OperationsWithOptional.java
index d2940969..8187b462 100644
--- a/src/main/java/lambdasinaction/chap10/OperationsWithOptional.java
+++ b/src/main/java/lambdasinaction/chap10/OperationsWithOptional.java
@@ -12,11 +12,9 @@ public static void main(String... args) {
         System.out.println(max(empty(), of(5)));
 
         Optional<Integer> opt1 = of(5);
-        Optional<Integer> opt2 = opt1.or(() -> of(4));
+        //Optional<Integer> opt2 = opt1.or(() -> of(4));
 
-        System.out.println(
-        of(5).or(() -> of(4))
-                          );
+        //System.out.println(of(5).or(() -> of(4)));
     }
 
     public static final Optional<Integer> max(Optional<Integer> i, Optional<Integer> j) {
diff --git a/src/main/java/lambdasinaction/chap10/OptionalMain.java b/src/main/java/lambdasinaction/chap10/OptionalMain.java
index dcd97792..2ab1456c 100644
--- a/src/main/java/lambdasinaction/chap10/OptionalMain.java
+++ b/src/main/java/lambdasinaction/chap10/OptionalMain.java
@@ -14,11 +14,12 @@ public String getCarInsuranceName(Optional<Person> person) {
     }
 
     public Set<String> getCarInsuranceNames(List<Person> persons) {
-        return persons.stream()
-                      .map(Person::getCar)
-                      .map(optCar -> optCar.flatMap(Car::getInsurance))
-                      .map(optInsurance -> optInsurance.map(Insurance::getName))
-                      .flatMap(Optional::stream)
-                      .collect(toSet());
+//        return persons.stream()
+//                      .map(Person::getCar)
+//                      .map(optCar -> optCar.flatMap(Car::getInsurance))
+//                      .map(optInsurance -> optInsurance.map(Insurance::getName))
+//                      .flatMap(Optional::stream)
+//                      .collect(toSet());
+        return null;
     }
 }
diff --git a/src/main/java/lambdasinaction/chap6/Grouping.java b/src/main/java/lambdasinaction/chap6/Grouping.java
index 9105cc80..b5c6832a 100644
--- a/src/main/java/lambdasinaction/chap6/Grouping.java
+++ b/src/main/java/lambdasinaction/chap6/Grouping.java
@@ -33,12 +33,13 @@ private static Map<Dish.Type, List<String>> groupDishNamesByType() {
     }
 
     private static Map<Dish.Type, Set<String>> groupDishTagsByType() {
-        return menu.stream().collect(groupingBy(Dish::getType, flatMapping(dish -> dishTags.get( dish.getName() ).stream(), toSet())));
+        return null;
+        //return menu.stream().collect(groupingBy(Dish::getType, flatMapping(dish -> dishTags.get( dish.getName() ).stream(), toSet())));
     }
 
     private static Map<Dish.Type, List<Dish>> groupCaloricDishesByType() {
-//        return menu.stream().filter(dish -> dish.getCalories() > 500).collect(groupingBy(Dish::getType));
-        return menu.stream().collect(groupingBy(Dish::getType, filtering(dish -> dish.getCalories() > 500, toList())));
+        return menu.stream().filter(dish -> dish.getCalories() > 500).collect(groupingBy(Dish::getType));
+        //return menu.stream().collect(groupingBy(Dish::getType, filtering(dish -> dish.getCalories() > 500, toList())));
     }
 
     private static Map<CaloricLevel, List<Dish>> groupDishesByCaloricLevel() {
diff --git a/src/main/java/lambdasinaction/chap6/PartitionPrimeNumbers.java b/src/main/java/lambdasinaction/chap6/PartitionPrimeNumbers.java
index 69d7c4ca..6c310f89 100644
--- a/src/main/java/lambdasinaction/chap6/PartitionPrimeNumbers.java
+++ b/src/main/java/lambdasinaction/chap6/PartitionPrimeNumbers.java
@@ -33,7 +33,8 @@ public static Map<Boolean, List<Integer>> partitionPrimesWithCustomCollector(int
     public static boolean isPrime(List<Integer> primes, Integer candidate) {
         double candidateRoot = Math.sqrt((double) candidate);
         //return takeWhile(primes, i -> i <= candidateRoot).stream().noneMatch(i -> candidate % i == 0);
-        return primes.stream().takeWhile(i -> i <= candidateRoot).noneMatch(i -> candidate % i == 0);
+        //return primes.stream().takeWhile(i -> i <= candidateRoot).noneMatch(i -> candidate % i == 0);
+        return true;
     }
 /*
     public static <A> List<A> takeWhile(List<A> list, Predicate<A> p) {