[hibernate-commits] Hibernate SVN: r15979 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-02-16 11:54:15 -0500 (Mon, 16 Feb 2009)
New Revision: 15979

Removed:
   beanvalidation/trunk/validation-api/src/main/java/javax/validation/GroupSequences.java
Modified:
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/EnglishDictonary.java
Log:
Removed obsolete GroupSequences

Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/GroupSequences.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/GroupSequences.java	2009-02-16 13:33:16 UTC (rev 15978)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/GroupSequences.java	2009-02-16 16:54:15 UTC (rev 15979)
@@ -1,33 +0,0 @@
-// $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 javax.validation;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * @author Hardy Ferentschik
- * FIXME remove that annotation
- */
- at Target({ TYPE })
- at Retention(RUNTIME)
-public @interface GroupSequences {
-	GroupSequence[] value();
-}
\ No newline at end of file

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java	2009-02-16 13:33:16 UTC (rev 15978)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java	2009-02-16 16:54:15 UTC (rev 15979)
@@ -28,7 +28,6 @@
 import java.util.Map;
 import javax.validation.BeanDescriptor;
 import javax.validation.GroupSequence;
-import javax.validation.GroupSequences;
 import javax.validation.PropertyDescriptor;
 import javax.validation.Valid;
 import javax.validation.ValidationException;
@@ -141,13 +140,6 @@
 			addGroupSequence( groupSequenceAnnotation );
 		}
 
-		GroupSequences groupSequencesAnnotation = clazz.getAnnotation( GroupSequences.class );
-		if ( groupSequencesAnnotation != null ) {
-			for ( GroupSequence group : groupSequencesAnnotation.value() ) {
-				addGroupSequence( group );
-			}
-		}
-
 		for ( Map.Entry<Class<?>, List<Class<?>>> mapEntry : groupSequences.entrySet() ) {
 			List<Class<?>> groups = mapEntry.getValue();
 			List<Class<?>> expandedGroups = new ArrayList<Class<?>>();

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-02-16 13:33:16 UTC (rev 15978)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java	2009-02-16 16:54:15 UTC (rev 15979)
@@ -98,7 +98,6 @@
 	 * @return List of invalid constraints.
 	 *
 	 * @todo Currently we iterate the cascaded fields multiple times. Maybe we should change to an approach where we iterate the object graph only once.
-	 * @todo Context root bean can be a different object than the current Validator<T> hence two different generics variables
 	 */
 	private <T> List<ConstraintViolationImpl<T>> validateInContext(ExecutionContext<T> context, List<Class<?>> groups) {
 		if ( context.peekValidatedObject() == null ) {

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java	2009-02-16 13:33:16 UTC (rev 15978)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java	2009-02-16 16:54:15 UTC (rev 15979)
@@ -18,20 +18,15 @@
 package org.hibernate.validation.eg;
 
 import javax.validation.GroupSequence;
-import javax.validation.GroupSequences;
-import javax.validation.groups.Default;
 import javax.validation.constraints.NotNull;
+import javax.validation.groups.Default;
 
 import org.hibernate.validation.constraints.NotEmpty;
-import org.hibernate.validation.eg.groups.All;
 
 /**
  * @author Hardy Ferentschik
  */
- at GroupSequences({
-		@GroupSequence(name = DefaultAlias.class, sequence = { Default.class }),
-		@GroupSequence(name = All.class, sequence = { Default.class, Dictonary.Translate.class })
-})
+ at GroupSequence(name = DefaultAlias.class, sequence = { Default.class })
 public class Dictonary extends Book {
 	@NotNull(groups = Translate.class)
 	@NotEmpty(groups = Translate.class)

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/EnglishDictonary.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/EnglishDictonary.java	2009-02-16 13:33:16 UTC (rev 15978)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/EnglishDictonary.java	2009-02-16 16:54:15 UTC (rev 15979)
@@ -18,7 +18,6 @@
 package org.hibernate.validation.eg;
 
 import javax.validation.GroupSequence;
-import javax.validation.GroupSequences;
 import javax.validation.groups.Default;
 
 import org.hibernate.validation.eg.groups.First;
@@ -26,8 +25,6 @@
 /**
  * @author Hardy Ferentschik
  */
- at GroupSequences({
-		@GroupSequence(name = Default.class, sequence = { First.class })  // illegal - default is already defined in Book
-})
+ at GroupSequence(name = Default.class, sequence = { First.class }) // illegal - default is already defined in Book
 public class EnglishDictonary extends Dictonary {
 }
\ No newline at end of file