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/13 00:20:33 UTC
svn commit: r764340 - in
/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval:
./ validation/
Author: gpetracek
Date: Sun Apr 12 22:20:32 2009
New Revision: 764340
URL: http://svn.apache.org/viewvc?rev=764340&view=rev
Log:
minor refactorings
Modified:
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/ExtValBeanValidationContext.java
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java
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=764340&r1=764339&r2=764340&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 Sun Apr 12 22:20:32 2009
@@ -540,7 +540,7 @@
}
}
- private void processMetaData(BeanValidation beanValidation,
+ protected void processMetaData(BeanValidation beanValidation,
Object metaDataSourceObject,
List<Class> foundGroupsForPropertyValidation,
List<Class> restrictedGroupsForPropertyValidation,
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.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/ExtValBeanValidationContext.java?rev=764340&r1=764339&r2=764340&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java Sun Apr 12 22:20:32 2009
@@ -52,16 +52,19 @@
private static MessageResolver messageResolver;
- @ToDo(value = Priority.HIGH, description = "refactor to a pluggable GroupStorage")
+ @ToDo(value = Priority.HIGH, description = "refactor to a pluggable Storage")
private Map<String, List<Class>> addedGroups = new HashMap<String, List<Class>>();
- @ToDo(value = Priority.HIGH, description = "refactor to a pluggable GroupStorage")
+ @ToDo(value = Priority.HIGH, description = "refactor to a pluggable Storage")
private Map<String, List<Class>> restrictedGroups = new HashMap<String, List<Class>>();
- @ToDo(value = Priority.HIGH, description = "refactor to a pluggable GroupStorage")
+ @ToDo(value = Priority.HIGH, description = "refactor to a pluggable Storage")
private Map<String, List<ModelValidationEntry>> modelValidationEntries =
new HashMap<String, List<ModelValidationEntry>>();
+ @ToDo(value = Priority.HIGH, description = "refactor to a pluggable Storage")
+ private List<String> componentsOfRequest = new ArrayList<String>();
+
private ExtValBeanValidationContext()
{
}
@@ -119,7 +122,14 @@
{
modelValidationEntry.setComponent(component);
- String componentId = component.getClientId(FacesContext.getCurrentInstance());
+ String componentId = null;
+
+ if(component != null)
+ {
+ componentId = component.getClientId(FacesContext.getCurrentInstance());
+ this.componentsOfRequest.add(componentId);
+ }
+
List<ModelValidationEntry> modelValidationEntryList =
this.modelValidationEntries.get(getGroupKey(viewId, componentId));
@@ -260,6 +270,20 @@
return getModelValidationEntries(viewId, "*");
}
+ public List<ModelValidationEntry> getModelValidationEntriesOfCurrentRequest(String viewId)
+ {
+ List<ModelValidationEntry> result = new ArrayList<ModelValidationEntry>();
+
+ for(String currentClientId : this.componentsOfRequest)
+ {
+ result.addAll(getModelValidationEntries(viewId, currentClientId));
+ }
+
+ result.addAll(getModelValidationEntries(viewId));
+
+ return result;
+ }
+
public List<ModelValidationEntry> getModelValidationEntries(String viewId, String componentId)
{
if(this.modelValidationEntries.size() < 1)
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.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/validation/ModelValidationPhaseListener.java?rev=764340&r1=764339&r2=764340&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java Sun Apr 12 22:20:32 2009
@@ -60,7 +60,7 @@
}
List<ModelValidationEntry> modelValidationEntries = ExtValBeanValidationContext.getCurrentInstance()
- .getAllModelValidationEntries(FacesContext.getCurrentInstance().getViewRoot().getViewId());
+ .getModelValidationEntriesOfCurrentRequest(FacesContext.getCurrentInstance().getViewRoot().getViewId());
List processedValidationTargets = new ArrayList();