#411 - Refactor AutoFetch, rename to "AutoTune", store/load tuning and profiling as XML

src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java

@@ -22,7 +22,7 @@ public class DefaultOrmQueryTest {
         .fetch("details.product", "sku, name");
 
     HashQueryPlanBuilder b1 = new HashQueryPlanBuilder();
-    query1.queryAutofetchHash(b1);
+    query1.queryAutoTuneHash(b1);
     HashQueryPlan hash1 = b1.build();
 
     SpiQuery<?> query2 = (SpiQuery<?>)Ebean.find(Order.class)
@@ -31,7 +31,7 @@ public class DefaultOrmQueryTest {
         .fetch("details.product", "sku, name");
 
     HashQueryPlanBuilder b2 = new HashQueryPlanBuilder();
-    query2.queryAutofetchHash(b2);
+    query2.queryAutoTuneHash(b2);
     HashQueryPlan hash2 = b2.build();
 
     assertThat(hash1).isNotEqualTo(hash2);

src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java

@@ -50,7 +50,7 @@ public class AutofetchEmbeddedTest extends BaseTestCase {
 //    for (int i = 0; i < 5; i++) {
 //      Ebean.beginTransaction();
 //      try {
-//        List<EMain> result = Ebean.find(EMain.class).setAutofetch(true).findList();
+//        List<EMain> result = Ebean.find(EMain.class).setAutoTune(true).findList();
 //        for (EMain e : result) {
 //          e.getEmbeddable().setDescription("Test" + i);
 //          Ebean.save(e);

src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java

@@ -17,7 +17,7 @@ public class MainAutoFetchExcludeLazyLobs {
 		Ebean.save(a);
 		
 		List<EBasicClob> list = Ebean.find(EBasicClob.class)
-			.setAutofetch(true)
+			.setAutoTune(true)
 			.findList();
 		
 		for (EBasicClob bean : list) {

src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java

@@ -18,7 +18,7 @@ public class MainAutoQueryTune1 {
 
 	private void tuneJoin() {
 		List<Order> list = Ebean.find(Order.class)
-			.setAutofetch(true)
+			.setAutoTune(true)
 			.fetch("customer")
 			.where()
 			.eq("status", Order.Status.NEW)

src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java

@@ -15,7 +15,7 @@ import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.bean.EntityBeanIntercept;
 import com.avaje.ebean.cache.ServerCacheManager;
 import com.avaje.ebeaninternal.api.SpiQuery;
-import com.avaje.ebeaninternal.server.autofetch.service.TunedQueryInfo;
+import com.avaje.ebeaninternal.server.autotune.service.TunedQueryInfo;
 import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
 import com.avaje.tests.model.basic.Order;
 import com.avaje.tests.model.basic.ResetBasicData;

src/test/java/com/avaje/tests/basic/MainDbBoolean.java

@@ -120,7 +120,7 @@ public class MainDbBoolean {
 
 		
 		List<TOne> list = server.find(TOne.class)
-			.setAutofetch(false)
+			.setAutoTune(false)
 			.order("id")
 			.findList();
 		
@@ -140,7 +140,7 @@ public class MainDbBoolean {
 		
 
 		Query<TOne> query = server.find(TOne.class)
-			.setAutofetch(false)
+			.setAutoTune(false)
 			.order("id");
 	
 		int rc = query.findRowCount();

src/test/java/com/avaje/tests/basic/TestFetchId.java

@@ -21,7 +21,7 @@ public class TestFetchId extends BaseTestCase {
 		ResetBasicData.reset();
 		
 		Query<Order> query = Ebean.find(Order.class)
-			.setAutofetch(false)
+			.setAutoTune(false)
 			.fetch("details")
 			.where().gt("id", 1)
 			.gt("details.id", 0)

src/test/java/com/avaje/tests/basic/TestInheritRef.java

@@ -31,7 +31,7 @@ public class TestInheritRef extends BaseTestCase {
       Ebean.save(t);
 
       List<Vehicle> list = Ebean.find(Vehicle.class)
-              .setAutofetch(false)
+              .setAutoTune(false)
               .findList();
 
       Assert.assertTrue(list.size() > 0);

src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java

@@ -24,7 +24,7 @@ public class TestLazyLoadEmptyOneToMany extends BaseTestCase {
     Ebean.save(c);
 
     Customer c1 = Ebean.find(Customer.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .select("id")
         .fetch("contacts", "id")
         .where().idEq(c.getId())

src/test/java/com/avaje/tests/basic/TestLimitQuery.java

@@ -30,7 +30,7 @@ public class TestLimitQuery extends BaseTestCase {
     boolean h2Db = "h2".equals(server.getDatabasePlatform().getName());
 
     Query<Order> query = Ebean.find(Order.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .fetch("details")
         .where().gt("details.id", 0)
         .setMaxRows(0)
@@ -57,7 +57,7 @@ public class TestLimitQuery extends BaseTestCase {
     boolean h2Db = "h2".equals(server.getDatabasePlatform().getName());
 
     Query<Order> query = Ebean.find(Order.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .fetch("details")
         .where().gt("details.id", 0)
         .setMaxRows(3)
@@ -83,7 +83,7 @@ public class TestLimitQuery extends BaseTestCase {
     boolean h2Db = "h2".equals(server.getDatabasePlatform().getName());
 
     Query<Order> query = Ebean.find(Order.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .fetch("details")
         .where().gt("details.id", 0)
         .query();
@@ -107,7 +107,7 @@ public class TestLimitQuery extends BaseTestCase {
     boolean h2Db = "h2".equals(server.getDatabasePlatform().getName());
 
     Query<Order> query = Ebean.find(Order.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .fetch("details")
         .where().gt("details.id", 0)
         .setMaxRows(10);
@@ -131,7 +131,7 @@ public class TestLimitQuery extends BaseTestCase {
     }
 
     query = Ebean.find(Order.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .fetch("details")
         .setMaxRows(10);
 

src/test/java/com/avaje/tests/basic/TestQuery.java

@@ -16,7 +16,7 @@ public class TestQuery extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class).setAutofetch(false).order().asc("orderDate")
+    Query<Order> query = Ebean.find(Order.class).setAutoTune(false).order().asc("orderDate")
         .order().desc("id");
     // .orderBy("orderDate");
 
@@ -31,14 +31,14 @@ public class TestQuery extends BaseTestCase {
   public void testForUpdate() {
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class).setAutofetch(false).setForUpdate(false)
+    Query<Order> query = Ebean.find(Order.class).setAutoTune(false).setForUpdate(false)
         .setMaxRows(1).order().asc("orderDate").order().desc("id");
 
     int rc = query.findList().size();
     Assert.assertTrue(rc > 0);
     Assert.assertTrue(!query.getGeneratedSql().toLowerCase().contains("for update"));
 
-    query = Ebean.find(Order.class).setAutofetch(false).setForUpdate(true).setMaxRows(1).order()
+    query = Ebean.find(Order.class).setAutoTune(false).setForUpdate(true).setMaxRows(1).order()
         .asc("orderDate").order().desc("id");
 
     rc = query.findList().size();

src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java

@@ -20,7 +20,7 @@ public class TestQueryWhereBetween extends BaseTestCase {
 
     Timestamp t = new Timestamp(System.currentTimeMillis());
 
-    Query<Order> query = Ebean.find(Order.class).setAutofetch(false).where()
+    Query<Order> query = Ebean.find(Order.class).setAutoTune(false).where()
         .betweenProperties("cretime", "updtime", t).order().asc("orderDate").order().desc("id");
 
     query.findList();

src/test/java/com/avaje/tests/basic/TestQueryWithCache.java

@@ -22,7 +22,7 @@ public class TestQueryWithCache extends BaseTestCase {
   // Ebean.getServer(null).runCacheWarming();
   //
   // Query<Order> query = Ebean.createQuery(Order.class)
-  // .setAutofetch(false)
+  // .setAutoTune(false)
   // .fetch("customer","+cache +readonly")
   // .setId(1);
   //
@@ -107,7 +107,7 @@ public class TestQueryWithCache extends BaseTestCase {
 
     Country nz3 = Ebean.find(Country.class, "NZ");
 
-    Country nz4 = Ebean.find(Country.class).setId("NZ").setAutofetch(false).setUseCache(false)
+    Country nz4 = Ebean.find(Country.class).setId("NZ").setAutoTune(false).setUseCache(false)
         .findUnique();
 
     Assert.assertTrue(nz2 == nz2b);

src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java

@@ -24,7 +24,7 @@ public class TestReadOnlyPropagation extends BaseTestCase {
 		ResetBasicData.reset();
 		
 		Order order = Ebean.find(Order.class)
-			.setAutofetch(false)
+			.setAutoTune(false)
 			.setUseCache(false)
 			.setReadOnly(true)
 			.setId(1)

src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java

@@ -27,7 +27,7 @@ public class TestSharedInstancePropagation extends BaseTestCase {
 		Ebean.getServerCacheManager().clearAll();
 
 		Order order = Ebean.find(Order.class)
-			.setAutofetch(false)
+			.setAutoTune(false)
 			.setUseCache(true)
 			.setReadOnly(true)
 			.setId(1)

src/test/java/com/avaje/tests/basic/TestTransient.java

@@ -19,7 +19,7 @@ public class TestTransient extends BaseTestCase {
     Ebean.save(cnew);
     Integer custId = cnew.getId();
 
-    Customer c = Ebean.find(Customer.class).setAutofetch(false).setId(custId).findUnique();
+    Customer c = Ebean.find(Customer.class).setAutoTune(false).setId(custId).findUnique();
 
     Assert.assertNotNull(c);
 

src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java

@@ -30,14 +30,14 @@ public class TestExtraScalarTypes extends BaseTestCase {
 
     Ebean.save(e);
 
-    ESomeType e2 = Ebean.find(ESomeType.class).setAutofetch(false).setId(e.getId()).findUnique();
+    ESomeType e2 = Ebean.find(ESomeType.class).setAutoTune(false).setId(e.getId()).findUnique();
 
     Assert.assertNotNull(e2.getCurrency());
     Assert.assertNotNull(e2.getLocale());
     Assert.assertNotNull(e2.getTimeZone());
 
     List<ESomeType> list = Ebean.find(ESomeType.class)
-        .setAutofetch(false).where()
+        .setAutoTune(false).where()
         .eq("locale", locale)
         .eq("timeZone", tz.getID())
         .eq("currency", currency)

src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java

@@ -20,7 +20,7 @@ public class TestSecondQueryNoRows extends BaseTestCase {
     Ebean.save(cnew);
 
     Customer c = Ebean.find(Customer.class)
-            .setAutofetch(false)
+            .setAutoTune(false)
             .setId(cnew.getId())
             .fetch("contacts", new FetchConfig().query())
             .findUnique();

src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java

@@ -35,7 +35,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
     custCache.clear();
     custManyIdsCache.clear();
 
-    List<Customer> list = Ebean.find(Customer.class).setAutofetch(false).setLoadBeanCache(true)
+    List<Customer> list = Ebean.find(Customer.class).setAutoTune(false).setLoadBeanCache(true)
         .order().asc("id").findList();
 
     Assert.assertTrue(list.size() > 1);

src/test/java/com/avaje/tests/cache/TestCacheCustomer.java

@@ -19,7 +19,7 @@ public class TestCacheCustomer extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    List<Customer> list = Ebean.find(Customer.class).setAutofetch(false).setLoadBeanCache(true)
+    List<Customer> list = Ebean.find(Customer.class).setAutoTune(false).setLoadBeanCache(true)
         .findList();
 
     Assert.assertTrue(list.size() > 1);

src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java

@@ -8,7 +8,7 @@ import com.avaje.ebean.Ebean;
 import com.avaje.ebean.Query;
 import com.avaje.ebean.cache.ServerCache;
 import com.avaje.ebeaninternal.api.SpiQuery;
-import com.avaje.ebeaninternal.server.autofetch.service.TunedQueryInfo;
+import com.avaje.ebeaninternal.server.autotune.service.TunedQueryInfo;
 import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
 import com.avaje.tests.model.basic.FeatureDescription;
 

src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java.orig

@@ -1,70 +0,0 @@
-package com.avaje.tests.ddd.iud;
-
-<<<<<<< HEAD
-import junit.framework.TestCase;
-
-import com.avaje.ebean.config.GlobalProperties;
-=======
-import java.util.Currency;
-
-import junit.framework.TestCase;
-
-import org.junit.Assert;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.config.GlobalProperties;
-import com.avaje.ebean.text.json.JsonContext;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.ebeaninternal.server.el.ElPropertyValue;
->>>>>>> json-refactor
-import com.avaje.tests.model.ddd.DPerson;
-
-public class TestDPersonEl extends TestCase {
-
-    public void test() {
-        
-        GlobalProperties.put("classes", DPerson.class.toString());
-        
-        Currency NZD = Currency.getInstance("NZD");
-        
-        DPerson p = new DPerson();
-        p.setFirstName("first");
-        p.setLastName("last");
-        p.setSalary(new Money("12200"));
-        p.setCmoney(new CMoney(new Money("12"), NZD));
-        
-        SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null);
-        
-        BeanDescriptor<DPerson> descriptor = server.getBeanDescriptor(DPerson.class);
-        
-        ElPropertyValue elCmoney = descriptor.getElGetValue("cmoney");
-//        ElPropertyValue elCmoneyAmt = descriptor.getElGetValue("cmoney.amount");
-//        ElPropertyValue elCmoneyCur = descriptor.getElGetValue("cmoney.currency");
-        
-        JsonContext jsonContext = server.createJsonContext();
-        String json = jsonContext.toJsonString(p);
-        
-        DPerson bean = jsonContext.toBean(DPerson.class, json);
-        Assert.assertEquals("first", bean.getFirstName());
-        Assert.assertEquals(new Money("12200"), bean.getSalary());
-        Assert.assertEquals(new Money("12"), bean.getCmoney().getAmount());
-        Assert.assertEquals(NZD, bean.getCmoney().getCurrency());
-        
-        
-        EntityBean entityBean = (EntityBean)p;
-        
-        Object cmoney = elCmoney.elGetValue(entityBean);
-//        Object amt = elCmoneyAmt.elGetValue(entityBean);
-//        Object cur = elCmoneyCur.elGetValue(entityBean);
-        
-        Assert.assertNotNull(cmoney);
-//        Assert.assertEquals(new Money("12"), amt);
-//        Assert.assertEquals(NZD, cur);
-        
-        p.setCmoney(null);
-        Assert.assertNull(p.getCmoney());
-    }
-    
-}

src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java

@@ -25,7 +25,7 @@ public class TestDPersonIUD extends TestCase {
 //        Assert.assertNotNull(id);
 //        
 //        DPerson p2 = Ebean.find(DPerson.class)
-//            .setAutofetch(false)
+//            .setAutoTune(false)
 //            .where().idEq(id)
 //            .findUnique();
 //        
@@ -38,7 +38,7 @@ public class TestDPersonIUD extends TestCase {
 //        
 //        
 //        Query<DPerson> query = Ebean.find(DPerson.class)
-//            .setAutofetch(false)
+//            .setAutoTune(false)
 //            .where().gt("cmoney.amount",1)
 //            .query();
 //        

src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java

@@ -27,7 +27,7 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<Order> q = Ebean.find(Order.class)
-        .setAutofetch(true)
+        .setAutoTune(true)
         //.fetch("customer")
         //.fetch("customer.contacts")
         .where().lt("id", 3).query();
@@ -65,7 +65,7 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase {
     // System.out.println(queryStats);
     // }
 
-    if (q.isAutofetchTuned()) {
+    if (q.isAutoTuned()) {
       System.out.println("TUNED...");
     }
   }

src/test/java/com/avaje/tests/query/TestLimitQuery.java

@@ -17,7 +17,7 @@ public class TestLimitQuery extends BaseTestCase {
     ResetBasicData.reset();
 
     List<Customer> customers = Ebean.find(Customer.class)
-            .setAutofetch(false)
+            .setAutoTune(false)
             .setFirstRow(0)
             .setMaxRows(10)
             .where().like("name", "%A%")

src/test/java/com/avaje/tests/query/TestQueryAlias.java

@@ -18,7 +18,7 @@ public class TestQueryAlias extends BaseTestCase {
 
     Query<CKeyParent> sq = Ebean.createQuery(CKeyParent.class)
             .select("id.oneKey").alias("st0")
-            .setAutofetch(false).where().query();
+            .setAutoTune(false).where().query();
 
     Query<CKeyParent> pq = Ebean.find(CKeyParent.class).alias("myt0").where().in("id.oneKey", sq).query();
 
@@ -44,7 +44,7 @@ public class TestQueryAlias extends BaseTestCase {
 
     Query<CKeyParent> sq = Ebean.createQuery(CKeyParent.class)
         .select("id.oneKey").alias("st0")
-        .setAutofetch(false).where().query();
+        .setAutoTune(false).where().query();
 
     Query<CKeyParent> pq = Ebean.find(CKeyParent.class).alias("myt0").where().notIn("id.oneKey", sq).query();
 

src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java

@@ -23,7 +23,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase {
 
     // test that join to order.details is not included in the initial query (included in query join)
     Query<Customer> query = Ebean.find(Customer.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .fetch("orders")
         .fetch("orders.details");
 
@@ -66,7 +66,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase {
     
     // test that join to order.details is not included
     Query<OrderShipment> shipQuery = Ebean.find(OrderShipment.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .fetch("order")
         .fetch("order.details");
 
@@ -107,7 +107,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase {
     
     // test that join to order.details is not included
     Query<Contact> query = Ebean.find(Contact.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .fetch("customer")
         .fetch("customer.orders");
 
@@ -138,7 +138,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase {
     
     // test that join to order.details is not included
     Query<Contact> query = Ebean.find(Contact.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .fetch("customer")
         .where().ilike("customer.name", "Rob%")
         .query();

src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java

@@ -21,8 +21,8 @@ public class TestQueryFetchSkipPath extends BaseTestCase {
 
     List<Order> list = Ebean.find(Order.class)
 
-    // .setAutofetch(true)
-        .setAutofetch(false).select("status")
+    // .setAutoTune(true)
+        .setAutoTune(false).select("status")
         // .fetch("customer","id")
         // .fetch("customer.contacts","id")
         .fetch("customer.contacts.notes", "title").findList();

src/test/java/com/avaje/tests/query/TestQueryFindEach.java

@@ -19,7 +19,7 @@ public class TestQueryFindEach extends BaseTestCase {
 
     Query<Customer> query
             = server.find(Customer.class)
-            .setAutofetch(false)
+            .setAutoTune(false)
             .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id")
             .setMaxRows(2);
 
@@ -46,7 +46,7 @@ public class TestQueryFindEach extends BaseTestCase {
 
     EbeanServer server = Ebean.getServer(null);
 
-    Query<Customer> query = server.find(Customer.class).setAutofetch(false)
+    Query<Customer> query = server.find(Customer.class).setAutoTune(false)
         .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id")
         .setMaxRows(2);
 

src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java

@@ -19,7 +19,7 @@ public class TestQueryFindEachWhile extends BaseTestCase {
 
     Query<Customer> query
             = server.find(Customer.class)
-            .setAutofetch(false)
+            .setAutoTune(false)
             .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id")
             .setMaxRows(2);
 
@@ -47,7 +47,7 @@ public class TestQueryFindEachWhile extends BaseTestCase {
 
     EbeanServer server = Ebean.getServer(null);
 
-    Query<Customer> query = server.find(Customer.class).setAutofetch(false)
+    Query<Customer> query = server.find(Customer.class).setAutoTune(false)
         .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id")
         .setMaxRows(2);
 

src/test/java/com/avaje/tests/query/TestQueryFindIterate.java

@@ -26,7 +26,7 @@ public class TestQueryFindIterate extends BaseTestCase {
     EbeanServer server = Ebean.getServer(null);
 
     Query<Customer> query = server.find(Customer.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         //.fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id")
         .setMaxRows(2);
 
@@ -154,7 +154,7 @@ public class TestQueryFindIterate extends BaseTestCase {
 
     // intentionally a query with incorrect type binding
     Query<Customer> query = server.find(Customer.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .where().gt("id","JUNK_NOT_A_LONG")
         .setMaxRows(2);
 
@@ -178,7 +178,7 @@ public class TestQueryFindIterate extends BaseTestCase {
     EbeanServer server = Ebean.getServer(null);
 
     Query<Customer> query = server.find(Customer.class)
-        .setAutofetch(false)
+        .setAutoTune(false)
         .where().gt("id", 0)
         .setMaxRows(2);
 

src/test/java/com/avaje/tests/query/TestQueryFindVisit.java

@@ -22,7 +22,7 @@ public class TestQueryFindVisit extends BaseTestCase {
 
     EbeanServer server = Ebean.getServer(null);
 
-    Query<Customer> query = server.find(Customer.class).setAutofetch(false)
+    Query<Customer> query = server.find(Customer.class).setAutoTune(false)
         .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id")
         .setMaxRows(2);
 
@@ -47,7 +47,7 @@ public class TestQueryFindVisit extends BaseTestCase {
 
     EbeanServer server = Ebean.getServer(null);
 
-    Query<Customer> query = server.find(Customer.class).setAutofetch(false)
+    Query<Customer> query = server.find(Customer.class).setAutoTune(false)
         .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id")
         .setMaxRows(2);
 

src/test/java/com/avaje/tests/query/TestSubQuery.java

@@ -49,7 +49,7 @@ public class TestSubQuery extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<CKeyParent> sq = Ebean.createQuery(CKeyParent.class).select("id.oneKey")
-        .setAutofetch(false).where().query();
+        .setAutoTune(false).where().query();
 
     Query<CKeyParent> pq = Ebean.find(CKeyParent.class).where().in("id.oneKey", sq).query();
 
@@ -71,7 +71,7 @@ public class TestSubQuery extends BaseTestCase {
    * public void testInheritance1() { ResetBasicData.reset();
    * 
    * Query<Vehicle> sq = Ebean.createQuery(Vehicle.class) .select("id")
-   * .setAutofetch(false) .where() .query();
+   * .setAutoTune(false) .where() .query();
    * 
    * Query<VehicleDriver> pq = Ebean.find(VehicleDriver.class)
    * .where().in("vehicle.id", sq) .query();
@@ -95,7 +95,7 @@ public class TestSubQuery extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class).select("vehicle")
-        .setAutofetch(false).where().query();
+        .setAutoTune(false).where().query();
 
     Query<Vehicle> pq = Ebean.find(Vehicle.class).where().in("id", sq).query();
 
@@ -124,7 +124,7 @@ public class TestSubQuery extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class).select("vehicle")
-        .setAutofetch(false).where().eq("vehicle.licenseNumber", "abc").query();
+        .setAutoTune(false).where().eq("vehicle.licenseNumber", "abc").query();
 
     Query<Vehicle> pq = Ebean.find(Vehicle.class).where().in("id", sq).query();
 
@@ -150,7 +150,7 @@ public class TestSubQuery extends BaseTestCase {
     ResetBasicData.reset();
 
     Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class).select("vehicle.id")
-        .setAutofetch(false).where().query();
+        .setAutoTune(false).where().query();
 
     Query<Vehicle> pq = Ebean.find(Vehicle.class).where().in("id", sq).query();
 

src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java

@@ -47,7 +47,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase {
     // String oq =
     // "find order join customer join customer.contacts join details (+query(4),+lazy(5))";
     // Query<Order> q = Ebean.createQuery(Order.class, oq);
-    // q.setAutofetch(false);
+    // q.setAutoTune(false);
     // List<Order> list2 = q.findList();
     //
     // Assert.assertTrue(list2.size() > 0);

src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java

@@ -73,7 +73,7 @@ public class TestOrderByWithDistinct extends BaseTestCase {
 		// still need them to be present for purpose of order by
 		// so here I'm "simulating" a scenario where autofetch has dropped userType.name
 		query = Ebean.find(MUser.class)
-				.setAutofetch(false)
+				.setAutoTune(false)
 				.select("userName")
 				.fetch("userType","name")
 				.where()

src/test/java/com/avaje/tests/query/other/TestQueryPlanHash.java

@@ -17,12 +17,12 @@ public class TestQueryPlanHash {
     HashQueryPlanBuilder builder1 = new HashQueryPlanBuilder();
     
     SpiQuery<Order> squery = (SpiQuery<Order>)Ebean.find(Order.class);
-    squery.queryAutofetchHash(builder1);
+    squery.queryAutoTuneHash(builder1);
     
     squery.where().in("id", 1,2,3);
 
     HashQueryPlanBuilder builder2 = new HashQueryPlanBuilder();
-    squery.queryAutofetchHash(builder2);
+    squery.queryAutoTuneHash(builder2);
     int q1BindHash = squery.queryBindHash();
     
     Assert.assertNotSame(builder1.build(), builder2.build());
@@ -31,7 +31,7 @@ public class TestQueryPlanHash {
     SpiQuery<Order> squery2 = (SpiQuery<Order>)Ebean.find(Order.class);
     squery2.where().in("id", 2,2,3);
 
-    squery2.queryAutofetchHash(builder3);
+    squery2.queryAutoTuneHash(builder3);
     int q2BindHash = squery2.queryBindHash();
 
     Assert.assertEquals(builder3.build(), builder2.build());    
@@ -42,7 +42,7 @@ public class TestQueryPlanHash {
     SpiQuery<Order> squery4 = (SpiQuery<Order>)Ebean.find(Order.class);
     squery4.where().in("name", 2,2,3);
 
-    squery4.queryAutofetchHash(builder4);
+    squery4.queryAutoTuneHash(builder4);
     int q4BindHash = squery4.queryBindHash();
 
     //different query plan

src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java

@@ -22,7 +22,7 @@ public class TestTextJsonInheritance extends BaseTestCase {
 
     setupData();
 
-    List<Vehicle> list = Ebean.find(Vehicle.class).setAutofetch(false).findList();
+    List<Vehicle> list = Ebean.find(Vehicle.class).setAutoTune(false).findList();
 
     Assert.assertEquals(2, list.size());