[hibernate-commits] Hibernate SVN: r15997 - beanvalidation/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4 and 4 other directories.

Author: epbernard Date: 2009-02-18 10:43:32 -0500 (Wed, 18 Feb 2009) New Revision: 15997 Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/GroupSequence.java beanvalidation/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Address.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/group/GroupChainGenerator.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Book.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/Address.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence1.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence2.java Log: BVAL-122 Rename @GroupSequence.sequence to @GroupSequence.value Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/GroupSequence.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/GroupSequence.java 2009-02-18 15:38:53 UTC (rev 15996) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/GroupSequence.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -35,5 +35,5 @@ //TODO depreciate Class<?> name() default void.class; - Class<?>[] sequence(); + Class<?>[] value(); } Modified: beanvalidation/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Address.java =================================================================== --- beanvalidation/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Address.java 2009-02-18 15:38:53 UTC (rev 15996) +++ beanvalidation/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Address.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -29,6 +29,6 @@ * check both basic constraints and high level ones. * high level constraints are not cheked if basic constraints fail */ - @GroupSequence(sequence = {Default.class, HighLevelCoherence.class}) + @GroupSequence(value = {Default.class, HighLevelCoherence.class}) public interface Complete {} } 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-18 15:38:53 UTC (rev 15996) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -141,7 +141,7 @@ defaultGroupSequence.add( Default.class ); } else { - defaultGroupSequence.addAll( Arrays.asList( groupSequenceAnnotation.sequence() ) ); + defaultGroupSequence.addAll( Arrays.asList( groupSequenceAnnotation.value() ) ); } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/group/GroupChainGenerator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/group/GroupChainGenerator.java 2009-02-18 15:38:53 UTC (rev 15996) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/group/GroupChainGenerator.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -79,7 +79,7 @@ } List<Group> resolvedGroupSequence = new ArrayList<Group>(); GroupSequence sequenceAnnotation = group.getAnnotation( GroupSequence.class ); - Class<?>[] sequenceArray = sequenceAnnotation.sequence(); + Class<?>[] sequenceArray = sequenceAnnotation.value(); for ( Class clazz : sequenceArray ) { if ( clazz.getAnnotation( GroupSequence.class ) == null ) { resolvedGroupSequence.add( new Group( clazz, group ) ); Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Book.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Book.java 2009-02-18 15:38:53 UTC (rev 15996) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Book.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -31,7 +31,7 @@ /** * @author Hardy Ferentschik */ -@GroupSequence(name = Default.class, sequence = { First.class, Second.class, Last.class }) +@GroupSequence(name = Default.class, value = { First.class, Second.class, Last.class }) public class Book { @NotNull(groups = First.class) @NotEmpty(groups = First.class) 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-18 15:38:53 UTC (rev 15996) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -26,7 +26,7 @@ /** * @author Hardy Ferentschik */ -@GroupSequence(name = DefaultAlias.class, sequence = { Default.class }) +@GroupSequence(name = DefaultAlias.class, value = { 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/engine/group/Address.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/Address.java 2009-02-18 15:38:53 UTC (rev 15996) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/Address.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -30,6 +30,6 @@ * Check both basic constraints and high level ones. * High level constraints are not checked if basic constraints fail. */ - @GroupSequence(sequence = {Default.class, HighLevelCoherence.class}) + @GroupSequence(value = {Default.class, HighLevelCoherence.class}) public interface Complete {} } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence.java 2009-02-18 15:38:53 UTC (rev 15996) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -22,6 +22,6 @@ /** * @author Hardy Ferentschik */ -@GroupSequence(sequence = CyclicGroupSequence.class) +@GroupSequence(value = CyclicGroupSequence.class) public interface CyclicGroupSequence { } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence1.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence1.java 2009-02-18 15:38:53 UTC (rev 15996) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence1.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -22,6 +22,6 @@ /** * @author Hardy Ferentschik */ -@GroupSequence(sequence = CyclicGroupSequence2.class) +@GroupSequence(value = CyclicGroupSequence2.class) public interface CyclicGroupSequence1 { } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence2.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence2.java 2009-02-18 15:38:53 UTC (rev 15996) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/group/CyclicGroupSequence2.java 2009-02-18 15:43:32 UTC (rev 15997) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -22,6 +22,6 @@ /** * @author Hardy Ferentschik */ -@GroupSequence( sequence = CyclicGroupSequence1.class) +@GroupSequence( value = CyclicGroupSequence1.class) public interface CyclicGroupSequence2 { } \ No newline at end of file