Filter module-info from loading.

Author: raphw

byte-buddy-dep/src/main/java/net/bytebuddy/ByteBuddy.java

@@ -801,24 +801,27 @@ public DynamicType.Builder<?> makeRecord() {
     /**
      * Creates a new module with the given name.
      *
-     * @param name The name of the module.
+     * @param name                The name of the module.
+     * @param modifierContributor The modifier contributors for the module.
      * @return A builder for a new module.
      */
-    public DynamicType.Builder.ModuleDefinition<?> makeModule(String name) {
-        return makeModule(name, false);
+    public DynamicType.Builder.ModuleDefinition<?> makeModule(String name,
+                                                              ModifierContributor.ForModule... modifierContributor) {
+        return makeModule(name, Arrays.asList(modifierContributor));
     }
 
     /**
      * Creates a new module with the given name.
      *
-     * @param name The name of the module.
-     * @param open {@code true} if the module is to be opened.
+     * @param name                 The name of the module.
+     * @param modifierContributors The modifier contributors for the module.
      * @return A builder for a new module.
      */
-    public DynamicType.Builder.ModuleDefinition<?> makeModule(String name, boolean open) {
+    public DynamicType.Builder.ModuleDefinition<?> makeModule(String name,
+                                                              Collection<? extends ModifierContributor.ForModule> modifierContributors) {
         return subclass(Object.class)
                 .name(ModuleDescription.MODULE_CLASS_NAME)
-                .module(name, open ? Opcodes.ACC_OPEN : ModifierContributor.EMPTY_MASK);
+                .module(name, modifierContributors);
     }
 
     /**

byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ByteArrayClassLoader.java

@@ -19,6 +19,7 @@
 import net.bytebuddy.ClassFileVersion;
 import net.bytebuddy.build.AccessControllerPlugin;
 import net.bytebuddy.build.HashCodeAndEqualsPlugin;
+import net.bytebuddy.description.module.ModuleDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.utility.GraalImageCode;
 import net.bytebuddy.utility.JavaModule;
@@ -366,6 +367,9 @@ public static Map<TypeDescription, Class<?>> load(@MaybeNull ClassLoader classLo
                 ClassFilePostProcessor.NoOp.INSTANCE);
         Map<TypeDescription, Class<?>> result = new LinkedHashMap<TypeDescription, Class<?>>();
         for (TypeDescription typeDescription : types.keySet()) {
+            if (typeDescription.getName().equals(ModuleDescription.MODULE_CLASS_NAME)) {
+                continue;
+            }
             try {
                 Class<?> type = Class.forName(typeDescription.getName(), false, classLoader);
                 if (!GraalImageCode.getCurrent().isNativeImageExecution() && forbidExisting && type.getClassLoader() != classLoader) {
@@ -1292,6 +1296,9 @@ public static Map<TypeDescription, Class<?>> load(@MaybeNull ClassLoader classLo
                     ClassFilePostProcessor.NoOp.INSTANCE);
             Map<TypeDescription, Class<?>> result = new LinkedHashMap<TypeDescription, Class<?>>();
             for (TypeDescription typeDescription : types.keySet()) {
+                if (typeDescription.getName().equals(ModuleDescription.MODULE_CLASS_NAME)) {
+                    continue;
+                }
                 try {
                     Class<?> type = Class.forName(typeDescription.getName(), false, classLoader);
                     if (!GraalImageCode.getCurrent().isNativeImageExecution() && forbidExisting && type.getClassLoader() != classLoader) {