[hibernate-commits] Hibernate SVN: r16734 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-06-10 06:44:41 -0400 (Wed, 10 Jun 2009)
New Revision: 16734

Removed:
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/DefaultValidationProviderResolver.java
Log:
Deleted obsolete class

Deleted: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/DefaultValidationProviderResolver.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/DefaultValidationProviderResolver.java	2009-06-10 10:43:12 UTC (rev 16733)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/DefaultValidationProviderResolver.java	2009-06-10 10:44:41 UTC (rev 16734)
@@ -1,121 +0,0 @@
-package org.hibernate.validation.engine;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-import javax.validation.ValidationException;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.spi.ValidationProvider;
-
-/**
- * Find <code>ValidationProvider</code> according to the default <code>ValidationProviderResolver</code> defined in the
- * Bean Validation specification. This implementation uses the current classloader or the classloader which has loaded
- * the current class if the current class loader is unavailable. The classloader is used to retrieve the Service Provider files.
- * <p>
- * This class implements the Service Provider pattern described <a href="http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html#Service%20Provider">here</a>.
- * Since we cannot rely on Java 6 we have to reimplement the <code>Service</code> functionality.
- * </p>
- *
- * Duplicated from the private innner class Validation#DefaultValidationProviderResolver
- *
- * @author Emmanuel Bernard
- * @author Hardy Ferentschik
- */
-public class DefaultValidationProviderResolver implements ValidationProviderResolver {
-
-	//cache per classloader for an appropriate discovery
-	//keep them in a weak hashmap to avoid memory leaks and allow proper hot redeployment
-	//TODO use a WeakConcurrentHashMap
-	private static final Map<ClassLoader, List<ValidationProvider>> providersPerClassloader =
-			new WeakHashMap<ClassLoader, List<ValidationProvider>>();
-
-	private static final String SERVICES_FILE = "META-INF/services/" + ValidationProvider.class.getName();
-
-	public List<ValidationProvider> getValidationProviders() {
-		ClassLoader classloader = Thread.currentThread().getContextClassLoader();
-		if ( classloader == null ) {
-			classloader = DefaultValidationProviderResolver.class.getClassLoader();
-		}
-
-		List<ValidationProvider> providers;
-		synchronized ( providersPerClassloader ) {
-			providers = providersPerClassloader.get( classloader );
-		}
-
-		if ( providers == null ) {
-			providers = new ArrayList<ValidationProvider>();
-			String name = null;
-			try {
-				Enumeration<URL> providerDefinitions = classloader.getResources( SERVICES_FILE );
-				while ( providerDefinitions.hasMoreElements() ) {
-					URL url = providerDefinitions.nextElement();
-					InputStream stream = url.openStream();
-					BufferedReader reader = new BufferedReader( new InputStreamReader( stream ), 100 );
-					try {
-						name = reader.readLine();
-						while ( name != null ) {
-							name = name.trim();
-							if ( !name.startsWith( "#" ) ) {
-								final Class<?> providerClass = loadClass(
-										name,
-										DefaultValidationProviderResolver.class
-								);
-
-								providers.add(
-										( ValidationProvider ) providerClass.newInstance()
-								);
-							}
-							name = reader.readLine();
-						}
-					}
-					finally {
-						reader.close();
-					}
-				}
-			}
-			catch ( IOException e ) {
-				throw new ValidationException( "Unable to read " + SERVICES_FILE, e );
-			}
-			catch ( ClassNotFoundException e ) {
-				//TODO is it better to not fail the whole loading because of a black sheep?
-				throw new ValidationException( "Unable to load Bean Validation provider " + name, e );
-			}
-			catch ( IllegalAccessException e ) {
-				throw new ValidationException( "Unable to instanciate Bean Validation provider" + name, e );
-			}
-			catch ( InstantiationException e ) {
-				throw new ValidationException( "Unable to instanciate Bean Validation provider" + name, e );
-			}
-
-			synchronized ( providersPerClassloader ) {
-				providersPerClassloader.put( classloader, providers );
-			}
-		}
-
-		return providers;
-	}
-
-	private static Class<?> loadClass(String name, Class caller) throws ClassNotFoundException {
-		try {
-			//try context classloader, if fails try caller classloader
-			ClassLoader loader = Thread.currentThread().getContextClassLoader();
-			if ( loader != null ) {
-				return loader.loadClass( name );
-			}
-		}
-		catch ( ClassNotFoundException e ) {
-			//trying caller classloader
-			if ( caller == null ) {
-				throw e;
-			}
-		}
-		return Class.forName( name, true, caller.getClassLoader() );
-	}
-}