changed names
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk@791414 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java b/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
index 84d0946..b4a6d26 100644
--- a/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
+++ b/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
@@ -27,7 +27,7 @@
import org.apache.myfaces.extensions.validator.core.factory.FactoryNames;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
import org.apache.myfaces.extensions.validator.trinidad.util.TrinidadUtils;
@@ -92,7 +92,7 @@
{
if(!(entry.getValue() instanceof Annotation &&
ExtValUtils.getValidationParameterExtractor()
- .extract(entry.getValue(Annotation.class), DisableClientValidation.class)
+ .extract(entry.getValue(Annotation.class), DisableClientSideValidation.class)
.iterator().hasNext()))
{
metaData = metaDataTransformer.convertMetaData(entry);
diff --git a/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java b/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
index 8734197..b220299 100644
--- a/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
+++ b/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
@@ -21,7 +21,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
@@ -98,7 +98,7 @@
if(!(entry.getValue() instanceof Annotation &&
ExtValUtils.getValidationParameterExtractor()
- .extract(entry.getValue(Annotation.class), DisableClientValidation.class)
+ .extract(entry.getValue(Annotation.class), DisableClientSideValidation.class)
.iterator().hasNext()))
{
metaData = metaDataTransformer.convertMetaData(entry);
diff --git a/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientValidation.java b/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientSideValidation.java
similarity index 93%
rename from core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientValidation.java
rename to core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientSideValidation.java
index 71e012b..64a5b0e 100644
--- a/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientValidation.java
+++ b/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientSideValidation.java
@@ -26,6 +26,6 @@
* @since 1.x.3
*/
@UsageInformation(UsageCategory.API)
-public interface DisableClientValidation extends ValidationParameter
+public interface DisableClientSideValidation extends ValidationParameter
{
}
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java b/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
index 07d379e..60a2b8c 100644
--- a/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
+++ b/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
@@ -40,7 +40,7 @@
* @since 1.x.1
*/
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.REUSE})
-public abstract class AbstractAnnotationValidationStrategy extends AbstractValidationStrategy
+public abstract class AbstractAnnotationValidationStrategy<A extends Annotation> extends AbstractValidationStrategy
{
protected static final String DETAIL_MESSAGE_KEY_POSTFIX = "_detail";
//e.g. for injecting a message resolver via spring
@@ -54,12 +54,12 @@
ExtValUtils.getMessageResolverForValidationStrategy(this).getMessage(key, locale);
}
- protected String getErrorMessageSummary(Annotation annotation)
+ protected String getErrorMessageSummary(A annotation)
{
return resolveMessage(getValidationErrorMsgKey(annotation));
}
- protected String getErrorMessageDetail(Annotation annotation)
+ protected String getErrorMessageDetail(A annotation)
{
try
{
@@ -77,12 +77,12 @@
return null;
}
- protected FacesMessage getValidationErrorFacesMassage(Annotation annotation)
+ protected FacesMessage getValidationErrorFacesMassage(A annotation)
{
return ExtValUtils.createFacesMessage(getErrorMessageSummary(annotation), getErrorMessageDetail(annotation));
}
- protected abstract String getValidationErrorMsgKey(Annotation annotation);
+ protected abstract String getValidationErrorMsgKey(A annotation);
public void setMessageResolver(MessageResolver messageResolver)
{
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java b/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
index 839b1cd..97c2d7d 100644
--- a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
+++ b/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
@@ -24,7 +24,7 @@
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.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.util.PropertyValidationUtils;
@@ -78,7 +78,7 @@
{
if(!(entry.getValue() instanceof Annotation &&
ExtValUtils.getValidationParameterExtractor()
- .extract(entry.getValue(Annotation.class), DisableClientValidation.class)
+ .extract(entry.getValue(Annotation.class), DisableClientSideValidation.class)
.iterator().hasNext()))
{
results.putAll(metaDataTransformer.convertMetaData(entry));
diff --git a/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/ParameterTestCase.java b/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/ParameterTestCase.java
index 5422246..2b017b2 100644
--- a/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/ParameterTestCase.java
+++ b/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/ParameterTestCase.java
@@ -23,7 +23,7 @@
import junit.framework.TestSuite;
import org.apache.myfaces.extensions.validator.core.validation.parameter.ValidationParameterExtractor;
import org.apache.myfaces.extensions.validator.core.validation.parameter.DefaultValidationParameterExtractor;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
import org.apache.myfaces.extensions.validator.core.validation.parameter.ViolationSeverity;
import org.apache.myfaces.extensions.validator.core.interceptor.PropertyValidationInterceptor;
import org.apache.myfaces.extensions.validator.baseval.annotation.Required;
@@ -96,11 +96,11 @@
TestPerson person = new TestPerson();
Required required = person.getClass().getDeclaredField("lastName").getAnnotation(Required.class);
- assertNotNull(extractor.extract(required).containsKey(DisableClientValidation.class));
- assertNotNull(extractor.extract(required, DisableClientValidation.class).iterator().next());
- assertEquals(extractor.extract(required, DisableClientValidation.class).size(), 1);
- assertEquals(extractor.extract(required, DisableClientValidation.class, Class.class).size(), 1);
- assertEquals(extractor.extract(required, DisableClientValidation.class, Class.class).iterator().next().getName(), DisableClientValidation.class.getName());
+ assertNotNull(extractor.extract(required).containsKey(DisableClientSideValidation.class));
+ assertNotNull(extractor.extract(required, DisableClientSideValidation.class).iterator().next());
+ assertEquals(extractor.extract(required, DisableClientSideValidation.class).size(), 1);
+ assertEquals(extractor.extract(required, DisableClientSideValidation.class, Class.class).size(), 1);
+ assertEquals(extractor.extract(required, DisableClientSideValidation.class, Class.class).iterator().next().getName(), DisableClientSideValidation.class.getName());
}
/*
diff --git a/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/TestPerson.java b/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/TestPerson.java
index 5e0a208..d6a3154 100644
--- a/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/TestPerson.java
+++ b/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/TestPerson.java
@@ -19,14 +19,8 @@
package org.apache.myfaces.extensions.validator.test.baseval.parameter;
import org.apache.myfaces.extensions.validator.baseval.annotation.Required;
-import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.validation.parameter.ViolationSeverity;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.ParameterValue;
-import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
public class TestPerson
{
@@ -38,7 +32,7 @@
TestDenyClientSideValidation.class,
TestPriorityHigh.class,
TestValidationInterceptor.class,
- DisableClientValidation.class,
+ DisableClientSideValidation.class,
//LoginValidator.class,
AdditionalValidator.class})
private String lastName;
