From 90752f9d87d4231df6768dd70ed6ae3d560fb0e9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 20 Jul 2016 21:41:30 +0200 Subject: [PATCH] Deprecate mock.staticmock package Issue: SPR-14485 --- .../mock/staticmock/AbstractMethodMockingControl.aj | 2 ++ .../staticmock/AnnotationDrivenStaticEntityMockingControl.aj | 2 ++ .../mock/staticmock/MockStaticEntityMethods.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj index fe378642a78..f77838e37ba 100644 --- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj +++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj @@ -36,7 +36,9 @@ import org.springframework.util.ObjectUtils; * @author Rod Johnson * @author Ramnivas Laddad * @author Sam Brannen + * @deprecated as of Spring 4.3, in favor of a custom aspect for such purposes */ +@Deprecated public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMethod()) { private final Expectations expectations = new Expectations(); 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 b2979303bb9..d67744df3a6 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 @@ -59,7 +59,9 @@ import org.aspectj.lang.annotation.SuppressAjWarnings; * @author Ramnivas Laddad * @author Sam Brannen * @see MockStaticEntityMethods + * @deprecated as of Spring 4.3, in favor of a custom aspect for such purposes */ +@Deprecated @RequiredTypes("javax.persistence.Entity") public aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl { diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java b/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java index f68b80640b8..3b2c128c577 100644 --- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java +++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java @@ -29,7 +29,9 @@ import java.lang.annotation.Target; * * @author Rod Johnson * @author Sam Brannen + * @deprecated as of Spring 4.3, in favor of a custom aspect for such purposes */ +@Deprecated @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface MockStaticEntityMethods {