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/02/24 00:25:21 UTC
svn commit: r747199 - in /myfaces/extensions/validator/trunk:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/
core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/
core/s...
Author: gpetracek
Date: Mon Feb 23 23:25:18 2009
New Revision: 747199
URL: http://svn.apache.org/viewvc?rev=747199&view=rev
Log:
EXTVAL-33: reverted api change due to a new jsr 303 integration approach
Modified:
myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AnnotationToValidationStrategyBeanNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConfiguredAnnotationToValidationStrategyNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/crossval/MockValidationStrategyFactory.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/util/MethodUtils.java
Modified: myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java Mon Feb 23 23:25:18 2009
@@ -82,7 +82,7 @@
Map<String, Object> metaData;
for (MetaDataEntry entry : annotationExtractor.extract(facesContext, targetComponent).getMetaDataEntries())
{
- validationStrategy = ExtValUtils.getValidationStrategyForMetaDataEntry(entry);
+ validationStrategy = ExtValUtils.getValidationStrategyForMetaData(entry.getKey());
if (validationStrategy != null)
{
Modified: myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java Mon Feb 23 23:25:18 2009
@@ -53,7 +53,7 @@
{
refreshComponent(uiComponent);
- if(processComponent(uiComponent) && metaDataEntry != null)
+ if(processComponent(uiComponent))
{
FacesMessage facesMessage = validatorException.getFacesMessage();
@@ -65,7 +65,7 @@
}
//override the label if the annotation provides a label
- if(metaDataEntry.getProperty(PropertyInformationKeys.LABEL) != null)
+ if(metaDataEntry != null && metaDataEntry.getProperty(PropertyInformationKeys.LABEL) != null)
{
label = metaDataEntry.getProperty(PropertyInformationKeys.LABEL, String.class);
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java Mon Feb 23 23:25:18 2009
@@ -64,6 +64,7 @@
return factoryFinder;
}
+ @SuppressWarnings({"unchecked"})
public final <T> T getFactory(FactoryNames factoryName, Class<T> targetClass)
{
if(!(factoryMap.containsKey(factoryName)))
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java Mon Feb 23 23:25:18 2009
@@ -76,7 +76,7 @@
Map<String, Object> metaData = new HashMap<String, Object>();
for (MetaDataEntry entry : metaDataExtractor.extract(facesContext, uiComponent).getMetaDataEntries())
{
- validationStrategy = ExtValUtils.getValidationStrategyForMetaDataEntry(entry);
+ validationStrategy = ExtValUtils.getValidationStrategyForMetaData(entry.getKey());
if (validationStrategy != null)
{
@@ -170,7 +170,7 @@
for (MetaDataEntry entry : metaDataExtractor.extract(facesContext, uiComponent).getMetaDataEntries())
{
- validationStrategy = ExtValUtils.getValidationStrategyForMetaDataEntry(entry);
+ validationStrategy = ExtValUtils.getValidationStrategyForMetaData(entry.getKey());
if (validationStrategy != null)
{
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java Mon Feb 23 23:25:18 2009
@@ -23,7 +23,6 @@
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
-import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfiguration;
import org.apache.myfaces.extensions.validator.core.initializer.configuration.StaticConfigurationEntry;
@@ -55,12 +54,12 @@
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.CUSTOMIZABLE})
public class DefaultValidationStrategyFactory extends AbstractNameMapperAwareFactory
- implements ClassMappingFactory<MetaDataEntry, ValidationStrategy>
+ implements ClassMappingFactory<String, ValidationStrategy>
{
protected final Log logger = LogFactory.getLog(getClass());
private Map<String, String> metaDataKeyToValidationStrategyMapping = null;
- private List<NameMapper<MetaDataEntry>> nameMapperList = new ArrayList<NameMapper<MetaDataEntry>>();
+ private List<NameMapper<String>> nameMapperList = new ArrayList<NameMapper<String>>();
public DefaultValidationStrategyFactory()
{
@@ -70,24 +69,24 @@
}
}
- public ValidationStrategy create(MetaDataEntry metaDataEntry)
+ public ValidationStrategy create(String metaDataKey)
{
if (metaDataKeyToValidationStrategyMapping == null)
{
initStaticMappings();
}
- if (metaDataKeyToValidationStrategyMapping.containsKey(metaDataEntry.getKey()))
+ if (metaDataKeyToValidationStrategyMapping.containsKey(metaDataKey))
{
- return getValidationStrategyInstance(metaDataKeyToValidationStrategyMapping.get(metaDataEntry.getKey()));
+ return getValidationStrategyInstance(metaDataKeyToValidationStrategyMapping.get(metaDataKey));
}
ValidationStrategy validationStrategy;
String strategyName;
//null -> use name mappers
- for (NameMapper<MetaDataEntry> nameMapper : this.nameMapperList)
+ for (NameMapper<String> nameMapper : nameMapperList)
{
- strategyName = nameMapper.createName(metaDataEntry);
+ strategyName = nameMapper.createName(metaDataKey);
if (strategyName == null)
{
@@ -98,7 +97,7 @@
if (validationStrategy != null)
{
- addMapping(metaDataEntry.getKey(), strategyName);
+ addMapping(metaDataKey, strategyName);
return validationStrategy;
}
}
@@ -184,7 +183,7 @@
}
}
- protected List<NameMapper<MetaDataEntry>> getNameMapperList()
+ protected List<NameMapper<String>> getNameMapperList()
{
return this.nameMapperList;
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java Mon Feb 23 23:25:18 2009
@@ -19,7 +19,6 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
-import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.commons.logging.Log;
@@ -30,7 +29,7 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.INTERNAL)
-public abstract class AbstractMetaDataToValidationStrategyNameMapper implements NameMapper<MetaDataEntry>
+public abstract class AbstractMetaDataToValidationStrategyNameMapper implements NameMapper<String>
{
protected final Log logger = LogFactory.getLog(getClass());
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AnnotationToValidationStrategyBeanNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AnnotationToValidationStrategyBeanNameMapper.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AnnotationToValidationStrategyBeanNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AnnotationToValidationStrategyBeanNameMapper.java Mon Feb 23 23:25:18 2009
@@ -19,7 +19,6 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
-import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -40,14 +39,14 @@
public class AnnotationToValidationStrategyBeanNameMapper extends AbstractMetaDataToValidationStrategyNameMapper
{
public static final String PREFIX_FOR_BEAN_MAPPING = "bean:";
- private NameMapper<MetaDataEntry> wrapped;
+ private NameMapper<String> wrapped;
- public AnnotationToValidationStrategyBeanNameMapper(NameMapper<MetaDataEntry> nameMapper)
+ public AnnotationToValidationStrategyBeanNameMapper(NameMapper<String> nameMapper)
{
this.wrapped = nameMapper;
}
- public String createName(MetaDataEntry source)
+ public String createName(String source)
{
String name = wrapped.createName(source);
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConfiguredAnnotationToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConfiguredAnnotationToValidationStrategyNameMapper.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConfiguredAnnotationToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConfiguredAnnotationToValidationStrategyNameMapper.java Mon Feb 23 23:25:18 2009
@@ -19,7 +19,6 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy.mapper;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
-import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.mapper.AbstractCustomNameMapper;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -33,7 +32,7 @@
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.CUSTOMIZABLE})
public class CustomConfiguredAnnotationToValidationStrategyNameMapper extends
- AbstractCustomNameMapper<MetaDataEntry>
+ AbstractCustomNameMapper<String>
{
protected String getCustomNameMapperClassName()
{
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java Mon Feb 23 23:25:18 2009
@@ -21,7 +21,6 @@
import org.apache.myfaces.extensions.validator.core.mapper.AbstractCustomNameMapper;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
-import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -36,7 +35,7 @@
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.CUSTOMIZABLE})
public class CustomConventionAnnotationToValidationStrategyNameMapper extends
- AbstractCustomNameMapper<MetaDataEntry>
+ AbstractCustomNameMapper<String>
{
protected String getCustomNameMapperClassName()
{
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java Mon Feb 23 23:25:18 2009
@@ -19,7 +19,6 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy.mapper;
import org.apache.myfaces.extensions.validator.core.InternalConventionProvider;
-import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -32,8 +31,8 @@
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultAnnotationToValidationStrategyNameMapper extends AbstractMetaDataToValidationStrategyNameMapper
{
- public String createName(MetaDataEntry metaDataEntry)
+ public String createName(String metaDataKey)
{
- return InternalConventionProvider.getValidationStrategyClassName(metaDataEntry.getKey());
+ return InternalConventionProvider.getValidationStrategyClassName(metaDataKey);
}
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java Mon Feb 23 23:25:18 2009
@@ -20,7 +20,6 @@
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInformation;
-import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -33,9 +32,9 @@
@UsageInformation({UsageCategory.INTERNAL})
public class SimpleAnnotationToValidationStrategyNameMapper extends AbstractMetaDataToValidationStrategyNameMapper
{
- public String createName(MetaDataEntry metaDataEntry)
+ public String createName(String metaDataKey)
{
- return metaDataEntry.getKey() +
+ return metaDataKey +
ExtValContext.getContext().getInformationProviderBean().get(CustomInformation.VALIDATION_STRATEGY_POSTFIX);
}
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java Mon Feb 23 23:25:18 2009
@@ -62,16 +62,16 @@
private static final String JAVAX_FACES_MAXIMUM = "javax.faces.validator.LengthValidator.MAXIMUM";
private static final String JAVAX_FACES_MAXIMUM_DETAIL = "javax.faces.validator.LengthValidator.MAXIMUM_detail";
- public static ValidationStrategy getValidationStrategyForMetaDataEntry(MetaDataEntry metaDataEntry)
+ public static ValidationStrategy getValidationStrategyForMetaData(String metaDataKey)
{
- return ((ClassMappingFactory<Object, ValidationStrategy>) ExtValContext.getContext()
+ return ((ClassMappingFactory<String, ValidationStrategy>) ExtValContext.getContext()
.getFactoryFinder()
.getFactory(FactoryNames.VALIDATION_STRATEGY_FACTORY, ClassMappingFactory.class))
- .create(metaDataEntry);
+ .create(metaDataKey);
}
public static void registerMetaDataToValidationStrategyNameMapper(
- NameMapper<MetaDataEntry> metaDataToValidationStrategyNameMapper)
+ NameMapper<String> metaDataToValidationStrategyNameMapper)
{
(ExtValContext.getContext()
.getFactoryFinder()
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java Mon Feb 23 23:25:18 2009
@@ -55,7 +55,7 @@
ValidatorException validatorException,
ValidationStrategy validatorExceptionSource)
{
- if(processComponent(uiComponent) && metaDataEntry != null)
+ if(processComponent(uiComponent))
{
FacesMessage facesMessage = validatorException.getFacesMessage();
@@ -68,7 +68,7 @@
}
//override the label if the annotation provides a label
- if(metaDataEntry.getProperty(PropertyInformationKeys.LABEL) != null)
+ if(metaDataEntry != null && metaDataEntry.getProperty(PropertyInformationKeys.LABEL) != null)
{
label = metaDataEntry.getProperty(PropertyInformationKeys.LABEL, String.class);
}
@@ -94,4 +94,4 @@
uiComponent instanceof HtmlSelectManyMenu ||
uiComponent instanceof HtmlInputTextarea;
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java Mon Feb 23 23:25:18 2009
@@ -60,7 +60,7 @@
for (MetaDataEntry entry : extractor.extract(FacesContext.getCurrentInstance(),
propertyDetails).getMetaDataEntries())
{
- validationStrategy = ExtValUtils.getValidationStrategyForMetaDataEntry(entry);
+ validationStrategy = ExtValUtils.getValidationStrategyForMetaData(entry.getKey());
metaDataTransformer = ExtValUtils.getMetaDataTransformerForValidationStrategy(validationStrategy);
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java Mon Feb 23 23:25:18 2009
@@ -49,14 +49,8 @@
String validationErrorMsgKey = (annotation).validationErrorMsgKey();
Locale currentLocale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
- MetaDataEntry tmpMetaDataEntry = new MetaDataEntry();
- tmpMetaDataEntry.setKey(annotation.annotationType().getName());
- tmpMetaDataEntry.setValue(annotation);
- //needed for jsr303 integration
- tmpMetaDataEntry.setProperties(metaDataEntry.getProperties());
-
ValidationStrategy validationStrategy =
- ExtValUtils.getValidationStrategyForMetaDataEntry(tmpMetaDataEntry);
+ ExtValUtils.getValidationStrategyForMetaData(annotation.annotationType().getName());
String validationErrorMsg = ExtValUtils.getMessageResolverForValidationStrategy(validationStrategy)
.getMessage(validationErrorMsgKey, currentLocale);
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java Mon Feb 23 23:25:18 2009
@@ -58,7 +58,7 @@
for (MetaDataEntry entry : extractor.extract(facesContext, propertyDetails).getMetaDataEntries())
{
- validationStrategy = ExtValUtils.getValidationStrategyForMetaDataEntry(entry);
+ validationStrategy = ExtValUtils.getValidationStrategyForMetaData(entry.getKey());
if (validationStrategy != null)
{
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/crossval/MockValidationStrategyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/crossval/MockValidationStrategyFactory.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/crossval/MockValidationStrategyFactory.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/crossval/MockValidationStrategyFactory.java Mon Feb 23 23:25:18 2009
@@ -29,10 +29,10 @@
public class MockValidationStrategyFactory extends DefaultValidationStrategyFactory
{
@Override
- public ValidationStrategy create(MetaDataEntry metaDataEntry)
+ public ValidationStrategy create(String metaDataKey)
{
//force init so that every test-case setup method can add a mock validation strategy via extval java-api
ReflectionUtils.tryToInvokeMethod(this,ReflectionUtils.tryToGetMethod(getClass(), "initStaticMappings"));
- return super.create(metaDataEntry);
+ return super.create(metaDataKey);
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/util/MethodUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/util/MethodUtils.java?rev=747199&r1=747198&r2=747199&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/util/MethodUtils.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/util/MethodUtils.java Mon Feb 23 23:25:18 2009
@@ -27,6 +27,10 @@
//TODO
public class MethodUtils
{
+ private MethodUtils()
+ {
+ }
+
public static boolean checkMethodCalled(Class usedClass, String methodName, int callCount)
{
checkRequiredClass(usedClass);