fix CompletableFuture examples

mariofusco · mariofusco · commit 56ee0b9e05bc · 2014-04-24T18:49:44.000+02:00
diff --git a/src/main/java/lambdasinaction/chap10/BestPriceFinder.java b/src/main/java/lambdasinaction/chap10/BestPriceFinder.java
@@ -20,29 +20,29 @@ public Thread newThread(Runnable r) {
             return t;
         }
     });
-
 /*
     public List<String> findPriceSequential(String product) {
         return shops.stream()
                 .map(shop -> shop.getName() + " price is " + shop.calculatePrice(product))
-                .collect(Collectors.<String>toList());
+                .collect(Collectors.toList());
     }
 
     public List<String> findPriceParallel(String product) {
         return shops.parallelStream()
                 .map(shop -> shop.getName() + " price is " + shop.calculatePrice(product))
-                .collect(Collectors.<String>toList());
+                .collect(Collectors.toList());
     }
 
     public List<String> findPrice(String product) {
         List<CompletableFuture<String>> priceFutures =
                 shops.stream()
-                .map(shop -> CompletableFuture.supplyAsync(() -> shop.getName() + " price is " + shop.calculatePrice(product)))
-                .collect(Collectors.<CompletableFuture<String>>toList());
+                .map(shop -> CompletableFuture.supplyAsync(() -> shop.getName() + " price is "
+                        + shop.calculatePrice(product), executor))
+                .collect(Collectors.toList());
 
         List<String> prices = priceFutures.stream()
                 .map(CompletableFuture::join)
-                .collect(Collectors.<String>toList());
+                .collect(Collectors.toList());
         return prices;
         //return sequence(priceFutures).join();
     }
@@ -52,15 +52,15 @@ public List<String> findPriceSequential(String product) {
                 .map(shop -> shop.getPrice(product))
                 .map(Quote::parse)
                 .map(Discount::applyDiscount)
-                .collect(Collectors.<String>toList());
+                .collect(Collectors.toList());
     }
 
     public List<String> findPriceParallel(String product) {
         return shops.parallelStream()
                 .map(shop -> shop.getPrice(product))
                 .map(Quote::parse)
                 .map(Discount::applyDiscount)
-                .collect(Collectors.<String>toList());
+                .collect(Collectors.toList());
     }
 
     public List<String> findPrice(String product) {
@@ -69,7 +69,7 @@ public List<String> findPrice(String product) {
 
         return priceFutures.stream()
                 .map(CompletableFuture::join)
-                .collect(Collectors.<String>toList());
+                .collect(Collectors.toList());
     }
 
     public Stream<CompletableFuture<String>> findPriceStream(String product) {
@@ -85,5 +85,7 @@ public void printPricesStream() {
                 .map(f -> f.thenAccept(s -> System.out.println(s + " (done in " + ((System.nanoTime() - start) / 1_000_000) + " msecs)")))
                 .toArray(size -> new CompletableFuture[size]);
         CompletableFuture.allOf(futures).join();
+        System.out.println("All shops have now responded in " + ((System.nanoTime() - start) / 1_000_000) + " msecs");
     }
+
 }
diff --git a/src/main/java/lambdasinaction/chap10/BestPriceFinderMain.java b/src/main/java/lambdasinaction/chap10/BestPriceFinderMain.java
@@ -11,9 +11,9 @@ public class BestPriceFinderMain {
     private static BestPriceFinder bestPriceFinder = new BestPriceFinder();
 
     public static void main(String[] args) {
-        //execute("sequential", () -> bestPriceFinder.findPriceSequential("myPhone"));
-        //execute("parallel", () -> bestPriceFinder.findPriceParallel("myPhone"));
-        //execute("composed CompletableFuture", () -> bestPriceFinder.findPrice("myPhone"));
+        execute("sequential", () -> bestPriceFinder.findPriceSequential("myPhone"));
+        execute("parallel", () -> bestPriceFinder.findPriceParallel("myPhone"));
+        execute("composed CompletableFuture", () -> bestPriceFinder.findPrice("myPhone"));
         bestPriceFinder.printPricesStream();
     }
 
