Builds and runs with JDK9

BruceEckel · BruceEckel · commit 185255634d71 · 2020-10-07T17:06:42.000-06:00
diff --git a/collectiontopics/CanonicalMapping.java b/collectiontopics/CanonicalMapping.java
@@ -19,6 +19,7 @@ public boolean equals(Object r) {
     return r instanceof Element &&
       Objects.equals(ident, ((Element)r).ident);
   }
+  @SuppressWarnings("deprecation")
   @Override
   protected void finalize() {
     System.out.println("Finalizing " +
diff --git a/collectiontopics/References.java b/collectiontopics/References.java
@@ -13,6 +13,7 @@ class VeryBig {
   VeryBig(String id) { ident = id; }
   @Override
   public String toString() { return ident; }
+  @SuppressWarnings("deprecation")
   @Override
   protected void finalize() {
     System.out.println("Finalizing " + ident);
diff --git a/collectiontopics/SetOrder.java b/collectiontopics/SetOrder.java
@@ -23,7 +23,7 @@ public class SetOrder {
     for(String type: sets) {
       System.out.format("[-> %s <-]%n",
         type.substring(type.lastIndexOf('.') + 1));
-      @SuppressWarnings("unchecked")
+      @SuppressWarnings({"unchecked", "deprecation"})
       Set<String> set = (Set<String>)
         Class.forName(type).newInstance();
       set.addAll(RLIST);
diff --git a/generics/DynamicProxyMixin.java b/generics/DynamicProxyMixin.java
@@ -44,6 +44,7 @@ public static Object newInstance(Tuple2... pairs) {
 
 public class DynamicProxyMixin {
   public static void main(String[] args) {
+    @SuppressWarnings("unchecked")
     Object mixin = MixinProxy.newInstance(
       tuple(new BasicImp(), Basic.class),
       tuple(new TimeStampedImp(), TimeStamped.class),
diff --git a/generics/InstantiateGenericType.java b/generics/InstantiateGenericType.java
@@ -3,18 +3,19 @@
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://OnJava8.com for more book information.
 import java.util.function.*;
+import java.lang.reflect.InvocationTargetException;
 
 class ClassAsFactory<T> implements Supplier<T> {
   Class<T> kind;
   ClassAsFactory(Class<T> kind) {
     this.kind = kind;
   }
+  @SuppressWarnings("deprecation")
   @Override
   public T get() {
     try {
       return kind.newInstance();
-    } catch(InstantiationException |
-            IllegalAccessException e) {
+    } catch(Exception e) {
       throw new RuntimeException(e);
     }
   }
diff --git a/generics/coffee/CoffeeSupplier.java b/generics/coffee/CoffeeSupplier.java
@@ -7,6 +7,7 @@
 import java.util.*;
 import java.util.function.*;
 import java.util.stream.*;
+import java.lang.reflect.InvocationTargetException;
 
 public class CoffeeSupplier
 implements Supplier<Coffee>, Iterable<Coffee> {
@@ -21,10 +22,13 @@ public CoffeeSupplier() {}
   public Coffee get() {
     try {
       return (Coffee)
-        types[rand.nextInt(types.length)].newInstance();
+        types[rand.nextInt(types.length)]
+        .getConstructor().newInstance();
       // Report programmer errors at run time:
-    } catch(InstantiationException |
-            IllegalAccessException e) {
+      } catch(InstantiationException |
+              NoSuchMethodException |
+              InvocationTargetException |
+              IllegalAccessException e) {
       throw new RuntimeException(e);
     }
   }
diff --git a/housekeeping/TerminationCondition.java b/housekeeping/TerminationCondition.java
@@ -14,6 +14,7 @@ class Book {
   void checkIn() {
     checkedOut = false;
   }
+  @SuppressWarnings("deprecation")
   @Override
   public void finalize() {
     if(checkedOut)
diff --git a/onjava/BasicSupplier.java b/onjava/BasicSupplier.java
@@ -5,6 +5,7 @@
 // Supplier from a class with a no-arg constructor
 package onjava;
 import java.util.function.*;
+import java.lang.reflect.InvocationTargetException;
 
 public class BasicSupplier<T> implements Supplier<T> {
   private Class<T> type;
@@ -15,8 +16,10 @@ public BasicSupplier(Class<T> type) {
   public T get() {
     try {
       // Assumes type is a public class:
-      return type.newInstance();
+      return type.getConstructor().newInstance();
     } catch(InstantiationException |
+            NoSuchMethodException |
+            InvocationTargetException |
             IllegalAccessException e) {
       throw new RuntimeException(e);
     }
diff --git a/onjava/atunit/AtUnit.java b/onjava/atunit/AtUnit.java
@@ -162,8 +162,11 @@ Method checkForCleanupMethod(Method m) {
       }
     } else { // Use the no-arg constructor:
       try {
-        return testClass.newInstance();
+        return testClass
+          .getConstructor().newInstance();
       } catch(InstantiationException |
+              NoSuchMethodException |
+              InvocationTargetException |
               IllegalAccessException e) {
         throw new RuntimeException(
           "Couldn't create a test object. " +
diff --git a/patterns/BoxObserver.java b/patterns/BoxObserver.java
@@ -13,6 +13,7 @@
 import onjava.MouseClick;
 
 // You must inherit a new type of Observable:
+@SuppressWarnings("deprecation")
 class BoxObservable extends Observable {
   @Override
   public void notifyObservers(Object b) {
@@ -22,6 +23,7 @@ public void notifyObservers(Object b) {
   }
 }
 
+@SuppressWarnings("deprecation")
 public class BoxObserver extends JFrame {
   Observable notifier = new BoxObservable();
   public BoxObserver(int grid) {
@@ -45,6 +47,7 @@ public static void main(String[] args) {
   }
 }
 
+@SuppressWarnings("deprecation")
 class OCBox extends JPanel implements Observer {
   Observable notifier;
   int x, y; // Locations in grid
diff --git a/patterns/ShapeFactory2.java b/patterns/ShapeFactory2.java
@@ -25,9 +25,7 @@ public Shape create(String id) {
       return (Shape)factories
         .computeIfAbsent(id, ShapeFactory2::load)
         .newInstance();
-    } catch(InstantiationException |
-            IllegalAccessException |
-            InvocationTargetException e) {
+    } catch(Exception e) {
       throw new BadShapeCreation(id);
     }
   }
diff --git a/patterns/observer/ObservedFlower.java b/patterns/observer/ObservedFlower.java
@@ -7,6 +7,7 @@
 package patterns.observer;
 import java.util.*;
 
+@SuppressWarnings("deprecation")
 class Flower {
   private boolean isOpen;
   private boolean alreadyOpen;
@@ -46,6 +47,7 @@ public void notifyObservers() {
   }
 }
 
+@SuppressWarnings("deprecation")
 class Bee {
   private String name;
   Bee(String nm)  { name = nm; }
@@ -61,6 +63,7 @@ public Observer closeObserver() {
   }
 }
 
+@SuppressWarnings("deprecation")
 class Hummingbird {
   private String name;
   Hummingbird(String nm) { name = nm; }
diff --git a/patterns/trash/Trash.java b/patterns/trash/Trash.java
@@ -70,7 +70,8 @@ public static <T extends Trash> T factory(Info info) {
             trashType.getConstructor(double.class);
           // Call the constructor to create a
           // new object:
-          return (T)ctor.newInstance(info.data);
+          return
+            (T)ctor.newInstance(info.data);
         } catch(Exception e) {
           throw new CannotCreateTrashException(e);
         }
diff --git a/references/ImmutableInteger.java b/references/ImmutableInteger.java
@@ -8,6 +8,7 @@
 
 public class ImmutableInteger {
   public static void main(String[] args) {
+    @SuppressWarnings("deprecation")
     List<Integer> v = IntStream.range(0, 10)
       .mapToObj(Integer::new)
       .collect(Collectors.toList());
diff --git a/typeinfo/DynamicSupplier.java b/typeinfo/DynamicSupplier.java
@@ -5,7 +5,6 @@
 import java.util.function.*;
 import java.util.stream.*;
 
-
 class CountedInteger {
   private static long counter;
   private final long id = counter++;
@@ -18,11 +17,11 @@ public class DynamicSupplier<T> implements Supplier<T> {
   public DynamicSupplier(Class<T> type) {
     this.type = type;
   }
+  @SuppressWarnings("deprecation")
   public T get() {
     try {
       return type.newInstance();
-    } catch(InstantiationException |
-            IllegalAccessException e) {
+    } catch(Exception e) {
       throw new RuntimeException(e);
     }
   }
diff --git a/typeinfo/pets/PetCreator.java b/typeinfo/pets/PetCreator.java
@@ -6,6 +6,7 @@
 package typeinfo.pets;
 import java.util.*;
 import java.util.function.*;
+import java.lang.reflect.InvocationTargetException;
 
 public abstract
 class PetCreator implements Supplier<Pet> {
@@ -15,8 +16,11 @@ class PetCreator implements Supplier<Pet> {
   public Pet get() { // Create one random Pet
     int n = rand.nextInt(types().size());
     try {
-      return types().get(n).newInstance();
+      return types().get(n)
+             .getConstructor().newInstance();
     } catch(InstantiationException |
+            NoSuchMethodException |
+            InvocationTargetException |
             IllegalAccessException e) {
       throw new RuntimeException(e);
     }
diff --git a/typeinfo/toys/GenericToyTest.java b/typeinfo/toys/GenericToyTest.java
@@ -7,6 +7,7 @@
 package typeinfo.toys;
 
 public class GenericToyTest {
+  @SuppressWarnings("deprecation")
   public static void
   main(String[] args) throws Exception {
     Class<FancyToy> ftClass = FancyToy.class;
diff --git a/typeinfo/toys/ToyTest.java b/typeinfo/toys/ToyTest.java
@@ -5,6 +5,7 @@
 // Testing class Class
 // {java typeinfo.toys.ToyTest}
 package typeinfo.toys;
+import java.lang.reflect.InvocationTargetException;
 
 interface HasBatteries {}
 interface Waterproof {}
@@ -31,6 +32,7 @@ static void printInfo(Class cc) {
     System.out.println(
       "Canonical name : " + cc.getCanonicalName());
   }
+  @SuppressWarnings("deprecation")
   public static void main(String[] args) {
     Class c = null;
     try {
@@ -47,12 +49,9 @@ public static void main(String[] args) {
     try {
       // Requires no-arg constructor:
       obj = up.newInstance();
-    } catch(InstantiationException e) {
-      System.out.println("Cannot instantiate");
-      System.exit(1);
-    } catch(IllegalAccessException e) {
-      System.out.println("Cannot access");
-      System.exit(1);
+    } catch(Exception e) {
+      throw new
+        RuntimeException("Cannot instantiate");
     }
     printInfo(obj.getClass());
   }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public boolean equals(Object r) {`
`19`	`19`	`return r instanceof Element &&`
`20`	`20`	`Objects.equals(ident, ((Element)r).ident);`
`21`	`21`	`}`
	`22`	`+ @SuppressWarnings("deprecation")`
`22`	`23`	`@Override`
`23`	`24`	`protected void finalize() {`
`24`	`25`	`System.out.println("Finalizing " +`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ class Book {`
`14`	`14`	`void checkIn() {`
`15`	`15`	`checkedOut = false;`
`16`	`16`	`}`
	`17`	`+ @SuppressWarnings("deprecation")`
`17`	`18`	`@Override`
`18`	`19`	`public void finalize() {`
`19`	`20`	`if(checkedOut)`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import onjava.MouseClick;`
`14`	`14`
`15`	`15`	`// You must inherit a new type of Observable:`
	`16`	`+@SuppressWarnings("deprecation")`
`16`	`17`	`class BoxObservable extends Observable {`
`17`	`18`	`@Override`
`18`	`19`	`public void notifyObservers(Object b) {`
`@@ -22,6 +23,7 @@ public void notifyObservers(Object b) {`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`
	`26`	`+@SuppressWarnings("deprecation")`
`25`	`27`	`public class BoxObserver extends JFrame {`
`26`	`28`	`Observable notifier = new BoxObservable();`
`27`	`29`	`public BoxObserver(int grid) {`
`@@ -45,6 +47,7 @@ public static void main(String[] args) {`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`
	`50`	`+@SuppressWarnings("deprecation")`
`48`	`51`	`class OCBox extends JPanel implements Observer {`
`49`	`52`	`Observable notifier;`
`50`	`53`	`int x, y; // Locations in grid`