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 2010/03/09 17:48:24 UTC
svn commit: r920978 - in
/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83:
core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/
validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/v...
Author: gpetracek
Date: Tue Mar 9 16:48:24 2010
New Revision: 920978
URL: http://svn.apache.org/viewvc?rev=920978&view=rev
Log:
EXTVAL-83 changes for EXTVAL-87
Modified:
myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java
myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java
Modified: myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java?rev=920978&r1=920977&r2=920978&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java (original)
+++ myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java Tue Mar 9 16:48:24 2010
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFac
import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
-import org.apache.myfaces.extensions.validator.util.ClassUtils;
+import org.apache.myfaces.extensions.validator.util.ProxyUtils;
import java.util.HashMap;
import java.util.Map;
@@ -95,7 +95,7 @@ public class DefaultMappedConstraintSour
private Map<String, PropertyDetails> getMapForClass(Class target)
{
- String key = ClassUtils.getClassName(target);
+ String key = ProxyUtils.getClassName(target);
if(!this.propertyDetailsMap.containsKey(key))
{
this.propertyDetailsMap.put(key, new HashMap<String, PropertyDetails>());
Modified: myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java?rev=920978&r1=920977&r2=920978&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java (original)
+++ myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java Tue Mar 9 16:48:24 2010
@@ -32,7 +32,7 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
-import org.apache.myfaces.extensions.validator.util.ClassUtils;
+import org.apache.myfaces.extensions.validator.util.ProxyUtils;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -155,11 +155,7 @@ class MappedConstraintSourceBeanValidati
return getMappedConstraintSource(baseBeanClass, property);
}
- //unproxy class
- if(ClassUtils.isProxiedClass(baseBeanClass))
- {
- baseBeanClass = ClassUtils.tryToLoadClassForName(ClassUtils.getClassName(baseBeanClass));
- }
+ baseBeanClass = ProxyUtils.getUnproxiedClass(baseBeanClass);
Class newBaseBeanClass = findMappedClass(baseBeanClass, property);