You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2009/04/09 19:39:51 UTC
svn commit: r763744 - in
/myfaces/extensions/validator/branches/beanval_integration/trunk:
examples/hello_world/src/main/java/org/apache/myfaces/blank/
validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/
va...
Author: gpetracek
Date: Thu Apr 9 17:39:50 2009
New Revision: 763744
URL: http://svn.apache.org/viewvc?rev=763744&view=rev
Log:
simplified syntax
Removed:
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/Group.java
Modified:
myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/None.java
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java?rev=763744&r1=763743&r2=763744&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/HelloWorldController.java Thu Apr 9 17:39:50 2009
@@ -21,7 +21,6 @@
import org.apache.myfaces.blank.domain.Person;
import org.apache.myfaces.blank.validation.group.Admin;
import org.apache.myfaces.blank.validation.group.User;
-import org.apache.myfaces.extensions.validator.beanval.annotation.group.Group;
import org.apache.myfaces.extensions.validator.beanval.annotation.group.BeanValidation;
/**
@@ -32,7 +31,7 @@
@BeanValidation
public class HelloWorldController
{
- //@BeanValidation(viewId = "/form1.jsp")
+ //@BeanValidation(viewIds = "/form1.jsp")
private Person person = new Person();
/**
@@ -52,9 +51,9 @@
}
@BeanValidation.List({
- @BeanValidation(viewId = "/helloWorld.jsp"),
- @BeanValidation(viewId = "/form1.jsp", use = @Group(User.class)),
- @BeanValidation(viewId = "/form2.jsp", use = {@Group(Admin.class)})
+ @BeanValidation(viewIds = "/helloWorld.jsp"),
+ @BeanValidation(viewIds = "/form1.jsp", useGroups = User.class),
+ @BeanValidation(viewIds = "/form2.jsp", useGroups = {Admin.class})
})
public Person getPerson()
{
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java?rev=763744&r1=763743&r2=763744&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java Thu Apr 9 17:39:50 2009
@@ -35,7 +35,6 @@
import org.apache.myfaces.extensions.validator.beanval.interceptor.PropertyValidationInterceptor;
import org.apache.myfaces.extensions.validator.beanval.property.BeanValidationPropertyInformationKeys;
import org.apache.myfaces.extensions.validator.beanval.annotation.group.BeanValidation;
-import org.apache.myfaces.extensions.validator.beanval.annotation.group.Group;
import org.apache.myfaces.extensions.validator.beanval.annotation.group.None;
import org.apache.myfaces.extensions.validator.beanval.annotation.extractor.DefaultGroupControllerScanningExtractor;
import org.apache.myfaces.extensions.validator.beanval.validation.strategy.BeanValidationStrategyAdapter;
@@ -305,8 +304,8 @@
Object firstBean = ExtValUtils.getELHelper().getBean(key[0]);
- List<Group> foundGroupsForCurrentView = new ArrayList<Group>();
- List<Group> restrictedGroupsForCurrentView = new ArrayList<Group>();
+ List<Class> foundGroupsForCurrentView = new ArrayList<Class>();
+ List<Class> restrictedGroupsForCurrentView = new ArrayList<Class>();
//extract bv-controller-annotation of
@@ -332,31 +331,25 @@
/*
* add found groups to context
*/
- for (Group currentGroup : foundGroupsForCurrentView)
+ for (Class currentGroupClass : foundGroupsForCurrentView)
{
- for (Class currentGroupClass : currentGroup.value())
- {
- ExtValBeanValidationContext.getCurrentInstance().addGroup(
- currentGroupClass, FacesContext.getCurrentInstance().getViewRoot().getViewId(), clientId);
- }
+ ExtValBeanValidationContext.getCurrentInstance().addGroup(
+ currentGroupClass, FacesContext.getCurrentInstance().getViewRoot().getViewId(), clientId);
}
/*
* add restricted groups
*/
- for (Group currentGroup : restrictedGroupsForCurrentView)
+ for (Class currentGroupClass : restrictedGroupsForCurrentView)
{
- for (Class currentGroupClass : currentGroup.value())
- {
- ExtValBeanValidationContext.getCurrentInstance().restrictGroup(
- currentGroupClass, FacesContext.getCurrentInstance().getViewRoot().getViewId(), clientId);
- }
+ ExtValBeanValidationContext.getCurrentInstance().restrictGroup(
+ currentGroupClass, FacesContext.getCurrentInstance().getViewRoot().getViewId(), clientId);
}
}
private void processClass(Class classToInspect,
- List<Group> foundGroupsForCurrentView,
- List<Group> restrictedGroupsForCurrentView)
+ List<Class> foundGroupsForCurrentView,
+ List<Class> restrictedGroupsForCurrentView)
{
while (!Object.class.getName().equals(classToInspect.getName()))
{
@@ -371,8 +364,8 @@
}
private void processInterfaces(Class currentClass,
- List<Group> foundGroupsForCurrentView,
- List<Group> restrictedGroupsForCurrentView)
+ List<Class> foundGroupsForCurrentView,
+ List<Class> restrictedGroupsForCurrentView)
{
for (Class currentInterface : currentClass.getInterfaces())
{
@@ -385,8 +378,8 @@
}
private void transferGroupValidationInformationToFoundGroups(Class classToInspect,
- List<Group> foundGroupsForCurrentView,
- List<Group> restrictedGroupsForCurrentView)
+ List<Class> foundGroupsForCurrentView,
+ List<Class> restrictedGroupsForCurrentView)
{
if (classToInspect.isAnnotationPresent(BeanValidation.class))
{
@@ -409,8 +402,8 @@
private void processFieldsAndProperties(String key,
Object base,
- String property, List<Group> foundGroupsForCurrentView,
- List<Group> restrictedGroupsForCurrentView)
+ String property, List<Class> foundGroupsForCurrentView,
+ List<Class> restrictedGroupsForCurrentView)
{
PropertyInformation propertyInformation = new DefaultGroupControllerScanningExtractor()
.extract(FacesContext.getCurrentInstance(), new PropertyDetails(key, base, property));
@@ -435,21 +428,20 @@
}
private void addGroupsForCurrentView(BeanValidation beanValidation,
- List<Group> foundGroupsForCurrentView,
- List<Group> restrictedGroupsForCurrentView)
+ List<Class> foundGroupsForCurrentView,
+ List<Class> restrictedGroupsForCurrentView)
{
- for (String currentViewId : beanValidation.viewId())
+ for (String currentViewId : beanValidation.viewIds())
{
if (currentViewId.equals(FacesContext.getCurrentInstance().getViewRoot().getViewId()) ||
currentViewId.equals("*"))
{
- foundGroupsForCurrentView.addAll(Arrays.asList(beanValidation.use()));
+ foundGroupsForCurrentView.addAll(Arrays.asList(beanValidation.useGroups()));
- if(!(beanValidation.restrict().length == 1 &&
- beanValidation.restrict()[0].value().length == 1 &&
- beanValidation.restrict()[0].value()[0].equals(None.class)))
+ if(!(beanValidation.restrictGroups().length == 1 &&
+ beanValidation.restrictGroups()[0].equals(None.class)))
{
- restrictedGroupsForCurrentView.addAll(Arrays.asList(beanValidation.restrict()));
+ restrictedGroupsForCurrentView.addAll(Arrays.asList(beanValidation.restrictGroups()));
}
}
}
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java?rev=763744&r1=763743&r2=763744&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/BeanValidation.java Thu Apr 9 17:39:50 2009
@@ -39,13 +39,13 @@
@UsageInformation(UsageCategory.API)
public @interface BeanValidation
{
- String[] viewId() default "*";
+ String[] viewIds() default "*";
boolean useModelValidation() default false;
- Group[] use() default @Group(Default.class);
+ Class[] useGroups() default Default.class;
- Group[] restrict() default @Group(None.class);
+ Class[] restrictGroups() default None.class;
@Retention(RUNTIME) static @interface List
{
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/None.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/None.java?rev=763744&r1=763743&r2=763744&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/None.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/annotation/group/None.java Thu Apr 9 17:39:50 2009
@@ -21,13 +21,6 @@
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-
/**
* default group for restricted groups
*
@@ -35,10 +28,7 @@
* @since 1.x.3
*/
-@Target({METHOD, FIELD, TYPE})
-@Retention(RUNTIME)
@UsageInformation(UsageCategory.INTERNAL)
-public @interface None
+public interface None
{
- public abstract Class<?>[] value();
}
\ No newline at end of file