#459 Implement possibility to stop cache event propagation

Author: Igor Polevoy

activejdbc/src/main/java/org/javalite/activejdbc/cache/CacheEvent.java

@@ -53,7 +53,7 @@ public enum  CacheEventType{
      */
     public CacheEvent( String group, String source){
         if(group == null)
-            throw new IllegalArgumentException("group canot be null");
+            throw new IllegalArgumentException("group cannot be null");
 
         this.type = CacheEventType.GROUP;
         this.source = source;

activejdbc/src/main/java/org/javalite/activejdbc/cache/CacheManager.java

@@ -56,24 +56,42 @@ public abstract class CacheManager {
 
 
     /**
-     * Flash cache.
+     * Flashes cache.
      *
+     * @param propagate true to propagate event to listeners, false to not propagate
      * @param event type of caches to flush.
      */
-    public final void flush(CacheEvent event){
+    public final void flush(CacheEvent event, boolean propagate){
         doFlush(event);
+        if(propagate){
+            propagate(event);
+        }
+
+        if (logger.isInfoEnabled()) {
+            String message = "Cache purged: " + (event.getType() == CacheEvent.CacheEventType.ALL
+                    ? "all caches" : "table: " + event.getGroup());
+            LogFilter.log(logger, message);
+        }
+    }
+
+    private void propagate(CacheEvent event){
         for(CacheEventListener listener: listeners){
             try{
                 listener.onFlush(event);
             }catch(Exception e){
                 logger.warn("failed to propagate cache event: {} to listener: {}", event, listener, e);
             }
         }
-        if (logger.isInfoEnabled()) {
-            String message = "Cache purged: " + (event.getType() == CacheEvent.CacheEventType.ALL
-                    ? "all caches" : "table: " + event.getGroup());
-            LogFilter.log(logger, message);
-        }
+    }
+
+
+    /**
+     * Flashes cache.
+     *
+     * @param event type of caches to flush.
+     */
+    public final void flush(CacheEvent event){
+        flush(event, true);
     }
 
     public final void addCacheEventListener(CacheEventListener listener){

activejdbc/src/test/java/org/javalite/activejdbc/CacheTest.java

@@ -28,6 +28,8 @@
 
 import java.util.List;
 
+import static org.javalite.test.jspec.JSpec.$;
+
 
 /**
  * @author Igor Polevoy
@@ -156,22 +158,33 @@ public void shouldNotAddInfoToStatisticsIfFoundResultInCache(){
     int count = 0;
     @Test
     public void shouldNotPropagateCacheEventForNonCachedModels(){
-
         CacheEventListener cl = new CacheEventListener() {
             public void onFlush(CacheEvent event) {
                 count++;
             }
         };
-
-        QueryCache.instance().getCacheManager().addCacheEventListener(cl);
+        Registry.cacheManager().addCacheEventListener(cl);
         Person.deleteAll();
         a(count).shouldBeEqual(1);
+        Account.deleteAll();
+        a(count).shouldBeEqual(1);
+    }
+
+    int count1 = 0;
+    @Test
+    public void shouldNotPropagateCacheEventOnFlush(){
+        CacheEventListener cl = new CacheEventListener() {
+            public void onFlush(CacheEvent event) {
+                count1++;
+            }
+        };
+        Registry.cacheManager().addCacheEventListener(cl);
 
+        Registry.cacheManager().flush(new CacheEvent("people", "blah"), false);
 
-        Account.deleteAll();
+        $(count1).shouldBeEqual(0);
 
-        a(count).shouldBeEqual(1);
 
-    }
 
+    }
 }