replace classInChaosMonkeyPackage calls with isBlackListedPointcut

codecentric · Aug 13, 2021 · 1a040fa · 1a040fa
1 parent 8baca6e
commit 1a040fa
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/...in/java/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/ChaosMonkeyBaseAspect.java b/...in/java/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/ChaosMonkeyBaseAspect.java
@@ -29,11 +29,10 @@ public void classInChaosMonkeyPackage() {}
   public void nonFinalOrJdkProxiedClassPointcut() {}
 
   // GenericFilterBean cannot be proxied due to final init method.
-  @Pointcut("this(org.springframework.web.filter.GenericFilterBean)")
+  @Pointcut("classInChaosMonkeyPackage() || target(org.springframework.web.filter.GenericFilterBean)")
   public void isBlackListedPointcut() {}
 
-  @Pointcut(
-      "!isBlackListedPointcut() && nonFinalOrJdkProxiedClassPointcut() && execution(* *.*(..))")
+  @Pointcut("nonFinalOrJdkProxiedClassPointcut() && execution(* *.*(..))")
   public void allPublicMethodPointcut() {}
 
   @Pointcut(

diff --git a/.../codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringBootHealthIndicatorAspect.java b/.../codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringBootHealthIndicatorAspect.java
@@ -24,7 +24,7 @@ public class SpringBootHealthIndicatorAspect extends ChaosMonkeyBaseAspect {
   @Pointcut("execution(* org.springframework.boot.actuate.health.HealthIndicator.getHealth(..))")
   public void getHealthPointCut() {}
 
-  @Around("getHealthPointCut() && !classInChaosMonkeyPackage()")
+  @Around("getHealthPointCut() && !isBlackListedPointcut()")
   public Object intercept(ProceedingJoinPoint pjp) throws Throwable {
     Health health = (Health) pjp.proceed();
     if (watcherProperties.isActuatorHealth()) {

diff --git a/...in/java/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringComponentAspect.java b/...in/java/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringComponentAspect.java
@@ -49,7 +49,7 @@ public void classInSpringCloudContextPackage() {}
 
   @Around(
       "classAnnotatedWithComponentPointcut() && !classInSpringCloudContextPackage() "
-          + "&& allPublicMethodPointcut() && !classInChaosMonkeyPackage() && !springHooksPointcut()")
+          + "&& allPublicMethodPointcut() && !isBlackListedPointcut() && !springHooksPointcut()")
   public Object intercept(ProceedingJoinPoint pjp) throws Throwable {
     if (watcherProperties.isComponent()) {
       log.debug("Watching public method on component class: {}", pjp.getSignature());

diff --git a/...n/java/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringControllerAspect.java b/...n/java/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringControllerAspect.java
@@ -45,7 +45,7 @@ public class SpringControllerAspect extends ChaosMonkeyBaseAspect {
   public void classAnnotatedWithControllerPointcut() {}
 
   @Around(
-      "classAnnotatedWithControllerPointcut() && allPublicMethodPointcut() && !classInChaosMonkeyPackage()")
+      "classAnnotatedWithControllerPointcut() && allPublicMethodPointcut() && !isBlackListedPointcut()")
   public Object intercept(ProceedingJoinPoint pjp) throws Throwable {
 
     if (watcherProperties.isController()) {

diff --git a/...va/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringRepositoryAspectJDBC.java b/...va/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringRepositoryAspectJDBC.java
@@ -45,7 +45,7 @@ public class SpringRepositoryAspectJDBC extends ChaosMonkeyBaseAspect {
   public void classAnnotatedWithRepositoryPointcut() {}
 
   @Around(
-      "classAnnotatedWithRepositoryPointcut() && allPublicMethodPointcut() && !classInChaosMonkeyPackage()")
+      "classAnnotatedWithRepositoryPointcut() && allPublicMethodPointcut() && !isBlackListedPointcut()")
   public Object intercept(ProceedingJoinPoint pjp) throws Throwable {
 
     if (watcherProperties.isRepository()) {

diff --git a/...ava/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringRepositoryAspectJPA.java b/...ava/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringRepositoryAspectJPA.java
@@ -45,7 +45,7 @@ public class SpringRepositoryAspectJPA extends ChaosMonkeyBaseAspect {
       "this(org.springframework.data.repository.Repository) || within(@org.springframework.data.repository.RepositoryDefinition *)")
   public void implementsCrudRepository() {}
 
-  @Around("implementsCrudRepository() && allPublicMethodPointcut() && !classInChaosMonkeyPackage()")
+  @Around("implementsCrudRepository() && allPublicMethodPointcut() && !isBlackListedPointcut()")
   public Object intercept(ProceedingJoinPoint pjp) throws Throwable {
 
     if (watcherProperties.isRepository()) {

diff --git a/...va/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringRestControllerAspect.java b/...va/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringRestControllerAspect.java
@@ -45,7 +45,7 @@ public class SpringRestControllerAspect extends ChaosMonkeyBaseAspect {
   public void classAnnotatedWithControllerPointcut() {}
 
   @Around(
-      "classAnnotatedWithControllerPointcut() && allPublicMethodPointcut() && !classInChaosMonkeyPackage()")
+      "classAnnotatedWithControllerPointcut() && allPublicMethodPointcut() && !isBlackListedPointcut()")
   public Object intercept(ProceedingJoinPoint pjp) throws Throwable {
 
     if (watcherProperties.isRestController()) {

diff --git a/...main/java/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringServiceAspect.java b/...main/java/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/SpringServiceAspect.java
@@ -45,7 +45,7 @@ public class SpringServiceAspect extends ChaosMonkeyBaseAspect {
   public void classAnnotatedWithServicePointcut() {}
 
   @Around(
-      "classAnnotatedWithServicePointcut() && allPublicMethodPointcut() && !classInChaosMonkeyPackage()"
+      "classAnnotatedWithServicePointcut() && allPublicMethodPointcut() && !isBlackListedPointcut()"
           + "&& !springHooksPointcut()")
   public Object intercept(ProceedingJoinPoint pjp) throws Throwable {