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/26 02:32:06 UTC
svn commit: r747982 - in
/myfaces/extensions/validator/branches/beanval_integration/trunk:
examples/hello_world/src/main/java/org/apache/myfaces/blank/domain/
validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/bean...
Author: gpetracek
Date: Thu Feb 26 01:32:05 2009
New Revision: 747982
URL: http://svn.apache.org/viewvc?rev=747982&view=rev
Log:
optional message interpolator to message resolver adapter
Added:
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/DefaultMessageInterpolator.java
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/ExtValMessageInterpolatorAdapter.java
Modified:
myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/domain/Person.java
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java
myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/domain/Person.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/domain/Person.java?rev=747982&r1=747981&r2=747982&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/domain/Person.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/examples/hello_world/src/main/java/org/apache/myfaces/blank/domain/Person.java Thu Feb 26 01:32:05 2009
@@ -29,7 +29,7 @@
@Required
private String firstName;
- //demo for jpa based validation support
+ //demo for bean validation based validation support
@NotNull
@Length(max = 6)
private String lastName;
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java?rev=747982&r1=747981&r2=747982&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java Thu Feb 26 01:32:05 2009
@@ -122,7 +122,9 @@
interceptor.beforeValidation(uiComponent, propertyInformation, convertedObject);
}
- Set<ConstraintViolation> violations = this.validationFactory.getValidator()
+ Set<ConstraintViolation> violations = this.validationFactory.usingContext()
+ .messageInterpolator(ExtValBeanValidationContext.getCurrentInstance().getMessageInterpolator())
+ .getValidator()
.validateValue(
baseBeanClass,
propertyName,
@@ -137,13 +139,8 @@
{
ConstraintViolation violation = (ConstraintViolation) violations.toArray()[0];
- this.validationFactory.getMessageInterpolator().interpolate(
- violation.getRawMessage(),
- violation.getConstraintDescriptor(),
- convertedObject,
- facesContext.getViewRoot().getLocale());
-
String violationMessage = violation.getInterpolatedMessage();
+
String labeledMessage = "{0}: " + violationMessage;
ValidatorException validatorException = new ValidatorException(
new FacesMessage(FacesMessage.SEVERITY_ERROR, labeledMessage, labeledMessage));
Modified: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java?rev=747982&r1=747981&r2=747982&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java (original)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java Thu Feb 26 01:32:05 2009
@@ -19,11 +19,16 @@
package org.apache.myfaces.extensions.validator.beanval;
import org.apache.myfaces.extensions.validator.beanval.interceptor.PropertyValidationInterceptor;
+import org.apache.myfaces.extensions.validator.beanval.validation.message.interpolator.DefaultMessageInterpolator;
+import org.apache.myfaces.extensions.validator.beanval.validation.message.interpolator.ExtValMessageInterpolatorAdapter;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
+import org.apache.myfaces.extensions.validator.core.validation.message.resolver.MessageResolver;
import javax.faces.context.FacesContext;
import javax.validation.groups.Default;
+import javax.validation.MessageInterpolator;
+import javax.validation.Validation;
import java.util.Map;
import java.util.List;
import java.util.ArrayList;
@@ -37,6 +42,11 @@
{
private static final String KEY = ExtValBeanValidationContext.class.getName() + ":KEY";
+ private static MessageInterpolator defaultMessageInterpolator = new DefaultMessageInterpolator(
+ Validation.buildDefaultValidatorFactory().getMessageInterpolator());
+
+ private static MessageResolver messageResolver;
+
@ToDo(value = Priority.HIGH, description = "refactor to a pluggable GroupStorage")
private Map<String, List<Class>> currentGroups = new HashMap<String, List<Class>>();
@@ -156,4 +166,19 @@
{
return this.propertyValidationInterceptors;
}
+
+ public MessageInterpolator getMessageInterpolator()
+ {
+ if(messageResolver != null)
+ {
+ return new ExtValMessageInterpolatorAdapter(defaultMessageInterpolator, messageResolver);
+ }
+
+ return defaultMessageInterpolator;
+ }
+
+ public static void setMessageResolver(MessageResolver customMessageResolver)
+ {
+ messageResolver = customMessageResolver;
+ }
}
Added: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/DefaultMessageInterpolator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/DefaultMessageInterpolator.java?rev=747982&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/DefaultMessageInterpolator.java (added)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/DefaultMessageInterpolator.java Thu Feb 26 01:32:05 2009
@@ -0,0 +1,58 @@
+/*
+ * 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.beanval.validation.message.interpolator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.validation.MessageInterpolator;
+import javax.validation.ConstraintDescriptor;
+import javax.faces.context.FacesContext;
+import java.util.Locale;
+
+/**
+ * @author Gerhard Petracek
+ * @since 1.x.3
+ */
+public class DefaultMessageInterpolator implements MessageInterpolator
+{
+ protected final Log logger = LogFactory.getLog(getClass());
+
+ private MessageInterpolator wrapped;
+
+ public DefaultMessageInterpolator(MessageInterpolator wrapped)
+ {
+ this.wrapped = wrapped;
+ }
+
+ public String interpolate(String messageOrKey, ConstraintDescriptor constraintDescriptor, Object o)
+ {
+ return interpolate(messageOrKey, constraintDescriptor, o, null);
+ }
+
+ public String interpolate(String messageOrKey, ConstraintDescriptor constraintDescriptor, Object o, Locale locale)
+ {
+ return this.wrapped.interpolate(messageOrKey, constraintDescriptor, o, getCurrentLocale());
+ }
+
+ protected Locale getCurrentLocale()
+ {
+ return FacesContext.getCurrentInstance().getViewRoot().getLocale();
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/ExtValMessageInterpolatorAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/ExtValMessageInterpolatorAdapter.java?rev=747982&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/ExtValMessageInterpolatorAdapter.java (added)
+++ myfaces/extensions/validator/branches/beanval_integration/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/ExtValMessageInterpolatorAdapter.java Thu Feb 26 01:32:05 2009
@@ -0,0 +1,65 @@
+/*
+ * 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.beanval.validation.message.interpolator;
+
+import org.apache.myfaces.extensions.validator.core.validation.message.resolver.MessageResolver;
+
+import javax.validation.MessageInterpolator;
+import javax.validation.ConstraintDescriptor;
+import java.util.Locale;
+
+/**
+ * @author Gerhard Petracek
+ * @since 1.x.3
+ */
+public class ExtValMessageInterpolatorAdapter extends DefaultMessageInterpolator
+{
+ private MessageResolver messageResolver;
+
+ public ExtValMessageInterpolatorAdapter(MessageInterpolator wrapped, MessageResolver messageResolver)
+ {
+ super(wrapped);
+ this.messageResolver = messageResolver;
+ }
+
+ @Override
+ public String interpolate(String messageOrKey, ConstraintDescriptor constraintDescriptor, Object o)
+ {
+ return interpolate(messageOrKey, constraintDescriptor, o, getCurrentLocale());
+ }
+
+ @Override
+ public String interpolate(String messageOrKey, ConstraintDescriptor constraintDescriptor, Object o, Locale locale)
+ {
+ if(this.messageResolver != null)
+ {
+ if(messageOrKey.startsWith("{") && messageOrKey.endsWith("}"))
+ {
+ messageOrKey = this.messageResolver
+ .getMessage(messageOrKey.substring(1, messageOrKey.length() - 1), getCurrentLocale());
+ }
+ else
+ {
+ this.logger.warn("you tried to use an extval message-resolver for" +
+ "jsr303 validation with an invalid key -> using a default interpolator");
+ }
+ }
+ return super.interpolate(messageOrKey, constraintDescriptor, o, getCurrentLocale());
+ }
+}