Merge pull request #218 from ebean-orm/feature/fluid-queryBuilders

Support fluid QueryBuilder, QueryBean etc

Author: rbygrave

ebean-agent/pom.xml

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

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

@@ -494,6 +494,10 @@ public boolean improvedQueryBeans() {
     return enhancementVersion >= 145;
   }
 
+  public boolean fluidQueryBuilders() {
+    return enhancementVersion >= 148;
+  }
+
   public ProfileLineNumberMode profileLineMode() {
     return profileLineNumberMode;
   }

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

@@ -330,6 +330,10 @@ private void addStaticInitialiser() {
     mv.visitEnd();
   }
 
+  boolean fluidQueryBuilders() {
+    return enhanceContext.fluidQueryBuilders();
+  }
+
   /**
    * Return true if profile location enhancement is on.
    */

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

@@ -33,7 +33,10 @@ public void visitMethodInsn(int opcode, String owner, String name, String desc,
           classAdapter.log("add profile location " + fieldIdx);
         }
         mv.visitFieldInsn(GETSTATIC, classAdapter.className(), QP_FIELD_PREFIX + fieldIdx, "Lio/ebean/ProfileLocation;");
-        mv.visitMethodInsn(INVOKEVIRTUAL, owner, "setProfileLocation", "(Lio/ebean/ProfileLocation;)Ljava/lang/Object;", false);
+        String descriptor = classAdapter.fluidQueryBuilders()
+          ? "(Lio/ebean/ProfileLocation;)Lio/ebean/typequery/QueryBean;"
+          : "(Lio/ebean/ProfileLocation;)Ljava/lang/Object;";
+        mv.visitMethodInsn(INVOKEVIRTUAL, owner, "setProfileLocation", descriptor, false);
         mv.visitTypeInsn(CHECKCAST, owner);
       }
 

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-agent-reactor</artifactId>
-  <version>14.7.0</version>
+  <version>14.7.1</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.7.0</version>
+    <version>14.7.1</version>
   </parent>
 
   <artifactId>ebean-agent-test</artifactId>