#2016 - L2 Cache - missing puts with explicit bean cache + findByIds/keys + after transaction writes

src/main/java/io/ebeaninternal/api/SpiTransaction.java

@@ -313,4 +313,9 @@ public interface SpiTransaction extends Transaction {
    * Return true when nested transactions should create Savepoints.
    */
   boolean isNestedUseSavepoint();
+
+  /**
+   * Return true if explicitly set to skip cache (ignores skipOnWrite).
+   */
+  boolean isSkipCacheExplicit();
 }

src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java

@@ -158,6 +158,11 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.setSkipCache(skipCache);
   }
 
+  @Override
+  public boolean isSkipCacheExplicit() {
+    return transaction.isSkipCacheExplicit();
+  }
+
   @Override
   public boolean isSkipCache() {
     return transaction.isSkipCache();

src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java

@@ -578,6 +578,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return cacheKey != null && query.getUseQueryCache().isPut();
   }
 
+  public boolean isBeanCachePutMany() {
+    return !transaction.isSkipCacheExplicit() && query.isBeanCachePut();
+  }
+
   public boolean isBeanCachePut() {
     return !transaction.isSkipCache() && query.isBeanCachePut();
   }

src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java

@@ -133,7 +133,7 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine {
 
     SpiQuery<T> query = request.getQuery();
 
-    if (request.isBeanCachePut()) {
+    if (request.isBeanCachePutMany()) {
       // load the individual beans into the bean cache
       BeanDescriptor<T> descriptor = request.getBeanDescriptor();
       Collection<T> c = result.getActualDetails();

src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java

@@ -140,6 +140,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     return false;
   }
 
+  @Override
+  public boolean isSkipCacheExplicit() {
+    return false;
+  }
+
   @Override
   public void setSkipCache(boolean skipCache) {
   }

src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java

@@ -293,6 +293,11 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     return sb.toString();
   }
 
+  @Override
+  public boolean isSkipCacheExplicit() {
+    return (skipCache != null && !skipCache);
+  }
+
   @Override
   public boolean isSkipCache() {
     if (skipCache != null) return skipCache;

src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java

@@ -200,6 +200,11 @@ class NoTransaction implements SpiTransaction {
   public void setSkipCache(boolean skipCache) {
   }
 
+  @Override
+  public boolean isSkipCacheExplicit() {
+    return false;
+  }
+
   @Override
   public boolean isSkipCache() {
     return false;