Fix compatibility with java 9+

Pazus · Pazus · commit 3909b1b2e111 · 2019-04-30T09:54:11.000+03:00
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/utplsql/api/ResourceUtil.java b/src/main/java/org/utplsql/api/ResourceUtil.java
@@ -1,6 +1,5 @@
 package org.utplsql.api;
 
-import com.sun.nio.zipfs.ZipPath;
 import org.utplsql.api.reporter.CoverageHTMLReporter;
 
 import java.io.IOException;
@@ -9,10 +8,7 @@
 import java.nio.file.*;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
 /**
  * Helper class for dealing with Resources
@@ -61,26 +57,10 @@ public static List<Path> getListOfChildren(Path resourceAsPath, boolean filesOnl
 
         final List<Path> result = new ArrayList<>();
 
-        if (resourcePath instanceof ZipPath) {
-            try (ZipFile zf = new ZipFile(resourcePath.getFileSystem().toString())) {
+        Files.walk(resourcePath)
+                .filter(p -> !filesOnly || p.toFile().isFile())
+                .forEach(p -> result.add(p.subpath(relativeStartIndex, p.getNameCount())));
 
-                for (Enumeration list = zf.entries(); list.hasMoreElements(); ) {
-                    ZipEntry entry = (ZipEntry) list.nextElement();
-                    // Get entry-path with root element so we can compare it
-                    Path entryPath = resourcePath.getRoot().resolve(resourcePath.getFileSystem().getPath(entry.toString()));
-
-                    if (entryPath.startsWith(resourcePath) && (!filesOnly || !entry.isDirectory())) {
-                        result.add(entryPath.subpath(relativeStartIndex, entryPath.getNameCount()));
-                    }
-                }
-            }
-            resourcePath.getFileSystem().close();
-        } else {
-            Files.walk(resourcePath)
-                    .filter(p -> !filesOnly || p.toFile().isFile())
-                    .forEach(p -> result.add(p.subpath(relativeStartIndex, p.getNameCount())));
-
-        }
 
         return result;
     }
diff --git a/src/main/java/org/utplsql/api/reporter/Reporter.java b/src/main/java/org/utplsql/api/reporter/Reporter.java
@@ -10,7 +10,6 @@
 import org.utplsql.api.compatibility.CompatibilityProxy;
 import org.utplsql.api.outputBuffer.OutputBuffer;
 
-import javax.xml.bind.DatatypeConverter;
 import java.sql.Connection;
 import java.sql.SQLException;
 
@@ -114,4 +113,17 @@ public Datum toDatum(Connection c) throws SQLException {
     public OutputBuffer getOutputBuffer() {
         return outputBuffer;
     }
+
+    private static class DatatypeConverter {
+        private static final char[] hexCode = "0123456789ABCDEF".toCharArray();
+
+        static String printHexBinary(byte[] data) {
+            StringBuilder r = new StringBuilder(data.length * 2);
+            for (byte b : data) {
+                r.append(hexCode[(b >> 4) & 0xF]);
+                r.append(hexCode[(b & 0xF)]);
+            }
+            return r.toString();
+        }
+    }
 }
diff --git a/src/test/java/org/utplsql/api/OptionalFeaturesIT.java b/src/test/java/org/utplsql/api/OptionalFeaturesIT.java
@@ -1,7 +1,6 @@
 package org.utplsql.api;
 
 import org.junit.jupiter.api.Test;
-import org.omg.CORBA.DynAnyPackage.Invalid;
 import org.utplsql.api.compatibility.CompatibilityProxy;
 import org.utplsql.api.compatibility.OptionalFeatures;
 import org.utplsql.api.exception.InvalidVersionException;
