Add @Override to remaining source files

Issue: SPR-10130

spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java

@@ -416,14 +416,17 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 			assertNull(autowired.getRamnivas());
 		}
 
+		@Override
 		public Object getObject() throws Exception {
 			return new TestBean();
 		}
 
+		@Override
 		public Class getObjectType() {
 			return TestBean.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return false;
 		}
@@ -559,6 +562,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 	public static class LineItem implements PricingStrategyClient {
 		private PricingStrategy pricingStrategy;
 
+		@Override
 		public void setPricingStrategy(PricingStrategy pricingStrategy) {
 			this.pricingStrategy = pricingStrategy;
 		}
@@ -568,6 +572,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 	public static class Order implements MailSenderClient, Serializable {
 		private transient MailSender mailSender;
 
+		@Override
 		public void setMailSender(MailSender mailSender) {
 			this.mailSender = mailSender;
 		}
@@ -577,10 +582,12 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 		private transient MailSender mailSender;
 		private transient PaymentProcessor paymentProcessor;
 
+		@Override
 		public void setMailSender(MailSender mailSender) {
 			this.mailSender = mailSender;
 		}
 
+		@Override
 		public void setPaymentProcessor(PaymentProcessor paymentProcessor) {
 			this.paymentProcessor = paymentProcessor;
 		}

spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java

@@ -46,6 +46,7 @@ public class AspectJAnnotationTests extends AbstractAnnotationTests {
 		Assert.assertSame(ctx.getBean("keyGenerator"), aspect.getKeyGenerator());
 	}
 
+	@Override
 	public void testMultiEvict(CacheableService<?> service) {
 		Object o1 = new Object();
 

spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java

@@ -33,109 +33,132 @@ public class AnnotatedClassCacheableService implements CacheableService<Object>
 	private final AtomicLong counter = new AtomicLong();
 	public static final AtomicLong nullInvocations = new AtomicLong();
 
+	@Override
 	public Object cache(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	public Object conditional(int field) {
 		return null;
 	}
 
+	@Override
 	public Object unless(int arg) {
 		return arg;
 	}
 
+	@Override
 	@CacheEvict("default")
 	public void invalidate(Object arg1) {
 	}
 
+	@Override
 	@CacheEvict("default")
 	public void evictWithException(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should NOT occur");
 	}
 
+	@Override
 	@CacheEvict(value = "default", allEntries = true)
 	public void evictAll(Object arg1) {
 	}
 
+	@Override
 	@CacheEvict(value = "default", beforeInvocation = true)
 	public void evictEarly(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}
 
+	@Override
 	@CacheEvict(value = "default", key = "#p0")
 	public void evict(Object arg1, Object arg2) {
 	}
 
+	@Override
 	@CacheEvict(value = "default", key = "#p0", beforeInvocation = true)
 	public void invalidateEarly(Object arg1, Object arg2) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#p0")
 	public Object key(Object arg1, Object arg2) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#root.methodName + #root.caches[0].name")
 	public Object name(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target")
 	public Object rootVars(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CachePut("default")
 	public Object update(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CachePut(value = "default", condition = "#arg.equals(3)")
 	public Object conditionalUpdate(Object arg) {
 		return arg;
 	}
 
+	@Override
 	public Object nullValue(Object arg1) {
 		nullInvocations.incrementAndGet();
 		return null;
 	}
 
+	@Override
 	public Number nullInvocations() {
 		return nullInvocations.get();
 	}
 
+	@Override
 	public Long throwChecked(Object arg1) throws Exception {
 		throw new UnsupportedOperationException(arg1.toString());
 	}
 
+	@Override
 	public Long throwUnchecked(Object arg1) {
 		throw new UnsupportedOperationException();
 	}
 
 	// multi annotations
 
+	@Override
 	@Caching(cacheable = { @Cacheable("primary"), @Cacheable("secondary") })
 	public Object multiCache(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0") })
 	public Object multiEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") })
 	public Object multiCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(cacheable = { @Cacheable(value = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") })
 	public Object multiConditionalCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(put = { @CachePut("primary"), @CachePut("secondary") })
 	public Object multiUpdate(Object arg1) {
 		return arg1;

spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java

@@ -125,6 +125,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 		final Exception ex = new Exception();
 		try {
 			testRollback(new TransactionOperationCallback() {
+				@Override
 				public Object performTransactionalOperation() throws Throwable {
 					return annotationOnlyOnClassWithNoInterface.echo(ex);
 				}
@@ -140,6 +141,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 		final RuntimeException ex = new RuntimeException();
 		try {
 			testRollback(new TransactionOperationCallback() {
+				@Override
 				public Object performTransactionalOperation() throws Throwable {
 					return annotationOnlyOnClassWithNoInterface.echo(ex);
 				}
@@ -156,6 +158,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 		final Exception ex = new Exception();
 		try {
 				testRollback(new TransactionOperationCallback() {
+				@Override
 				public Object performTransactionalOperation() throws Throwable {
 					return new SubclassOfClassWithTransactionalAnnotation().echo(ex);
 				}
@@ -171,6 +174,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 		final Exception ex = new Exception();
 		try {
 			testRollback(new TransactionOperationCallback() {
+				@Override
 				public Object performTransactionalOperation() throws Throwable {
 					return new SubclassOfClassWithTransactionalMethodAnnotation().echo(ex);
 				}
@@ -191,6 +195,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 
 		final Exception ex = new Exception();
 		testNotTransactional(new TransactionOperationCallback() {
+			@Override
 			public Object performTransactionalOperation() throws Throwable {
 				return new ImplementsAnnotatedInterface().echo(ex);
 			}
@@ -221,6 +226,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 
 		final Exception rollbackProvokingException = new RuntimeException();
 		testNotTransactional(new TransactionOperationCallback() {
+			@Override
 			public Object performTransactionalOperation() throws Throwable {
 				return new ImplementsAnnotatedInterface().echo(rollbackProvokingException);
 			}
@@ -275,6 +281,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 
 	public static class ImplementsAnnotatedInterface implements ITransactional {
 
+		@Override
 		public Object echo(Throwable t) throws Throwable {
 			if (t != null) {
 				throw t;