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

This commit is contained in:
Robin Bygrave committed 2016-02-16 09:21:10 +13:00
1 parent 4df2d4020e
commit ae7827c483
5 files changed
+6 -8

No files matched your search

@@ -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;
@@ -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);
}
@@ -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);
}