diff --git a/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java index f9e09eb200..d6379f4e03 100644 --- a/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java @@ -837,7 +837,7 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA PropertyTokenHolder tokens = getPropertyNameTokens(nestedProperty); String canonicalName = tokens.canonicalName; Object value = getPropertyValue(tokens); - if (value == null || (value instanceof Optional && !((Optional) value).isPresent())) { + if (value == null || (value instanceof Optional && !((Optional) value).isPresent())) { if (isAutoGrowNestedPaths()) { value = setDefaultValue(tokens); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index 54a75d3733..76bb9d197b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -523,8 +523,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean */ @SuppressWarnings("deprecation") protected boolean determineRequiredStatus(MergedAnnotation ann) { - return determineRequiredStatus((AnnotationAttributes) - ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType()))); + return determineRequiredStatus(ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType()))); } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java index ef6d5c6731..5479fb5f91 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java @@ -229,6 +229,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * @return the number of bean definitions found * @throws BeanDefinitionStoreException in case of loading or parsing errors */ + @SuppressWarnings("rawtypes") public int loadBeanDefinitions(EncodedResource encodedResource) throws BeanDefinitionStoreException { // Check for XML files and redirect them to the "standard" XmlBeanDefinitionReader String filename = encodedResource.getResource().getFilename(); @@ -242,7 +243,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp Closure beans = new Closure(this) { @Override - public Object call(Object[] args) { + public Object call(Object... args) { invokeBeanDefiningClosure((Closure) args[0]); return null; } @@ -285,6 +286,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * @param closure the block or closure * @return this {@code GroovyBeanDefinitionReader} instance */ + @SuppressWarnings("rawtypes") public GroovyBeanDefinitionReader beans(Closure closure) { return invokeBeanDefiningClosure(closure); } @@ -306,6 +308,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * @param args the constructors arguments and closure configurer * @return the bean definition */ + @SuppressWarnings("rawtypes") public AbstractBeanDefinition bean(Class type, Object...args) { GroovyBeanDefinitionWrapper current = this.currentBeanDefinition; try { @@ -373,6 +376,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * This method overrides method invocation to create beans for each method name that * takes a class argument. */ + @SuppressWarnings("rawtypes") public Object invokeMethod(String name, Object arg) { Object[] args = (Object[])arg; if ("beans".equals(name) && args.length == 1 && args[0] instanceof Closure) { @@ -426,6 +430,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp return false; } + @SuppressWarnings("rawtypes") private void finalizeDeferredProperties() { for (DeferredProperty dp : this.deferredProperties.values()) { if (dp.value instanceof List) { @@ -444,6 +449,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * @param callable the closure argument * @return this {@code GroovyBeanDefinitionReader} instance */ + @SuppressWarnings("rawtypes") protected GroovyBeanDefinitionReader invokeBeanDefiningClosure(Closure callable) { callable.setDelegate(this); callable.call(); @@ -458,6 +464,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp * argument is sometimes a closure. All the arguments in between are constructor arguments. * @return the bean definition wrapper */ + @SuppressWarnings("rawtypes") private GroovyBeanDefinitionWrapper invokeBeanDefiningMethod(String beanName, Object[] args) { boolean hasClosureArgument = (args[args.length - 1] instanceof Closure); if (args[0] instanceof Class) { @@ -483,9 +490,9 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp else if (args[0] instanceof Map) { // named constructor arguments if (args.length > 1 && args[1] instanceof Class) { - List constructorArgs = resolveConstructorArguments(args, 2, hasClosureArgument ? args.length - 1 : args.length); - this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName, (Class)args[1], constructorArgs); - Map namedArgs = (Map)args[0]; + List constructorArgs = resolveConstructorArguments(args, 2, hasClosureArgument ? args.length - 1 : args.length); + this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName, (Class) args[1], constructorArgs); + Map namedArgs = (Map) args[0]; for (Object o : namedArgs.keySet()) { String propName = (String) o; setProperty(propName, namedArgs.get(propName)); @@ -494,7 +501,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp // factory method syntax else { this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName); - //First arg is the map containing factoryBean : factoryMethod + // First arg is the map containing factoryBean : factoryMethod Map.Entry factoryBeanEntry = (Map.Entry) ((Map) args[0]).entrySet().iterator().next(); // If we have a closure body, that will be the last argument. // In between are the constructor args @@ -537,6 +544,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp return beanDefinition; } + @SuppressWarnings("rawtypes") protected List resolveConstructorArguments(Object[] args, int start, int end) { Object[] constructorArgs = Arrays.copyOfRange(args, start, end); for (int i = 0; i < constructorArgs.length; i++) { @@ -607,6 +615,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp } } + @SuppressWarnings("rawtypes") protected void applyPropertyToBeanDefinition(String name, Object value) { if (value instanceof GString) { value = value.toString(); @@ -785,7 +794,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp /** - * Wraps a bean definition property an ensures that any RuntimeBeanReference + * Wraps a bean definition property and ensures that any RuntimeBeanReference * additions to it are deferred for resolution later. */ private class GroovyPropertyValue extends GroovyObjectSupport { @@ -799,17 +808,20 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp this.propertyValue = propertyValue; } + @SuppressWarnings("unused") public void leftShift(Object value) { InvokerHelper.invokeMethod(this.propertyValue, "leftShift", value); updateDeferredProperties(value); } + @SuppressWarnings("unused") public boolean add(Object value) { boolean retVal = (Boolean) InvokerHelper.invokeMethod(this.propertyValue, "add", value); updateDeferredProperties(value); return retVal; } + @SuppressWarnings({ "rawtypes", "unused" }) public boolean addAll(Collection values) { boolean retVal = (Boolean) InvokerHelper.invokeMethod(this.propertyValue, "addAll", values); for (Object value : values) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java index 9afc6e9c30..6e70203631 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java @@ -173,6 +173,7 @@ class GroovyBeanDefinitionWrapper extends GroovyObjectSupport { } @Override + @SuppressWarnings("rawtypes") public void setProperty(String property, Object newValue) { if (PARENT.equals(property)) { setParent(newValue); diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java index be5c89adc5..df2578de38 100644 --- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java @@ -1142,6 +1142,7 @@ public abstract class AbstractPropertyAccessorTests { } @Test + @SuppressWarnings("rawtypes") public void setGenericArrayProperty() { SkipReaderStub target = new SkipReaderStub(); AbstractPropertyAccessor accessor = createAccessor(target); @@ -1459,7 +1460,7 @@ public abstract class AbstractPropertyAccessorTests { assertEquals("rob", ((TestBean) target.getMap().get(2)).getName()); } - @SuppressWarnings("unchecked") // must work with raw map in this test + @SuppressWarnings({ "unchecked", "rawtypes" }) // must work with raw map in this test @Test public void setRawMapPropertyWithNoEditorRegistered() { IndexedTestBean target = new IndexedTestBean(); @@ -1787,6 +1788,7 @@ public abstract class AbstractPropertyAccessorTests { } + @SuppressWarnings("unused") private static class Simple { private String name; @@ -1815,6 +1817,7 @@ public abstract class AbstractPropertyAccessorTests { } } + @SuppressWarnings("unused") private static class Person { private String name; @@ -1845,6 +1848,7 @@ public abstract class AbstractPropertyAccessorTests { } } + @SuppressWarnings("unused") private static class Address { private String city; @@ -1876,6 +1880,7 @@ public abstract class AbstractPropertyAccessorTests { } } + @SuppressWarnings("unused") private static class Country { private String name; @@ -1904,7 +1909,7 @@ public abstract class AbstractPropertyAccessorTests { } } - @SuppressWarnings("unused") + @SuppressWarnings({ "unused", "rawtypes" }) private static class Foo { private List list; @@ -2200,10 +2205,12 @@ public abstract class AbstractPropertyAccessorTests { public SkipReaderStub() { } + @SuppressWarnings("unchecked") public SkipReaderStub(T... items) { this.items = items; } + @SuppressWarnings("unchecked") public void setItems(T... items) { this.items = items; } @@ -2237,6 +2244,7 @@ public abstract class AbstractPropertyAccessorTests { } @Override + @SuppressWarnings("unchecked") public Spr13837Bean setSomething(final Integer something) { this.something = something; return this; diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java index e4dcfc645b..2e541709ce 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java @@ -164,6 +164,7 @@ public class BeanWrapperAutoGrowingTests { } + @SuppressWarnings("rawtypes") public static class Bean { private String prop; diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index 7d7a307959..24ac84454a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -160,7 +160,7 @@ public class BeanWrapperGenericsTests { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false)); - Map input = new HashMap<>(); + Map> input = new HashMap<>(); HashSet value1 = new HashSet<>(); value1.add(new Integer(1)); input.put("1", value1); @@ -507,6 +507,7 @@ public class BeanWrapperGenericsTests { public Holder(D data) { this.data = data; } + @SuppressWarnings("unused") public D getData() { return this.data; } diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index 02008f06fd..c135730bfe 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -176,6 +176,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests { } @Test + @SuppressWarnings("unchecked") public void getPropertyWithOptional() { GetterWithOptional target = new GetterWithOptional(); TestBean tb = new TestBean("x"); diff --git a/spring-beans/src/test/java/org/springframework/beans/PropertyMatchesTests.java b/spring-beans/src/test/java/org/springframework/beans/PropertyMatchesTests.java index 8cf77c6aee..2a6e8f6a84 100644 --- a/spring-beans/src/test/java/org/springframework/beans/PropertyMatchesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/PropertyMatchesTests.java @@ -124,6 +124,7 @@ public class PropertyMatchesTests { } + @SuppressWarnings("unused") private static class SampleBeanProperties { private String name; @@ -178,6 +179,7 @@ public class PropertyMatchesTests { } + @SuppressWarnings("unused") private static class SampleFieldProperties { private String name; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index cdb2a9b49d..9599904b64 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -1464,6 +1464,7 @@ public class DefaultListableBeanFactoryTests { } @Test + @SuppressWarnings("rawtypes") public void testGetFactoryBeanByTypeWithPrimary() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); RootBeanDefinition bd1 = new RootBeanDefinition(NullTestBeanFactoryBean.class); @@ -1814,6 +1815,7 @@ public class DefaultListableBeanFactoryTests { } @Test + @SuppressWarnings("rawtypes") public void testBeanProviderSerialization() throws Exception { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); lbf.setSerializationId("test"); @@ -2674,10 +2676,6 @@ public class DefaultListableBeanFactoryTests { public Object postProcessBeforeInitialization(Object bean, String beanName) { return new TestBean(); } - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) { - return bean; - } }); BeanWithDisposableBean.closed = false; lbf.preInstantiateSingletons(); @@ -2695,10 +2693,6 @@ public class DefaultListableBeanFactoryTests { public Object postProcessBeforeInitialization(Object bean, String beanName) { return new TestBean(); } - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) { - return bean; - } }); BeanWithDisposableBean.closed = false; lbf.preInstantiateSingletons(); @@ -2717,10 +2711,6 @@ public class DefaultListableBeanFactoryTests { public Object postProcessBeforeInitialization(Object bean, String beanName) { return new TestBean(); } - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) { - return bean; - } }); BeanWithDestroyMethod.closeCount = 0; lbf.preInstantiateSingletons(); @@ -2943,7 +2933,7 @@ public class DefaultListableBeanFactoryTests { } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testInitSecurityAwarePrototypeBean() { final DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); RootBeanDefinition bd = new RootBeanDefinition(TestSecuredBean.class); @@ -3202,6 +3192,7 @@ public class DefaultListableBeanFactoryTests { private static int closeCount = 0; + @SuppressWarnings("unused") private BeanWithDestroyMethod inner; public void setInner(BeanWithDestroyMethod inner) { @@ -3416,7 +3407,7 @@ public class DefaultListableBeanFactoryTests { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public Object convertIfNecessary(Object value, @Nullable Class requiredType) { if (value instanceof String && Float.class.isAssignableFrom(requiredType)) { try { @@ -3435,13 +3426,13 @@ public class DefaultListableBeanFactoryTests { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public Object convertIfNecessary(Object value, @Nullable Class requiredType, @Nullable MethodParameter methodParam) { return convertIfNecessary(value, requiredType); } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public Object convertIfNecessary(Object value, @Nullable Class requiredType, @Nullable Field field) { return convertIfNecessary(value, requiredType); } @@ -3564,6 +3555,7 @@ public class DefaultListableBeanFactoryTests { public TestBean testBean; + @SuppressWarnings("unused") public TestBeanRecipient(TestBean testBean) { this.testBean = testBean; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java index d39d72c117..5900055d64 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java @@ -95,7 +95,7 @@ public class CustomScopeConfigurerTests { figurer.postProcessBeanFactory(factory); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test(expected = ClassCastException.class) public void testWhereScopeMapHasNonStringTypedScopeNameInKeySet() { Map scopes = new HashMap(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java index e3ced632e6..f90c2494a4 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java @@ -73,6 +73,7 @@ public class ObjectFactoryCreatingFactoryBeanTests { } @Test + @SuppressWarnings("rawtypes") public void testFactorySerialization() throws Exception { FactoryTestBean testBean = beanFactory.getBean("factoryTestBean", FactoryTestBean.class); ObjectFactory objectFactory = testBean.getObjectFactory(); @@ -95,6 +96,7 @@ public class ObjectFactoryCreatingFactoryBeanTests { } @Test + @SuppressWarnings("rawtypes") public void testProviderSerialization() throws Exception { ProviderTestBean testBean = beanFactory.getBean("providerTestBean", ProviderTestBean.class); Provider provider = testBean.getProvider(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java index 3b1c520458..60cb5a296e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java @@ -329,7 +329,7 @@ public class PropertyResourceConfigurerTests { } private void doTestPropertyPlaceholderConfigurer(boolean parentChildSeparation) { - Map singletonMap = Collections.singletonMap("myKey", "myValue"); + Map singletonMap = Collections.singletonMap("myKey", "myValue"); if (parentChildSeparation) { MutablePropertyValues pvs1 = new MutablePropertyValues(); pvs1.add("age", "${age}"); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java index abd7dbcdde..f4b39dee9c 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java @@ -262,7 +262,7 @@ public class ServiceLocatorFactoryBeanTests { } @Test(expected = IllegalArgumentException.class) - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testWhenServiceLocatorExceptionClassIsNotAnExceptionSubclass() throws Exception { ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean(); factory.setServiceLocatorExceptionClass((Class) getClass()); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java index 4aed64b4bd..328210f578 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java @@ -63,7 +63,7 @@ import static org.junit.Assert.fail; * Security test case. Checks whether the container uses its privileges for its * internal work but does not leak them when touching/calling user code. * - *t The first half of the test case checks that permissions are downgraded when + *

The first half of the test case checks that permissions are downgraded when * calling user code while the second half that the caller code permission get * through and Spring doesn't override the permission stack. * @@ -162,7 +162,7 @@ public class CallbacksSecurityTests { } } - @SuppressWarnings("unused") + @SuppressWarnings({ "unused", "rawtypes" }) private static class NonPrivilegedFactoryBean implements SmartFactoryBean { private String expectedName; @@ -557,4 +557,5 @@ public class CallbacksSecurityTests { } }, provider.getAccessControlContext()); } + } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java index 22536776f4..4ec3d7131b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.beans.factory.support.security.support; import java.util.Properties; @@ -22,15 +23,15 @@ import org.springframework.beans.factory.FactoryBean; /** * @author Costin Leau */ -public class CustomFactoryBean implements FactoryBean { +public class CustomFactoryBean implements FactoryBean { @Override - public Object getObject() throws Exception { + public Properties getObject() throws Exception { return System.getProperties(); } @Override - public Class getObjectType() { + public Class getObjectType() { System.setProperty("factory.object.type", "true"); return Properties.class; } @@ -39,4 +40,5 @@ public class CustomFactoryBean implements FactoryBean { public boolean isSingleton() { return true; } + } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java index 69fe687042..b2135bce50 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java @@ -70,6 +70,7 @@ public class CollectionsWithDefaultTypesTests { assertMap(bean.getSomeMap()); } + @SuppressWarnings("rawtypes") private void assertMap(Map map) { for (Map.Entry entry : map.entrySet()) { assertEquals("Key type is incorrect", Integer.class, entry.getKey().getClass()); @@ -78,6 +79,7 @@ public class CollectionsWithDefaultTypesTests { } @Test + @SuppressWarnings("rawtypes") public void testBuildCollectionFromMixtureOfReferencesAndValues() throws Exception { MixedCollectionBean jumble = (MixedCollectionBean) this.beanFactory.getBean("jumble"); assertTrue("Expected 3 elements, not " + jumble.getJumble().size(), diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java index 340f8efae0..3a992e3334 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java @@ -22,7 +22,7 @@ import org.springframework.tests.sample.beans.TestBean; /** * @author Juergen Hoeller */ -public class CountingFactory implements FactoryBean { +public class CountingFactory implements FactoryBean { private static int factoryBeanInstanceCount = 0; @@ -51,12 +51,12 @@ public class CountingFactory implements FactoryBean { @Override - public Object getObject() { + public String getObject() { return "myString"; } @Override - public Class getObjectType() { + public Class getObjectType() { return String.class; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java index 2997dd2f28..49fb74a1dd 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java @@ -62,7 +62,7 @@ public class FactoryMethods { } @SuppressWarnings("unused") - private static List listInstance() { + private static List listInstance() { return Collections.EMPTY_LIST; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java index 834324f98d..a3419e46f1 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java @@ -27,14 +27,14 @@ import java.util.Collection; */ public class MixedCollectionBean { - private Collection jumble; + private Collection jumble; - public void setJumble(Collection jumble) { + public void setJumble(Collection jumble) { this.jumble = jumble; } - public Collection getJumble() { + public Collection getJumble() { return jumble; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java index dceb26f8a6..14fa12434e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java @@ -91,6 +91,7 @@ public class NestedBeansElementAttributeRecursionTests { assertMerge(bf); } + @SuppressWarnings("unchecked") private void assertMerge(DefaultListableBeanFactory bf) { TestBean topLevel = bf.getBean("topLevelConcreteTestBean", TestBean.class); // has the concrete child bean values diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java index 6d2f4ff257..6791903d4b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java @@ -48,6 +48,7 @@ import static org.junit.Assert.assertTrue; * @author Juergen Hoeller * @author Mark Fisher */ +@SuppressWarnings("rawtypes") public class UtilNamespaceHandlerTests { private DefaultListableBeanFactory beanFactory; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java index 447b302a26..87c66c2725 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java @@ -54,6 +54,7 @@ import static org.junit.Assert.fail; * @author Chris Beams * @since 19.12.2004 */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public class XmlBeanCollectionTests { private final DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java index 9f71558fc9..f0be94b62f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java @@ -40,7 +40,7 @@ public class CustomCollectionEditorTests { } @Test(expected = IllegalArgumentException.class) - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testCtorWithNonCollectionType() throws Exception { new CustomCollectionEditor((Class) String.class); } diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java index 8fb932a751..1d1ab0f818 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java @@ -38,6 +38,7 @@ import static org.junit.Assert.assertTrue; public class PagedListHolderTests { @Test + @SuppressWarnings({ "rawtypes", "unchecked" }) public void testPagedListHolder() { Assume.group(TestGroup.LONG_RUNNING); diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java index 9f420eb38d..bb009ec108 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java @@ -92,6 +92,7 @@ public class PropertyComparatorTests { } + @SuppressWarnings("unused") private static class Dog implements Comparable { private String nickName; diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericBean.java index 32bf66acf8..26b536b786 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericBean.java @@ -51,7 +51,7 @@ public class GenericBean { private List> listOfMaps; - private Map plainMap; + private Map plainMap; private Map shortMap; @@ -100,7 +100,7 @@ public class GenericBean { this.resourceList = Collections.singletonList(resource); } - public GenericBean(Map plainMap, Map shortMap) { + public GenericBean(Map plainMap, Map shortMap) { this.plainMap = plainMap; this.shortMap = shortMap; } @@ -178,7 +178,7 @@ public class GenericBean { this.listOfMaps = listOfMaps; } - public Map getPlainMap() { + public Map getPlainMap() { return plainMap; } @@ -289,30 +289,37 @@ public class GenericBean { this.standardEnumMap = standardEnumMap; } + @SuppressWarnings({ "rawtypes", "unchecked" }) public static GenericBean createInstance(Set integerSet) { return new GenericBean(integerSet); } + @SuppressWarnings({ "rawtypes", "unchecked" }) public static GenericBean createInstance(Set integerSet, List resourceList) { return new GenericBean(integerSet, resourceList); } + @SuppressWarnings({ "rawtypes", "unchecked" }) public static GenericBean createInstance(HashSet integerSet, Map shortMap) { return new GenericBean(integerSet, shortMap); } + @SuppressWarnings({ "rawtypes", "unchecked" }) public static GenericBean createInstance(Map shortMap, Resource resource) { return new GenericBean(shortMap, resource); } + @SuppressWarnings({ "rawtypes", "unchecked" }) public static GenericBean createInstance(Map map, Map shortMap) { return new GenericBean(map, shortMap); } + @SuppressWarnings({ "rawtypes", "unchecked" }) public static GenericBean createInstance(HashMap longMap) { return new GenericBean(longMap); } + @SuppressWarnings({ "rawtypes", "unchecked" }) public static GenericBean createInstance(boolean someFlag, Map> collectionMap) { return new GenericBean(someFlag, collectionMap); } diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/HasMap.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/HasMap.java index e980cff064..29359e4c55 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/HasMap.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/HasMap.java @@ -45,9 +45,9 @@ public class HasMap { private List> classList; - private IdentityHashMap identityMap; + private IdentityHashMap identityMap; - private CopyOnWriteArraySet concurrentSet; + private CopyOnWriteArraySet concurrentSet; private HasMap() { } @@ -108,19 +108,19 @@ public class HasMap { this.classList = classList; } - public IdentityHashMap getIdentityMap() { + public IdentityHashMap getIdentityMap() { return identityMap; } - public void setIdentityMap(IdentityHashMap identityMap) { + public void setIdentityMap(IdentityHashMap identityMap) { this.identityMap = identityMap; } - public CopyOnWriteArraySet getConcurrentSet() { + public CopyOnWriteArraySet getConcurrentSet() { return concurrentSet; } - public void setConcurrentSet(CopyOnWriteArraySet concurrentSet) { + public void setConcurrentSet(CopyOnWriteArraySet concurrentSet) { this.concurrentSet = concurrentSet; } diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java index b71c53471e..2c8f85189f 100644 --- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java +++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java @@ -30,6 +30,7 @@ import java.util.TreeSet; * @author Juergen Hoeller * @since 11.11.2003 */ +@SuppressWarnings("rawtypes") public class IndexedTestBean { private TestBean[] array; @@ -57,6 +58,7 @@ public class IndexedTestBean { } } + @SuppressWarnings("unchecked") public void populate() { TestBean tb0 = new TestBean("name0", 0); TestBean tb1 = new TestBean("name1", 0);