From 061b2463070e4a2150012d47e5a650bc5ef851ca Mon Sep 17 00:00:00 2001 From: Janning Vygen Date: Mon, 17 Nov 2014 16:26:34 +0100 Subject: [PATCH] Add @AjSuppressWarnings on static mocks Issue: SPR-12447 --- .../staticmock/AnnotationDrivenStaticEntityMockingControl.aj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj index eec0e00d4b..b2979303bb 100644 --- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj +++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj @@ -17,6 +17,7 @@ package org.springframework.mock.staticmock; import org.aspectj.lang.annotation.RequiredTypes; +import org.aspectj.lang.annotation.SuppressAjWarnings; /** * Annotation-based aspect to use in test builds to enable mocking of static methods @@ -112,8 +113,10 @@ public aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodM // @MockStaticEntityMethods classes to invoke each other without creating a // new mocking environment); however, this is no longer the case. The current // pointcut applies to all public methods in @MockStaticEntityMethods classes. + @SuppressAjWarnings("adviceDidNotMatch") protected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..)); + @SuppressAjWarnings("adviceDidNotMatch") protected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..)); }