[hibernate-commits] Hibernate SVN: r17095 - in validator/trunk: hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/haintegration and 1 other directories.

[hibernate-commits at 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
  */
+ at 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
  */
+ at SuppressWarnings({ "deprecation" })
 public abstract class JPATestCase extends junit.framework.TestCase {
 	protected EntityManagerFactory factory;