#1233 - Remove deprecated CacheMode.RECACHE (migrate to CacheMode.PUT)

src/test/java/org/tests/basic/TestLazyLoadInCache.java

@@ -24,7 +24,7 @@ public class TestLazyLoadInCache extends BaseTestCase {
 
     Map<Integer, Customer> map = Ebean.find(Customer.class)
       .select("id, name")
-      .setBeanCacheMode(CacheMode.RECACHE)
+      .setBeanCacheMode(CacheMode.PUT)
       .setReadOnly(true)
       .orderBy().asc("id")
       .findMap();

src/test/java/org/tests/cache/TestCacheCollectionIds.java

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

src/test/java/org/tests/cache/TestCacheCustomer.java

@@ -39,7 +39,7 @@ public class TestCacheCustomer extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    List<Customer> list = Ebean.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.RECACHE)
+    List<Customer> list = Ebean.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.PUT)
       .findList();
 
     Assert.assertTrue(list.size() > 1);

src/test/java/org/tests/cache/TestCacheNaturalId.java

@@ -24,7 +24,7 @@ public class TestCacheNaturalId extends BaseTestCase {
 
     ServerCache contactCache = Ebean.getServerCacheManager().getBeanCache(Contact.class);
 
-    List<Contact> list = Ebean.find(Contact.class).setBeanCacheMode(CacheMode.RECACHE).findList();
+    List<Contact> list = Ebean.find(Contact.class).setBeanCacheMode(CacheMode.PUT).findList();
 
     assertTrue(contactCache.size() > 0);
 

src/test/java/org/tests/cache/TestQueryCache.java

@@ -6,11 +6,11 @@ import io.ebean.Ebean;
 import io.ebean.bean.BeanCollection;
 import io.ebean.cache.ServerCache;
 import org.ebeantest.LoggedSqlCollector;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.cache.EColAB;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
@@ -84,7 +84,7 @@ public class TestQueryCache extends BaseTestCase {
       .findSingleAttributeList();
 
     assertThat(colA_Second).isNotSameAs(colA_NotDistinct);
-    
+
     // ensure that findCount & findSingleAttribute use different
     // slots in cache. If not a "Cannot cast List to int" should happen.
     int count = Ebean.getServer(null)
@@ -121,7 +121,7 @@ public class TestQueryCache extends BaseTestCase {
 
     assertThat(count0).isEqualTo(count1);
     assertThat(sql).hasSize(1);
-    
+
     // and now, ensure that we hit the database
     LoggedSqlCollector.start();
     int count2 = Ebean.find(EColAB.class)
@@ -133,10 +133,10 @@ public class TestQueryCache extends BaseTestCase {
     sql = LoggedSqlCollector.stop();
     assertThat(sql).hasSize(1);
   }
-  
+
   @Test
   public void findCountDifferentQueries() {
-    
+
 
     LoggedSqlCollector.start();
 
@@ -156,12 +156,12 @@ public class TestQueryCache extends BaseTestCase {
 
     assertThat(count0).isEqualTo(count1);
     assertThat(sql).hasSize(2); // different queries
-    
+
   }
 
   @Test
   public void findCountFirstOnThenRecache() {
-    
+
 
     LoggedSqlCollector.start();
 
@@ -172,7 +172,7 @@ public class TestQueryCache extends BaseTestCase {
       .findCount();
 
     int count1 = Ebean.find(EColAB.class)
-      .setUseQueryCache(CacheMode.RECACHE)
+      .setUseQueryCache(CacheMode.PUT)
       .where()
       .eq("columnB", "uvw")
       .findCount();
@@ -181,18 +181,18 @@ public class TestQueryCache extends BaseTestCase {
 
     assertThat(count0).isEqualTo(count1);
     assertThat(sql).hasSize(2); // try recache as second query - it must fetch it
-    
+
   }
-  
-  
+
+
   @Test
   public void findCountFirstRecacheThenOn() {
-    
+
 
     LoggedSqlCollector.start();
 
     int count0 = Ebean.find(EColAB.class)
-      .setUseQueryCache(CacheMode.RECACHE)
+      .setUseQueryCache(CacheMode.PUT)
       .where()
       .eq("columnB", "xyz")
       .findCount();
@@ -207,7 +207,7 @@ public class TestQueryCache extends BaseTestCase {
 
     assertThat(count0).isEqualTo(count1);
     assertThat(sql).hasSize(1); // try recache as first query - second "ON" query must fetch it.
-    
+
   }
 
   @Test
@@ -241,7 +241,7 @@ public class TestQueryCache extends BaseTestCase {
     Assert.assertSame(list, list2B);
 
 
-   
+
 
     List<Customer> list3 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(false).where()
         .ilike("name", "Rob").findList();
@@ -263,8 +263,8 @@ public class TestQueryCache extends BaseTestCase {
     new EColAB("03", "someId").save();
     new EColAB("04", "someId").save();
     new EColAB("05", "someId").save();
-    
-    
+
+
     LoggedSqlCollector.start();
 
     List<Integer> colA_first = Ebean.find(EColAB.class)
@@ -284,17 +284,17 @@ public class TestQueryCache extends BaseTestCase {
     assertThat(colA_first).isSameAs(colA_second);
     assertThat(colA_first).hasSize(3);
     assertThat(sql).hasSize(1);
-    
+
     // and now, ensure that we hit the database
     LoggedSqlCollector.start();
     colA_second = Ebean.find(EColAB.class)
-        .setUseQueryCache(CacheMode.RECACHE)
+        .setUseQueryCache(CacheMode.PUT)
         .where()
         .eq("columnB", "someId")
         .findIds();
     sql = LoggedSqlCollector.stop();
-    
+
     assertThat(sql).hasSize(1);
   }
-  
+
 }

src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java

@@ -78,7 +78,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
   private void loadSomeIntoCache() {
 
     Ebean.find(OCachedNatKeyBean.class)
-      .setBeanCacheMode(CacheMode.RECACHE)
+      .setBeanCacheMode(CacheMode.PUT)
       .where().le("sku", "2")
       .findList();
 

src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java

@@ -82,7 +82,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
   private void loadSomeIntoCache() {
 
     Ebean.find(OCachedNatKeyBean3.class)
-      .setBeanCacheMode(CacheMode.RECACHE)
+      .setBeanCacheMode(CacheMode.PUT)
       .where()
       .ge("sku", "2")
       .eq("store", "def")

src/test/java/org/tests/query/TestQueryFindReadOnly.java

@@ -32,7 +32,7 @@ public class TestQueryFindReadOnly extends BaseTestCase {
     Section s2 = ar1sections.get(0);
     Assert.assertTrue("readonly cascading", Ebean.getBeanState(s2).isReadOnly());
 
-    Ebean.find(Article.class).setBeanCacheMode(CacheMode.RECACHE).findList();
+    Ebean.find(Article.class).setBeanCacheMode(CacheMode.PUT).findList();
 
     Article ar0 = Ebean.find(Article.class, a0.getId());