Some cleanups and improvements to Groovy scripts (type safety)

Author: uschindler

src/tools/groovy/generate-deprecated-java5.groovy

@@ -15,13 +15,15 @@
  */
 
 import de.thetaphi.forbiddenapis.DeprecatedGen;
+
+import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-new DeprecatedGen(properties['build.java.runtime'], new File(System.getProperty("java.home"), "lib/rt.jar"), new File(properties['deprecated.output.file'])) {
+new DeprecatedGen<File>(properties['build.java.runtime'], new File(System.getProperty("java.home"), "lib/rt.jar"), properties['deprecated.output.file'] as File) {
   @Override
-  protected void collectClasses(def source) throws IOException {
+  protected void collectClasses(File source) throws IOException {
     new ZipInputStream(new FileInputStream(source)).withStream {
-      def entry;
+      ZipEntry entry;
       while ((entry = it.getNextEntry()) != null) {
         try {
           if (entry.isDirectory()) continue;

src/tools/groovy/generate-deprecated-java9.groovy

@@ -15,12 +15,18 @@
  */
 
 import de.thetaphi.forbiddenapis.DeprecatedGen;
-import java.nio.file.*;
+
+import java.nio.file.Files;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.PathMatcher;
+import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 
-new DeprecatedGen(properties['build.java.runtime'], URI.create("jrt:/"), new File(properties['deprecated.output.file'])) {
+new DeprecatedGen<URI>(properties['build.java.runtime'], URI.create("jrt:/"), properties['deprecated.output.file'] as File) {
   @Override
-  protected void collectClasses(def uri) throws IOException {
+  protected void collectClasses(URI uri) throws IOException {
     Path modules = Paths.get(uri);
     PathMatcher fileMatcher = modules.getFileSystem().getPathMatcher("glob:*.class"),
       prefixMatcher = modules.getFileSystem().getPathMatcher("glob:/java.**");

src/tools/groovy/generate-deprecated.groovy

@@ -16,17 +16,17 @@
 
 import org.apache.tools.ant.BuildException;
 
-def objectClassURL = ClassLoader.getSystemClassLoader().getResource("java/lang/Object.class");
-def isJava9 = objectClassURL != null && "jrt".equalsIgnoreCase(objectClassURL.getProtocol());
+URL objectClassURL = ClassLoader.getSystemClassLoader().getResource("java/lang/Object.class");
+boolean isJava9 = objectClassURL != null && "jrt".equalsIgnoreCase(objectClassURL.getProtocol());
 
-def hasRTJar = new File(properties['java.home'], "lib/rt.jar").isFile();
+boolean hasRTJar = new File(properties['java.home'], "lib/rt.jar").isFile();
 
-def vendor = properties['java.vendor'].toLowerCase(Locale.ENGLISH);
-def isOracle = vendor.contains("oracle") || vendor.contains("sun microsystems");
-def isDetectedJavaVersion = properties['java.version'].startsWith(properties['build.java.runtime']);
+String vendor = properties['java.vendor'].toLowerCase(Locale.ENGLISH);
+boolean isOracle = vendor.contains("oracle") || vendor.contains("sun microsystems");
+boolean isDetectedJavaVersion = properties['java.version'].startsWith(properties['build.java.runtime']);
 
 if (isOracle && isDetectedJavaVersion && (isJava9 || hasRTJar)) {
-  def script = isJava9 ? "generate-deprecated-java9.groovy" : "generate-deprecated-java5.groovy";
+  String script = isJava9 ? "generate-deprecated-java9.groovy" : "generate-deprecated-java5.groovy";
   evaluate(new File(properties['groovy-tools.dir'], script));
 } else {
   throw new BuildException("Regenerating the deprecated signatures files need stock Oracle/Sun JDK, "+