Inline trivial ModuleSupport methods

Author: Christian Wimmer

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java

@@ -93,7 +93,7 @@
 public class NativeImage {
 
     private static final String DEFAULT_GENERATOR_CLASS_NAME = NativeImageGeneratorRunner.class.getName();
-    private static final String DEFAULT_GENERATOR_MODULE_NAME = ModuleSupport.getModuleName(NativeImageGeneratorRunner.class);
+    private static final String DEFAULT_GENERATOR_MODULE_NAME = NativeImageGeneratorRunner.class.getModule().getName();
 
     private static final String DEFAULT_GENERATOR_9PLUS_SUFFIX = "$JDK9Plus";
     private static final String CUSTOM_SYSTEM_CLASS_LOADER = NativeImageSystemClassLoader.class.getCanonicalName();

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FallbackFeature.java

@@ -26,6 +26,9 @@
 
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.lang.module.ModuleDescriptor;
+import java.lang.module.ModuleFinder;
+import java.lang.module.ModuleReference;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -34,6 +37,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.graalvm.nativeimage.hosted.Feature;
 
@@ -46,7 +50,6 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FeatureImpl.AfterAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.BeforeAnalysisAccessImpl;
-import com.oracle.svm.util.ModuleSupport;
 
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -63,7 +66,9 @@ public class FallbackFeature implements Feature {
     private final List<String> proxyCalls = new ArrayList<>();
     private final List<String> serializationCalls = new ArrayList<>();
 
-    private final Set<Object> systemModuleDescriptors = ModuleSupport.getSystemModuleDescriptors();
+    private final Set<ModuleDescriptor> systemModuleDescriptors = ModuleFinder.ofSystem().findAll().stream()
+                    .map(ModuleReference::descriptor)
+                    .collect(Collectors.toSet());
 
     private static class AutoProxyInvoke {
         private final ResolvedJavaMethod method;
@@ -124,7 +129,7 @@ void trackMethod(AnalysisMetaAccess metaAccess) {
 
         void apply(BytecodePosition invokeLocation) {
             Class<?> javaClass = ((AnalysisMethod) invokeLocation.getMethod()).getDeclaringClass().getJavaClass();
-            if (systemModuleDescriptors.contains(ModuleSupport.getModuleDescriptor(javaClass))) {
+            if (systemModuleDescriptors.contains(javaClass.getModule().getDescriptor())) {
                 /* Ensure all JDK system modules are excluded from reporting reflection use. */
                 return;
             }

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

@@ -47,7 +47,6 @@
 import com.oracle.svm.core.option.OptionUtils;
 import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.hosted.ImageClassLoader;
-import com.oracle.svm.util.ModuleSupport;
 
 /**
  * An abstract cache manager for some subspace of the JDK, GraalVM or application source file space.
@@ -297,7 +296,7 @@ protected Path tryCacheFile(Path filePath, Class<?> clazz) {
         String moduleName = null;
         if (clazz != null) {
             /* Paths require the module name as prefix */
-            moduleName = ModuleSupport.getModuleName(clazz);
+            moduleName = clazz.getModule().getName();
         }
 
         if (moduleName != null) {
@@ -361,7 +360,7 @@ protected Path checkCacheFile(Path filePath, Class<?> clazz) {
         String moduleName = null;
         if (clazz != null) {
             /* Paths require the module name as prefix */
-            moduleName = ModuleSupport.getModuleName(clazz);
+            moduleName = clazz.getModule().getName();
         }
 
         if (moduleName != null) {

substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupport.java

@@ -24,12 +24,9 @@
  */
 package com.oracle.svm.util;
 
-import java.lang.module.ModuleFinder;
-import java.lang.module.ModuleReference;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -123,18 +120,4 @@ public static void exportAndOpenPackageToUnnamed(String name, String pkg, boolea
         Modules.addExportsToAllUnnamed(module, pkg);
         Modules.addOpensToAllUnnamed(module, pkg);
     }
-
-    public static String getModuleName(Class<?> clazz) {
-        return clazz.getModule().getName();
-    }
-
-    public static Object getModuleDescriptor(Class<?> clazz) {
-        return clazz.getModule().getDescriptor();
-    }
-
-    public static Set<Object> getSystemModuleDescriptors() {
-        return ModuleFinder.ofSystem().findAll().stream()
-                        .map(ModuleReference::descriptor)
-                        .collect(Collectors.toSet());
-    }
 }