Clean up warnings

Author: sbrannen

spring-beans/src/main/java/org/springframework/beans/factory/config/AutowiredPropertyMarker.java

@@ -34,6 +34,7 @@
  * @see BeanDefinition#getPropertyValues()
  * @see org.springframework.beans.factory.support.BeanDefinitionBuilder#addAutowiredProperty
  */
+@SuppressWarnings("serial")
 public final class AutowiredPropertyMarker implements Serializable {
 
 	/**

spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java

@@ -244,6 +244,7 @@ public int loadBeanDefinitions(EncodedResource encodedResource) throws BeanDefin
 			logger.trace("Loading Groovy bean definitions from " + encodedResource);
 		}
 
+		@SuppressWarnings("serial")
 		Closure beans = new Closure(this) {
 			@Override
 			public Object call(Object... args) {

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionOverrideException.java

@@ -30,6 +30,7 @@
  * @see DefaultListableBeanFactory#setAllowBeanDefinitionOverriding
  * @see DefaultListableBeanFactory#registerBeanDefinition
  */
+@SuppressWarnings("serial")
 public class BeanDefinitionOverrideException extends BeanDefinitionStoreException {
 
 	private final BeanDefinition beanDefinition;

spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java

@@ -41,7 +41,6 @@ protected DirectFieldAccessor createAccessor(Object target) {
 	public void withShadowedField() {
 		final StringBuilder sb = new StringBuilder();
 
-		@SuppressWarnings("serial")
 		TestBean target = new TestBean() {
 			@SuppressWarnings("unused")
 			StringBuilder name = sb;

spring-beans/src/test/java/org/springframework/tests/sample/beans/Colour.java

@@ -20,7 +20,6 @@
  * @author Rob Harrop
  * @author Juergen Hoeller
  */
-@SuppressWarnings("serial")
 public class Colour {
 
 	public static final Colour RED = new Colour("RED");

spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java

@@ -118,7 +118,7 @@ public void validate(Object target, Errors errors, Object... validationHints) {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void validateValue(
 			Class<?> targetType, String fieldName, @Nullable Object value, Errors errors, Object... validationHints) {

spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java

@@ -95,7 +95,7 @@ public void testWhenTargetBeanClassCannotBeResolved() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void testSunnyDayPath() throws Exception {
 		given(beanFactory.getType(BEAN_NAME)).willReturn((Class)String.class);
 		factory.setTargetBeanName(BEAN_NAME);
@@ -110,7 +110,7 @@ public void testSunnyDayPath() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void testWhereMethodCannotBeResolved() {
 		given(beanFactory.getType(BEAN_NAME)).willReturn((Class)String.class);
 		factory.setTargetBeanName(BEAN_NAME);

spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java

@@ -1356,6 +1356,7 @@ public String toString() {
 	@Configuration
 	public static class RawFactoryMethodRepositoryConfiguration {
 
+		@SuppressWarnings("rawtypes") // intentionally a raw type
 		@Bean
 		public Repository stringRepo() {
 			return new Repository<String>() {

spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java

@@ -305,6 +305,7 @@ static class ConfigWithResolvablePlaceholderAndFactoryBean {
 
 		@Inject Environment env;
 
+		@SuppressWarnings("rawtypes")
 		@Bean
 		public FactoryBean testBean() {
 			final String name = env.getProperty("testbean.name");

spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java

@@ -578,6 +578,7 @@ public void onApplicationEvent(MyEvent event) {
 	}
 
 
+	@SuppressWarnings("rawtypes")
 	public static class MyPayloadListener implements ApplicationListener<PayloadApplicationEvent> {
 
 		public final Set<Object> seenPayloads = new HashSet<>();