Exclude GenericFilterBean from proxying

chaos-monkey-docs/src/main/asciidoc/changes.adoc

@@ -6,6 +6,7 @@ Built with Spring Boot {spring-boot-version}
 === Bug Fixes
 - https://github.com/codecentric/chaos-monkey-spring-boot/pull/252[#252] Update Maven Wrapper from 0.5.5 to 0.5.6.
 - https://github.com/codecentric/chaos-monkey-spring-boot/pull/251[#251] Fix missing AssaultPropertiesUpdate validation.
+- https://github.com/codecentric/chaos-monkey-spring-boot/pull/261[#261] Fix crash when GenericFilterBean Component exists.
 // - https://github.com/codecentric/chaos-monkey-spring-boot/pull/xxx[#xxx] Added example entry. Please don't remove.
 
 === Improvements

chaos-monkey-spring-boot/src/main/java/de/codecentric/spring/boot/chaos/monkey/watcher/aspect/ChaosMonkeyBaseAspect.java

@@ -28,6 +28,11 @@ public void classInChaosMonkeyPackage() {}
   @Pointcut("!within(is(FinalType)) || within(com.sun.proxy.*)")
   public void nonFinalOrJdkProxiedClassPointcut() {}
 
+  // GenericFilterBean cannot be proxied due to final init method.
+  @Pointcut(
+      "classInChaosMonkeyPackage() || target(org.springframework.web.filter.GenericFilterBean)")
+  public void isBlackListedPointcut() {}
+
   @Pointcut("nonFinalOrJdkProxiedClassPointcut() && execution(* *.*(..))")
   public void allPublicMethodPointcut() {}
 

chaos-monkey-spring-boot/src/main/java/de/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()) {

chaos-monkey-spring-boot/src/main/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());

chaos-monkey-spring-boot/src/main/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()) {

chaos-monkey-spring-boot/src/main/java/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()) {

chaos-monkey-spring-boot/src/main/java/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()) {

chaos-monkey-spring-boot/src/main/java/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()) {

chaos-monkey-spring-boot/src/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 {