You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by dw...@apache.org on 2010/05/12 19:53:48 UTC
svn commit: r943598 - in /incubator/bval/trunk/bval-jsr303/src:
main/java/org/apache/bval/jsr303/groups/GroupsComputer.java
test/java/org/apache/bval/jsr303/groups/GroupsComputerTest.java
Author: dwoods
Date: Wed May 12 17:53:47 2010
New Revision: 943598
URL: http://svn.apache.org/viewvc?rev=943598&view=rev
Log:
BVAL-43 GroupDefinitionException must be thrown on cyclic group detection. Contributed by Carlos Vara.
Modified:
incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java
incubator/bval/trunk/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/GroupsComputerTest.java
Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java?rev=943598&r1=943597&r2=943598&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java Wed May 12 17:53:47 2010
@@ -19,6 +19,7 @@
package org.apache.bval.jsr303.groups;
+import javax.validation.GroupDefinitionException;
import javax.validation.GroupSequence;
import javax.validation.ValidationException;
import javax.validation.groups.Default;
@@ -105,7 +106,7 @@ public class GroupsComputer {
private List<Group> resolveSequence(Class<?> group, GroupSequence sequenceAnnotation,
Set<Class<?>> processedSequences) {
if (processedSequences.contains(group)) {
- throw new ValidationException("Cyclic dependency in groups definition");
+ throw new GroupDefinitionException("Cyclic dependency in groups definition");
} else {
processedSequences.add(group);
}
Modified: incubator/bval/trunk/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/GroupsComputerTest.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/GroupsComputerTest.java?rev=943598&r1=943597&r2=943598&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/GroupsComputerTest.java (original)
+++ incubator/bval/trunk/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/GroupsComputerTest.java Wed May 12 17:53:47 2010
@@ -22,6 +22,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import javax.validation.GroupDefinitionException;
import javax.validation.ValidationException;
import javax.validation.groups.Default;
@@ -100,7 +101,7 @@ public class GroupsComputerTest extends
groups.add(CyclicGroupSequence1.class);
groupsComputer.computeGroups(groups);
fail();
- } catch (ValidationException ex) {
+ } catch (GroupDefinitionException ex) {
}
}
@@ -111,7 +112,7 @@ public class GroupsComputerTest extends
groups.add(CyclicGroupSequence.class);
groupsComputer.computeGroups(groups);
fail();
- } catch (ValidationException ex) {
+ } catch (GroupDefinitionException ex) {
}
}