Rework after 2nd review

Author: adinn

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/JDKSourceCache.java

@@ -40,6 +40,7 @@
 import java.util.List;
 
 import com.oracle.svm.core.util.VMError;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 
 public class JDKSourceCache extends SourceCache {
 
@@ -72,7 +73,7 @@ protected void initSrcRoots() {
         assert javaHome != null;
         Path javaHomePath = Paths.get("", javaHome);
         Path srcZipPath;
-        if (isJDK8()) {
+        if (JavaVersionUtil.JAVA_SPEC < 11) {
             Path srcZipDir = javaHomePath.getParent();
             if (srcZipDir == null) {
                 VMError.shouldNotReachHere("Cannot resolve parent directory of " + javaHome);
@@ -88,7 +89,7 @@ protected void initSrcRoots() {
                     srcRoots.add(root);
                 }
                 specialSrcRoots = new HashMap<>();
-                if (!isJDK8()) {
+                if (JavaVersionUtil.JAVA_SPEC >= 11) {
                     for (Path root : srcFileSystem.getRootDirectories()) {
                         // add dirs named "src" as extra roots for special modules
                         for (String specialRootModule : specialRootModules) {
@@ -107,7 +108,7 @@ protected void initSrcRoots() {
 
     @Override
     public Path checkCacheFile(Path filePath) {
-        if (!isJDK8()) {
+        if (JavaVersionUtil.JAVA_SPEC >= 11) {
             for (String specialRootModule : specialRootModules) {
                 if (filePath.startsWith(specialRootModule)) {
                     // handle this module specially as it has intermediate dirs
@@ -138,7 +139,7 @@ public Path checkCacheFile(Path filePath) {
 
     @Override
     public Path tryCacheFile(Path filePath) {
-        if (!isJDK8()) {
+        if (JavaVersionUtil.JAVA_SPEC >= 11) {
             for (String specialRootModule : specialRootModules) {
                 if (filePath.startsWith(specialRootModule)) {
                     // handle this module specially as it has intermediate dirs

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java

@@ -70,18 +70,6 @@ public abstract class SourceCache {
      */
     protected List<Path> srcRoots;
 
-    private static final String JAVA_SPEC_VERSION_PROP = "java.specification.version";
-
-    /**
-     *
-     * The java spec version for the current JDK.
-     */
-    private static String javaSpecVersion = System.getProperty(JAVA_SPEC_VERSION_PROP);
-
-    public static boolean isJDK8() {
-        return javaSpecVersion.equals("1.8");
-    }
-
     /**
      * Create some flavour of source cache.
      */

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java

@@ -30,10 +30,12 @@
 import com.oracle.svm.util.ModuleSupport;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.stream.Stream;
 
 /**
  * A singleton class responsible for locating source files for classes included in a native image
@@ -178,9 +180,9 @@ private static Path computePrototypeName(String fileName, String packageName, So
     }
 
     /**
-     * An accept list of packages prefixes used to pre-filter JDK11+ runtime class lookups.
+     * An accept list of packages prefixes used to pre-filter JDK8 runtime class lookups.
      */
-    public static final String[] JDK_SRC_PACKAGE_PREFIXES = {
+    public static final String[] JDK8_SRC_PACKAGE_PREFIXES = {
                     "java.",
                     "jdk.",
                     "javax.",
@@ -191,24 +193,15 @@ private static Path computePrototypeName(String fileName, String packageName, So
                     "org.omg.",
                     "org.w3c.",
                     "org.xml",
-                    "org.graalvm.compiler",
     };
 
     /**
-     * A variant accept list of packages prefixes used to pre-filter JDK8 runtime class lookups.
+     * A variant accept list of packages prefixes used to pre-filter JDK11+ runtime class lookups.
      */
-    public static final String[] JDK8_SRC_PACKAGE_PREFIXES = {
-                    "java.",
-                    "jdk.",
-                    "javax.",
-                    "sun.",
-                    "com.sun.",
-                    "org.ietf.",
-                    "org.jcp.",
-                    "org.omg.",
-                    "org.w3c.",
-                    "org.xml",
-    };
+    public static final String[] JDK_SRC_PACKAGE_PREFIXES = Stream.concat(Stream.of(JDK8_SRC_PACKAGE_PREFIXES),
+                    Stream.of("org.graalvm.compiler"))
+                    .toArray(String[]::new);
+
     /**
      * An accept list of packages prefixes used to pre-filter GraalVM class lookups.
      */
@@ -245,7 +238,7 @@ private static boolean acceptList(String packageName, String[] acceptList) {
      * @return the corresponding source cache type
      */
     private static SourceCacheType sourceCacheType(String packageName) {
-        if (acceptList(packageName, (SourceCache.isJDK8() ? JDK8_SRC_PACKAGE_PREFIXES : JDK_SRC_PACKAGE_PREFIXES))) {
+        if (acceptList(packageName, (JavaVersionUtil.JAVA_SPEC >= 11 ? JDK_SRC_PACKAGE_PREFIXES : JDK8_SRC_PACKAGE_PREFIXES))) {
             return SourceCacheType.JDK;
         }
         if (acceptList(packageName, GRAALVM_SRC_PACKAGE_PREFIXES)) {