root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #694 from kicktipp/SPR-12447 

* SPR-12447:
  Add @AjSuppressWarnings on static mocks
This commit is contained in:
Stephane Nicoll 2014-12-03 10:57:25 +01:00
parent fbd85925de 061b246307
commit e7c577fd08
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
View File

@ -17,6 +17,7 @@
package org.springframework.mock.staticmock; package org.springframework.mock.staticmock;
import org.aspectj.lang.annotation.RequiredTypes; 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 * 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 // @MockStaticEntityMethods classes to invoke each other without creating a
// new mocking environment); however, this is no longer the case. The current // new mocking environment); however, this is no longer the case. The current
// pointcut applies to all public methods in @MockStaticEntityMethods classes. // pointcut applies to all public methods in @MockStaticEntityMethods classes.
@SuppressAjWarnings("adviceDidNotMatch")
protected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..)); protected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));
@SuppressAjWarnings("adviceDidNotMatch")
protected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..)); protected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));
} }