Permalink
Browse files

review comments fixed

  • Loading branch information...
eliranbivas committed Jan 10, 2013
1 parent 7f02d3c commit 3092065567fbd2f9d4b53ce642d72d175723ebbc
@@ -30,7 +30,7 @@
private EhcacheCollapsingFrameHelper() {
}
- public static CollapsingFrameHelper getInstance() {
+ public static final CollapsingFrameHelper getInstance() {
return INSTANCE;
}
@@ -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),
@@ -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) {
@@ -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) {
@@ -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());

0 comments on commit 3092065

Please sign in to comment.