[#8890] Revert InternalModule, Check optional-module clearly

pinpoint-apm · Jun 24, 2022 · b69d235 · b69d235
1 parent ffe9556
commit b69d235
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/...internal/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/InternalModules.java b/...internal/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/InternalModules.java
@@ -19,13 +19,8 @@
 import jdk.internal.loader.BootLoader;
 import jdk.internal.module.Modules;
 
-import java.lang.module.Configuration;
 import java.lang.module.ModuleDescriptor;
-import java.lang.module.ModuleFinder;
 import java.net.URI;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 
 final class InternalModules {
 
@@ -49,20 +44,10 @@ static Module getUnnamedModule() {
      * The URI is for information purposes only.
      */
     static Module defineModule(ClassLoader loader,
-                                      ModuleDescriptor descriptor,
-                                      URI uri)
+                               ModuleDescriptor descriptor,
+                               URI uri)
     {
-        final String moduleName = descriptor.name();
-        final ModuleLayer parent = ModuleLayer.boot();
-
-        final ModuleFinder before = new SingleModuleFinder(descriptor, uri);
-        final Configuration cf = parent.configuration().resolve(before, ModuleFinder.of(), Set.of(moduleName));
-        final Module module = ModuleLayer.defineModules(cf, List.of(parent), name -> loader)
-                .layer()
-                .findModule(moduleName)
-                .orElse(null);
-
-        return Objects.requireNonNull(module, moduleName);
+        return Modules.defineModule(loader, descriptor, uri);
     }
 
 

diff --git a/...trap-java9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilder.java b/...trap-java9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilder.java
@@ -20,18 +20,15 @@
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.lang.module.Configuration;
 import java.lang.module.ModuleDescriptor;
+import java.lang.module.ModuleFinder;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.jar.JarFile;
+import java.util.stream.Collectors;
 
 /**
  * @author Woonduk Kang(emeroad)
@@ -68,11 +65,31 @@ Module defineModule(String moduleName, ClassLoader classLoader, URL[] urls) {
         }
 
         ModuleDescriptor moduleDescriptor = builder.build();
-        URI url = getInformationURI(urls);
+        URI uri = getInformationURI(urls);
 
-        Module module = InternalModules.defineModule(classLoader, moduleDescriptor , url);
-        logger.info("defineModule module:" + module);
-        return module;
+        ModuleLayer parent = ModuleLayer.boot();
+
+        ModuleFinder before = new SingleModuleFinder(moduleDescriptor, uri);
+        Configuration cf = parent.configuration().resolve(before, ModuleFinder.of(), Set.of(moduleName));
+
+        ModuleLayer moduleLayer = ModuleLayer.defineModules(cf, List.of(parent), name -> classLoader).layer();
+        Optional<Module> oModule = moduleLayer.findModule(moduleName);
+
+        if (!oModule.isPresent()) {
+            if (moduleLayer.modules().isEmpty()) {
+                logger.info("Attempt to create module " + moduleName + ", but nothing happened");
+            } else {
+                Module unknownModule = moduleLayer.modules().iterator().next();
+                logger.info("Attempt to create module " + moduleName + ", but ignored -> " + unknownModule.getName());
+            }
+            logger.info("module name: " + moduleDescriptor.name());
+            logger.info("  - packages: " + moduleDescriptor.packages());
+            logger.info("  - providers: " + moduleDescriptor.provides());
+            throw new IllegalStateException("Failed to create module-layer, module " + moduleName);
+        }
+
+        logger.info("defineModule module:" + oModule.get());
+        return oModule.get();
     }
 
     private Map<String, Set<String>> mergeServiceInfo(List<PackageInfo> packageInfos) {

diff --git a/...trap/java9/module/SingleModuleFinder.java → ...trap/java9/module/SingleModuleFinder.java b/...trap/java9/module/SingleModuleFinder.java → ...trap/java9/module/SingleModuleFinder.java