Add additional properties on class reader representation.

Author: raphw

byte-buddy-dep/src/main/java/net/bytebuddy/utility/AsmClassReader.java

@@ -15,6 +15,7 @@
  */
 package net.bytebuddy.utility;
 
+import jdk.internal.org.objectweb.asm.Opcodes;
 import net.bytebuddy.ClassFileVersion;
 import net.bytebuddy.build.AccessControllerPlugin;
 import net.bytebuddy.build.HashCodeAndEqualsPlugin;
@@ -26,6 +27,9 @@
 import org.objectweb.asm.ClassVisitor;
 
 import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * A facade for creating a class reader that accepts {@link ClassVisitor} instances and reader flags.
@@ -48,24 +52,37 @@ public interface AsmClassReader {
     <T> T unwrap(Class<T> type);
 
     /**
-     * Returns the internal name of the represented type's super class or {@code null} if there is none.
-     * The super class is - after possibility - read without parsing the entire class file.
+     * Returns the modifiers of the represented class. The property is read, if possible, without parsing the entire
+     * class file.
      *
-     * @return The internal name of the represented type's super class or {@code null} if there is none.
+     * @return The modifiers of the represented class.
      */
-    @MaybeNull
-    String getSuperClassName();
+    int getModifiers();
 
     /**
-     * Returns an array of internal names of the represented type's interface types, or {@code null} if
-     * none are defined. The interface types are - after possibility - read without parsing the entire
-     * class file.
+     * Returns the internal name of the represented class. The property is read, if possible, without parsing
+     * the entire class file.
      *
-     * @return An array of internal names of the represented type's interface types, or {@code null} if
-     * none are defined.
+     * @return The internal name of the represented class.
+     */
+    String getInternalName();
+
+    /**
+     * Returns the internal name of the represented class's super class, or {@code null} if no such class exists.
+     * The property is read, if possible, without parsing the entire class file.
+     *
+     * @return The internal name of the represented class's super class, or {@code null} if no such class exists.
      */
     @MaybeNull
-    String[] getInterfaceTypeName();
+    String getSuperClassInternalName();
+
+    /**
+     * Returns the internal names of the represented class's interfaces. The property is read, if possible,
+     * without parsing the entire class file.
+     *
+     * @return Returns the internal names of the represented class's interfaces.
+     */
+    List<String> getInterfaceInternalNames();
 
     /**
      * Accepts a class visitor to read a class.
@@ -238,6 +255,35 @@ public <T> T unwrap(Class<T> type) {
                     : null;
         }
 
+        /**
+         * {@inheritDoc}
+         */
+        public int getModifiers() {
+            return classReader.getAccess();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public String getInternalName() {
+            return classReader.getClassName();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public String getSuperClassInternalName() {
+            return classReader.getSuperName();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public List<String> getInterfaceInternalNames() {
+            String[] value = classReader.getInterfaces();
+            return value == null ? Collections.emptyList() : Arrays.asList(value);
+        }
+
         /**
          * {@inheritDoc}
          */
@@ -298,6 +344,52 @@ public <T> T unwrap(Class<T> type) {
                     : null;
         }
 
+        /**
+         * {@inheritDoc}
+         */
+        public int getModifiers() {
+            return DISPATCHER.getAccess(classReader);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public String getInternalName() {
+            return DISPATCHER.getClassName(classReader);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @MaybeNull
+        public String getSuperClassInternalName() {
+            return DISPATCHER.getSuperClass(classReader);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public List<String> getInterfaceInternalNames() {
+            String[] value = DISPATCHER.getInterfaces(classReader);
+            return value == null ? Collections.emptyList() : Arrays.asList(value);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @MaybeNull
+        public String getSuperClassName() {
+            return DISPATCHER.getSuperClass(classReader);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @MaybeNull
+        public String[] getInterfaceTypeName() {
+            return DISPATCHER.getInterfaces(classReader);
+        }
+
         /**
          * {@inheritDoc}
          */
@@ -330,6 +422,40 @@ protected interface JdkClassReader {
             @JavaDispatcher.IsConstructor
             Object make(byte[] binaryRepresentation, Attribute[] attribute);
 
+            /**
+             * Returns the access flags of the underlying {@code codes.rafael.asmjdkbridge.JdkClassReader}.
+             *
+             * @param classReader The class reader that is being queried.
+             * @return The access flags of the underlying {@code codes.rafael.asmjdkbridge.JdkClassReader}.
+             */
+            int getAccess(Object classReader);
+
+            /**
+             * Returns the internal name of the represented type.
+             *
+             * @param classReader The class reader that is being queried.
+             * @return The internal name of the represented type.
+             */
+            String getClassName(Object classReader);
+
+            /**
+             * Returns the internal name of the represented type's super class or {@code null} if there is none.
+             *
+             * @param classReader The class reader that is being queried.
+             * @return The internal name of the represented type's super class or {@code null} if there is none.
+             */
+            @MaybeNull
+            String getSuperClass(Object classReader);
+
+            /**
+             * Returns an array of internal names of the represented type's interface types, or {@code null} if none.
+             *
+             * @param classReader The class reader that is being queried.
+             * @return An array of internal names of the represented type's interface types, or {@code null} if none.
+             */
+            @MaybeNull
+            String[] getInterfaces(Object classReader);
+
             /**
              * Accepts a class reader to visit the represented class file.
              *

pom.xml

@@ -70,7 +70,7 @@
         <bytecode.test.version>1.6</bytecode.test.version>
         <pitest.target>net.bytebuddy</pitest.target>
         <version.asm>9.8</version.asm>
-        <version.asmjdkbridge>0.0.9</version.asmjdkbridge>
+        <version.asmjdkbridge>0.0.10</version.asmjdkbridge>
         <version.jna>5.12.1</version.jna>
         <version.junit>4.13.2</version.junit>
         <version.mockito>2.28.2</version.mockito>