review comments fixed

spring-attic · Jan 10, 2013 · 3092065 · 3092065
1 parent 7f02d3c
commit 3092065
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 21 deletions.
diff --git a/...e/src/main/java/com/springsource/insight/plugin/ehcache/EhcacheCollapsingFrameHelper.java b/...e/src/main/java/com/springsource/insight/plugin/ehcache/EhcacheCollapsingFrameHelper.java
@@ -30,7 +30,7 @@ public final class EhcacheCollapsingFrameHelper extends AbstractCollapsingFrameH
     private EhcacheCollapsingFrameHelper() {
     }
 
-    public static CollapsingFrameHelper getInstance() {
+    public static final CollapsingFrameHelper getInstance() {
         return INSTANCE;
     }
 

diff --git a/.../main/java/com/springsource/insight/plugin/ehcache/EhcacheGetOperationCollectionAspect.aj b/.../main/java/com/springsource/insight/plugin/ehcache/EhcacheGetOperationCollectionAspect.aj
@@ -32,13 +32,11 @@ public aspect EhcacheGetOperationCollectionAspect extends EhcacheMethodOperation
         super(new EhcacheGetOperationCollector());
     }
 
-    public pointcut getValueFlow ()
+    public pointcut ehcacheCollectionPoint ()
         : execution(* Ehcache+.get(..))
        || execution(* Ehcache+.getQuiet(..))
         ;
 
-    protected pointcut ehcacheCollectionPoint() : getValueFlow() && (!cflowbelow(getValueFlow()));
-
     @Override
     protected Operation createOperation(final JoinPoint jp) {
         return createGetOperation(super.createOperation(jp).type(EhcacheDefinitions.CACHE_OPERATION),

diff --git a/.../main/java/com/springsource/insight/plugin/ehcache/EhcachePutOperationCollectionAspect.aj b/.../main/java/com/springsource/insight/plugin/ehcache/EhcachePutOperationCollectionAspect.aj
@@ -30,17 +30,12 @@ public aspect EhcachePutOperationCollectionAspect extends EhcacheMethodOperation
 		super();
 	}
 
-    public pointcut putValueFlow ()
+    public pointcut ehcacheCollectionPoint ()
         : execution(* Ehcache+.put(..))
        || execution(* Ehcache+.putWithWriter(..))
        || execution(* Ehcache+.putQuiet(..))
        || execution(* Ehcache+.putIfAbsent(..))
         ;
-
-    protected pointcut ehcacheCollectionPoint ()
-        : putValueFlow()
-       && (!cflowbelow(putValueFlow()))
-        ;
 
     @Override
     protected Operation createOperation(final JoinPoint jp) {

diff --git a/...in/java/com/springsource/insight/plugin/ehcache/EhcacheRemoveOperationCollectionAspect.aj b/...in/java/com/springsource/insight/plugin/ehcache/EhcacheRemoveOperationCollectionAspect.aj
@@ -31,17 +31,13 @@ public aspect EhcacheRemoveOperationCollectionAspect extends EhcacheMethodOperat
 		super();
 	}
 
-    public pointcut removeValueFlow ()
+    public pointcut ehcacheCollectionPoint ()
         : execution(* Ehcache+.remove(..))
        || execution(* Ehcache+.removeQuiet(..))
        || execution(* Ehcache+.removeWithWriter(Object))
        || execution(* Ehcache+.removeElement(Element))
         ;
 
-    public pointcut ehcacheCollectionPoint ()
-        : removeValueFlow()
-       && (!cflowbelow(removeValueFlow()))
-        ;
 
     @Override
     protected Operation createOperation(JoinPoint jp) {

diff --git a/...n/java/com/springsource/insight/plugin/ehcache/EhcacheReplaceOperationCollectionAspect.aj b/...n/java/com/springsource/insight/plugin/ehcache/EhcacheReplaceOperationCollectionAspect.aj
@@ -30,16 +30,11 @@ public aspect EhcacheReplaceOperationCollectionAspect extends EhcacheMethodOpera
 		super();
 	}
 
-    public pointcut replaceValueFlow ()
+    public pointcut ehcacheCollectionPoint ()
         : execution(* Ehcache+.replace(Element,Element))
        || execution(* Ehcache+.replace(Element))
         ;
 
-    public pointcut ehcacheCollectionPoint ()
-        : replaceValueFlow()
-       && (!cflowbelow(replaceValueFlow()))
-        ;
-
     @Override
     protected Operation createOperation(final JoinPoint jp) {
         return createReplaceOperation(super.createOperation(jp), (Ehcache) jp.getTarget(), jp.getArgs());