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 2008/10/28 00:17:55 UTC
svn commit: r708374 - in /myfaces/extensions/validator/branches/jsf_1.1:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/
core/src/main/java/org/apache/myfaces/extensions/validator...
Author: gpetracek
Date: Mon Oct 27 16:17:54 2008
New Revision: 708374
URL: http://svn.apache.org/viewvc?rev=708374&view=rev
Log:
unified skip validation mechanism
Removed:
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/AbstractMetaDataTransformer.java
Modified:
myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidatorAdapter.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java
Modified: myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java Mon Oct 27 16:17:54 2008
@@ -25,7 +25,6 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.util.Map;
-import java.util.List;
/**
* @author Gerhard Petracek
@@ -37,20 +36,19 @@
public boolean configureTrinidadComponent(FacesContext facesContext, UIComponent uiComponent,
Map<String, Object> metaData)
{
- if(metaData.containsKey(CommonMetaDataKeys.REQUIRED) || metaData.containsKey(CommonMetaDataKeys.WEAK_REQUIRED)||
+ if(metaData.containsKey(CommonMetaDataKeys.REQUIRED) ||
+ metaData.containsKey(CommonMetaDataKeys.WEAK_REQUIRED)||
metaData.containsKey(CommonMetaDataKeys.SKIP_VALIDATION))
{
- if((Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.WEAK_REQUIRED)) &&
+ if((Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.WEAK_REQUIRED)) ||
+ Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)))
+ &&
Boolean.TRUE.equals(isComponentRequired(uiComponent)))
- ||
- (Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)) &&
- Boolean.TRUE.equals(isComponentRequired(uiComponent))))
{
((EditableValueHolder)uiComponent).setRequired(true);
return true;
}
- else if(metaData.containsKey(CommonMetaDataKeys.SKIP_VALIDATION) &&
- ((List)metaData.get(CommonMetaDataKeys.SKIP_VALIDATION)).contains(CommonMetaDataKeys.WEAK_REQUIRED)&&
+ else if(Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.SKIP_VALIDATION)) &&
!Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)))
{
((EditableValueHolder)uiComponent).setRequired(false);
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java Mon Oct 27 16:17:54 2008
@@ -25,6 +25,8 @@
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractorFactory;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
+import org.apache.myfaces.extensions.validator.core.metadata.CommonMetaDataKeys;
+import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.factory.FactoryNames;
import org.apache.myfaces.extensions.validator.core.recorder.ProcessedInformationRecorder;
@@ -71,35 +73,44 @@
MetaDataExtractor metaDataExtractor = ExtValContext.getContext().getFactoryFinder().getFactory(
FactoryNames.COMPONENT_META_DATA_EXTRACTOR_FACTORY, MetaDataExtractorFactory.class).create();
- Map<String, Object> metaData;
+ Map<String, Object> metaData = new HashMap<String, Object>();
for (MetaDataEntry entry : metaDataExtractor.extract(facesContext, uiComponent).getMetaDataEntries())
{
validationStrategy = ExtValUtils.getValidationStrategyForMetaData(entry.getKey());
if (validationStrategy != null)
{
- if(skipValidation(facesContext, uiComponent, validationStrategy, entry))
+ if(!skipValidation(facesContext, uiComponent, validationStrategy, entry))
{
- continue;
- }
-
- metaDataTransformer = ExtValUtils.getMetaDataTransformerForValidationStrategy(validationStrategy);
+ metaDataTransformer = ExtValUtils.getMetaDataTransformerForValidationStrategy(validationStrategy);
- if(metaDataTransformer != null)
- {
- metaData = metaDataTransformer.convertMetaData(entry);
- }
- else
- {
- metaData = null;
+ if(metaDataTransformer != null)
+ {
+ if(this.logger.isDebugEnabled())
+ {
+ this.logger.debug(metaDataTransformer.getClass().getName() + " instantiated");
+ }
+
+ metaData = metaDataTransformer.convertMetaData(entry);
+ }
+ else
+ {
+ metaData = null;
+ }
+
+ if(metaData == null)
+ {
+ metaData = new HashMap<String, Object>();
+ }
}
- if(metaData == null)
+ if(Boolean.TRUE.equals(entry.getProperty(PropertySourceInformationKeys.SKIP_VALIDATION, Boolean.class)))
{
- metaData = new HashMap<String, Object>();
+ metaData.put(CommonMetaDataKeys.SKIP_VALIDATION, true);
}
//get component initializer for the current component and configure it
+ //also in case of skipped validation to reset e.g. the required attribute
ExtValUtils.configureComponentWithMetaData(facesContext, uiComponent, metaData);
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java Mon Oct 27 16:17:54 2008
@@ -25,7 +25,6 @@
import org.apache.commons.logging.LogFactory;
import java.util.Map;
-import java.util.List;
/**
* it's just a helper for proxies - you just need it, if you define the equivalent validation strategy as bean and
@@ -40,43 +39,18 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.REUSE})
-public class BeanMetaDataTransformerAdapterImpl extends AbstractMetaDataTransformer
- implements BeanMetaDataTransformerAdapter
+public class BeanMetaDataTransformerAdapterImpl implements MetaDataTransformer, BeanMetaDataTransformerAdapter
{
protected final Log logger = LogFactory.getLog(getClass());
private MetaDataTransformer metaDataTransformer;
private String metaDataTransformerClassName;
- public Map<String, Object> convert(MetaDataEntry metaDataEntry)
+ public Map<String, Object> convertMetaData(MetaDataEntry metaDataEntry)
{
- if(this.metaDataTransformer instanceof AbstractMetaDataTransformer)
- {
- return ((AbstractMetaDataTransformer)this.metaDataTransformer).convert(metaDataEntry);
- }
return this.metaDataTransformer.convertMetaData(metaDataEntry);
}
- @Override
- protected String getSkipExpression(MetaDataEntry metaData)
- {
- if(this.metaDataTransformer instanceof AbstractMetaDataTransformer)
- {
- return ((AbstractMetaDataTransformer)this.metaDataTransformer).getSkipExpression(metaData);
- }
- return super.getSkipExpression(metaData);
- }
-
- @Override
- protected List<String> getMetaDataKeys()
- {
- if(this.metaDataTransformer instanceof AbstractMetaDataTransformer)
- {
- return ((AbstractMetaDataTransformer)this.metaDataTransformer).getMetaDataKeys();
- }
- return super.getMetaDataKeys();
- }
-
public String getMetaDataTransformerClassName()
{
if(metaDataTransformerClassName != null)
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidatorAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidatorAdapter.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidatorAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidatorAdapter.java Mon Oct 27 16:17:54 2008
@@ -19,10 +19,8 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.myfaces.extensions.validator.core.el.ValueBindingExpression;
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.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,8 +34,6 @@
* Furthermore it provides:<br/>
* initValidation<br/>
* processAfterValidatorException
- * <p/>
- * adds support for "skipable" validation strategies
*
* @author Gerhard Petracek
* @since 1.x.1
@@ -46,7 +42,6 @@
public abstract class AbstractValidatorAdapter implements ValidationStrategy
{
protected final Log logger = LogFactory.getLog(getClass());
- private static final String DO_NOT_SKIP = "#{false}"; //don't skip
protected AbstractValidatorAdapter()
{
@@ -64,15 +59,6 @@
logger.trace("start initValidation of " + getClass().getName());
}
- if(skipValidation(facesContext, uiComponent, metaDataEntry, convertedObject))
- {
- if(logger.isTraceEnabled())
- {
- logger.trace(getClass() + " validation skiped");
- }
- return;
- }
-
initValidation(facesContext, uiComponent, metaDataEntry, convertedObject);
if(logger.isTraceEnabled())
@@ -121,33 +107,6 @@
}
}
- protected boolean skipValidation(FacesContext facesContext, UIComponent uiComponent,
- MetaDataEntry metaDataEntry, Object convertedObject)
- {
- String expression = getSkipExpression(metaDataEntry.getValue());
-
- //just for a better performance for "none-skipable" strategies
- if(DO_NOT_SKIP.equals(expression))
- {
- return false;
- }
-
- Boolean result = (Boolean)ExtValUtils.getELHelper()
- .getValueOfExpression(facesContext, new ValueBindingExpression(expression));
-
- if(logger.isTraceEnabled())
- {
- logger.trace(getClass() + "#skipValidation result of getSkipExpression: " + expression);
- }
-
- return result;
- }
-
- protected String getSkipExpression(Object metaData)
- {
- return DO_NOT_SKIP;
- }
-
protected void initValidation(FacesContext facesContext,
UIComponent uiComponent,
MetaDataEntry metaDataEntry,
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java Mon Oct 27 16:17:54 2008
@@ -26,7 +26,6 @@
import javax.faces.component.html.HtmlInputText;
import javax.faces.context.FacesContext;
import java.util.Map;
-import java.util.List;
/**
* @author Gerhard Petracek
@@ -44,24 +43,28 @@
UIComponent uiComponent,
Map<String, Object> metaData)
{
- if(metaData.containsKey(CommonMetaDataKeys.REQUIRED) || metaData.containsKey(CommonMetaDataKeys.WEAK_REQUIRED)||
- metaData.containsKey(CommonMetaDataKeys.SKIP_VALIDATION))
+ if(!processComponent(uiComponent))
{
- if((Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.WEAK_REQUIRED)) &&
- Boolean.TRUE.equals(isComponentRequired(uiComponent)))
- ||
- (Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)) &&
- Boolean.TRUE.equals(isComponentRequired(uiComponent))))
- {
- ((EditableValueHolder)uiComponent).setRequired(true);
- }
- else if(metaData.containsKey(CommonMetaDataKeys.SKIP_VALIDATION) &&
- ((List)metaData.get(CommonMetaDataKeys.SKIP_VALIDATION)).contains(CommonMetaDataKeys.WEAK_REQUIRED)&&
- !Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)))
- {
- ((EditableValueHolder)uiComponent).setRequired(false);
- }
+ return;
}
+
+ if((Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.WEAK_REQUIRED)) ||
+ Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)))
+ &&
+ Boolean.TRUE.equals(isComponentRequired(uiComponent)))
+ {
+ ((EditableValueHolder)uiComponent).setRequired(true);
+ }
+ else if(Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.SKIP_VALIDATION)) &&
+ !Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)))
+ {
+ ((EditableValueHolder)uiComponent).setRequired(false);
+ }
+ }
+
+ protected boolean processComponent(UIComponent uiComponent)
+ {
+ return uiComponent instanceof HtmlInputText;
}
/**
@@ -73,13 +76,8 @@
*/
protected Boolean isComponentRequired(UIComponent uiComponent)
{
- if(uiComponent instanceof HtmlInputText)
- {
- HtmlInputText htmlInputText = (HtmlInputText)uiComponent;
- return !(htmlInputText.isReadonly() || htmlInputText.isDisabled());
- }
-
- return null;
+ HtmlInputText htmlInputText = (HtmlInputText)uiComponent;
+ return !(htmlInputText.isReadonly() || htmlInputText.isDisabled());
}
protected void configureMaxLengthAttribute(FacesContext facesContext,
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/Required.java Mon Oct 27 16:17:54 2008
@@ -32,6 +32,4 @@
public @interface Required
{
String validationErrorMsgKey() default "field_required";
-
- String skipValidation() default "#{false}"; //default - don't skip
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/DoubleRangeMetaDataTransformer.java Mon Oct 27 16:17:54 2008
@@ -21,7 +21,7 @@
import org.apache.myfaces.extensions.validator.baseval.annotation.DoubleRange;
import org.apache.myfaces.extensions.validator.core.metadata.CommonMetaDataKeys;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.transformer.AbstractMetaDataTransformer;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import java.util.HashMap;
import java.util.Map;
@@ -30,9 +30,9 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class DoubleRangeMetaDataTransformer extends AbstractMetaDataTransformer
+public class DoubleRangeMetaDataTransformer implements MetaDataTransformer
{
- protected Map<String, Object> convert(MetaDataEntry metaDataEntry)
+ public Map<String, Object> convertMetaData(MetaDataEntry metaDataEntry)
{
Map<String, Object> results = new HashMap<String, Object>();
DoubleRange annotation = metaDataEntry.getValue(DoubleRange.class);
@@ -44,7 +44,7 @@
if(minimum > 0)
{
- results.put(CommonMetaDataKeys.REQUIRED, true);
+ results.put(CommonMetaDataKeys.WEAK_REQUIRED, true);
}
return results;
Modified: myfaces/extensions/validator/branches/jsf_1.1/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/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java Mon Oct 27 16:17:54 2008
@@ -24,7 +24,6 @@
import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
-import org.apache.myfaces.extensions.validator.core.metadata.transformer.AbstractMetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.el.ValueBindingExpression;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
@@ -37,9 +36,9 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class JoinMetaDataTransformer extends AbstractMetaDataTransformer
+public class JoinMetaDataTransformer implements MetaDataTransformer
{
- protected Map<String, Object> convert(MetaDataEntry metaDataEntry)
+ public Map<String, Object> convertMetaData(MetaDataEntry metaDataEntry)
{
MetaDataExtractor extractor = new DefaultPropertyScanningMetaDataExtractor();
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java Mon Oct 27 16:17:54 2008
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.validator.baseval.annotation.Length;
import org.apache.myfaces.extensions.validator.core.metadata.CommonMetaDataKeys;
-import org.apache.myfaces.extensions.validator.core.metadata.transformer.AbstractMetaDataTransformer;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import java.util.HashMap;
@@ -30,9 +30,9 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class LengthMetaDataTransformer extends AbstractMetaDataTransformer
+public class LengthMetaDataTransformer implements MetaDataTransformer
{
- protected Map<String, Object> convert(MetaDataEntry metaDataEntry)
+ public Map<String, Object> convertMetaData(MetaDataEntry metaDataEntry)
{
Map<String, Object> results = new HashMap<String, Object>();
Length annotation = metaDataEntry.getValue(Length.class);
@@ -44,7 +44,7 @@
if(minimum > 0)
{
- results.put(CommonMetaDataKeys.REQUIRED, true);
+ results.put(CommonMetaDataKeys.WEAK_REQUIRED, true);
}
return results;
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LongRangeMetaDataTransformer.java Mon Oct 27 16:17:54 2008
@@ -21,7 +21,7 @@
import org.apache.myfaces.extensions.validator.baseval.annotation.LongRange;
import org.apache.myfaces.extensions.validator.core.metadata.CommonMetaDataKeys;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.transformer.AbstractMetaDataTransformer;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import java.util.HashMap;
import java.util.Map;
@@ -30,9 +30,9 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class LongRangeMetaDataTransformer extends AbstractMetaDataTransformer
+public class LongRangeMetaDataTransformer implements MetaDataTransformer
{
- protected Map<String, Object> convert(MetaDataEntry metaDataEntry)
+ public Map<String, Object> convertMetaData(MetaDataEntry metaDataEntry)
{
Map<String, Object> results = new HashMap<String, Object>();
LongRange annotation = metaDataEntry.getValue(LongRange.class);
@@ -44,7 +44,7 @@
if(minimum > 0)
{
- results.put(CommonMetaDataKeys.REQUIRED, true);
+ results.put(CommonMetaDataKeys.WEAK_REQUIRED, true);
}
return results;
Modified: myfaces/extensions/validator/branches/jsf_1.1/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/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/PatternMetaDataTransformer.java Mon Oct 27 16:17:54 2008
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.baseval.metadata.transformer;
import org.apache.myfaces.extensions.validator.core.metadata.CommonMetaDataKeys;
-import org.apache.myfaces.extensions.validator.core.metadata.transformer.AbstractMetaDataTransformer;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.baseval.annotation.Pattern;
@@ -34,9 +34,9 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class PatternMetaDataTransformer extends AbstractMetaDataTransformer
+public class PatternMetaDataTransformer implements MetaDataTransformer
{
- protected Map<String, Object> convert(MetaDataEntry metaDataEntry)
+ public Map<String, Object> convertMetaData(MetaDataEntry metaDataEntry)
{
Map<String, Object> results = new HashMap<String, Object>();
Pattern annotation = metaDataEntry.getValue(Pattern.class);
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/RequiredMetaDataTransformer.java Mon Oct 27 16:17:54 2008
@@ -20,39 +20,21 @@
import org.apache.myfaces.extensions.validator.core.metadata.CommonMetaDataKeys;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.transformer.AbstractMetaDataTransformer;
-import org.apache.myfaces.extensions.validator.baseval.annotation.Required;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import java.util.HashMap;
import java.util.Map;
-import java.util.List;
-import java.util.ArrayList;
/**
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class RequiredMetaDataTransformer extends AbstractMetaDataTransformer
+public class RequiredMetaDataTransformer implements MetaDataTransformer
{
- protected Map<String, Object> convert(MetaDataEntry metaDataEntry)
+ public Map<String, Object> convertMetaData(MetaDataEntry metaDataEntry)
{
Map<String, Object> results = new HashMap<String, Object>();
results.put(CommonMetaDataKeys.WEAK_REQUIRED, true);
return results;
}
-
- @Override
- protected String getSkipExpression(MetaDataEntry metaDataEntry)
- {
- return metaDataEntry.getValue(Required.class).skipValidation();
- }
-
- //returns the key of the skiped meta-data e.g.
- @Override
- protected List<String> getMetaDataKeys()
- {
- List<String> skippedMetaDataList = new ArrayList<String>();
- skippedMetaDataList.add(CommonMetaDataKeys.WEAK_REQUIRED);
- return skippedMetaDataList;
- }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/ValidatorMetaDataTransformer.java Mon Oct 27 16:17:54 2008
@@ -21,7 +21,7 @@
import org.apache.myfaces.extensions.validator.baseval.annotation.Validator;
import org.apache.myfaces.extensions.validator.core.metadata.CommonMetaDataKeys;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.transformer.AbstractMetaDataTransformer;
+import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import java.util.HashMap;
import java.util.Map;
@@ -32,9 +32,9 @@
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class ValidatorMetaDataTransformer extends AbstractMetaDataTransformer
+public class ValidatorMetaDataTransformer implements MetaDataTransformer
{
- protected Map<String, Object> convert(MetaDataEntry metaDataEntry)
+ public Map<String, Object> convertMetaData(MetaDataEntry metaDataEntry)
{
Map<String, Object> results = new HashMap<String, Object>();
Validator annotation = metaDataEntry.getValue(Validator.class);
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java?rev=708374&r1=708373&r2=708374&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/RequiredStrategy.java Mon Oct 27 16:17:54 2008
@@ -52,10 +52,4 @@
{
return ((Required) annotation).validationErrorMsgKey();
}
-
- @Override
- protected String getSkipExpression(Object metaData)
- {
- return ((Required)metaData).skipValidation();
- }
}