Add modifier handling.

Author: raphw

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

@@ -27,6 +27,7 @@
 import net.bytebuddy.description.modifier.Ownership;
 import net.bytebuddy.description.modifier.TypeManifestation;
 import net.bytebuddy.description.modifier.Visibility;
+import net.bytebuddy.description.module.ModuleDescription;
 import net.bytebuddy.description.type.PackageDescription;
 import net.bytebuddy.description.type.RecordComponentDescription;
 import net.bytebuddy.description.type.TypeDefinition;
@@ -797,6 +798,29 @@ public DynamicType.Builder<?> makeRecord() {
                 .method(isToString()).intercept(RecordObjectMethod.TO_STRING);
     }
 
+    /**
+     * Creates a new module with the given name.
+     *
+     * @param name The name of the module.
+     * @return A builder for a new module.
+     */
+    public DynamicType.Builder.ModuleDefinition<?> makeModule(String name) {
+        return makeModule(name, false);
+    }
+
+    /**
+     * 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.
+     * @return A builder for a new module.
+     */
+    public DynamicType.Builder.ModuleDefinition<?> makeModule(String name, boolean open) {
+        return subclass(Object.class)
+                .name(ModuleDescription.MODULE_CLASS_NAME)
+                .module(name, open ? Opcodes.ACC_OPEN : ModifierContributor.EMPTY_MASK);
+    }
+
     /**
      * <p>
      * Creates a new {@link Annotation} type. Annotation properties are implemented as non-static, public methods with the

byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java

@@ -336,6 +336,13 @@ public interface TypeDescription extends TypeDefinition, ByteCodeElement, TypeVa
     @MaybeNull
     ModuleDescription toModuleDescription();
 
+    /**
+     * Returns {@code true} if the represented type includes a module description.
+     *
+     * @return {@code true} if the represented type includes a module description.
+     */
+    boolean isModule();
+
     /**
      * Returns the annotations that this type declares or inherits from super types.
      *
@@ -8013,7 +8020,8 @@ public int getActualModifiers(boolean superFlag) {
             int actualModifiers = getModifiers()
                     | (getDeclaredAnnotations().isAnnotationPresent(Deprecated.class) ? Opcodes.ACC_DEPRECATED : EMPTY_MASK)
                     | (isRecord() ? Opcodes.ACC_RECORD : EMPTY_MASK)
-                    | (superFlag ? Opcodes.ACC_SUPER : EMPTY_MASK);
+                    | (superFlag ? Opcodes.ACC_SUPER : EMPTY_MASK)
+                    | (isModule() ? Opcodes.ACC_MODULE : EMPTY_MASK);
             if (isPrivate()) {
                 return actualModifiers & ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC);
             } else if (isProtected()) {
@@ -8059,6 +8067,13 @@ public String getGenericSignature() {
             }
         }
 
+        /**
+         * {@inheritDoc}
+         */
+        public boolean isModule() {
+            return toModuleDescription() != null;
+        }
+
         /**
          * {@inheritDoc}
          */

byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java

@@ -5080,7 +5080,8 @@ public void visit(int classFileVersionNumber,
                                 instrumentedType.getActualModifiers((modifiers & Opcodes.ACC_SUPER) != 0 && !instrumentedType.isInterface())
                                         | resolveDeprecationModifiers(modifiers)
                                         // Anonymous types might not preserve their class file's final modifier via their inner class modifier.
-                                        | (((modifiers & Opcodes.ACC_FINAL) != 0 && instrumentedType.isAnonymousType()) ? Opcodes.ACC_FINAL : 0),
+                                        | (((modifiers & Opcodes.ACC_FINAL) != 0 && instrumentedType.isAnonymousType()) ? Opcodes.ACC_FINAL : ModifierContributor.EMPTY_MASK)
+                                        | (instrumentedType.isModule() ? Opcodes.ACC_MODULE : ModifierContributor.EMPTY_MASK),
                                 instrumentedType.getInternalName(),
                                 TypeDescription.AbstractBase.RAW_TYPES
                                         ? genericSignature

byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java

@@ -3412,13 +3412,21 @@ public PackageDescription getPackage() {
                         : name.substring(0, index));
             }
 
+            /**
+             * {@inheritDoc}
+             */
             @MaybeNull
             public ModuleDescription toModuleDescription() {
                 return moduleToken == null
                         ? ModuleDescription.UNDEFINED
                         : moduleToken.toModuleDescription(this);
             }
 
+            @Override
+            public boolean isModule() {
+                return moduleToken != null;
+            }
+
             /**
              * {@inheritDoc}
              */