Added java 9+ compatibility (bugfix & addition)

animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/ClassFileVisitor.java

@@ -29,14 +29,12 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.FileVisitOption;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.Iterator;
@@ -137,24 +135,33 @@ else if ( ( file.getName().endsWith( ".jar" ) || file.getName().endsWith( ".jmod
      *             or a class file (in which case that single class is processed).
      */
     public void process( Path path )
-            throws IOException {
-        Files.walkFileTree(path, Collections.<FileVisitOption>emptySet(), 10000, new SimpleFileVisitor<Path>() {
+        throws IOException
+    {
+        Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
 
-            @Override
-            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
-                return FileVisitResult.CONTINUE;
-            }
+            final SortedSet<Path> files = new TreeSet<>();
 
             @Override
-            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
                 if (file.getFileName().toString().endsWith(".class")) {
-                    process(file.toString(), Files.newInputStream(file));
+                    files.add(file);
                 }
                 // XXX we could add processing of jars here as well
                 // but it's not necessary for processing: Paths.get(URI.create("jrt:/modules"))
                 return FileVisitResult.CONTINUE;
             }
 
+            @Override
+            public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) throws IOException {
+                for (final Path file : files) {
+                    try (final InputStream inputStream = Files.newInputStream(file)) {
+                        process(file.toString(), inputStream);
+                    }
+                }
+                files.clear();
+                return super.postVisitDirectory(dir, exc);
+            }
+
             @Override
             public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
                 return FileVisitResult.CONTINUE;

animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/Main.java

@@ -26,9 +26,11 @@
  */
 
 import java.io.DataInputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -58,7 +60,7 @@ public static void main( String[] args )
         Main m = new Main();
         String threshold = null;
 
-        List<File> files = new ArrayList<File>();
+        List<Path> files = new ArrayList<Path>();
         for ( int i = 0; i < args.length; i++ )
         {
             if (args[i].equals("-h"))
@@ -80,16 +82,21 @@ public static void main( String[] args )
                 continue;
             }
 
-            files.add(new File(args[i]));
+            try {
+                files.add(Paths.get(new URI(args[i]))); // attempt to treat it as an URI
+            } catch (Exception e) {
+                files.add(Paths.get(args[i])); // if that fails: treat is as a normal file/path
+            }
         }
 
-        for (int i = 0; i < files.size(); i++)
-        {
-            m.process((File) files.get(i));
+        for (Path file : files) {
+            m.process(file);
         }
 
-        if (threshold!=null && m.maximumVersion.compareTo(threshold)>0)
+        if ( threshold != null && m.maximumVersion.compareTo(threshold) > 0 )
+        {
             System.exit(1);
+        }
     }
 
     protected void process( String name, InputStream image )
@@ -129,5 +136,14 @@ private static int u2( byte u, byte d )
         HUMAN_READABLE_NAME.put("48.0","Java4");
         HUMAN_READABLE_NAME.put("49.0","Java5");
         HUMAN_READABLE_NAME.put("50.0","Java6");
+        HUMAN_READABLE_NAME.put("51.0","Java7");
+        HUMAN_READABLE_NAME.put("52.0","Java8");
+        HUMAN_READABLE_NAME.put("53.0","Java9");
+        HUMAN_READABLE_NAME.put("54.0","Java10");
+        HUMAN_READABLE_NAME.put("55.0","Java11");
+        HUMAN_READABLE_NAME.put("56.0","Java12");
+        HUMAN_READABLE_NAME.put("57.0","Java13");
+        HUMAN_READABLE_NAME.put("58.0","Java14");
+        HUMAN_READABLE_NAME.put("59.0","Java15");
     }
 }