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/01/05 02:33:52 UTC
svn commit: r731403 - in /myfaces/extensions/validator/trunk:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/tr...
Author: gpetracek
Date: Sun Jan 4 17:33:52 2009
New Revision: 731403
URL: http://svn.apache.org/viewvc?rev=731403&view=rev
Log:
prevention of server-side double validation in case of trinidad client-side validation support
Added:
myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadClientValidatorWrapper.java
Modified:
myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/DoubleRangeInitializer.java
myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LengthInitializer.java
myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LongRangeInitializer.java
myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/PatternInitializer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/PatternStrategy.java
Added: myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadClientValidatorWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadClientValidatorWrapper.java?rev=731403&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadClientValidatorWrapper.java (added)
+++ myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/ExtValTrinidadClientValidatorWrapper.java Sun Jan 4 17:33:52 2009
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.trinidad;
+
+import org.apache.myfaces.trinidad.validator.ClientValidator;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+import javax.faces.context.FacesContext;
+import javax.faces.component.UIComponent;
+import java.io.Serializable;
+import java.util.Collection;
+
+/**
+ * in case of client-side validation a trinidad client validator is added to the component based on the meta-data.
+ * at the postback: the extval validation strategy gets called and after that the added validator.
+ * this wrapper prevents such a server-side double validation.
+ * it just delegates the client-side functionality.
+ *
+ * @author Gerhard Petracek
+ * @since 1.x.1
+ */
+@UsageInformation(UsageCategory.REUSE)
+public class ExtValTrinidadClientValidatorWrapper implements Validator, ClientValidator, Serializable
+{
+ private ClientValidator wrapped;
+ private static final long serialVersionUID = 1414547841700621410L;
+
+ public ExtValTrinidadClientValidatorWrapper(ClientValidator clientValidator)
+ {
+ this.wrapped = clientValidator;
+ }
+
+ public void validate(FacesContext facesContext, UIComponent uiComponent, Object o) throws ValidatorException
+ {
+ //don't validate - the extval validation strategy will do that
+ }
+
+ public String getClientLibrarySource(FacesContext facesContext)
+ {
+ return wrapped.getClientLibrarySource(facesContext);
+ }
+
+ public Collection<String> getClientImportNames()
+ {
+ return wrapped.getClientImportNames();
+ }
+
+ public String getClientScript(FacesContext facesContext, UIComponent uiComponent)
+ {
+ return wrapped.getClientScript(facesContext, uiComponent);
+ }
+
+ public String getClientValidation(FacesContext facesContext, UIComponent uiComponent)
+ {
+ return wrapped.getClientValidation(facesContext, uiComponent);
+ }
+}
Modified: myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/DoubleRangeInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/DoubleRangeInitializer.java?rev=731403&r1=731402&r2=731403&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/DoubleRangeInitializer.java (original)
+++ myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/DoubleRangeInitializer.java Sun Jan 4 17:33:52 2009
@@ -23,7 +23,9 @@
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadClientValidatorWrapper;
import org.apache.myfaces.trinidad.validator.DoubleRangeValidator;
+import org.apache.myfaces.trinidad.validator.ClientValidator;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
@@ -43,7 +45,7 @@
Map<String, Object> metaData)
{
boolean informationAdded = false;
- DoubleRangeValidator lengthValidator = (DoubleRangeValidator)facesContext.getApplication()
+ DoubleRangeValidator doubleRangeValidator = (DoubleRangeValidator)facesContext.getApplication()
.createValidator("org.apache.myfaces.trinidad.DoubleRange");
if(metaData.containsKey(CommonMetaDataKeys.RANGE_MIN))
@@ -52,7 +54,7 @@
if(min instanceof Double)
{
- lengthValidator.setMinimum((Double)min);
+ doubleRangeValidator.setMinimum((Double)min);
informationAdded = true;
}
}
@@ -63,13 +65,15 @@
if(maxLength instanceof Double)
{
- lengthValidator.setMaximum((Double)maxLength);
+ doubleRangeValidator.setMaximum((Double)maxLength);
informationAdded = true;
}
}
- if(informationAdded)
+
+ if(informationAdded && doubleRangeValidator instanceof ClientValidator)
{
- ((EditableValueHolder)uiComponent).addValidator(lengthValidator);
+ ((EditableValueHolder)uiComponent).addValidator(
+ new ExtValTrinidadClientValidatorWrapper((ClientValidator)doubleRangeValidator));
return true;
}
return false;
Modified: myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LengthInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LengthInitializer.java?rev=731403&r1=731402&r2=731403&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LengthInitializer.java (original)
+++ myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LengthInitializer.java Sun Jan 4 17:33:52 2009
@@ -24,6 +24,8 @@
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadClientValidatorWrapper;
+import org.apache.myfaces.trinidad.validator.ClientValidator;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
@@ -82,9 +84,11 @@
//reInitValidators((EditableValueHolder)uiComponent, metaData); //search wrappers and call .deactivate
- if(informationAdded)
+ if(informationAdded && lengthValidator instanceof ClientValidator)
{
- ((EditableValueHolder)uiComponent).addValidator(lengthValidator);
+ ((EditableValueHolder)uiComponent).addValidator(
+ new ExtValTrinidadClientValidatorWrapper((ClientValidator)lengthValidator));
+
return true;
}
return false;
Modified: myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LongRangeInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LongRangeInitializer.java?rev=731403&r1=731402&r2=731403&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LongRangeInitializer.java (original)
+++ myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/LongRangeInitializer.java Sun Jan 4 17:33:52 2009
@@ -23,7 +23,9 @@
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadClientValidatorWrapper;
import org.apache.myfaces.trinidad.validator.LongRangeValidator;
+import org.apache.myfaces.trinidad.validator.ClientValidator;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
@@ -43,7 +45,7 @@
Map<String, Object> metaData)
{
boolean informationAdded = false;
- LongRangeValidator lengthValidator = (LongRangeValidator)facesContext.getApplication()
+ LongRangeValidator longRangeValidator = (LongRangeValidator)facesContext.getApplication()
.createValidator("org.apache.myfaces.trinidad.LongRange");
if(metaData.containsKey(CommonMetaDataKeys.RANGE_MIN))
@@ -52,7 +54,7 @@
if(min instanceof Long)
{
- lengthValidator.setMinimum((Long)min);
+ longRangeValidator.setMinimum((Long)min);
informationAdded = true;
}
}
@@ -63,13 +65,16 @@
if(maxLength instanceof Long)
{
- lengthValidator.setMaximum((Long)maxLength);
+ longRangeValidator.setMaximum((Long)maxLength);
informationAdded = true;
}
}
- if(informationAdded)
+
+ if(informationAdded && longRangeValidator instanceof ClientValidator)
{
- ((EditableValueHolder)uiComponent).addValidator(lengthValidator);
+ ((EditableValueHolder)uiComponent).addValidator(
+ new ExtValTrinidadClientValidatorWrapper((ClientValidator)longRangeValidator));
+
return true;
}
return false;
Modified: myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/PatternInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/PatternInitializer.java?rev=731403&r1=731402&r2=731403&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/PatternInitializer.java (original)
+++ myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/PatternInitializer.java Sun Jan 4 17:33:52 2009
@@ -23,7 +23,9 @@
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadClientValidatorWrapper;
import org.apache.myfaces.trinidad.validator.RegExpValidator;
+import org.apache.myfaces.trinidad.validator.ClientValidator;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
@@ -60,7 +62,11 @@
regExpValidator.setMessageDetailNoMatch((String)metaData.get(
CommonMetaDataKeys.PATTERN_VALIDATION_ERROR_MESSAGE));
- ((EditableValueHolder)uiComponent).addValidator(regExpValidator);
+ if(regExpValidator instanceof ClientValidator)
+ {
+ ((EditableValueHolder)uiComponent).addValidator(
+ new ExtValTrinidadClientValidatorWrapper((ClientValidator)regExpValidator));
+ }
}
return true;
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/PatternStrategy.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/PatternStrategy.java?rev=731403&r1=731402&r2=731403&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/PatternStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/PatternStrategy.java Sun Jan 4 17:33:52 2009
@@ -43,7 +43,6 @@
UIComponent uiComponent, MetaDataEntry metaDataEntry,
Object convertedObject) throws ValidatorException
{
-
Pattern annotation = metaDataEntry.getValue(Pattern.class);
for (String expression : annotation.value())
@@ -55,8 +54,7 @@
throw new ValidatorException(new FacesMessage(
FacesMessage.SEVERITY_ERROR,
getErrorMessageSummary(annotation),
- getErrorMessageDetail(annotation).replace("{0}",
- expression)));
+ getErrorMessageDetail(annotation).replace("{0}", expression)));
}
}
}