Merge pull request #213 from ebean-orm/feature/improvedQueryBeansSupport

Improved Query beans support (AssocOne and AssocMany)

Author: rbygrave

ebean-agent/pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-agent</artifactId>
-  <version>14.5.1</version>
+  <version>14.5.2</version>
   <packaging>jar</packaging>
 
   <name>ebean-agent</name>

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

@@ -490,6 +490,10 @@ public boolean supportsProfileWithLine() {
     return enhancementVersion >= 143; // Ebean 13.13.1 onwards
   }
 
+  public boolean improvedQueryBeans() {
+    return enhancementVersion >= 145;
+  }
+
   public ProfileLineNumberMode profileLineMode() {
     return profileLineNumberMode;
   }

ebean-agent/src/main/java/io/ebean/enhance/querybean/TypeQueryClassAdapter.java

@@ -104,7 +104,11 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
           return super.visitMethod(access, name, desc, signature, exceptions);
         }
         if (!typeQueryRootBean) {
-          return handleAssocBeanConstructor(access, name, desc, signature, exceptions);
+          if (enhanceContext.improvedQueryBeans()) {
+            return super.visitMethod(access, name, desc, signature, exceptions);
+          } else {
+             return handleAssocBeanConstructor(access, name, desc, signature, exceptions);
+          }
         }
         return new TypeQueryConstructorAdapter(classInfo, superName, getDomainClass(), cv, desc, signature);
       }
@@ -161,7 +165,9 @@ public void visitEnd() {
     }
     if (classInfo.isTypeQueryBean()) {
       if (!typeQueryRootBean) {
-        classInfo.addAssocBeanExtras(cv, superName);
+        if (!enhanceContext.improvedQueryBeans()) {
+          classInfo.addAssocBeanExtras(cv, superName);
+        }
       } else {
         enhanceContext.summaryQueryBean(className);
       }

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

@@ -70,7 +70,10 @@ private static boolean filterManyInit(String desc) {
   }
 
   private boolean isAssocQueryBean(String owner) {
-    return owner.contains("/query/assoc/QAssoc") || owner.endsWith("$Assoc");
+    return owner.contains("/query/assoc/QAssoc")
+      || owner.endsWith("$Assoc")
+      || owner.endsWith("$AssocMany")
+      || owner.endsWith("$AssocOne");
   }
 
   private boolean isNewUpdateQuery(String name, String desc) {

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-agent-reactor</artifactId>
-  <version>14.5.1</version>
+  <version>14.5.2</version>
   <packaging>pom</packaging>
   <name>ebean agent reactor</name>
 

test/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.ebean</groupId>
     <artifactId>ebean-agent-reactor</artifactId>
-    <version>14.5.1</version>
+    <version>14.5.2</version>
   </parent>
 
   <artifactId>ebean-agent-test</artifactId>