touch-ups

Bruce Eckel · Bruce Eckel · commit 45d4e5d85ba8 · 2017-01-02T14:22:25.000-08:00
diff --git a/concurrent/Batter.java b/concurrent/Batter.java
@@ -14,16 +14,16 @@ static <T> T prepare(T ingredient) {
     new Nap(100);
     return ingredient;
   }
-  static <T> CompletableFuture<T> cf(T ingredient) {
+  static <T> CompletableFuture<T> prep(T ingredient) {
     return CompletableFuture
       .completedFuture(ingredient)
-      .thenApply(Batter::prepare);
+      .thenApplyAsync(Batter::prepare);
   }
   public static CompletableFuture<Batter> mix() {
-    CompletableFuture<Eggs> eggs = cf(new Eggs());
-    CompletableFuture<Milk> milk = cf(new Milk());
-    CompletableFuture<Sugar> sugar = cf(new Sugar());
-    CompletableFuture<Flour> flour = cf(new Flour());
+    CompletableFuture<Eggs> eggs = prep(new Eggs());
+    CompletableFuture<Milk> milk = prep(new Milk());
+    CompletableFuture<Sugar> sugar = prep(new Sugar());
+    CompletableFuture<Flour> flour = prep(new Flour());
     CompletableFuture
       .allOf(eggs, milk, sugar, flour)
       .join();
diff --git a/concurrent/CatchCompletableExceptions.java b/concurrent/CatchCompletableExceptions.java
@@ -7,8 +7,8 @@
 
 public class CatchCompletableExceptions {
   static void handleException(int failcount) {
-    // Call Function only if there's an exception,
-    // Must produce same type as came in:
+    // Call the Function only if there's an
+    // exception, must produce same type as came in:
     CompletableExceptions
       .test("exceptionally", failcount)
       .exceptionally((ex) -> { // Function
diff --git a/concurrent/CompletedMachina.java b/concurrent/CompletedMachina.java
@@ -7,8 +7,8 @@
 public class CompletedMachina {
   public static void main(String[] args) {
     CompletableFuture<Machina> cf =
-        CompletableFuture.completedFuture(
-          new Machina(0));
+      CompletableFuture.completedFuture(
+        new Machina(0));
     try {
       Machina m = cf.get();  // Doesn't block
     } catch(InterruptedException |
diff --git a/concurrent/FrostedCake.java b/concurrent/FrostedCake.java
@@ -26,7 +26,7 @@ public static void main(String[] args) {
       .thenCombineAsync(Frosting.make(),
         (cake, frosting) ->
           new FrostedCake(cake, frosting))
-      .thenAcceptAsync(System.out::println).join());
-      // Need to rewrite...
+      .thenAcceptAsync(System.out::println)
+      .join());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static void main(String[] args) {`
`26`	`26`	`.thenCombineAsync(Frosting.make(),`
`27`	`27`	`(cake, frosting) ->`
`28`	`28`	`new FrostedCake(cake, frosting))`
`29`		`- .thenAcceptAsync(System.out::println).join());`
`30`		`- // Need to rewrite...`
	`29`	`+ .thenAcceptAsync(System.out::println)`
	`30`	`+ .join());`
`31`	`31`	`}`
`32`	`32`	`}`