Merge pull request #207 from ebean-orm/feature/206

#206 Fix Signature when adding interface to class

Author: rbygrave

ebean-agent/src/main/java/io/ebean/enhance/common/VisitUtil.java

@@ -3,7 +3,18 @@
 import io.ebean.enhance.asm.MethodVisitor;
 import io.ebean.enhance.asm.Opcodes;
 
-public class VisitUtil implements Opcodes {
+public final class VisitUtil implements Opcodes {
+
+  /**
+   * Append the interfaceType to the existing class signature.
+   */
+  public static String signatureAppend(String signature, String interfaceType) {
+    if (signature == null) {
+      return 'L' + interfaceType + ';';
+    } else {
+      return signature + 'L' + interfaceType + ';';
+    }
+  }
 
   /**
   * Helper method for visiting an int value.

ebean-agent/src/main/java/io/ebean/enhance/entity/ClassAdapterEntity.java

@@ -5,10 +5,7 @@
 import io.ebean.enhance.asm.FieldVisitor;
 import io.ebean.enhance.asm.MethodVisitor;
 import io.ebean.enhance.asm.Opcodes;
-import io.ebean.enhance.common.ClassMeta;
-import io.ebean.enhance.common.EnhanceConstants;
-import io.ebean.enhance.common.EnhanceContext;
-import io.ebean.enhance.common.NoEnhancementRequiredException;
+import io.ebean.enhance.common.*;
 
 import static io.ebean.enhance.Transformer.EBEAN_ASM_VERSION;
 
@@ -58,21 +55,22 @@ public void visit(int version, int access, String name, String signature, String
     skipMockitoMock(name);
     classMeta.setClassName(name, superName);
 
-    String[] c = new String[interfaces.length + 1];
+    String[] newInterfaces = new String[interfaces.length + 1];
     for (int i = 0; i < interfaces.length; i++) {
-      c[i] = interfaces[i];
-      if (c[i].equals(C_ENTITYBEAN)) {
+      newInterfaces[i] = interfaces[i];
+      if (newInterfaces[i].equals(C_ENTITYBEAN)) {
         throw new NoEnhancementRequiredException();
       }
-      if (c[i].equals(C_SCALAOBJECT)) {
+      if (newInterfaces[i].equals(C_SCALAOBJECT)) {
         classMeta.setScalaInterface(true);
       }
-      if (c[i].equals(C_GROOVYOBJECT)) {
+      if (newInterfaces[i].equals(C_GROOVYOBJECT)) {
         classMeta.setGroovyInterface(true);
       }
     }
     // add the EntityBean interface
-    c[c.length - 1] = C_ENTITYBEAN;
+    newInterfaces[newInterfaces.length - 1] = C_ENTITYBEAN;
+    String newSignature = VisitUtil.signatureAppend(signature, C_ENTITYBEAN);
     if (classMeta.isLog(8)) {
       classMeta.log("... add EntityBean interface");
     }
@@ -87,7 +85,7 @@ public void visit(int version, int access, String name, String signature, String
         classMeta.setSuperMeta(superMeta);
       }
     }
-    super.visit(version, access, name, signature, superName, c);
+    super.visit(version, access, name, newSignature, superName, newInterfaces);
   }
 
   /**

ebean-agent/src/main/java/io/ebean/enhance/transactional/ClassAdapterTransactional.java

@@ -5,13 +5,7 @@
 import io.ebean.enhance.asm.FieldVisitor;
 import io.ebean.enhance.asm.Label;
 import io.ebean.enhance.asm.MethodVisitor;
-import io.ebean.enhance.common.AlreadyEnhancedException;
-import io.ebean.enhance.common.AnnotationInfo;
-import io.ebean.enhance.common.AnnotationInfoVisitor;
-import io.ebean.enhance.common.ClassMeta;
-import io.ebean.enhance.common.EnhanceConstants;
-import io.ebean.enhance.common.EnhanceContext;
-import io.ebean.enhance.common.NoEnhancementRequiredException;
+import io.ebean.enhance.common.*;
 import io.ebean.enhance.querybean.TypeQueryUtil;
 
 import java.util.*;
@@ -154,7 +148,8 @@ public void visit(int version, int access, String name, String signature, String
 
     // Add the EnhancedTransactional interface
     newInterfaces[newInterfaces.length - 1] = EnhanceConstants.C_ENHANCEDTRANSACTIONAL;
-    super.visit(version, access, name, signature, superName, newInterfaces);
+    String newSignature = VisitUtil.signatureAppend(signature, C_ENHANCEDTRANSACTIONAL);
+    super.visit(version, access, name, newSignature, superName, newInterfaces);
   }
 
   /**