Hibernate SVN: r17101 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-07-15 11:24:21 -0400 (Wed, 15 Jul 2009)
New Revision: 17101
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java
Log:
fixed handling of maps in conjunction with @Valid
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java 2009-07-15 14:52:23 UTC (rev 17100)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java 2009-07-15 15:24:21 UTC (rev 17101)
@@ -387,7 +387,7 @@
}
else if ( ReflectionHelper.isMap( type ) ) {
Map<?, ?> map = ( Map<?, ?> ) value;
- iter = map.values().iterator();
+ iter = map.entrySet().iterator();
context.markCurrentPropertyAsIterable();
}
else if ( TypeUtils.isArray( type ) ) {
@@ -437,16 +437,13 @@
if ( value instanceof Map.Entry ) {
mapKey = ( ( Map.Entry ) value ).getKey();
value = ( ( Map.Entry ) value ).getValue();
+ currentPath.getLeafNode().setKey( mapKey );
}
-
- if ( isIndexable ) {
- // only one of the two values index/mapKey will be set. The other will stay null.
+ else if ( isIndexable ) {
currentPath.getLeafNode().setIndex( index );
- currentPath.getLeafNode().setKey( mapKey );
}
if ( !context.isAlreadyValidated( value, currentGroup, currentPath ) ) {
-
GroupChain groupChain = groupChainGenerator.getGroupChainFor(
Arrays.asList(
new Class<?>[] {
16 years, 4 months
Hibernate SVN: r17100 - jpa-api/trunk/src/main/java/javax/persistence.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-07-15 10:52:23 -0400 (Wed, 15 Jul 2009)
New Revision: 17100
Modified:
jpa-api/trunk/src/main/java/javax/persistence/TupleElement.java
Log:
fixed javadoc
Modified: jpa-api/trunk/src/main/java/javax/persistence/TupleElement.java
===================================================================
--- jpa-api/trunk/src/main/java/javax/persistence/TupleElement.java 2009-07-15 14:19:32 UTC (rev 17099)
+++ jpa-api/trunk/src/main/java/javax/persistence/TupleElement.java 2009-07-15 14:52:23 UTC (rev 17100)
@@ -5,7 +5,7 @@
/**
* The TupleElement interface defines an element that is returned in
* a query result tuple.
- * @param <T> the type of the element
+ * @param <X> the type of the element
*/
public interface TupleElement<X> {
16 years, 4 months
Hibernate SVN: r17099 - jpa-api/trunk.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-07-15 10:19:32 -0400 (Wed, 15 Jul 2009)
New Revision: 17099
Modified:
jpa-api/trunk/pom.xml
Log:
use new agreed upon version scheme
Modified: jpa-api/trunk/pom.xml
===================================================================
--- jpa-api/trunk/pom.xml 2009-07-15 13:36:47 UTC (rev 17098)
+++ jpa-api/trunk/pom.xml 2009-07-15 14:19:32 UTC (rev 17099)
@@ -4,7 +4,7 @@
<groupId>org.hibernate.java-persistence</groupId>
<artifactId>jpa-api</artifactId>
<packaging>jar</packaging>
- <version>2.0.pfd-SNAPSHOT</version>
+ <version>2.0.Beta-SNAPSHOT</version>
<name>JPA API (developmental)</name>
<description>
16 years, 4 months
Hibernate SVN: r17098 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-07-15 09:36:47 -0400 (Wed, 15 Jul 2009)
New Revision: 17098
Added:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
Log:
added test for field and method visibilty
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-15 13:05:38 UTC (rev 17097)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-15 13:36:47 UTC (rev 17098)
@@ -20,6 +20,8 @@
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -124,7 +126,7 @@
}
@Test(enabled = false)
- @SpecAssertion(section = "3.1.2", id = "e")
+ @SpecAssertion(section = "3.1", id = "b")
public void testIgnoreStaticFieldsAndProperties() {
StaticFieldsAndProperties entity = new StaticFieldsAndProperties();
@@ -133,6 +135,32 @@
assertCorrectNumberOfViolations( violations, 0 );
}
+ @Test
+ @SpecAssertion(section = "3.1.2", id = "e")
+ public void testFieldAndPropertyVisiblityIsNotConstrainted() {
+ Visibility entity = new Visibility();
+
+ Validator validator = TestUtil.getDefaultValidator();
+ Set<ConstraintViolation<Visibility>> violations = validator.validate( entity );
+ assertCorrectNumberOfViolations( violations, 6 );
+ assertCorrectConstraintTypes(
+ violations, Min.class, Min.class, Min.class, DecimalMin.class, DecimalMin.class, DecimalMin.class
+ );
+ assertCorrectConstraintViolationMessages(
+ violations,
+ "publicField",
+ "protectedField",
+ "privateField",
+ "publicProperty",
+ "protectedProperty",
+ "privateProperty"
+ );
+
+ entity.setValues( 100 );
+ violations = validator.validate( entity );
+ assertCorrectNumberOfViolations( violations, 0 );
+ }
+
static class StaticFieldsAndProperties {
@NotNull
static Object staticField = null;
Added: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java 2009-07-15 13:36:47 UTC (rev 17098)
@@ -0,0 +1,57 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed 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.hibernate.jsr303.tck.tests.constraints.application;
+
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.DecimalMin;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class Visibility {
+ @Min(value = 100, message = "publicField")
+ public int publicValue;
+
+ @Min(value = 100, message = "protectedField")
+ protected int protectedValue;
+
+ @Min(value = 100, message = "privateField")
+ private int privateValue;
+
+ @DecimalMin(value = "100.0", message = "publicProperty")
+ public int getPublicValue() {
+ return publicValue;
+ }
+
+ public void setValues(int value) {
+ this.publicValue = value;
+ this.protectedValue = value;
+ this.privateValue = value;
+ }
+
+ @DecimalMin(value = "100.0", message = "protectedProperty")
+ protected int getProtectedValue() {
+ return protectedValue;
+ }
+
+ @DecimalMin(value = "100.0", message = "privateProperty")
+ private int getPrivateValue() {
+ return privateValue;
+ }
+}
16 years, 4 months
Hibernate SVN: r17097 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-07-15 09:05:38 -0400 (Wed, 15 Jul 2009)
New Revision: 17097
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
Log:
disabled test for static field and properties
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-15 12:28:36 UTC (rev 17096)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-15 13:05:38 UTC (rev 17097)
@@ -123,7 +123,7 @@
assertCorrectConstraintViolationMessages( violations, expectedMessage, expectedMessage );
}
- @Test
+ @Test(enabled = false)
@SpecAssertion(section = "3.1.2", id = "e")
public void testIgnoreStaticFieldsAndProperties() {
StaticFieldsAndProperties entity = new StaticFieldsAndProperties();
16 years, 4 months
Hibernate SVN: r17096 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-07-15 08:28:36 -0400 (Wed, 15 Jul 2009)
New Revision: 17096
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintViolationImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/GlobalExecutionContext.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/LocalExecutionContext.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/MetaConstraint.java
Log:
Enabled test and made sure that if both field and property get annotated two constraint violations get crearted.
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-15 11:54:34 UTC (rev 17095)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-15 12:28:36 UTC (rev 17096)
@@ -108,7 +108,7 @@
assertCorrectNumberOfViolations( violations, 0 );
}
- @Test(enabled = false)
+ @Test
@SpecAssertions({
@SpecAssertion(section = "3.1.2", id = "a"),
@SpecAssertion(section = "3.1.2", id = "b")
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintViolationImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintViolationImpl.java 2009-07-15 11:54:34 UTC (rev 17095)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintViolationImpl.java 2009-07-15 12:28:36 UTC (rev 17096)
@@ -17,6 +17,7 @@
*/
package org.hibernate.validation.engine;
+import java.lang.annotation.ElementType;
import javax.validation.ConstraintViolation;
import javax.validation.Path;
import javax.validation.metadata.ConstraintDescriptor;
@@ -34,11 +35,12 @@
private final ConstraintDescriptor constraintDescriptor;
private final String rawMessage;
private final Class<T> rootBeanClass;
+ private final ElementType elementType;
public ConstraintViolationImpl(String messageTemplate, String interpolatedMessage, Class<T> rootBeanClass,
T rootBean, Object leafBeanInstance, Object value,
- Path propertyPath, ConstraintDescriptor constraintDescriptor) {
+ Path propertyPath, ConstraintDescriptor constraintDescriptor, ElementType elementType) {
this.rawMessage = messageTemplate;
this.interpolatedMessage = interpolatedMessage;
this.rootBean = rootBean;
@@ -47,6 +49,7 @@
this.leafBeanInstance = leafBeanInstance;
this.constraintDescriptor = constraintDescriptor;
this.rootBeanClass = rootBeanClass;
+ this.elementType = elementType;
}
public String getMessage() {
@@ -105,6 +108,9 @@
if ( leafBeanInstance != null ? !leafBeanInstance.equals( that.leafBeanInstance ) : that.leafBeanInstance != null ) {
return false;
}
+ if ( elementType != null ? !elementType.equals( that.elementType ) : that.elementType != null ) {
+ return false;
+ }
if ( value != null ? !value.equals( that.value ) : that.value != null ) {
return false;
}
@@ -119,6 +125,7 @@
result = 31 * result + ( rootBean != null ? rootBean.hashCode() : 0 );
result = 31 * result + ( leafBeanInstance != null ? leafBeanInstance.hashCode() : 0 );
result = 31 * result + ( value != null ? value.hashCode() : 0 );
+ result = 31 * result + ( elementType != null ? elementType.hashCode() : 0 );
return result;
}
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/GlobalExecutionContext.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/GlobalExecutionContext.java 2009-07-15 11:54:34 UTC (rev 17095)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/GlobalExecutionContext.java 2009-07-15 12:28:36 UTC (rev 17096)
@@ -159,7 +159,8 @@
localContext.getCurrentBean(),
localContext.getCurrentValidatedValue(),
error.getPath(),
- descriptor
+ descriptor,
+ localContext.getElementType()
);
}
@@ -196,6 +197,7 @@
}
private void addConstraintFailure(ConstraintViolation<T> failingConstraintViolation) {
+ // NOTE: we are relying on the fact that ConstraintViolation.equals() is implemented correctly.
int i = failingConstraintViolations.indexOf( failingConstraintViolation );
if ( i == -1 ) {
failingConstraintViolations.add( failingConstraintViolation );
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/LocalExecutionContext.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/LocalExecutionContext.java 2009-07-15 11:54:34 UTC (rev 17095)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/LocalExecutionContext.java 2009-07-15 12:28:36 UTC (rev 17096)
@@ -17,6 +17,7 @@
*/
package org.hibernate.validation.engine;
+import java.lang.annotation.ElementType;
import javax.validation.groups.Default;
/**
@@ -51,6 +52,11 @@
*/
private V currentValue;
+ /**
+ * The {@code ElementType} the constraint was defined on
+ */
+ private ElementType elementType;
+
public static <T, V> LocalExecutionContext<T, V> getLocalExecutionContext(T value) {
@SuppressWarnings("unchecked")
Class<T> rootBeanClass = ( Class<T> ) value.getClass();
@@ -106,14 +112,25 @@
return getCurrentGroup() != null && getCurrentGroup().getName().equals( Default.class.getName() );
}
+ public ElementType getElementType() {
+ return elementType;
+ }
+
+ public void setElementType(ElementType elementType) {
+ this.elementType = elementType;
+ }
+
@Override
public String toString() {
- return "LocalExecutionContext{" +
- "currentBean=" + currentBean +
- ", currentBeanType=" + currentBeanType +
- ", propertyPath=" + propertyPath +
- ", currentGroup=" + currentGroup +
- ", currentValue=" + currentValue +
- '}';
+ final StringBuilder sb = new StringBuilder();
+ sb.append( "LocalExecutionContext" );
+ sb.append( "{currentBean=" ).append( currentBean );
+ sb.append( ", currentBeanType=" ).append( currentBeanType );
+ sb.append( ", propertyPath=" ).append( propertyPath );
+ sb.append( ", currentGroup=" ).append( currentGroup );
+ sb.append( ", currentValue=" ).append( currentValue );
+ sb.append( ", elementType=" ).append( elementType );
+ sb.append( '}' );
+ return sb.toString();
}
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/MetaConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/MetaConstraint.java 2009-07-15 11:54:34 UTC (rev 17095)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/MetaConstraint.java 2009-07-15 12:28:36 UTC (rev 17096)
@@ -123,6 +123,7 @@
public <T, U, V> boolean validateConstraint(GlobalExecutionContext<T> executionContext, LocalExecutionContext<U, V> localExecutionContext) {
List<ConstraintViolation<T>> constraintViolations = new ArrayList<ConstraintViolation<T>>();
+ localExecutionContext.setElementType( elementType );
constraintTree.validateConstraints(
typeOfAnnoatedElement(), executionContext, localExecutionContext, constraintViolations
);
16 years, 4 months
Hibernate SVN: r17095 - in validator/trunk: hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/haintegration and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-07-15 07:54:34 -0400 (Wed, 15 Jul 2009)
New Revision: 17095
Modified:
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/haintegration/EmbeddedObjectTest.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/jpa/JPATestCase.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java
Log:
HV-172 - Added checks for static fields and properties
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java 2009-07-15 11:53:24 UTC (rev 17094)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java 2009-07-15 11:54:34 UTC (rev 17095)
@@ -22,6 +22,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -250,6 +251,10 @@
private void initFieldConstraints(Class<?> clazz, AnnotationIgnores annotationIgnores) {
for ( Field field : clazz.getDeclaredFields() ) {
+ // HV-172
+ if ( Modifier.isStatic( field.getModifiers() ) ) {
+ continue;
+ }
List<ConstraintDescriptorImpl<?>> fieldMetadata = findConstraints( field );
for ( ConstraintDescriptorImpl<?> constraintDescription : fieldMetadata ) {
if ( annotationIgnores.isIgnoreAnnotations( field ) ) {
@@ -269,6 +274,10 @@
private void initMethodConstraints(Class<?> clazz, AnnotationIgnores annotationIgnores) {
for ( Method method : clazz.getDeclaredMethods() ) {
+ // HV-172
+ if ( Modifier.isStatic( method.getModifiers() ) ) {
+ continue;
+ }
List<ConstraintDescriptorImpl<?>> methodMetadata = findConstraints( method );
for ( ConstraintDescriptorImpl<?> constraintDescription : methodMetadata ) {
if ( annotationIgnores.isIgnoreAnnotations( method ) ) {
Modified: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/haintegration/EmbeddedObjectTest.java
===================================================================
--- validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/haintegration/EmbeddedObjectTest.java 2009-07-15 11:53:24 UTC (rev 17094)
+++ validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/haintegration/EmbeddedObjectTest.java 2009-07-15 11:54:34 UTC (rev 17095)
@@ -14,6 +14,7 @@
/**
* @author Emmanuel Bernard
*/
+@SuppressWarnings({ "deprecation" })
public class EmbeddedObjectTest extends HANTestCase {
public void testNotNullEmbeddedObject() throws Exception {
CreditCard cc = new CreditCard();
Modified: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/jpa/JPATestCase.java
===================================================================
--- validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/jpa/JPATestCase.java 2009-07-15 11:53:24 UTC (rev 17094)
+++ validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/jpa/JPATestCase.java 2009-07-15 11:54:34 UTC (rev 17095)
@@ -16,6 +16,7 @@
/**
* @author Emmanuel Bernard
*/
+@SuppressWarnings({ "deprecation" })
public abstract class JPATestCase extends junit.framework.TestCase {
protected EntityManagerFactory factory;
16 years, 4 months
Hibernate SVN: r17094 - in validator/trunk/hibernate-validator-legacy/src: test/java/org/hibernate/validator/test and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-07-15 07:53:24 -0400 (Wed, 15 Jul 2009)
New Revision: 17094
Modified:
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidateEventListener.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/HANTestCase.java
Log:
Trying to reduce compiler warnings - at leasin in Idea
Modified: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidateEventListener.java
===================================================================
--- validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidateEventListener.java 2009-07-15 11:52:12 UTC (rev 17093)
+++ validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidateEventListener.java 2009-07-15 11:53:24 UTC (rev 17094)
@@ -168,11 +168,13 @@
}
}
+ @SuppressWarnings({ "deprecation" })
public boolean onPreInsert(PreInsertEvent event) {
validate( event.getEntity(), event.getSource().getEntityMode() );
return false;
}
+ @SuppressWarnings({ "deprecation" })
public boolean onPreUpdate(PreUpdateEvent event) {
validate( event.getEntity(), event.getSource().getEntityMode() );
return false;
Modified: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/HANTestCase.java
===================================================================
--- validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/HANTestCase.java 2009-07-15 11:52:12 UTC (rev 17093)
+++ validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/HANTestCase.java 2009-07-15 11:53:24 UTC (rev 17094)
@@ -68,6 +68,7 @@
}
}
+ @SuppressWarnings({ "deprecation" })
protected void runTest() throws Throwable {
try {
super.runTest();
16 years, 4 months
Hibernate SVN: r17093 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/customconstraint.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-07-15 07:52:12 -0400 (Wed, 15 Jul 2009)
New Revision: 17093
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/customconstraint/CustomConstraintValidatorTest.java
Log:
Added more test mappings
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/customconstraint/CustomConstraintValidatorTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/customconstraint/CustomConstraintValidatorTest.java 2009-07-15 11:47:38 UTC (rev 17092)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/customconstraint/CustomConstraintValidatorTest.java 2009-07-15 11:52:12 UTC (rev 17093)
@@ -37,6 +37,7 @@
import org.hibernate.jsr303.tck.util.TestUtil;
import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations;
+import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths;
/**
* @author Emmanuel Bernard
@@ -180,7 +181,23 @@
assertEquals( constraintViolation.getMessageTemplate(), "The company name must be a minimum {min} characters" );
}
+ @Test
+ @SpecAssertion(section = "2.4", id = "o")
+ public void testDefaultPropertyPath() {
+ Validator validator = TestUtil.getDefaultValidator();
+ Author author = new Author();
+ author.setLastName( "John" );
+ author.setFirstName( "Doe" );
+ author.setCompany( "" );
+
+ Set<ConstraintViolation<Author>> constraintViolations = validator.validate( author );
+ assertCorrectNumberOfViolations( constraintViolations, 1 );
+
+ assertCorrectPropertyPaths( constraintViolations, "company" );
+ }
+
+
public static class Shoe {
@Positive
public int size;
16 years, 4 months
Hibernate SVN: r17092 - in beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests: validation and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-07-15 07:47:38 -0400 (Wed, 15 Jul 2009)
New Revision: 17092
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java
Log:
Added more test mappings
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-14 20:58:00 UTC (rev 17091)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-15 11:47:38 UTC (rev 17092)
@@ -20,6 +20,7 @@
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
+import javax.validation.constraints.NotNull;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -79,7 +80,6 @@
assertCorrectNumberOfViolations( violations, 0 );
}
-
@Test
@SpecAssertions({
@SpecAssertion(section = "3.1", id = "d"),
@@ -122,6 +122,26 @@
String expectedMessage = "Building costs are max {max} dollars.";
assertCorrectConstraintViolationMessages( violations, expectedMessage, expectedMessage );
}
+
+ @Test
+ @SpecAssertion(section = "3.1.2", id = "e")
+ public void testIgnoreStaticFieldsAndProperties() {
+ StaticFieldsAndProperties entity = new StaticFieldsAndProperties();
+
+ Validator validator = TestUtil.getDefaultValidator();
+ Set<ConstraintViolation<StaticFieldsAndProperties>> violations = validator.validate( entity );
+ assertCorrectNumberOfViolations( violations, 0 );
+ }
+
+ static class StaticFieldsAndProperties {
+ @NotNull
+ static Object staticField = null;
+
+ @NotNull
+ static Object getStaticProperty() {
+ return null;
+ }
+ }
}
interface DummyGroup {
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java 2009-07-14 20:58:00 UTC (rev 17091)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java 2009-07-15 11:47:38 UTC (rev 17092)
@@ -49,7 +49,7 @@
* @author Hardy Ferentschik
*/
@Artifact(artifactType = ArtifactType.JSR303)
-(a)Classes({TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class})
+@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
public class ValidateTest extends AbstractTest {
@Test
@@ -177,7 +177,10 @@
}
@Test
- @SpecAssertion(section = "4.2", id = "h")
+ @SpecAssertions({
+ @SpecAssertion(section = "2.4", id = "o"),
+ @SpecAssertion(section = "4.2", id = "h")
+ })
public void testGraphValidationWithList() {
Validator validator = TestUtil.getDefaultValidator();
@@ -199,11 +202,16 @@
assertEquals( "Everyone has a last name.", constraintViolation.getMessage(), "Wrong message" );
assertEquals( constraintViolation.getRootBean(), clint, "Wrong root entity" );
assertEquals( constraintViolation.getInvalidValue(), morgan.getLastName(), "Wrong value" );
- assertCorrectPropertyPaths( constraintViolations, "playedWith[0].playedWith[1].lastName", "playedWith[1].lastName" );
+ assertCorrectPropertyPaths(
+ constraintViolations, "playedWith[0].playedWith[1].lastName", "playedWith[1].lastName"
+ );
}
@Test
- @SpecAssertion(section = "4.2", id = "h")
+ @SpecAssertions({
+ @SpecAssertion(section = "2.4", id = "o"),
+ @SpecAssertion(section = "4.2", id = "h")
+ })
public void testGraphValidationWithArray() {
Validator validator = TestUtil.getDefaultValidator();
@@ -224,7 +232,9 @@
assertEquals( "Everyone has a last name.", constraintViolation.getMessage(), "Wrong message" );
assertEquals( constraintViolation.getRootBean(), clint, "Wrong root entity" );
assertEquals( constraintViolation.getInvalidValue(), morgan.getLastName(), "Wrong value" );
- assertCorrectPropertyPaths( constraintViolations, "playedWith[0].playedWith[1].lastName", "playedWith[1].lastName" );
+ assertCorrectPropertyPaths(
+ constraintViolations, "playedWith[0].playedWith[1].lastName", "playedWith[1].lastName"
+ );
}
@Test(expectedExceptions = IllegalArgumentException.class)
16 years, 4 months