You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/04/29 22:32:22 UTC
svn commit: r769916 -
/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Validation.java
Author: dwoods
Date: Wed Apr 29 20:32:22 2009
New Revision: 769916
URL: http://svn.apache.org/viewvc?rev=769916&view=rev
Log:
GERONIMO-4619 some code formatting and cleanup
Modified:
geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Validation.java
Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Validation.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Validation.java?rev=769916&r1=769915&r2=769916&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Validation.java (original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/src/main/java/javax/validation/Validation.java Wed Apr 29 20:32:22 2009
@@ -18,7 +18,6 @@
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.ArrayList;
@@ -58,8 +57,8 @@
* @param configurationType
* @return ProviderSpecificBootstrap<T>
*/
- public static <T extends Configuration<T>> ProviderSpecificBootstrap<T> byProvider(
- Class<T> configurationType) {
+ public static <T extends Configuration<T>> ProviderSpecificBootstrap<T>
+ byProvider(Class<T> configurationType) {
return new ProviderSpecificBootstrapImpl<T>(configurationType);
}
@@ -71,7 +70,7 @@
private static final String SPI_CFG =
"META-INF/services/javax.validation.spi.ValidationProvider";
-
+
/*
* (non-Javadoc)
*
@@ -79,12 +78,14 @@
* javax.validation.ValidationProviderResolver#getValidationProviders()
*/
public List<ValidationProvider> getValidationProviders() {
- List<ValidationProvider> providers = new ArrayList<ValidationProvider>();
+ List<ValidationProvider> providers =
+ new ArrayList<ValidationProvider>();
try {
// get our classloader
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- if ( cl == null )
- cl = DefaultValidationProviderResolver.class.getClassLoader();
+ if (cl == null)
+ cl = DefaultValidationProviderResolver.class.
+ getClassLoader();
// find all service provider cfgs
Enumeration<URL> cfgs = cl.getResources(SPI_CFG);
while (cfgs.hasMoreElements()) {
@@ -100,37 +101,40 @@
if (!line.startsWith("#")) {
try {
// try loading the specified class
- final Class<?> provider = cl.loadClass(line);
+ final Class<?> provider =
+ cl.loadClass(line);
// create an instance to return
- providers.add((ValidationProvider)provider.newInstance());
+ providers.add((ValidationProvider) provider
+ .newInstance());
} catch (ClassNotFoundException e) {
throw new ValidationException(
"Failed to load provider " + line +
- " configured in file " + url, e);
+ " configured in file " + url, e);
} catch (InstantiationException e) {
throw new ValidationException(
- "Failed to instantiate provider " + line +
- " configured in file " + url, e);
+ "Failed to instantiate provider " +
+ line + " configured in file " + url,
+ e);
} catch (IllegalAccessException e) {
throw new ValidationException(
"Failed to load provider " + line +
- " configured in file " + url, e);
+ " configured in file " + url, e);
}
}
line = br.readLine();
}
br.close();
} catch (IOException e) {
- throw new ValidationException(
- "Error trying to read " + url, e);
+ throw new ValidationException("Error trying to read " +
+ url, e);
} finally {
if (br != null)
br.close();
}
}
} catch (IOException e) {
- throw new ValidationException(
- "Error trying to read a " + SPI_CFG, e);
+ throw new ValidationException("Error trying to read a " +
+ SPI_CFG, e);
}
// caller must handle the case of no providers found
return providers;
@@ -158,8 +162,8 @@
return resolv.getValidationProviders().get(0)
.createGenericConfiguration(this);
} catch (Exception e) {
- throw new ValidationException(
- "Could not create configuration.", e);
+ throw new ValidationException("Could not create configuration",
+ e);
}
}
@@ -227,7 +231,7 @@
bootstrap.providerResolver(vpResolver);
// Create a Configuration<T> from the above bootstrap state
// and configurationType
- cfg = vProvider.createSpecializedConfiguration(bootstrap,
+ cfg = vProvider.createSpecializedConfiguration(bootstrap,
cfgType);
}
}