Java 5 code style

Author: jhoeller

org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java

@@ -25,7 +25,6 @@
 import java.net.URLConnection;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.jar.JarEntry;
@@ -297,12 +296,12 @@ protected Resource[] findAllClassPathResources(String location) throws IOExcepti
 			path = path.substring(1);
 		}
 		Enumeration resourceUrls = getClassLoader().getResources(path);
-		Set result = new LinkedHashSet(16);
+		Set<Resource> result = new LinkedHashSet<Resource>(16);
 		while (resourceUrls.hasMoreElements()) {
 			URL url = (URL) resourceUrls.nextElement();
 			result.add(convertClassLoaderURL(url));
 		}
-		return (Resource[]) result.toArray(new Resource[result.size()]);
+		return result.toArray(new Resource[result.size()]);
 	}
 
 	/**
@@ -332,9 +331,9 @@ protected Resource[] findPathMatchingResources(String locationPattern) throws IO
 		String rootDirPath = determineRootDir(locationPattern);
 		String subPattern = locationPattern.substring(rootDirPath.length());
 		Resource[] rootDirResources = getResources(rootDirPath);
-		Set result = new LinkedHashSet(16);
-		for (int i = 0; i < rootDirResources.length; i++) {
-			Resource rootDirResource = resolveRootDirResource(rootDirResources[i]);
+		Set<Resource> result = new LinkedHashSet<Resource>(16);
+		for (Resource rootDirResource : rootDirResources) {
+			rootDirResource = resolveRootDirResource(rootDirResource);
 			if (isJarResource(rootDirResource)) {
 				result.addAll(doFindPathMatchingJarResources(rootDirResource, subPattern));
 			}
@@ -345,7 +344,7 @@ protected Resource[] findPathMatchingResources(String locationPattern) throws IO
 		if (logger.isDebugEnabled()) {
 			logger.debug("Resolved location pattern [" + locationPattern + "] to resources " + result);
 		}
-		return (Resource[]) result.toArray(new Resource[result.size()]);
+		return result.toArray(new Resource[result.size()]);
 	}
 
 	/**
@@ -416,7 +415,9 @@ protected boolean isJarResource(Resource resource) throws IOException {
 	 * @see java.net.JarURLConnection
 	 * @see org.springframework.util.PathMatcher
 	 */
-	protected Set doFindPathMatchingJarResources(Resource rootDirResource, String subPattern) throws IOException {
+	protected Set<Resource> doFindPathMatchingJarResources(Resource rootDirResource, String subPattern)
+			throws IOException {
+
 		URLConnection con = rootDirResource.getURL().openConnection();
 		JarFile jarFile = null;
 		String jarFileUrl = null;
@@ -461,7 +462,7 @@ protected Set doFindPathMatchingJarResources(Resource rootDirResource, String su
 				// The Sun JRE does not return a slash here, but BEA JRockit does.
 				rootEntryPath = rootEntryPath + "/";
 			}
-			Set result = new LinkedHashSet(8);
+			Set<Resource> result = new LinkedHashSet<Resource>(8);
 			for (Enumeration entries = jarFile.entries(); entries.hasMoreElements();) {
 				JarEntry entry = (JarEntry) entries.nextElement();
 				String entryPath = entry.getName();
@@ -511,7 +512,9 @@ protected JarFile getJarFile(String jarFileUrl) throws IOException {
 	 * @see #retrieveMatchingFiles
 	 * @see org.springframework.util.PathMatcher
 	 */
-	protected Set doFindPathMatchingFileResources(Resource rootDirResource, String subPattern) throws IOException {
+	protected Set<Resource> doFindPathMatchingFileResources(Resource rootDirResource, String subPattern)
+			throws IOException {
+
 		File rootDir = null;
 		try {
 			rootDir = rootDirResource.getFile().getAbsoluteFile();
@@ -521,7 +524,7 @@ protected Set doFindPathMatchingFileResources(Resource rootDirResource, String s
 				logger.debug("Cannot search for matching files underneath " + rootDirResource +
 						" because it does not correspond to a directory in the file system", ex);
 			}
-			return Collections.EMPTY_SET;
+			return Collections.emptySet();
 		}
 		return doFindMatchingFileSystemResources(rootDir, subPattern);
 	}
@@ -536,14 +539,13 @@ protected Set doFindPathMatchingFileResources(Resource rootDirResource, String s
 	 * @see #retrieveMatchingFiles
 	 * @see org.springframework.util.PathMatcher
 	 */
-	protected Set doFindMatchingFileSystemResources(File rootDir, String subPattern) throws IOException {
+	protected Set<Resource> doFindMatchingFileSystemResources(File rootDir, String subPattern) throws IOException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Looking for matching resources in directory tree [" + rootDir.getPath() + "]");
 		}
-		Set matchingFiles = retrieveMatchingFiles(rootDir, subPattern);
-		Set result = new LinkedHashSet(matchingFiles.size());
-		for (Iterator it = matchingFiles.iterator(); it.hasNext();) {
-			File file = (File) it.next();
+		Set<File> matchingFiles = retrieveMatchingFiles(rootDir, subPattern);
+		Set<Resource> result = new LinkedHashSet<Resource>(matchingFiles.size());
+		for (File file : matchingFiles) {
 			result.add(new FileSystemResource(file));
 		}
 		return result;
@@ -558,7 +560,7 @@ protected Set doFindMatchingFileSystemResources(File rootDir, String subPattern)
 	 * @return the Set of matching File instances
 	 * @throws IOException if directory contents could not be retrieved
 	 */
-	protected Set retrieveMatchingFiles(File rootDir, String pattern) throws IOException {
+	protected Set<File> retrieveMatchingFiles(File rootDir, String pattern) throws IOException {
 		if (!rootDir.isDirectory()) {
 			throw new IllegalArgumentException("Resource path [" + rootDir + "] does not denote a directory");
 		}
@@ -567,7 +569,7 @@ protected Set retrieveMatchingFiles(File rootDir, String pattern) throws IOExcep
 			fullPattern += "/";
 		}
 		fullPattern = fullPattern + StringUtils.replace(pattern, File.separator, "/");
-		Set result = new LinkedHashSet(8);
+		Set<File> result = new LinkedHashSet<File>(8);
 		doRetrieveMatchingFiles(fullPattern, rootDir, result);
 		return result;
 	}
@@ -581,7 +583,7 @@ protected Set retrieveMatchingFiles(File rootDir, String pattern) throws IOExcep
 	 * @param result the Set of matching File instances to add to
 	 * @throws IOException if directory contents could not be retrieved
 	 */
-	protected void doRetrieveMatchingFiles(String fullPattern, File dir, Set result) throws IOException {
+	protected void doRetrieveMatchingFiles(String fullPattern, File dir, Set<File> result) throws IOException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Searching directory [" + dir.getAbsolutePath() +
 					"] for files matching pattern [" + fullPattern + "]");
@@ -590,8 +592,7 @@ protected void doRetrieveMatchingFiles(String fullPattern, File dir, Set result)
 		if (dirContents == null) {
 			throw new IOException("Could not retrieve contents of directory [" + dir.getAbsolutePath() + "]");
 		}
-		for (int i = 0; i < dirContents.length; i++) {
-			File content = dirContents[i];
+		for (File content : dirContents) {
 			String currPath = StringUtils.replace(content.getAbsolutePath(), File.separator, "/");
 			if (content.isDirectory() && getPathMatcher().matchStart(fullPattern, currPath + "/")) {
 				doRetrieveMatchingFiles(fullPattern, content, result);

org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java

@@ -23,7 +23,6 @@
 import java.sql.Statement;
 import java.util.Collection;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 import javax.sql.DataSource;
@@ -52,7 +51,6 @@
 import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
 import org.springframework.jdbc.support.JdbcUtils;
 import org.springframework.jdbc.support.lob.LobHandler;
-import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
@@ -108,13 +106,17 @@
  */
 public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implements BeanClassLoaderAware {
 
-	private static final ThreadLocal configTimeDataSourceHolder = new ThreadLocal();
+	private static final ThreadLocal<DataSource> configTimeDataSourceHolder =
+			new ThreadLocal<DataSource>();
 
-	private static final ThreadLocal configTimeTransactionManagerHolder = new ThreadLocal();
+	private static final ThreadLocal<TransactionManager> configTimeTransactionManagerHolder =
+			new ThreadLocal<TransactionManager>();
 
-	private static final ThreadLocal configTimeCacheProviderHolder = new ThreadLocal();
+	private static final ThreadLocal<CacheProvider> configTimeCacheProviderHolder =
+			new ThreadLocal<CacheProvider>();
 
-	private static final ThreadLocal configTimeLobHandlerHolder = new ThreadLocal();
+	private static final ThreadLocal<LobHandler> configTimeLobHandlerHolder =
+			new ThreadLocal<LobHandler>();
 
 	/**
 	 * Return the DataSource for the currently configured Hibernate SessionFactory,
@@ -126,7 +128,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 	 * @see LocalDataSourceConnectionProvider
 	 */
 	public static DataSource getConfigTimeDataSource() {
-		return (DataSource) configTimeDataSourceHolder.get();
+		return configTimeDataSourceHolder.get();
 	}
 
 	/**
@@ -139,7 +141,7 @@ public static DataSource getConfigTimeDataSource() {
 	 * @see LocalTransactionManagerLookup
 	 */
 	public static TransactionManager getConfigTimeTransactionManager() {
-		return (TransactionManager) configTimeTransactionManagerHolder.get();
+		return configTimeTransactionManagerHolder.get();
 	}
 
 	/**
@@ -151,7 +153,7 @@ public static TransactionManager getConfigTimeTransactionManager() {
 	 * @see #setCacheProvider
 	 */
 	public static CacheProvider getConfigTimeCacheProvider() {
-		return (CacheProvider) configTimeCacheProviderHolder.get();
+		return configTimeCacheProviderHolder.get();
 	}
 
 	/**
@@ -166,7 +168,7 @@ public static CacheProvider getConfigTimeCacheProvider() {
 	 * @see org.springframework.orm.hibernate3.support.BlobSerializableType
 	 */
 	public static LobHandler getConfigTimeLobHandler() {
-		return (LobHandler) configTimeLobHandlerHolder.get();
+		return configTimeLobHandlerHolder.get();
 	}
 
 
@@ -204,7 +206,7 @@ public static LobHandler getConfigTimeLobHandler() {
 
 	private Properties collectionCacheStrategies;
 
-	private Map eventListeners;
+	private Map<String, Object> eventListeners;
 
 	private boolean schemaUpdate = false;
 
@@ -484,7 +486,7 @@ public void setCollectionCacheStrategies(Properties collectionCacheStrategies) {
 	 * listener objects as values
 	 * @see org.hibernate.cfg.Configuration#setListener(String, Object)
 	 */
-	public void setEventListeners(Map eventListeners) {
+	public void setEventListeners(Map<String, Object> eventListeners) {
 		this.eventListeners = eventListeners;
 	}
 
@@ -506,6 +508,7 @@ public void setBeanClassLoader(ClassLoader beanClassLoader) {
 
 
 	@Override
+	@SuppressWarnings("unchecked")
 	protected SessionFactory buildSessionFactory() throws Exception {
 		// Create Configuration instance.
 		Configuration config = newConfiguration();
@@ -576,23 +579,22 @@ protected SessionFactory buildSessionFactory() throws Exception {
 			if (this.typeDefinitions != null) {
 				// Register specified Hibernate type definitions.
 				Mappings mappings = config.createMappings();
-				for (int i = 0; i < this.typeDefinitions.length; i++) {
-					TypeDefinitionBean typeDef = this.typeDefinitions[i];
+				for (TypeDefinitionBean typeDef : this.typeDefinitions) {
 					mappings.addTypeDef(typeDef.getTypeName(), typeDef.getTypeClass(), typeDef.getParameters());
 				}
 			}
 
 			if (this.filterDefinitions != null) {
 				// Register specified Hibernate FilterDefinitions.
-				for (int i = 0; i < this.filterDefinitions.length; i++) {
-					config.addFilterDefinition(this.filterDefinitions[i]);
+				for (FilterDefinition filterDef : this.filterDefinitions) {
+					config.addFilterDefinition(filterDef);
 				}
 			}
 
 			if (this.configLocations != null) {
-				for (int i = 0; i < this.configLocations.length; i++) {
+				for (Resource resource : this.configLocations) {
 					// Load Hibernate configuration from given location.
-					config.configure(this.configLocations[i].getURL());
+					config.configure(resource.getURL());
 				}
 			}
 
@@ -620,42 +622,40 @@ else if (config.getProperty(Environment.TRANSACTION_MANAGER_STRATEGY) != null) {
 
 			if (this.mappingResources != null) {
 				// Register given Hibernate mapping definitions, contained in resource files.
-				for (int i = 0; i < this.mappingResources.length; i++) {
-					Resource resource = new ClassPathResource(this.mappingResources[i].trim(), this.beanClassLoader);
+				for (String mapping : this.mappingResources) {
+					Resource resource = new ClassPathResource(mapping.trim(), this.beanClassLoader);
 					config.addInputStream(resource.getInputStream());
 				}
 			}
 
 			if (this.mappingLocations != null) {
 				// Register given Hibernate mapping definitions, contained in resource files.
-				for (int i = 0; i < this.mappingLocations.length; i++) {
-					config.addInputStream(this.mappingLocations[i].getInputStream());
+				for (Resource resource : this.mappingLocations) {
+					config.addInputStream(resource.getInputStream());
 				}
 			}
 
 			if (this.cacheableMappingLocations != null) {
 				// Register given cacheable Hibernate mapping definitions, read from the file system.
-				for (int i = 0; i < this.cacheableMappingLocations.length; i++) {
-					config.addCacheableFile(this.cacheableMappingLocations[i].getFile());
+				for (Resource resource : this.cacheableMappingLocations) {
+					config.addCacheableFile(resource.getFile());
 				}
 			}
 
 			if (this.mappingJarLocations != null) {
 				// Register given Hibernate mapping definitions, contained in jar files.
-				for (int i = 0; i < this.mappingJarLocations.length; i++) {
-					Resource resource = this.mappingJarLocations[i];
+				for (Resource resource : this.mappingJarLocations) {
 					config.addJar(resource.getFile());
 				}
 			}
 
 			if (this.mappingDirectoryLocations != null) {
 				// Register all Hibernate mapping definitions in the given directories.
-				for (int i = 0; i < this.mappingDirectoryLocations.length; i++) {
-					File file = this.mappingDirectoryLocations[i].getFile();
+				for (Resource resource : this.mappingDirectoryLocations) {
+					File file = resource.getFile();
 					if (!file.isDirectory()) {
 						throw new IllegalArgumentException(
-								"Mapping directory location [" + this.mappingDirectoryLocations[i] +
-								"] does not denote a directory");
+								"Mapping directory location [" + resource + "] does not denote a directory");
 					}
 					config.addDirectory(file);
 				}
@@ -698,13 +698,11 @@ else if (strategyAndRegion.length > 0) {
 
 			if (this.eventListeners != null) {
 				// Register specified Hibernate event listeners.
-				for (Iterator it = this.eventListeners.entrySet().iterator(); it.hasNext();) {
-					Map.Entry entry = (Map.Entry) it.next();
-					Assert.isTrue(entry.getKey() instanceof String, "Event listener key needs to be of type String");
-					String listenerType = (String) entry.getKey();
+				for (Map.Entry<String, Object> entry : this.eventListeners.entrySet()) {
+					String listenerType = entry.getKey();
 					Object listenerObject = entry.getValue();
 					if (listenerObject instanceof Collection) {
-						Collection listeners = (Collection) listenerObject;
+						Collection<Object> listeners = (Collection<Object>) listenerObject;
 						EventListeners listenerRegistry = config.getEventListeners();
 						Object[] listenerArray =
 								(Object[]) Array.newInstance(listenerRegistry.getListenerClassFor(listenerType), listeners.size());
@@ -979,8 +977,8 @@ protected void executeSchemaScript(Connection con, String[] sql) throws SQLExcep
 			try {
 				Statement stmt = con.createStatement();
 				try {
-					for (int i = 0; i < sql.length; i++) {
-						executeSchemaStatement(stmt, sql[i]);
+					for (String sqlStmt : sql) {
+						executeSchemaStatement(stmt, sqlStmt);
 					}
 				}
 				finally {