diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java index 1eab7c8520..0ef76eba69 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java @@ -700,7 +700,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov // 1 primitive arg, and one candidate... for (int i = 0; i < this.argumentTypes.length; i++) { if (isUnbound(i) && this.argumentTypes[i].isPrimitive()) { - bindParameterName(i, (String) varNames.get(0)); + bindParameterName(i, varNames.get(0)); break; } } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java index 20765ec960..9f70ed53a0 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java @@ -77,7 +77,7 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx // sort it List sorted = - (List) PartialOrder.sort(partiallyComparableAdvisors); + PartialOrder.sort(partiallyComparableAdvisors); if (sorted == null) { // TODO: work harder to give a better error message here. throw new IllegalArgumentException("Advice precedence circularity error"); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index 0a485087c3..f6f82fb412 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -386,7 +386,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests { ), CannotBeUnlocked.class); assertTrue(proxy instanceof Lockable); - Lockable lockable = (Lockable) proxy; + Lockable lockable = proxy; assertTrue("Already locked", lockable.locked()); lockable.lock(); assertTrue("Real target ignores locking", lockable.locked()); diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj index ccc3aa2c69..aa6ad3a9cb 100644 --- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj +++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj @@ -114,7 +114,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth if (responseType == CallResponse.return_) { return call.returnValue(lastSig, args); } else if(responseType == CallResponse.throw_) { - return (RuntimeException)call.throwException(lastSig, args); + return call.throwException(lastSig, args); } else if(responseType == CallResponse.nothing) { // do nothing } diff --git a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java index c383a52b5b..76c295490e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java +++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java @@ -495,7 +495,7 @@ class PropertyDescriptorUtils { // copy all attributes (emulating behavior of private FeatureDescriptor#addTable) Enumeration keys = source.attributeNames(); while (keys.hasMoreElements()) { - String key = (String)keys.nextElement(); + String key = keys.nextElement(); target.setValue(key, source.getValue(key)); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java index d3e6796a7d..9eff79944c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java @@ -197,7 +197,7 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, BeanCla else if (value instanceof String) { Class editorClass = ClassUtils.forName((String) value, this.beanClassLoader); Assert.isAssignable(PropertyEditor.class, editorClass); - beanFactory.registerCustomEditor(requiredType, (Class) editorClass); + beanFactory.registerCustomEditor(requiredType, editorClass); } else { throw new IllegalArgumentException("Mapped value [" + value + "] for custom editor key [" + 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 f97a686dfb..d420e860c5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -995,15 +995,15 @@ public final class BeanWrapperTests { bw.setPropertyValues(pvs); assertEquals(tb5, bean.getArray()[0]); assertEquals(tb4, bean.getArray()[1]); - assertEquals(tb3, ((TestBean) bean.getList().get(0))); - assertEquals(tb2, ((TestBean) bean.getList().get(1))); - assertEquals(tb0, ((TestBean) bean.getList().get(2))); - assertEquals(null, ((TestBean) bean.getList().get(3))); - assertEquals(tb1, ((TestBean) bean.getList().get(4))); - assertEquals(tb1, ((TestBean) bean.getMap().get("key1"))); - assertEquals(tb0, ((TestBean) bean.getMap().get("key2"))); - assertEquals(tb4, ((TestBean) bean.getMap().get("key5"))); - assertEquals(tb5, ((TestBean) bean.getMap().get("key9"))); + assertEquals(tb3, (bean.getList().get(0))); + assertEquals(tb2, (bean.getList().get(1))); + assertEquals(tb0, (bean.getList().get(2))); + assertEquals(null, (bean.getList().get(3))); + assertEquals(tb1, (bean.getList().get(4))); + assertEquals(tb1, (bean.getMap().get("key1"))); + assertEquals(tb0, (bean.getMap().get("key2"))); + assertEquals(tb4, (bean.getMap().get("key5"))); + assertEquals(tb5, (bean.getMap().get("key9"))); assertEquals(tb5, bw.getPropertyValue("array[0]")); assertEquals(tb4, bw.getPropertyValue("array[1]")); assertEquals(tb3, bw.getPropertyValue("list[0]")); 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 24d271c47b..d52f73e510 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 @@ -497,7 +497,7 @@ public class DefaultListableBeanFactoryTests { int count = (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p, PREFIX); assertTrue("2 beans registered, not " + count, count == 2); - TestBean kerry = (TestBean) lbf.getBean("kerry", TestBean.class); + TestBean kerry = lbf.getBean("kerry", TestBean.class); assertTrue("Kerry name is Kerry", "Kerry".equals(kerry.getName())); ITestBean spouse = kerry.getSpouse(); assertTrue("Kerry spouse is non null", spouse != null); @@ -516,7 +516,7 @@ public class DefaultListableBeanFactoryTests { assertTrue("1 beans registered, not " + count, count == 1); assertEquals(1, lbf.getBeanDefinitionCount()); - TestBean tb = (TestBean) lbf.getBean("tb", TestBean.class); + TestBean tb = lbf.getBean("tb", TestBean.class); assertEquals("my.value", tb.getSomeMap().get("my.key")); } 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 b67861cc28..e02b77f2a1 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 @@ -113,7 +113,7 @@ public class ObjectFactoryCreatingFactoryBeanTests { factory.setTargetBeanName(targetBeanName); factory.setBeanFactory(beanFactory); factory.afterPropertiesSet(); - ObjectFactory objectFactory = (ObjectFactory) factory.getObject(); + ObjectFactory objectFactory = factory.getObject(); Object actualSingleton = objectFactory.getObject(); assertSame(expectedSingleton, actualSingleton); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java index 18fd8bd421..e4446440b8 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java @@ -42,7 +42,7 @@ public final class PropertiesFactoryBeanTests { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setLocation(TEST_PROPS); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); } @@ -51,7 +51,7 @@ public final class PropertiesFactoryBeanTests { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setLocation(TEST_PROPS_XML); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); } @@ -62,7 +62,7 @@ public final class PropertiesFactoryBeanTests { localProps.setProperty("key2", "value2"); pfb.setProperties(localProps); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("value2", props.getProperty("key2")); } @@ -75,7 +75,7 @@ public final class PropertiesFactoryBeanTests { localProps.setProperty("tb.array[0].age", "0"); pfb.setProperties(localProps); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); assertEquals("value2", props.getProperty("key2")); } @@ -100,7 +100,7 @@ public final class PropertiesFactoryBeanTests { pfb.setPropertiesArray(new Properties[] {props1, props2, props3}); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); assertEquals("value2", props.getProperty("key2")); assertEquals("framework", props.getProperty("spring")); @@ -119,7 +119,7 @@ public final class PropertiesFactoryBeanTests { pfb.setProperties(localProps); pfb.setLocalOverride(true); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("0", props.getProperty("tb.array[0].age")); assertEquals("value2", props.getProperty("key2")); } @@ -133,10 +133,10 @@ public final class PropertiesFactoryBeanTests { localProps.setProperty("key2", "value2"); pfb.setProperties(localProps); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); assertEquals("value2", props.getProperty("key2")); - Properties newProps = (Properties) pfb.getObject(); + Properties newProps = pfb.getObject(); assertTrue(props != newProps); assertEquals("99", newProps.getProperty("tb.array[0].age")); assertEquals("value2", newProps.getProperty("key2")); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java index 9dc27c7f37..36745a65c0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java @@ -33,7 +33,7 @@ public class ManagedListTests extends TestCase { ManagedList child = new ManagedList(); child.add("three"); child.setMergeEnabled(true); - List mergedList = (List) child.merge(parent); + List mergedList = child.merge(parent); assertEquals("merge() obviously did not work.", 3, mergedList.size()); } @@ -72,7 +72,7 @@ public class ManagedListTests extends TestCase { parent.add("two"); ManagedList child = new ManagedList(); child.setMergeEnabled(true); - List mergedList = (List) child.merge(parent); + List mergedList = child.merge(parent); assertEquals("merge() obviously did not work.", 2, mergedList.size()); } @@ -84,7 +84,7 @@ public class ManagedListTests extends TestCase { ManagedList child = new ManagedList(); child.add("one"); child.setMergeEnabled(true); - List mergedList = (List) child.merge(parent); + List mergedList = child.merge(parent); assertEquals("merge() obviously did not work.", 3, mergedList.size()); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java index 0eea409ab8..22dbf41ba3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java @@ -33,7 +33,7 @@ public class ManagedSetTests extends TestCase { ManagedSet child = new ManagedSet(); child.add("three"); child.setMergeEnabled(true); - Set mergedSet = (Set) child.merge(parent); + Set mergedSet = child.merge(parent); assertEquals("merge() obviously did not work.", 3, mergedSet.size()); } @@ -72,7 +72,7 @@ public class ManagedSetTests extends TestCase { parent.add("two"); ManagedSet child = new ManagedSet(); child.setMergeEnabled(true); - Set mergedSet = (Set) child.merge(parent); + Set mergedSet = child.merge(parent); assertEquals("merge() obviously did not work.", 2, mergedSet.size()); } @@ -84,7 +84,7 @@ public class ManagedSetTests extends TestCase { ManagedSet child = new ManagedSet(); child.add("one"); child.setMergeEnabled(true); - Set mergedSet = (Set) child.merge(parent); + Set mergedSet = child.merge(parent); assertEquals("merge() obviously did not work.", 2, mergedSet.size()); } diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java index e1bd9a8c63..0607947d6c 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java @@ -118,7 +118,7 @@ public class QuartzSupportTests { } mijdfb.setTargetMethod("doSomething"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTriggerBean trigger1 = new SimpleTriggerBean(); trigger1.setBeanName("myTrigger1"); @@ -210,7 +210,7 @@ public class QuartzSupportTests { mijdfb.setTargetObject(task1); mijdfb.setTargetMethod("doSomething"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTriggerBean trigger1 = new SimpleTriggerBean(); trigger1.setBeanName("myTrigger1"); @@ -304,7 +304,7 @@ public class QuartzSupportTests { mijdfb.setTargetObject(task1); mijdfb.setTargetMethod("doSomething"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTriggerBean trigger1 = new SimpleTriggerBean(); trigger1.setBeanName("myTrigger1"); @@ -446,7 +446,7 @@ public class QuartzSupportTests { mijdfb.setTargetObject(task1); mijdfb.setTargetMethod("doWait"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTriggerBean trigger0 = new SimpleTriggerBean(); trigger0.setBeanName("myTrigger1"); @@ -532,7 +532,7 @@ public class QuartzSupportTests { mijdfb.setTargetObject(task1); mijdfb.setTargetMethod("doSomething"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTrigger trigger1 = new SimpleTrigger(); trigger1.setName("myTrigger1"); @@ -618,7 +618,7 @@ public class QuartzSupportTests { try { schedulerFactoryBean.afterPropertiesSet(); schedulerFactoryBean.start(); - Scheduler returnedScheduler = (Scheduler) schedulerFactoryBean.getObject(); + Scheduler returnedScheduler = schedulerFactoryBean.getObject(); assertEquals(tb, returnedScheduler.getContext().get("testBean")); assertEquals(ac, returnedScheduler.getContext().get("appCtx")); } @@ -659,7 +659,7 @@ public class QuartzSupportTests { mijdfb.setTargetMethod("doSomething"); mijdfb.setJobListenerNames(names); mijdfb.afterPropertiesSet(); - JobDetail jobDetail = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail = mijdfb.getObject(); List result = Arrays.asList(jobDetail.getJobListenerNames()); assertEquals(Arrays.asList(names), result); } diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java index 26a7b4ec47..b0004bb1a7 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java @@ -93,7 +93,7 @@ class WebSphereClassLoaderAdapter { public ClassLoader getThrowawayClassLoader() { try { - ClassLoader loader = (ClassLoader) cloneConstructor.newInstance(getClassLoader()); + ClassLoader loader = cloneConstructor.newInstance(getClassLoader()); // clear out the transformers (copied as well) List list = (List) transformerList.get(loader); list.clear(); diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java index 8e8198a6fa..60d1364888 100644 --- a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java +++ b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java @@ -186,7 +186,7 @@ public abstract class AbstractErrors implements Errors, Serializable { public FieldError getFieldError(String field) { List fieldErrors = getFieldErrors(field); - return (!fieldErrors.isEmpty() ? (FieldError) fieldErrors.get(0) : null); + return (!fieldErrors.isEmpty() ? fieldErrors.get(0) : null); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java index 690e0355a7..2c8e8a714b 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java @@ -137,7 +137,7 @@ public final class AfterReturningAdviceBindingTests { @Test public void testReturningBeanArray() { this.testBeanTarget.setSpouse(new TestBean()); - ITestBean[] spouses = (ITestBean[]) this.testBeanTarget.getSpouses(); + ITestBean[] spouses = this.testBeanTarget.getSpouses(); mockCollaborator.testBeanArrayArg(spouses); replay(mockCollaborator); testBeanProxy.getSpouses(); diff --git a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index 84ade3b7dd..a0493b62ec 100644 --- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -94,7 +94,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe } public void testGrandparentTypedDefinitionFound() throws Exception { - TestBean dad = (TestBean) applicationContext.getBean("father", TestBean.class); + TestBean dad = applicationContext.getBean("father", TestBean.class); assertTrue("Dad has correct name", dad.getName().equals("Albert")); } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java index e104e7b466..79da547c13 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java @@ -145,14 +145,14 @@ public abstract class AbstractJmxAssemblerTests extends AbstractJmxTests { ModelMBeanOperationInfo get = info.getOperation("getName"); assertNotNull("get operation should not be null", get); assertEquals("get operation should have visibility of four", - (Integer) get.getDescriptor().getFieldValue("visibility"), + get.getDescriptor().getFieldValue("visibility"), new Integer(4)); assertEquals("get operation should have role \"getter\"", "getter", get.getDescriptor().getFieldValue("role")); ModelMBeanOperationInfo set = info.getOperation("setName"); assertNotNull("set operation should not be null", set); assertEquals("set operation should have visibility of four", - (Integer) set.getDescriptor().getFieldValue("visibility"), + set.getDescriptor().getFieldValue("visibility"), new Integer(4)); assertEquals("set operation should have role \"setter\"", "setter", set.getDescriptor().getFieldValue("role")); } diff --git a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java index 56244c74a4..d53d8366fe 100644 --- a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java @@ -62,7 +62,7 @@ public class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTe bean.afterPropertiesSet(); try { - MBeanServerConnection connection = (MBeanServerConnection) bean.getObject(); + MBeanServerConnection connection = bean.getObject(); assertNotNull("Connection should not be null", connection); // perform simple MBean count test @@ -100,7 +100,7 @@ public class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTe bean.setConnectOnStartup(false); bean.afterPropertiesSet(); - MBeanServerConnection connection = (MBeanServerConnection) bean.getObject(); + MBeanServerConnection connection = bean.getObject(); assertTrue(AopUtils.isAopProxy(connection)); JMXConnectorServer connector = null; @@ -122,7 +122,7 @@ public class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTe bean.setConnectOnStartup(false); bean.afterPropertiesSet(); - MBeanServerConnection connection = (MBeanServerConnection) bean.getObject(); + MBeanServerConnection connection = bean.getObject(); assertTrue(AopUtils.isAopProxy(connection)); bean.destroy(); } diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java index 5e8f75a358..921a5c4e11 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java @@ -52,7 +52,7 @@ public class ScheduledTasksBeanDefinitionParserTests { public void setup() { this.context = new ClassPathXmlApplicationContext( "scheduledTasksContext.xml", ScheduledTasksBeanDefinitionParserTests.class); - this.registrar = (ScheduledTaskRegistrar) this.context.getBeansOfType( + this.registrar = this.context.getBeansOfType( ScheduledTaskRegistrar.class).values().iterator().next(); this.testBean = this.context.getBean("testBean"); } diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java index 620c737c86..5886a912ea 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java @@ -39,7 +39,7 @@ public class TimerSupportTests extends TestCase { mittfb.setTargetObject(task1); mittfb.setTargetMethod("doSomething"); mittfb.afterPropertiesSet(); - final TimerTask timerTask1 = (TimerTask) mittfb.getObject(); + final TimerTask timerTask1 = mittfb.getObject(); final TestRunnable timerTask2 = new TestRunnable(); diff --git a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java index 4782e44bf4..7a243abad7 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java @@ -322,7 +322,7 @@ public abstract class GenericCollectionTypeResolver { Type resolvedType = type; if (type instanceof TypeVariable && typeVariableMap != null) { - Type mappedType = typeVariableMap.get((TypeVariable) type); + Type mappedType = typeVariableMap.get(type); if (mappedType != null) { resolvedType = mappedType; } @@ -383,7 +383,7 @@ public abstract class GenericCollectionTypeResolver { } Type paramType = paramTypes[typeIndex]; if (paramType instanceof TypeVariable && typeVariableMap != null) { - Type mappedType = typeVariableMap.get((TypeVariable) paramType); + Type mappedType = typeVariableMap.get(paramType); if (mappedType != null) { paramType = mappedType; } diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java index 50e13dac06..40041e8de4 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java @@ -106,7 +106,7 @@ public class AnnotationAttributes extends LinkedHashMap { @SuppressWarnings("unchecked") public Class getClass(String attributeName) { - return (Class)doGet(attributeName, Class.class); + return doGet(attributeName, Class.class); } public Class[] getClassArray(String attributeName) { diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index 67f5bcf616..6c16ee75a3 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -71,8 +71,8 @@ public class CollectionToCollectionConverterTests { @SuppressWarnings("unchecked") List result = (List) conversionService.convert(list, sourceType, targetType); assertFalse(list.equals(result)); - assertEquals((Integer) 9, result.get(0)); - assertEquals((Integer) 37, result.get(1)); + assertEquals(9, result.get(0)); + assertEquals(37, result.get(1)); } public ArrayList scalarListTarget; diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java index c9c936af90..c0495b5213 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java @@ -298,7 +298,7 @@ public class DefaultConversionTests { @Test public void testSpr7766() throws Exception { - ConverterRegistry registry = ((ConverterRegistry) conversionService); + ConverterRegistry registry = (conversionService); registry.addConverter(new ColorConverter()); List colors = (List) conversionService.convert(new String[] { "ffffff", "#000000" }, TypeDescriptor.valueOf(String[].class), new TypeDescriptor(new MethodParameter(getClass().getMethod("handlerMethod", List.class), 0))); assertEquals(2, colors.size()); diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java index ca52e93e38..fe1d6c9eed 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java @@ -147,7 +147,7 @@ public class AnnotationMetadataTests { assertThat(specialAttrs.getString("clazz"), is(String.class.getName())); AnnotationAttributes nestedAnno = specialAttrs.getAnnotation("nestedAnno"); - assertArrayEquals(new String[]{String.class.getName()}, (String[])nestedAnno.getStringArray("classArray")); + assertArrayEquals(new String[]{String.class.getName()}, nestedAnno.getStringArray("classArray")); assertArrayEquals(new String[]{String.class.getName()}, nestedAnno.getStringArray("classArray")); AnnotationAttributes[] nestedAnnoArray = specialAttrs.getAnnotationArray("nestedAnnoArray"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index 696c68831d..56e26f30da 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -1312,7 +1312,7 @@ public class EvaluationTests extends ExpressionTestCase { e = parser.parseExpression("#wibble=#wibble+#wibble"); String s = e.getValue(ctx,String.class); assertEquals("hello worldhello world",s); - assertEquals("hello worldhello world",(String)ctx.lookupVariable("wibble")); + assertEquals("hello worldhello world",ctx.lookupVariable("wibble")); ctx.setVariable("wobble", 3); e = parser.parseExpression("#wobble++"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java index 3c0a3024f5..b5ca0a2da5 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java @@ -457,7 +457,7 @@ public class ParsingTests { */ public void parseCheck(String expression, String expectedStringFormOfAST) { try { - SpelExpression e = (SpelExpression) parser.parseRaw(expression); + SpelExpression e = parser.parseRaw(expression); if (e != null && !e.toStringAST().equals(expectedStringFormOfAST)) { SpelUtilities.printAbstractSyntaxTree(System.err, e); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java index c460b90663..e40ddac2a4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java @@ -70,7 +70,7 @@ public class BeanFactoryDataSourceLookup implements DataSourceLookup, BeanFactor public DataSource getDataSource(String dataSourceName) throws DataSourceLookupFailureException { Assert.state(this.beanFactory != null, "BeanFactory is required"); try { - return (DataSource) this.beanFactory.getBean(dataSourceName, DataSource.class); + return this.beanFactory.getBean(dataSourceName, DataSource.class); } catch (BeansException ex) { throw new DataSourceLookupFailureException( diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java index 1f548759ea..08b71e6fcb 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java @@ -953,7 +953,7 @@ public class SqlQueryTests extends AbstractJdbcTests { public List findCustomers(List ids) { Map params = new HashMap(); params.put("ids", ids); - return (List) executeByNamedParam(params); + return executeByNamedParam(params); } } @@ -1026,7 +1026,7 @@ public class SqlQueryTests extends AbstractJdbcTests { public List findCustomers(Integer id) { Map params = new HashMap(); params.put("id1", id); - return (List) executeByNamedParam(params); + return executeByNamedParam(params); } } @@ -1067,7 +1067,7 @@ public class SqlQueryTests extends AbstractJdbcTests { public List findCustomers(Integer id1) { Map params = new HashMap(); params.put("id1", id1); - return (List) executeByNamedParam(params); + return executeByNamedParam(params); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java index 6062ab5eb8..67e9cdc47f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java @@ -198,7 +198,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { TestSQLErrorCodesFactory sf = new TestSQLErrorCodesFactory(); assertEquals(1, sf.getErrorCodes("Oracle").getCustomTranslations().length); CustomSQLErrorCodesTranslation translation = - (CustomSQLErrorCodesTranslation) sf.getErrorCodes("Oracle").getCustomTranslations()[0]; + sf.getErrorCodes("Oracle").getCustomTranslations()[0]; assertEquals(CustomErrorCodeException.class, translation.getExceptionClass()); assertEquals(1, translation.getErrorCodes().length); } diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java index f28ae3a115..9da3ed1d6b 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java @@ -73,7 +73,7 @@ public class BeanFactoryDestinationResolver implements DestinationResolver, Bean Assert.state(this.beanFactory != null, "BeanFactory is required"); try { - return (Destination) this.beanFactory.getBean(destinationName, Destination.class); + return this.beanFactory.getBean(destinationName, Destination.class); } catch (BeansException ex) { throw new DestinationResolutionException( diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java index 79403bcf45..ddc08aed8b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java @@ -208,7 +208,7 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory if (this.beanFactory == null) { throw new IllegalStateException("Cannot get entity interceptor via bean name if no bean factory set"); } - return (Interceptor) this.beanFactory.getBean((String) this.entityInterceptor, Interceptor.class); + return this.beanFactory.getBean((String) this.entityInterceptor, Interceptor.class); } return (Interceptor) this.entityInterceptor; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java index 5fe4923a67..06fdf97311 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java @@ -228,8 +228,8 @@ public class OpenEntityManagerInViewTests extends TestCase { replay(manager, factory); - final EntityManagerFactory factory2 = (EntityManagerFactory) createMock(EntityManagerFactory.class); - final EntityManager manager2 = (EntityManager) createMock(EntityManager.class); + final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class); + final EntityManager manager2 = createMock(EntityManager.class); expect(factory2.createEntityManager()).andReturn(manager2); expect(manager2.isOpen()).andReturn(true); @@ -292,8 +292,8 @@ public class OpenEntityManagerInViewTests extends TestCase { replay(manager, factory); - final EntityManagerFactory factory2 = (EntityManagerFactory) createMock(EntityManagerFactory.class); - final EntityManager manager2 = (EntityManager) createMock(EntityManager.class); + final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class); + final EntityManager manager2 = createMock(EntityManager.class); expect(factory2.createEntityManager()).andReturn(manager2); expect(manager2.isOpen()).andReturn(true); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java index 3c5fbe2d49..f8af85a584 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java @@ -256,7 +256,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public void testPublicPersistenceUnitSetterWithOverriding() { EntityManagerFactory mockEmf2 = - (EntityManagerFactory) MockControl.createControl(EntityManagerFactory.class).getMock(); + MockControl.createControl(EntityManagerFactory.class).getMock(); GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); @@ -274,7 +274,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public void testPublicPersistenceUnitSetterWithUnitIdentifiedThroughBeanName() { EntityManagerFactory mockEmf2 = - (EntityManagerFactory) MockControl.createControl(EntityManagerFactory.class).getMock(); + MockControl.createControl(EntityManagerFactory.class).getMock(); GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); @@ -329,7 +329,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Ignore public void ignoreTestPersistenceUnitsFromJndi() { mockEmf.createEntityManager(); - Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); + Object mockEm = MockControl.createControl(EntityManager.class).getMock(); emfMc.setReturnValue(mockEm, 1); emfMc.replay(); @@ -428,9 +428,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } public void testPersistenceContextsFromJndi() { - Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm3 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); + Object mockEm = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm2 = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm3 = MockControl.createControl(EntityManager.class).getMock(); Map persistenceContexts = new HashMap(); persistenceContexts.put("", "pc1"); @@ -467,9 +467,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } public void testPersistenceContextsFromJndiWithDefaultUnit() { - Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm3 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); + Object mockEm = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm2 = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm3 = MockControl.createControl(EntityManager.class).getMock(); Map persistenceContexts = new HashMap(); persistenceContexts.put("System", "pc1"); @@ -507,8 +507,8 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } public void testSinglePersistenceContextFromJndi() { - Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); + Object mockEm = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm2 = MockControl.createControl(EntityManager.class).getMock(); Map persistenceContexts = new HashMap(); persistenceContexts.put("System", "pc1"); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java index b22527cdab..93072c225f 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java @@ -61,7 +61,7 @@ public class SharedEntityManagerFactoryTests { assertTrue(EntityManager.class.isAssignableFrom(proxyFactoryBean.getObjectType())); assertTrue(proxyFactoryBean.isSingleton()); - EntityManager proxy = (EntityManager) proxyFactoryBean.getObject(); + EntityManager proxy = proxyFactoryBean.getObject(); assertSame(proxy, proxyFactoryBean.getObject()); assertFalse(proxy.contains(o)); diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java index 4cd57b33be..4c5387aaa3 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java @@ -66,7 +66,7 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { protected void testFlight(Object o) { Flight flight = (Flight) o; assertNotNull("Flight is null", flight); - assertEquals("Number is invalid", 42L, (long) flight.getNumber()); + assertEquals("Number is invalid", 42L, flight.getNumber()); } @Override @@ -104,10 +104,10 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { assertEquals("Invalid amount of items", 2, order.getOrderItemCount()); OrderItem item = order.getOrderItem(0); assertEquals("Invalid items", "1", item.getId()); - assertEquals("Invalid items", 15, (int)item.getQuantity()); + assertEquals("Invalid items", 15, item.getQuantity()); item = order.getOrderItem(1); assertEquals("Invalid items", "3", item.getId()); - assertEquals("Invalid items", 20, (int)item.getQuantity()); + assertEquals("Invalid items", 20, item.getQuantity()); } @Test diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java index 0375792f22..b43d3f5152 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java @@ -127,7 +127,7 @@ public class DelegatingActionProxy extends Action { protected Action getDelegateAction(ActionMapping mapping) throws BeansException { WebApplicationContext wac = getWebApplicationContext(getServlet(), mapping.getModuleConfig()); String beanName = determineActionBeanName(mapping); - return (Action) wac.getBean(beanName, Action.class); + return wac.getBean(beanName, Action.class); } /** diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java index 1a6506e05c..063ad2f9a7 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java @@ -177,7 +177,7 @@ public class DelegatingRequestProcessor extends RequestProcessor { if (!getWebApplicationContext().containsBean(beanName)) { return null; } - return (Action) getWebApplicationContext().getBean(beanName, Action.class); + return getWebApplicationContext().getBean(beanName, Action.class); } /** diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java index 1f765bd4c8..b614dd30b0 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java @@ -126,7 +126,7 @@ public class DelegatingTilesRequestProcessor extends TilesRequestProcessor { if (!getWebApplicationContext().containsBean(beanName)) { return null; } - return (Action) getWebApplicationContext().getBean(beanName, Action.class); + return getWebApplicationContext().getBean(beanName, Action.class); } /** diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java index 65d2dc4644..61c2f37df6 100644 --- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java +++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java @@ -59,7 +59,7 @@ public class FlashAttributeResultMatchers { return new ResultMatcher() { @SuppressWarnings("unchecked") public void match(MvcResult result) throws Exception { - assertEquals("Flash attribute", value, (T) result.getFlashMap().get(name)); + assertEquals("Flash attribute", value, result.getFlashMap().get(name)); } }; } diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java index 7281894d51..d6ba452f23 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java @@ -269,7 +269,7 @@ public class MockPortletRequest implements PortletRequest { public String getProperty(String key) { Assert.notNull(key, "Property key must not be null"); List list = this.properties.get(key); - return (list != null && list.size() > 0 ? (String) list.get(0) : null); + return (list != null && list.size() > 0 ? list.get(0) : null); } public Enumeration getProperties(String key) { diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java index c8f43b9625..50bdd4c2de 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java @@ -699,7 +699,7 @@ public class CciTemplateTests { replay(connectionFactory, connection, interaction); CciTemplate ct = new CciTemplate(connectionFactory); - Record tmpOutputRecord = (Record) ct.execute(interactionSpec, + Record tmpOutputRecord = ct.execute(interactionSpec, inputOutputRecord); assertNull(tmpOutputRecord); diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java index a04b3e44f9..a0b0a2a5b5 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java @@ -129,7 +129,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv @Override public boolean canRead(Class clazz, MediaType mediaType) { - return canRead((Type) clazz, null, mediaType); + return canRead(clazz, null, mediaType); } public boolean canRead(Type type, Class contextClass, MediaType mediaType) { diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java index dee7fe7869..448b3be8e8 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java @@ -127,7 +127,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve @Override public boolean canRead(Class clazz, MediaType mediaType) { - return canRead((Type) clazz, null, mediaType); + return canRead(clazz, null, mediaType); } public boolean canRead(Type type, Class contextClass, MediaType mediaType) { diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java index c74a8584b5..8adf208b32 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java @@ -48,7 +48,7 @@ public class UnsatisfiedServletRequestParameterException extends ServletRequestB public UnsatisfiedServletRequestParameterException(String[] paramConditions, Map actualParams) { super(""); this.paramConditions = paramConditions; - this.actualParams = (Map) actualParams; + this.actualParams = actualParams; } diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java index a34c838195..c01de6e6fc 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java @@ -55,7 +55,7 @@ public class HttpRequestHandlerServlet extends HttpServlet { @Override public void init() throws ServletException { WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); - this.target = (HttpRequestHandler) wac.getBean(getServletName(), HttpRequestHandler.class); + this.target = wac.getBean(getServletName(), HttpRequestHandler.class); } @@ -68,7 +68,7 @@ public class HttpRequestHandlerServlet extends HttpServlet { this.target.handleRequest(request, response); } catch (HttpRequestMethodNotSupportedException ex) { - String[] supportedMethods = ((HttpRequestMethodNotSupportedException) ex).getSupportedMethods(); + String[] supportedMethods = ex.getSupportedMethods(); if (supportedMethods != null) { response.setHeader("Allow", StringUtils.arrayToDelimitedString(supportedMethods, ", ")); } diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java index b97d64e654..23e9a81f66 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java @@ -126,7 +126,7 @@ public abstract class HtmlUtils { char character = input.charAt(i); if (characterEntityReferences.isMappedToReference(character)) { escaped.append(HtmlCharacterEntityReferences.HEX_REFERENCE_START); - escaped.append(Integer.toString((int) character, 16)); + escaped.append(Integer.toString(character, 16)); escaped.append(HtmlCharacterEntityReferences.REFERENCE_END); } else { diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java index 89cbe30df7..5763411e8e 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java @@ -76,7 +76,7 @@ public class Jaxb2RootElementHttpMessageConverterTest { public void readXmlRootElement() throws Exception { byte[] body = "".getBytes("UTF-8"); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); - RootElement result = (RootElement) converter.read((Class) RootElement.class, inputMessage); + RootElement result = (RootElement) converter.read(RootElement.class, inputMessage); assertEquals("Invalid result", "Hello World", result.type.s); } @@ -85,7 +85,7 @@ public class Jaxb2RootElementHttpMessageConverterTest { public void readXmlRootElementSubclass() throws Exception { byte[] body = "".getBytes("UTF-8"); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); - RootElementSubclass result = (RootElementSubclass) converter.read((Class) RootElementSubclass.class, inputMessage); + RootElementSubclass result = (RootElementSubclass) converter.read(RootElementSubclass.class, inputMessage); assertEquals("Invalid result", "Hello World", result.type.s); } @@ -94,7 +94,7 @@ public class Jaxb2RootElementHttpMessageConverterTest { public void readXmlType() throws Exception { byte[] body = "".getBytes("UTF-8"); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); - Type result = (Type) converter.read((Class) Type.class, inputMessage); + Type result = (Type) converter.read(Type.class, inputMessage); assertEquals("Invalid result", "Hello World", result.s); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index 84ade3b7dd..a0493b62ec 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -94,7 +94,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe } public void testGrandparentTypedDefinitionFound() throws Exception { - TestBean dad = (TestBean) applicationContext.getBean("father", TestBean.class); + TestBean dad = applicationContext.getBean("father", TestBean.class); assertTrue("Dad has correct name", dad.getName().equals("Albert")); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java index 48d2d30788..f271cfe479 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java @@ -132,7 +132,7 @@ public abstract class AbstractMessageConverterMethodArgumentResolver implements logger.debug("Reading [" + targetType + "] as \"" + contentType + "\" using [" + converter + "]"); } - return (T) genericConverter.read(targetType, contextClass, inputMessage); + return genericConverter.read(targetType, contextClass, inputMessage); } } if (targetClass != null) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java index 8b9f21c2cf..51a846808f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java @@ -86,7 +86,7 @@ public class CheckboxTag extends AbstractSingleCheckedElementTag { if (value == null) { throw new IllegalArgumentException("Attribute 'value' is required when binding to non-boolean values"); } - Object resolvedValue = (value instanceof String ? evaluate("value", (String) value) : value); + Object resolvedValue = (value instanceof String ? evaluate("value", value) : value); renderFromValue(resolvedValue, tagWriter); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java index 94595d54b9..066242271d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java @@ -72,7 +72,7 @@ public class BeanNameViewResolver extends WebApplicationObjectSupport implements // Allow for ViewResolver chaining. return null; } - return (View) context.getBean(viewName, View.class); + return context.getBean(viewName, View.class); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java index 35dc231f50..68ecc69edb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java @@ -106,7 +106,7 @@ public class XmlViewResolver extends AbstractCachingViewResolver protected View loadView(String viewName, Locale locale) throws BeansException { BeanFactory factory = initFactory(); try { - return (View) factory.getBean(viewName, View.class); + return factory.getBean(viewName, View.class); } catch (NoSuchBeanDefinitionException ex) { // to allow for ViewResolver chaining diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java index 2541dfe052..ce3c45d2e7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java @@ -100,7 +100,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe } public void testGrandparentTypedDefinitionFound() throws Exception { - TestBean dad = (TestBean) applicationContext.getBean("father", TestBean.class); + TestBean dad = applicationContext.getBean("father", TestBean.class); assertTrue("Dad has correct name", dad.getName().equals("Albert")); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java index 8b34815e38..cd36fa2508 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java @@ -338,7 +338,7 @@ public class ServletAnnotationControllerTests { MockHttpServletResponse response = new MockHttpServletResponse(); servlet.service(request, response); assertEquals("Invalid response status", HttpServletResponse.SC_METHOD_NOT_ALLOWED, response.getStatus()); - String allowHeader = (String) response.getHeader("Allow"); + String allowHeader = response.getHeader("Allow"); assertNotNull("No Allow header", allowHeader); Set allowedMethods = new HashSet(); allowedMethods.addAll(Arrays.asList(StringUtils.delimitedListToStringArray(allowHeader, ", "))); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index ccc2028efa..d1872128cb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -292,7 +292,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl MockHttpServletResponse response = new MockHttpServletResponse(); getServlet().service(request, response); assertEquals("Invalid response status", HttpServletResponse.SC_METHOD_NOT_ALLOWED, response.getStatus()); - String allowHeader = (String) response.getHeader("Allow"); + String allowHeader = response.getHeader("Allow"); assertNotNull("No Allow header", allowHeader); Set allowedMethods = new HashSet(); allowedMethods.addAll(Arrays.asList(StringUtils.delimitedListToStringArray(allowHeader, ", "))); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java index 8ff6f889b5..2c372aa6da 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java @@ -267,7 +267,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests { } public String getAsText() { - return "F" + (Float) getValue(); + return "F" + getValue(); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java index 69a916bcd8..dc9b9404e2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java @@ -242,7 +242,7 @@ public class SelectTagTests extends AbstractFormTagTests { if (value==null) { return null; } - return ((Country) value).getName(); + return value.getName(); } }); getPageContext().getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "testBean", bindingResult); @@ -295,7 +295,7 @@ public class SelectTagTests extends AbstractFormTagTests { if (value==null) { return ""; } - return ((Country) value).getName(); + return value.getName(); } }); getPageContext().getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "testBean", bindingResult); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java index 873e98e8e0..d3e02cc7c2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java @@ -297,7 +297,7 @@ public class BaseViewTests extends TestCase { private void checkContainsAll(Map expected, Map actual) { Set keys = expected.keySet(); for (Iterator iter = keys.iterator(); iter.hasNext();) { - String key = (String) iter.next(); + String key = iter.next(); //System.out.println("Checking model key " + key); assertTrue("Value for model key '" + key + "' must match", actual.get(key) == expected.get(key)); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java index be564fee2d..46d34e7b33 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java @@ -84,7 +84,7 @@ public class InternalResourceViewTests extends TestCase { Set keys = model.keySet(); for (Iterator it = keys.iterator(); it.hasNext();) { - String key = (String) it.next(); + String key = it.next(); assertEquals(model.get(key), request.getAttribute(key)); } @@ -129,7 +129,7 @@ public class InternalResourceViewTests extends TestCase { Set keys = model.keySet(); for (Iterator it = keys.iterator(); it.hasNext();) { - String key = (String) it.next(); + String key = it.next(); assertEquals(model.get(key), request.getAttribute(key)); } @@ -153,7 +153,7 @@ public class InternalResourceViewTests extends TestCase { expectLastCall().andReturn(null); Set keys = model.keySet(); for (Iterator iter = keys.iterator(); iter.hasNext();) { - String key = (String) iter.next(); + String key = iter.next(); request.setAttribute(key, model.get(key)); expectLastCall().times(1); } @@ -186,7 +186,7 @@ public class InternalResourceViewTests extends TestCase { expectLastCall().andReturn(null); Set keys = model.keySet(); for (Iterator iter = keys.iterator(); iter.hasNext();) { - String key = (String) iter.next(); + String key = iter.next(); request.setAttribute(key, model.get(key)); expectLastCall().times(1); } @@ -220,7 +220,7 @@ public class InternalResourceViewTests extends TestCase { expectLastCall().andReturn(null); Set keys = model.keySet(); for (Iterator iter = keys.iterator(); iter.hasNext();) { - String key = (String) iter.next(); + String key = iter.next(); request.setAttribute(key, model.get(key)); expectLastCall().times(1); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java index dd94064a9e..8da83022c4 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java @@ -73,7 +73,7 @@ public class FreeMarkerConfigurerTests extends TestCase { FreeMarkerConfigurationFactoryBean fcfb = new FreeMarkerConfigurationFactoryBean(); fcfb.setTemplateLoaderPath("file:/mydir"); fcfb.afterPropertiesSet(); - Configuration cfg = (Configuration) fcfb.getObject(); + Configuration cfg = fcfb.getObject(); assertTrue(cfg.getTemplateLoader() instanceof SpringTemplateLoader); } @@ -97,7 +97,7 @@ public class FreeMarkerConfigurerTests extends TestCase { }); fcfb.afterPropertiesSet(); assertTrue(fcfb.getObject() instanceof Configuration); - Configuration fc = (Configuration) fcfb.getObject(); + Configuration fc = fcfb.getObject(); Template ft = fc.getTemplate("test"); assertEquals("test", FreeMarkerTemplateUtils.processTemplateIntoString(ft, new HashMap())); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java index 08547efa2b..af090a253b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java @@ -69,7 +69,7 @@ public class VelocityConfigurerTests extends TestCase { vefb.setVelocityPropertiesMap(map); vefb.afterPropertiesSet(); assertTrue(vefb.getObject() instanceof VelocityEngine); - VelocityEngine ve = (VelocityEngine) vefb.getObject(); + VelocityEngine ve = vefb.getObject(); assertEquals("/mydir", ve.getProperty("myprop")); assertEquals(value, ve.getProperty("myentry")); } @@ -79,7 +79,7 @@ public class VelocityConfigurerTests extends TestCase { vefb.setResourceLoaderPath("file:/mydir"); vefb.afterPropertiesSet(); assertTrue(vefb.getObject() instanceof VelocityEngine); - VelocityEngine ve = (VelocityEngine) vefb.getObject(); + VelocityEngine ve = vefb.getObject(); assertEquals(new File("/mydir").getAbsolutePath(), ve.getProperty(VelocityEngine.FILE_RESOURCE_LOADER_PATH)); } @@ -104,7 +104,7 @@ public class VelocityConfigurerTests extends TestCase { }); vefb.afterPropertiesSet(); assertTrue(vefb.getObject() instanceof VelocityEngine); - VelocityEngine ve = (VelocityEngine) vefb.getObject(); + VelocityEngine ve = vefb.getObject(); assertEquals("test", VelocityEngineUtils.mergeTemplateIntoString(ve, "test", new HashMap())); }