From 40357be72bcd687972c0778f03593d076fe05d98 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 19 Dec 2012 16:03:11 +0100 Subject: [PATCH] Fix various compiler warnings in spring-context All warning types other than [deprecation] and [unchecked] are now fixed in spring-context/src/test --- .../java/example/scannable/ServiceInvocationCounter.java | 3 +-- .../springframework/beans/factory/config/SimpleMapScope.java | 4 ++-- .../context/annotation/ConfigurationClassAndBFPPTests.java | 5 +---- .../java/org/springframework/validation/DataBinderTests.java | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java index fbaf713374..292b058656 100644 --- a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java +++ b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java @@ -40,8 +40,7 @@ public class ServiceInvocationCounter { @Before("serviceExecution()") public void countUse() { this.useCount++; - this.threadLocalCount.set(this.useCount); - System.out.println(""); + threadLocalCount.set(this.useCount); } public int getCount() { diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index 9ae909d7b7..604d2595b0 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -70,8 +70,8 @@ public class SimpleMapScope implements Scope, Serializable { } public void close() { - for (Iterator it = this.callbacks.iterator(); it.hasNext();) { - Runnable runnable = (Runnable) it.next(); + for (Iterator it = this.callbacks.iterator(); it.hasNext();) { + Runnable runnable = it.next(); runnable.run(); } } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java index 060c9f6bf2..d917b0d608 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java @@ -99,14 +99,11 @@ public class ConfigurationClassAndBFPPTests { @Test - @SuppressWarnings("static-access") public void staticBeanMethodsDoNotRespectScoping() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(ConfigWithStaticBeanMethod.class); ctx.refresh(); - - ConfigWithStaticBeanMethod config = ctx.getBean(ConfigWithStaticBeanMethod.class); - assertThat(config.testBean(), not(sameInstance(config.testBean()))); + assertThat(ConfigWithStaticBeanMethod.testBean(), not(sameInstance(ConfigWithStaticBeanMethod.testBean()))); } diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index c9f12660a1..e85cf9a623 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -1444,7 +1444,6 @@ public class DataBinderTests extends TestCase { assertEquals("badName", nameError.getCode()); } - @SuppressWarnings("unchecked") public void testBindingWithResortedList() { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); @@ -1590,6 +1589,7 @@ public class DataBinderTests extends TestCase { mpv.add("f[list][1]", "secondValue"); binder.bind(mpv); assertFalse(binder.getBindingResult().hasErrors()); + @SuppressWarnings("unchecked") List list = (List) form.getF().get("list"); assertEquals("firstValue", list.get(0)); assertEquals("secondValue", list.get(1));