#566 - Refactor internals - SpiExpression, add prepareExpression() to merge queryAutoTuneHash() and queryPlanHash() - tidy up createQueryRequest - part 2

src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java

@@ -13,11 +13,8 @@ import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
 import com.avaje.ebean.event.readaudit.ReadAuditLogger;
 import com.avaje.ebean.event.readaudit.ReadAuditPrepare;
-import com.avaje.ebeaninternal.server.core.SpiOrmQueryRequest;
-import com.avaje.ebean.dbmigration.DdlGenerator;
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
 import com.avaje.ebeaninternal.server.query.CQuery;
-import com.avaje.ebeaninternal.server.query.CQueryEngine;
 import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent;
 
 import java.util.List;

src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java

@@ -348,7 +348,7 @@ public interface SpiQuery<T> extends Query<T> {
   /**
    * Convert any many joins fetch joins to query joins.
    */
-  void convertManyFetchJoinsToQueryJoins(boolean allowOne, int queryBatch);
+  void convertManyFetchJoinsToQueryJoins(int queryBatch);
 
   /**
    * Return the TransactionContext.

src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java

@@ -1080,10 +1080,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       query.setSqlDistinct(true);
     }
 
-    query.convertManyFetchJoinsToQueryJoins(query.isAllowOneManyFetch(), queryBatchSize);
+    query.convertManyFetchJoinsToQueryJoins(queryBatchSize);
 
     OrmQueryRequest<T> request = new OrmQueryRequest<T>(this, queryEngine, query, desc, (SpiTransaction) t);
-    request.adapterPreQuery();
     request.prepareQuery();
 
     return request;

src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java

@@ -133,7 +133,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Run BeanQueryAdapter preQuery() if needed.
    */
-  public void adapterPreQuery() {
+  private void adapterPreQuery() {
     BeanQueryAdapter queryAdapter = beanDescriptor.getQueryAdapter();
     if (queryAdapter != null) {
       queryAdapter.preQuery(this);
@@ -144,6 +144,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
    * Prepare the query and calculate the query plan key.
    */
   public void prepareQuery() {
+    adapterPreQuery();
     this.queryPlanKey = query.prepare(this);
   }
 

src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -456,7 +456,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   /**
    * Convert any many joins fetch joins to query joins.
    */
-  public void convertManyFetchJoinsToQueryJoins(boolean allowOne, int queryBatch) {
+  public void convertManyFetchJoinsToQueryJoins(int queryBatch) {
+    boolean allowOne = isAllowOneManyFetch();
     detail.convertManyFetchJoinsToQueryJoins(beanDescriptor, lazyLoadManyPath, allowOne, queryBatch);
   }