You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by dw...@apache.org on 2010/06/14 21:09:20 UTC
svn commit: r954591 - in
/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval:
constraints/ jsr303/ jsr303/groups/ jsr303/xml/
Author: dwoods
Date: Mon Jun 14 19:09:20 2010
New Revision: 954591
URL: http://svn.apache.org/viewvc?rev=954591&view=rev
Log:
BVAL-68 Remove 6 findbugs hits
Modified:
incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmptyValidator.java
incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java
incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheValidatorFactory.java
incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java
incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java
incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java
Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmptyValidator.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmptyValidator.java?rev=954591&r1=954590&r2=954591&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmptyValidator.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmptyValidator.java Mon Jun 14 19:09:20 2010
@@ -22,6 +22,7 @@ import javax.validation.ConstraintValida
import javax.validation.ConstraintValidatorContext;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
/**
* Description: Check the non emptyness of an
@@ -42,7 +43,11 @@ public class NotEmptyValidator implement
if (isEmptyMethod != null) {
return !((Boolean) isEmptyMethod.invoke(value)).booleanValue();
}
- } catch (Exception ex) {
+ } catch (IllegalAccessException iae) {
+ // do nothing
+ } catch (NoSuchMethodException nsme) {
+ // do nothing
+ } catch (InvocationTargetException ite) {
// do nothing
}
return value.toString().length() > 0;
Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java?rev=954591&r1=954590&r2=954591&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java Mon Jun 14 19:09:20 2010
@@ -100,8 +100,10 @@ final class AnnotationConstraintBuilder
} else {
garr = null;
}
- garr = (garr == null || garr.length == 0) ? GroupsComputer.DEFAULT_GROUP_ARRAY :
- garr;
+
+ if (garr == null || garr.length == 0) {
+ garr = GroupsComputer.getDefaultGroupArray();
+ }
constraintValidation.setGroups(new HashSet(Arrays.asList(garr)));
}
Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheValidatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheValidatorFactory.java?rev=954591&r1=954590&r2=954591&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheValidatorFactory.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheValidatorFactory.java Mon Jun 14 19:09:20 2010
@@ -37,7 +37,7 @@ import java.util.*;
* this instance is not thread-safe<br/>
*/
public class ApacheValidatorFactory implements ValidatorFactory, Cloneable {
- private static ApacheValidatorFactory DEFAULT_FACTORY;
+ private static volatile ApacheValidatorFactory DEFAULT_FACTORY;
private static final ConstraintDefaults defaultConstraints = new ConstraintDefaults();
private MessageInterpolator messageResolver;
Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java?rev=954591&r1=954590&r2=954591&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/BeanDescriptorImpl.java Mon Jun 14 19:09:20 2010
@@ -90,10 +90,9 @@ public class BeanDescriptorImpl extends
private PropertyDescriptor getPropertyDescriptor(MetaProperty prop) {
PropertyDescriptorImpl edesc =
- prop.getFeature(Jsr303Features.Property.PropertyDescriptor);
+ prop.getFeature(Jsr303Features.Property.PropertyDescriptor);
if (edesc == null) {
- Class<?> targetClass =
- prop.getFeature(Features.Property.REF_BEAN_TYPE, prop.getTypeClass());
+ prop.getFeature(Features.Property.REF_BEAN_TYPE, prop.getTypeClass());
edesc = new PropertyDescriptorImpl(
metaBean,
prop.getName(),
Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java?rev=954591&r1=954590&r2=954591&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java Mon Jun 14 19:09:20 2010
@@ -32,12 +32,15 @@ import java.util.*;
*/
public class GroupsComputer {
/** The default group array used in case any of the validate methods is called without a group. */
- public static final Class<?>[] DEFAULT_GROUP_ARRAY = new Class<?>[]{Default.class};
private static final Groups DEFAULT_GROUPS;
static {
- DEFAULT_GROUPS =
- new GroupsComputer().computeGroups(Arrays.asList(DEFAULT_GROUP_ARRAY));
+ DEFAULT_GROUPS = new GroupsComputer().computeGroups(
+ Arrays.asList(getDefaultGroupArray()));
+ }
+
+ public static Class<?>[] getDefaultGroupArray() {
+ return new Class<?>[]{Default.class};
}
/** caching resolved groups in a thread-safe map. */
@@ -57,7 +60,6 @@ public class GroupsComputer {
return computeGroups(Arrays.asList(groups));
}
-
protected Groups computeGroups(Collection<Class<?>> groups) {
if (groups == null || groups.size() == 0) {
throw new IllegalArgumentException("At least one group has to be specified.");
Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java?rev=954591&r1=954590&r2=954591&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java Mon Jun 14 19:09:20 2010
@@ -268,8 +268,12 @@ public class ValidationMappingParser {
if (converter == null && returnType.isEnum()) {
converter = EnumerationConverter.getInstance();
}
-
- return converter.convert(returnType, value);
+
+ if (converter != null) {
+ return converter.convert(returnType, value);
+ } else {
+ return converter;
+ }
}
private <A extends Annotation> Annotation createAnnotation(AnnotationType annotationType,