Revert "Merge branch 'SPR-10130' into cleanup-master"

This reverts commit 45fa508, reversing
changes made to a312d90.

build.gradle

@@ -33,8 +33,8 @@ configure(allprojects) {
 	group = "org.springframework"
 
 	compileJava {
-		sourceCompatibility=1.6
-		targetCompatibility=1.6
+		sourceCompatibility=1.5
+		targetCompatibility=1.5
 	}
 	compileTestJava {
 		sourceCompatibility=1.7

spring-aop/src/main/java/org/springframework/aop/TargetSource.java

@@ -39,7 +39,6 @@ public interface TargetSource extends TargetClassAware {
 	 * target class.
 	 * @return the type of targets returned by this {@link TargetSource}
 	 */
-	@Override
 	Class<?> getTargetClass();
 
 	/**

spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java

@@ -34,7 +34,6 @@ class TrueClassFilter implements ClassFilter, Serializable {
 	private TrueClassFilter() {
 	}
 
-	@Override
 	public boolean matches(Class clazz) {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java

@@ -35,17 +35,14 @@ class TrueMethodMatcher implements MethodMatcher, Serializable {
 	private TrueMethodMatcher() {
 	}
 
-	@Override
 	public boolean isRuntime() {
 		return false;
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return true;
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass, Object[] args) {
 		// Should never be invoked as isRuntime returns false.
 		throw new UnsupportedOperationException();

spring-aop/src/main/java/org/springframework/aop/TruePointcut.java

@@ -34,12 +34,10 @@ class TruePointcut implements Pointcut, Serializable {
 	private TruePointcut() {
 	}
 
-	@Override
 	public ClassFilter getClassFilter() {
 		return ClassFilter.TRUE;
 	}
 
-	@Override
 	public MethodMatcher getMethodMatcher() {
 		return MethodMatcher.TRUE;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java

@@ -203,7 +203,6 @@ public final ClassLoader getAspectClassLoader() {
 		return this.aspectInstanceFactory.getAspectClassLoader();
 	}
 
-	@Override
 	public int getOrder() {
 		return this.aspectInstanceFactory.getOrder();
 	}
@@ -213,7 +212,6 @@ public void setAspectName(String name) {
 		this.aspectName = name;
 	}
 
-	@Override
 	public String getAspectName() {
 		return this.aspectName;
 	}
@@ -225,7 +223,6 @@ public void setDeclarationOrder(int order) {
 		this.declarationOrder = order;
 	}
 
-	@Override
 	public int getDeclarationOrder() {
 		return this.declarationOrder;
 	}
@@ -681,7 +678,6 @@ public AdviceExcludingMethodMatcher(Method adviceMethod) {
 			this.adviceMethod = adviceMethod;
 		}
 
-		@Override
 		public boolean matches(Method method, Class targetClass) {
 			return !this.adviceMethod.equals(method);
 		}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java

@@ -222,7 +222,6 @@ public void setThrowingName(String throwingName) {
 	 * @param method the target {@link Method}
 	 * @return the parameter names
 	 */
-	@Override
 	public String[] getParameterNames(Method method) {
 		this.argumentTypes = method.getParameterTypes();
 		this.numberOfRemainingUnboundArguments = this.argumentTypes.length;
@@ -310,7 +309,6 @@ public String[] getParameterNames(Method method) {
 	 * @throws UnsupportedOperationException if
 	 * {@link #setRaiseExceptions(boolean) raiseExceptions} has been set to {@code true}
 	 */
-	@Override
 	public String[] getParameterNames(Constructor ctor) {
 		if (this.raiseExceptions) {
 			throw new UnsupportedOperationException("An advice method can never be a constructor");

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java

@@ -37,7 +37,6 @@ public AspectJAfterAdvice(
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
@@ -47,12 +46,10 @@ public Object invoke(MethodInvocation mi) throws Throwable {
 		}
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java

@@ -40,12 +40,10 @@ public AspectJAfterReturningAdvice(
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
@@ -55,7 +53,6 @@ public void setReturningName(String name) {
 		setReturningNameNoCheck(name);
 	}
 
-	@Override
 	public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable {
 		if (shouldInvokeOnReturnValueOf(method, returnValue)) {
 			invokeAdviceMethod(getJoinPointMatch(), returnValue, null);

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java

@@ -37,12 +37,10 @@ public AspectJAfterThrowingAdvice(
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
@@ -52,7 +50,6 @@ public void setThrowingName(String name) {
 		setThrowingNameNoCheck(name);
 	}
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java

@@ -41,12 +41,10 @@ public AspectJAroundAdvice(
 		super(aspectJAroundAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return false;
 	}
@@ -57,7 +55,6 @@ protected boolean supportsProceedingJoinPoint() {
 	}
 
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		if (!(mi instanceof ProxyMethodInvocation)) {
 			throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

@@ -155,19 +155,16 @@ public void setParameterTypes(Class[] types) {
 		this.pointcutParameterTypes = types;
 	}
 
-	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
 
-	@Override
 	public ClassFilter getClassFilter() {
 		checkReadyToMatch();
 		return this;
 	}
 
-	@Override
 	public MethodMatcher getMethodMatcher() {
 		checkReadyToMatch();
 		return this;
@@ -247,7 +244,6 @@ public PointcutExpression getPointcutExpression() {
 		return this.pointcutExpression;
 	}
 
-	@Override
 	public boolean matches(Class targetClass) {
 		checkReadyToMatch();
 		try {
@@ -271,7 +267,6 @@ public boolean matches(Class targetClass) {
 		}
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass, boolean beanHasIntroductions) {
 		checkReadyToMatch();
 		Method targetMethod = AopUtils.getMostSpecificMethod(method, targetClass);
@@ -292,18 +287,15 @@ else if (shadowMatch.neverMatches()) {
 		}
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return matches(method, targetClass, false);
 	}
 
-	@Override
 	public boolean isRuntime() {
 		checkReadyToMatch();
 		return this.pointcutExpression.mayNeedDynamicTest();
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass, Object[] args) {
 		checkReadyToMatch();
 		ShadowMatch shadowMatch = getShadowMatch(AopUtils.getMostSpecificMethod(method, targetClass), method);
@@ -514,12 +506,10 @@ private class BeanNamePointcutDesignatorHandler implements PointcutDesignatorHan
 
 		private static final String BEAN_DESIGNATOR_NAME = "bean";
 
-		@Override
 		public String getDesignatorName() {
 			return BEAN_DESIGNATOR_NAME;
 		}
 
-		@Override
 		public ContextBasedMatcher parse(String expression) {
 			return new BeanNameContextMatcher(expression);
 		}
@@ -541,27 +531,22 @@ public BeanNameContextMatcher(String expression) {
 			this.expressionPattern = new NamePattern(expression);
 		}
 
-		@Override
 		public boolean couldMatchJoinPointsInType(Class someClass) {
 			return (contextMatch(someClass) == FuzzyBoolean.YES);
 		}
 
-		@Override
 		public boolean couldMatchJoinPointsInType(Class someClass, MatchingContext context) {
 			return (contextMatch(someClass) == FuzzyBoolean.YES);
 		}
 
-		@Override
 		public boolean matchesDynamically(MatchingContext context) {
 			return true;
 		}
 
-		@Override
 		public FuzzyBoolean matchesStatically(MatchingContext context) {
 			return contextMatch(null);
 		}
 
-		@Override
 		public boolean mayNeedDynamicTest() {
 			return false;
 		}
@@ -626,22 +611,18 @@ public DefensiveShadowMatch(ShadowMatch primary, ShadowMatch other) {
 			this.other = other;
 		}
 
-		@Override
 		public boolean alwaysMatches() {
 			return primary.alwaysMatches();
 		}
 
-		@Override
 		public boolean maybeMatches() {
 			return primary.maybeMatches();
 		}
 
-		@Override
 		public boolean neverMatches() {
 			return primary.neverMatches();
 		}
 
-		@Override
 		public JoinPointMatch matchesJoinPoint(Object thisObject,
 				Object targetObject, Object[] args) {
 			try {
@@ -651,7 +632,6 @@ public JoinPointMatch matchesJoinPoint(Object thisObject,
 			}
 		}
 
-		@Override
 		public void setMatchingContext(MatchingContext aMatchContext) {
 			primary.setMatchingContext(aMatchContext);
 			other.setMatchingContext(aMatchContext);

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java

@@ -31,7 +31,6 @@ public class AspectJExpressionPointcutAdvisor extends AbstractGenericPointcutAdv
 	private final AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
 
 
-	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java

@@ -35,17 +35,14 @@ public AspectJMethodBeforeAdvice(
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public void before(Method method, Object[] args, Object target) throws Throwable {
 		invokeAdviceMethod(getJoinPointMatch(), null, null);
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return true;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return false;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java

@@ -56,22 +56,18 @@ public void setOrder(int order) {
 	}
 
 
-	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
 
-	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
-	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
 
-	@Override
 	public int getOrder() {
 		if (this.order != null) {
 			return this.order;

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java

@@ -48,7 +48,6 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
 	private static final Log LOGGER = LogFactory.getLog("AspectJ Weaver");
 
 
-	@Override
 	public boolean handleMessage(IMessage message) throws AbortException {
 		Kind messageKind = message.getKind();
 
@@ -94,18 +93,15 @@ private String makeMessageFor(IMessage aMessage) {
 		return AJ_ID + aMessage.getMessage();
 	}
 
-	@Override
 	public boolean isIgnoring(Kind messageKind) {
 		// We want to see everything, and allow configuration of log levels dynamically.
 		return false;
 	}
 
-	@Override
 	public void dontIgnore(Kind messageKind) {
 		// We weren't ignoring anything anyway...
 	}
 
-	@Override
 	public void ignore(Kind kind) {
 		// We weren't ignoring anything anyway...
 	}