You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by si...@apache.org on 2010/04/01 13:11:20 UTC
svn commit: r929925 - in
/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions:
MethodBeanDescriptorImpl.java MethodValidatorMetaBeanFactory.java
Author: simonetripodi
Date: Thu Apr 1 11:11:20 2010
New Revision: 929925
URL: http://svn.apache.org/viewvc?rev=929925&view=rev
Log:
added generics parameters
using interfaces instead of implementations
removed useless imports
Modified:
incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodBeanDescriptorImpl.java
incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodValidatorMetaBeanFactory.java
Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodBeanDescriptorImpl.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodBeanDescriptorImpl.java?rev=929925&r1=929924&r2=929925&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodBeanDescriptorImpl.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodBeanDescriptorImpl.java Thu Apr 1 11:11:20 2010
@@ -33,7 +33,7 @@ import org.apache.bval.model.Validation;
*/
class MethodBeanDescriptorImpl extends BeanDescriptorImpl
implements MethodBeanDescriptor {
- private Map<Method, MethodDescriptorImpl> methodConstraints;
+ private Map<Method, MethodDescriptor> methodConstraints;
private Map<Constructor<?>, ConstructorDescriptor> constructorConstraints;
protected MethodBeanDescriptorImpl(ApacheFactoryContext factoryContext,
@@ -41,7 +41,7 @@ class MethodBeanDescriptorImpl extends B
super(factoryContext, metaBean, validations);
}
- public void setMethodConstraints(Map<Method, MethodDescriptorImpl> methodConstraints) {
+ public void setMethodConstraints(Map<Method, MethodDescriptor> methodConstraints) {
this.methodConstraints = methodConstraints;
}
@@ -62,7 +62,7 @@ class MethodBeanDescriptorImpl extends B
return new HashSet<MethodDescriptor>(methodConstraints.values());
}
- public void putMethodDescriptor(Method method, MethodDescriptorImpl desc) {
+ public void putMethodDescriptor(Method method, MethodDescriptor desc) {
methodConstraints.put(method, desc);
}
@@ -70,11 +70,11 @@ class MethodBeanDescriptorImpl extends B
return new HashSet<ConstructorDescriptor>(this.constructorConstraints.values());
}
- public void putConstructorDescriptor(Constructor<?> cons, ConstructorDescriptorImpl desc) {
+ public void putConstructorDescriptor(Constructor<?> cons, ConstructorDescriptor desc) {
constructorConstraints.put(cons, desc);
}
- public Map<Method, MethodDescriptorImpl> getMethodConstraints() {
+ public Map<Method, MethodDescriptor> getMethodConstraints() {
return methodConstraints;
}
Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodValidatorMetaBeanFactory.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodValidatorMetaBeanFactory.java?rev=929925&r1=929924&r2=929925&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodValidatorMetaBeanFactory.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodValidatorMetaBeanFactory.java Thu Apr 1 11:11:20 2010
@@ -17,6 +17,16 @@
package org.apache.bval.jsr303.extensions;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
+import javax.validation.Constraint;
+import javax.validation.ConstraintValidator;
+import javax.validation.Valid;
+
import org.apache.bval.jsr303.ApacheFactoryContext;
import org.apache.bval.jsr303.AppendValidation;
import org.apache.bval.jsr303.Jsr303MetaBeanFactory;
@@ -24,16 +34,6 @@ import org.apache.bval.jsr303.util.Secur
import org.apache.bval.model.Validation;
import org.apache.bval.util.AccessStrategy;
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.Valid;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.List;
-
/**
* Description: <br/>
*/
@@ -54,9 +54,9 @@ public class MethodValidatorMetaBeanFact
private void buildConstructorConstraints(MethodBeanDescriptorImpl beanDesc)
throws InvocationTargetException, IllegalAccessException {
- beanDesc.setConstructorConstraints(new HashMap());
+ beanDesc.setConstructorConstraints(new HashMap<Constructor<?>, ConstructorDescriptor>());
- for (Constructor cons : beanDesc.getMetaBean().getBeanClass()
+ for (Constructor<?> cons : beanDesc.getMetaBean().getBeanClass()
.getDeclaredConstructors()) {
if (!factoryContext.getFactory().getAnnotationIgnores()
.isIgnoreAnnotations(cons)) {
@@ -68,7 +68,7 @@ public class MethodValidatorMetaBeanFact
Annotation[][] paramsAnnos = cons.getParameterAnnotations();
int idx = 0;
for (Annotation[] paramAnnos : paramsAnnos) {
- ParameterAccess access = new ParameterAccess(cons.getParameterTypes()[idx], idx);
+ ParameterAccess access = new ParameterAccess(cons.getParameterTypes()[idx], idx);
processAnnotations(consDesc, paramAnnos, access, idx);
idx++;
}
@@ -78,7 +78,7 @@ public class MethodValidatorMetaBeanFact
private void buildMethodConstraints(MethodBeanDescriptorImpl beanDesc)
throws InvocationTargetException, IllegalAccessException {
- beanDesc.setMethodConstraints(new HashMap());
+ beanDesc.setMethodConstraints(new HashMap<Method, MethodDescriptor>());
for (Method method : beanDesc.getMetaBean().getBeanClass().getDeclaredMethods()) {
if (!factoryContext.getFactory().getAnnotationIgnores()
@@ -95,14 +95,13 @@ public class MethodValidatorMetaBeanFact
for (Annotation anno : method.getAnnotations()) {
processAnnotation(anno, methodDesc, returnAccess, validations);
}
- methodDesc.getConstraintDescriptors().addAll(
- (List)validations.getValidations());
+ methodDesc.getConstraintDescriptors().addAll(validations.getValidations());
// parameter validations
Annotation[][] paramsAnnos = method.getParameterAnnotations();
int idx = 0;
for (Annotation[] paramAnnos : paramsAnnos) {
- ParameterAccess access = new ParameterAccess(method.getParameterTypes()[idx], idx);
+ ParameterAccess access = new ParameterAccess(method.getParameterTypes()[idx], idx);
processAnnotations(methodDesc, paramAnnos, access, idx);
idx++;
}
@@ -150,6 +149,5 @@ public class MethodValidatorMetaBeanFact
}
}
}
-
-
+
}