From f1c852b14ca86860b7b692c8caeaaa8282eded86 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 12 May 2009 23:39:56 +0000 Subject: [PATCH] polishing --- .../support/PathMatchingResourcePatternResolver.java | 10 +++++----- .../core/type/AnnotationMetadataTests.java | 9 +++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java b/org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java index 9aaa94ca236..342e1e0956c 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java +++ b/org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java @@ -171,7 +171,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol try { Class fileLocatorClass = PathMatchingResourcePatternResolver.class.getClassLoader().loadClass( "org.eclipse.core.runtime.FileLocator"); - equinoxResolveMethod = fileLocatorClass.getMethod("resolve", new Class[] {URL.class}); + equinoxResolveMethod = fileLocatorClass.getMethod("resolve", URL.class); logger.debug("Found Equinox FileLocator for OSGi bundle URL resolution"); } catch (Throwable ex) { @@ -420,9 +420,9 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol throws IOException { URLConnection con = rootDirResource.getURL().openConnection(); - JarFile jarFile = null; - String jarFileUrl = null; - String rootEntryPath = null; + JarFile jarFile; + String jarFileUrl; + String rootEntryPath; boolean newJarFile = false; if (con instanceof JarURLConnection) { @@ -516,7 +516,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol protected Set doFindPathMatchingFileResources(Resource rootDirResource, String subPattern) throws IOException { - File rootDir = null; + File rootDir; try { rootDir = rootDirResource.getFile().getAbsoluteFile(); } diff --git a/org.springframework.core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/org.springframework.core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java index 001a215658f..f2303e8593b 100644 --- a/org.springframework.core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java +++ b/org.springframework.core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java @@ -82,7 +82,7 @@ public class AnnotationMetadataTests extends TestCase { assertEquals(String.class.getName(), specialAttrs.get("clazz")); assertEquals(Thread.State.NEW, specialAttrs.get("state")); } - + private void doTestMethodAnnotationInfo(AnnotationMetadata classMetadata) { Set methods = classMetadata.getAnnotatedMethods("org.springframework.beans.factory.annotation.Autowired"); assertEquals(1, methods.size()); @@ -111,14 +111,11 @@ public class AnnotationMetadataTests extends TestCase { @Autowired public void doWork(@Qualifier("myColor") java.awt.Color color) { - } @Test - public void doSleep() - { - + + public void doSleep() { } } - }