1 files changed, 39 insertions, 10 deletions

diff --git a/abi-check-plugin/src/main/java/com/yahoo/abicheck/collector/PublicSignatureCollector.java b/abi-check-plugin/src/main/java/com/yahoo/abicheck/collector/PublicSignatureCollector.java
index b7520c58d96..b6506bb4622 100644
--- a/abi-check-plugin/src/main/java/com/yahoo/abicheck/collector/PublicSignatureCollector.java
+++ b/abi-check-plugin/src/main/java/com/yahoo/abicheck/collector/PublicSignatureCollector.java
@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -18,8 +19,11 @@ public class PublicSignatureCollector extends ClassVisitor {
   private final Map<String, JavaClassSignature> classSignatures = new LinkedHashMap<>();
 
   private String currentName;
+  private String currentSuper;
+  private Set<String> currentInterfaces;
   private int currentAccess;
   private Set<String> currentMethods;
+  private Set<String> currentFields;
 
   public PublicSignatureCollector() {
     super(Opcodes.ASM6);
@@ -31,23 +35,39 @@ public class PublicSignatureCollector extends ClassVisitor {
 
   private static String describeMethod(String name, int access, String returnType,
       List<String> argumentTypes) {
-    String attributes = String.join(" ", Util.convertAccess(access, Util.methodFlags));
-    return String
-        .format("%s %s %s(%s)", attributes, returnType, name, String.join(", ", argumentTypes));
+    return String.format("%s %s %s(%s)", describeAccess(access, Util.methodFlags), returnType, name,
+        String.join(", ", argumentTypes));
+  }
+
+  private static String describeAccess(int access, List<Util.AccessFlag> possibleFlags) {
+    return String.join(" ", Util.convertAccess(access, possibleFlags));
+  }
+
+  private static String describeField(String name, int access, String type) {
+    return String.format("%s %s %s", describeAccess(access, Util.fieldFlags), type, name);
+  }
+
+  private static String internalNameToClassName(String superName) {
+    return Type.getObjectType(superName).getClassName();
   }
 
   @Override
   public void visit(int version, int access, String name, String signature, String superName,
       String[] interfaces) {
-    currentName = Type.getObjectType(name).getClassName();
+    currentName = internalNameToClassName(name);
+    currentSuper = internalNameToClassName(superName);
+    currentInterfaces = Arrays.stream(interfaces)
+        .map(PublicSignatureCollector::internalNameToClassName)
+        .collect(Collectors.toCollection(LinkedHashSet::new));
     currentAccess = access;
     currentMethods = new LinkedHashSet<>();
+    currentFields = new LinkedHashSet<>();
   }
 
   @Override
   public MethodVisitor visitMethod(int access, String name, String descriptor, String signature,
       String[] exceptions) {
-    if (isVisibleMethod(access)) {
+    if (isVisibleMember(access)) {
       Type method = Type.getMethodType(descriptor);
       List<String> argumentTypes = Arrays.stream(method.getArgumentTypes()).map(Type::getClassName)
           .collect(Collectors.toList());
@@ -57,12 +77,21 @@ public class PublicSignatureCollector extends ClassVisitor {
     return null;
   }
 
-  private boolean isVisibleMethod(int access) {
-    // Public methods are visible
+  @Override
+  public FieldVisitor visitField(int access, String name, String descriptor, String signature,
+      Object value) {
+    if (isVisibleMember(access)) {
+      currentFields.add(describeField(name, access, Type.getType(descriptor).getClassName()));
+    }
+    return null;
+  }
+
+  private boolean isVisibleMember(int access) {
+    // Public members are visible
     if (testBit(access, Opcodes.ACC_PUBLIC)) {
       return true;
     }
-    // Protected non-static methods are visible if the class is not final (can be called from
+    // Protected non-static members are visible if the class is not final (can be called from
     // extending classes)
     if (!testBit(access, Opcodes.ACC_STATIC) && testBit(access, Opcodes.ACC_PROTECTED) && !testBit(
         currentAccess, Opcodes.ACC_FINAL)) {
@@ -76,8 +105,8 @@ public class PublicSignatureCollector extends ClassVisitor {
   public void visitEnd() {
     if ((currentAccess & Opcodes.ACC_PUBLIC) != 0) {
       classSignatures.put(currentName,
-          new JavaClassSignature(Util.convertAccess(currentAccess, Util.classFlags),
-              currentMethods));
+          new JavaClassSignature(currentSuper, currentInterfaces,
+              Util.convertAccess(currentAccess, Util.classFlags), currentMethods, currentFields));
     }
   }