http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/RecursiveFoo.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/RecursiveFoo.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/RecursiveFoo.java index e5e6aa4..ad4a1ba 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/RecursiveFoo.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/RecursiveFoo.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.example; - import org.apache.bval.constraints.NotEmpty; import javax.validation.Valid;
http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/SizeTestEntity.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/SizeTestEntity.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/SizeTestEntity.java index 2bfde0f..10c94ca 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/SizeTestEntity.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/SizeTestEntity.java @@ -26,31 +26,31 @@ import java.util.Map; * Description: <br/> */ public class SizeTestEntity { - @Size(max=2) - public Map<String,String> map; - @Size(max=2) + @Size(max = 2) + public Map<String, String> map; + @Size(max = 2) public Collection<String> coll; - @Size(max=2) + @Size(max = 2) public String text; - @Size(max=2) + @Size(max = 2) public Object[] oa; - @Size(max=2) + @Size(max = 2) public byte[] ba; - @Size(max=2) + @Size(max = 2) public int[] it; - @Size(max=2) + @Size(max = 2) public Integer[] oa2; - @Size(max=2) + @Size(max = 2) public boolean[] boa; - @Size(max=2) + @Size(max = 2) public char[] ca; - @Size(max=2) + @Size(max = 2) public double[] da; - @Size(max=2) + @Size(max = 2) public float[] fa; - @Size(max=2) + @Size(max = 2) public long[] la; - @Size(max=2) + @Size(max = 2) public short[] sa; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/ZipCodeCityCarrier.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/ZipCodeCityCarrier.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/ZipCodeCityCarrier.java index a5631c6..f207070 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/ZipCodeCityCarrier.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/ZipCodeCityCarrier.java @@ -23,5 +23,6 @@ package org.apache.bval.jsr.example; */ public interface ZipCodeCityCarrier { String getZipCode(); + String getCity(); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/ExampleMethodService.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/ExampleMethodService.java b/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/ExampleMethodService.java index 9dd1e01..52cdb35 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/ExampleMethodService.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/ExampleMethodService.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.extensions; - import org.apache.bval.constraints.NotEmpty; import javax.validation.Valid; @@ -42,28 +41,28 @@ public class ExampleMethodService { public String concat(@NotNull @NotEmpty String s1, @NotNull String s2) { return s1 + s2; } - - public void save(@Pattern(regexp="[a-f0-9]{4}") String data) { - return; + + public void save(@Pattern(regexp = "[a-f0-9]{4}") String data) { + return; } - + @NotNull - @Size(min=3,max=10) - public String echo(@NotNull @Size(min=3,max=10) String str) { - return str; + @Size(min = 3, max = 10) + public String echo(@NotNull @Size(min = 3, max = 10) String str) { + return str; } - + public void personOp1(@Valid Person p) { return; } - + public void personOp2(@NotNull @Valid Person p) { return; } - + public static class Person { @NotNull String name; } - + } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/MethodValidatorImplTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/MethodValidatorImplTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/MethodValidatorImplTest.java index f581a0a..4740f5b 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/MethodValidatorImplTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/MethodValidatorImplTest.java @@ -103,9 +103,9 @@ public class MethodValidatorImplTest extends TestCase { ExampleMethodService service = new ExampleMethodService(); ExecutableValidator mv = getValidator().unwrap(ExecutableValidator.class); Constructor constructor = service.getClass().getConstructor(String.class, String.class); - String[] params = new String[] {"Hello ", "world" }; - - assertTrue(mv.<ExampleMethodService>validateConstructorParameters(constructor, params).isEmpty()); + String[] params = new String[] { "Hello ", "world" }; + + assertTrue(mv.<ExampleMethodService> validateConstructorParameters(constructor, params).isEmpty()); params[0] = ""; assertEquals(1, mv.validateConstructorParameters(constructor, params).size()); @@ -154,7 +154,8 @@ public class MethodValidatorImplTest extends TestCase { assertTrue("No violations expected", mv.validateParameters(service, personOp1, new Object[] { p }).isEmpty()); // validate with null person - assertTrue("No violations expected", mv.validateParameters(service, personOp1, new Object[] { null }).isEmpty()); + assertTrue("No violations expected", + mv.validateParameters(service, personOp1, new Object[] { null }).isEmpty()); } public void testValidateNotNullValidParam() throws NoSuchMethodException { @@ -164,7 +165,8 @@ public class MethodValidatorImplTest extends TestCase { Method personOp2 = service.getClass().getMethod("personOp2", Person.class); // Validate with null person - assertEquals("Expected 1 violation", 1, mv.validateParameters(service, personOp2, new Object[] { null }).size()); + assertEquals("Expected 1 violation", 1, + mv.validateParameters(service, personOp2, new Object[] { null }).size()); // Validate with invalid person Person p = new ExampleMethodService.Person(); @@ -209,7 +211,6 @@ public class MethodValidatorImplTest extends TestCase { } private Validator getValidator() { - return Validation.byProvider(ApacheValidationProvider.class).configure() - .buildValidatorFactory().getValidator(); + return Validation.byProvider(ApacheValidationProvider.class).configure().buildValidatorFactory().getValidator(); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/BillableUser.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/BillableUser.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/BillableUser.java index 3f96801..da72f78 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/BillableUser.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/BillableUser.java @@ -32,7 +32,7 @@ public class BillableUser { @NotNull(groups = Default.class) private String lastname; - @NotNull(groups = {Billable.class, BuyInOneClick.class}) + @NotNull(groups = { Billable.class, BuyInOneClick.class }) private BillableCreditCard defaultCreditCard; public String getFirstname() { http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence2.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence2.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence2.java index 140cd51..bb9940d 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence2.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence2.java @@ -23,7 +23,7 @@ import javax.validation.GroupSequence; /** * Description: <br/> */ -@GroupSequence( value = CyclicGroupSequence1.class) +@GroupSequence(value = CyclicGroupSequence1.class) public interface CyclicGroupSequence2 { } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/DefaultGroupSequenceTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/DefaultGroupSequenceTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/DefaultGroupSequenceTest.java index 5acdac4..76ade45 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/DefaultGroupSequenceTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/DefaultGroupSequenceTest.java @@ -82,7 +82,6 @@ public class DefaultGroupSequenceTest extends TestCase { chain.assertDefaultGroupSequenceIsExpandable(defaultSequence); } - public void testAssertDefaulGroupSequenceIsExpandableWithDefaultAtBeginningOfSequence() { // create a dummy sequence Group a = new Group(GroupA.class); @@ -104,7 +103,6 @@ public class DefaultGroupSequenceTest extends TestCase { defaultSequence.add(new Group(GroupA.class)); chain.assertDefaultGroupSequenceIsExpandable(defaultSequence); - defaultSequence.clear(); defaultSequence.add(new Group(GroupA.class)); defaultSequence.add(Group.DEFAULT); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass2.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass2.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass2.java index 1724992..5a19023 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass2.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass2.java @@ -23,6 +23,6 @@ import javax.validation.GroupSequence; /** * Description: <br/> */ -@GroupSequence({GClass1.class, GClass2.class}) +@GroupSequence({ GClass1.class, GClass2.class }) public class GClass2 extends GClass1 { } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass3.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass3.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass3.java index fe7b64d..bf25101 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass3.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass3.java @@ -23,6 +23,6 @@ import javax.validation.GroupSequence; /** * Description: <br/> */ -@GroupSequence({GClass3.class, GClass1.class}) +@GroupSequence({ GClass3.class, GClass1.class }) public class GClass3 { } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceIsolationTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceIsolationTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceIsolationTest.java index c6c07c9..89489fb 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceIsolationTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceIsolationTest.java @@ -41,7 +41,7 @@ import org.junit.Test; * @author Carlos Vara */ public class GroupSequenceIsolationTest extends ValidationTestBase { - + /** * When validating the {@link Default} group in a bean whose class doesn't * define a {@link GroupSequence}, all the classes in the hierarchy must be @@ -56,7 +56,7 @@ public class GroupSequenceIsolationTest extends ValidationTestBase { h.a1 = "good"; assertEquals(set("a2", "b2"), violationPaths(validator.validate(h))); - + h.b2 = "good"; assertEquals(set("a2", "b1"), violationPaths(validator.validate(h))); @@ -97,9 +97,9 @@ public class GroupSequenceIsolationTest extends ValidationTestBase { return result; } - @GroupSequence({GroupA1.class, A.class}) + @GroupSequence({ GroupA1.class, A.class }) public static class A { - @NotNull(groups={GroupA1.class}) + @NotNull(groups = { GroupA1.class }) public String a1; @NotNull public String a2; @@ -108,9 +108,9 @@ public class GroupSequenceIsolationTest extends ValidationTestBase { public interface GroupA1 { } - @GroupSequence({B.class, GroupB1.class}) + @GroupSequence({ B.class, GroupB1.class }) public static class B extends A { - @NotNull(groups={GroupB1.class}) + @NotNull(groups = { GroupB1.class }) public String b1; @NotNull public String b2; @@ -123,7 +123,7 @@ public class GroupSequenceIsolationTest extends ValidationTestBase { public static class HolderWithNoGS extends B { } - @GroupSequence({GroupA1.class, HolderWithGS.class, GroupB1.class}) + @GroupSequence({ GroupA1.class, HolderWithGS.class, GroupB1.class }) public static class HolderWithGS extends B { } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceTest.java index b9ea5fe..d5cf4f2 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceTest.java @@ -48,8 +48,7 @@ public class GroupSequenceTest extends ValidationTestBase { @Test public void testGroupSequence1() { MetaBean metaBean = - ApacheValidatorFactory.getDefault().usingContext().getMetaBeanFinder() - .findForClass(GInterface1.class); + ApacheValidatorFactory.getDefault().usingContext().getMetaBeanFinder().findForClass(GInterface1.class); List<Group> gseq = metaBean.getFeature(JsrFeatures.Bean.GROUP_SEQUENCE); assertNotNull(gseq); assertEquals(1, gseq.size()); @@ -59,8 +58,7 @@ public class GroupSequenceTest extends ValidationTestBase { @Test public void testGroupSequence2() { MetaBean metaBean = - ApacheValidatorFactory.getDefault().usingContext().getMetaBeanFinder() - .findForClass(GClass1.class); + ApacheValidatorFactory.getDefault().usingContext().getMetaBeanFinder().findForClass(GClass1.class); List<Group> gseq = metaBean.getFeature(JsrFeatures.Bean.GROUP_SEQUENCE); assertNotNull(gseq); assertEquals(1, gseq.size()); @@ -70,8 +68,7 @@ public class GroupSequenceTest extends ValidationTestBase { @Test public void testGroupSequence3() { MetaBean metaBean = - ApacheValidatorFactory.getDefault().usingContext().getMetaBeanFinder() - .findForClass(GClass2.class); + ApacheValidatorFactory.getDefault().usingContext().getMetaBeanFinder().findForClass(GClass2.class); List<Group> gseq = metaBean.getFeature(JsrFeatures.Bean.GROUP_SEQUENCE); assertNotNull(gseq); assertEquals(2, gseq.size()); @@ -82,8 +79,7 @@ public class GroupSequenceTest extends ValidationTestBase { @Test public void testGroupSequence4() { MetaBean metaBean = - ApacheValidatorFactory.getDefault().usingContext().getMetaBeanFinder() - .findForClass(GClass3.class); + ApacheValidatorFactory.getDefault().usingContext().getMetaBeanFinder().findForClass(GClass3.class); List<Group> gseq = metaBean.getFeature(JsrFeatures.Bean.GROUP_SEQUENCE); assertNotNull(gseq); assertEquals(2, gseq.size()); @@ -101,7 +97,7 @@ public class GroupSequenceTest extends ValidationTestBase { book.setAuthor(author); Set<ConstraintViolation<Book>> constraintViolations = - validator.validate(book, First.class, Second.class, Last.class); + validator.validate(book, First.class, Second.class, Last.class); assertEquals("Wrong number of constraints", 3, constraintViolations.size()); assertNotNull(TestUtils.getViolation(constraintViolations, "title")); assertNotNull(TestUtils.getViolation(constraintViolations, "author.firstName")); @@ -154,8 +150,7 @@ public class GroupSequenceTest extends ValidationTestBase { Book book = new Book(); book.setAuthor(author); - Set<ConstraintViolation<Book>> constraintViolations = - validator.validate(book, Book.All.class); + Set<ConstraintViolation<Book>> constraintViolations = validator.validate(book, Book.All.class); assertEquals(2, constraintViolations.size()); author.setFirstName("Kelvin"); @@ -190,10 +185,10 @@ public class GroupSequenceTest extends ValidationTestBase { assertEquals("Group1 should be evaluated first", "field1", violation.getPropertyPath().toString()); } - @GroupSequence({Dummy.Group1.class, Dummy.class}) + @GroupSequence({ Dummy.Group1.class, Dummy.class }) public static class Dummy { - @NotNull(groups=Group1.class) + @NotNull(groups = Group1.class) public String field1; @NotNull http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java index 3d9de7b..13a49e1 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java @@ -136,7 +136,6 @@ public class GroupsComputerTest extends TestCase { assertEquals(2, chain.groups.size()); } - public void testSequenceResolution() { Set<Class<?>> groups = new HashSet<Class<?>>(); groups.add(Address.Complete.class); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Auditable.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Auditable.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Auditable.java index 609d0e4..5a50893 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Auditable.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Auditable.java @@ -25,9 +25,15 @@ import javax.validation.constraints.NotNull; * Example 3.7. Example of interface / group hosting constraints */ public interface Auditable { - @NotNull String getCreationDate(); + @NotNull + String getCreationDate(); + @NotNull String getLastUpdate(); - @NotNull String getLastModifier(); - @NotNull String getLastReader(); + + @NotNull + String getLastModifier(); + + @NotNull + String getLastReader(); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java index a3981d0..50e79e9 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java @@ -53,7 +53,7 @@ public class Order implements Auditable { } @NotNull - @Size(min=10, max=10) + @Size(min = 10, max = 10) public String getOrderNumber() { return this.orderNumber; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BillableUser.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BillableUser.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BillableUser.java index 4594903..88b14c3 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BillableUser.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BillableUser.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.groups.inheritance; - import org.apache.bval.jsr.groups.Billable; import org.apache.bval.jsr.groups.BillableCreditCard; @@ -35,7 +34,7 @@ public class BillableUser { @NotNull(groups = Default.class) private String lastname; - @NotNull(groups = {Billable.class}) + @NotNull(groups = { Billable.class }) private BillableCreditCard defaultCreditCard; public String getFirstname() { http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BuyInOneClick.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BuyInOneClick.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BuyInOneClick.java index d9a7081..ea9aaf3 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BuyInOneClick.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BuyInOneClick.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.groups.inheritance; - import org.apache.bval.jsr.groups.Billable; import javax.validation.groups.Default; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java index e5589f8..c5cf008 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java @@ -47,8 +47,7 @@ public class GroupInheritanceTest extends TestCase { public void testValidGroupBuyInOneClick() { BillableUser user = new BillableUser(); - Set<ConstraintViolation<BillableUser>> violations = - validator.validate(user, BuyInOneClick.class); + Set<ConstraintViolation<BillableUser>> violations = validator.validate(user, BuyInOneClick.class); assertEquals(3, violations.size()); assertNotNull(TestUtils.getViolation(violations, "firstname")); assertNotNull(TestUtils.getViolation(violations, "lastname")); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java index 09967ec..15943f7 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.groups.redefining; - import org.apache.bval.constraints.ZipCodeCityCoherence; import org.apache.bval.jsr.example.ZipCodeCityCarrier; @@ -32,28 +31,30 @@ import javax.validation.constraints.Size; * this sequence expresses the sequence of groups that does * substitute Default for this class. */ -@GroupSequence({Address.class, Address.HighLevelCoherence.class, Address.ExtraCareful.class }) +@GroupSequence({ Address.class, Address.HighLevelCoherence.class, Address.ExtraCareful.class }) @ZipCodeCityCoherence(groups = Address.HighLevelCoherence.class) public class Address implements ZipCodeCityCarrier { - + /** * check coherence on the overall object * Needs basic checking to be green first */ - public interface HighLevelCoherence {} - + public interface HighLevelCoherence { + } + /** * Extra-careful validation group. */ - public interface ExtraCareful {} + public interface ExtraCareful { + } @NotNull @Size(max = 50, min = 1, groups = ExtraCareful.class) private String street1; - @NotNull + @NotNull private String zipCode; - + @NotNull @Size(max = 30) private String city; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/InvalidRedefinedDefaultGroupAddress.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/InvalidRedefinedDefaultGroupAddress.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/InvalidRedefinedDefaultGroupAddress.java index 8019c25..a4e1306 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/InvalidRedefinedDefaultGroupAddress.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/InvalidRedefinedDefaultGroupAddress.java @@ -21,13 +21,12 @@ package org.apache.bval.jsr.groups.redefining; import javax.validation.GroupSequence; import javax.validation.constraints.NotNull; - /** * If a @GroupSequence redefining the Default group for a class A does not * contain the group A, a GroupDefinitionException is raised when the class is * validated or when its metadata is requested. */ -@GroupSequence({Address.class, Address.HighLevelCoherence.class}) +@GroupSequence({ Address.class, Address.HighLevelCoherence.class }) public class InvalidRedefinedDefaultGroupAddress { @NotNull(groups = Address.HighLevelCoherence.class) private String street; @@ -39,6 +38,7 @@ public class InvalidRedefinedDefaultGroupAddress { * check coherence on the overall object * Needs basic checking to be green first */ - public interface HighLevelCoherence {} + public interface HighLevelCoherence { + } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java index 4a37368..371ae89 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java @@ -69,9 +69,7 @@ public class RedefiningDefaultGroupTest extends ValidationTestBase { * the group sequence defined on the Address class is used. */ violations = validator.validate(address); - assertEquals( - "redefined default group for Address must also validate HighLevelCoherence", - 1, violations.size()); + assertEquals("redefined default group for Address must also validate HighLevelCoherence", 1, violations.size()); } @Test http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/util/TestUtils.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/util/TestUtils.java b/bval-jsr/src/test/java/org/apache/bval/jsr/util/TestUtils.java index 8f17678..a121b54 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/util/TestUtils.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/util/TestUtils.java @@ -103,7 +103,8 @@ public class TestUtils { * @param constraintFinder * @param types */ - public static void assertConstraintTypesFound(ConstraintFinder constraintFinder, Class<? extends Annotation>... types) { + public static void assertConstraintTypesFound(ConstraintFinder constraintFinder, + Class<? extends Annotation>... types) { outer: for (Class<? extends Annotation> type : types) { for (ConstraintDescriptor<?> descriptor : constraintFinder.getConstraintDescriptors()) { if (descriptor.getAnnotation().annotationType().equals(type)) { http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/xml/ValidationParserTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/xml/ValidationParserTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/xml/ValidationParserTest.java index e51ea8c..827abae 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/xml/ValidationParserTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/xml/ValidationParserTest.java @@ -62,7 +62,8 @@ public class ValidationParserTest implements ApacheValidatorConfiguration.Proper assertNotNull(ValidationParser.getInputStream("sample-validation.xml")); // make sure there are duplicate resources on the classpath before the next checks: - final Enumeration<URL> resources = Reflection.getClassLoader(ValidationParser.class).getResources("META-INF/MANIFEST.MF"); + final Enumeration<URL> resources = + Reflection.getClassLoader(ValidationParser.class).getResources("META-INF/MANIFEST.MF"); assumeTrue(resources.hasMoreElements()); resources.nextElement(); @@ -92,8 +93,7 @@ public class ValidationParserTest implements ApacheValidatorConfiguration.Proper } private ValidatorFactory getFactory() { - ApacheValidatorConfiguration config = - Validation.byProvider(ApacheValidationProvider.class).configure(); + ApacheValidatorConfiguration config = Validation.byProvider(ApacheValidationProvider.class).configure(); config.addProperty(VALIDATION_XML_PATH, "sample-validation.xml"); return config.buildValidatorFactory(); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-tck11/src/main/java/org/apache/bval/arquillian/EJBEnricher.java ---------------------------------------------------------------------- diff --git a/bval-tck11/src/main/java/org/apache/bval/arquillian/EJBEnricher.java b/bval-tck11/src/main/java/org/apache/bval/arquillian/EJBEnricher.java index 1a2eee4..36c738d 100644 --- a/bval-tck11/src/main/java/org/apache/bval/arquillian/EJBEnricher.java +++ b/bval-tck11/src/main/java/org/apache/bval/arquillian/EJBEnricher.java @@ -36,7 +36,8 @@ public class EJBEnricher implements TestEnricher { for (final Field f : field.getType().getDeclaredFields()) { if (f.getAnnotation(Resource.class) != null) { if (f.getType().equals(Validator.class)) { - f.set(instance, Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator()); + f.set(instance, + Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator()); } else if (f.getType().equals(ValidatorFactory.class)) { f.set(instance, Validation.byDefaultProvider().configure().buildValidatorFactory()); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-tck11/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java ---------------------------------------------------------------------- diff --git a/bval-tck11/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java b/bval-tck11/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java index 10727ee..3b3d71c 100644 --- a/bval-tck11/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java +++ b/bval-tck11/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java @@ -31,18 +31,19 @@ import java.util.Hashtable; public class BValJndiFactory implements InitialContextFactory { public Context getInitialContext(final Hashtable<?, ?> environment) throws NamingException { return Context.class.cast(Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), - new Class<?>[] { Context.class }, new InvocationHandler() { - public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { - if (method.getName().equals("lookup") && args != null && args.length == 1 && String.class.isInstance(args[0])) { - if ("java:comp/ValidatorFactory".equals(args[0])) { - return Validation.byDefaultProvider().configure().buildValidatorFactory(); - } - if ("java:comp/Validator".equals(args[0])) { - return Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator(); + new Class<?>[] { Context.class }, new InvocationHandler() { + public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { + if (method.getName().equals("lookup") && args != null && args.length == 1 + && String.class.isInstance(args[0])) { + if ("java:comp/ValidatorFactory".equals(args[0])) { + return Validation.byDefaultProvider().configure().buildValidatorFactory(); + } + if ("java:comp/Validator".equals(args[0])) { + return Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator(); + } } + return null; } - return null; - } - })); + })); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/routines/EMailValidation.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/routines/EMailValidation.java b/bval-xstream/src/main/java/org/apache/bval/routines/EMailValidation.java index 61d7aaa..925b9c2 100644 --- a/bval-xstream/src/main/java/org/apache/bval/routines/EMailValidation.java +++ b/bval-xstream/src/main/java/org/apache/bval/routines/EMailValidation.java @@ -16,7 +16,6 @@ */ package org.apache.bval.routines; - import org.apache.bval.model.Validation; import org.apache.bval.model.ValidationContext; import org.apache.bval.model.ValidationListener; @@ -32,7 +31,8 @@ public class EMailValidation implements Validation { @Override public <T extends ValidationListener> void validate(ValidationContext<T> context) { - if (context.getPropertyValue() == null) return; + if (context.getPropertyValue() == null) + return; if (!EMailValidationUtils.isValid(context.getPropertyValue(), getPattern())) { context.getListener().addError(Reasons.EMAIL_ADDRESS, context); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java b/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java index 504c5a1..5d8b84a 100644 --- a/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java +++ b/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java @@ -61,8 +61,10 @@ public class StandardValidation implements Validation { protected <T extends ValidationListener> void validateTimeLag(ValidationContext<T> context) { String lag = (String) context.getMetaProperty().getFeature(TIME_LAG); - if (lag == null) return; - if (context.getPropertyValue() == null) return; + if (lag == null) + return; + if (context.getPropertyValue() == null) + return; long date = ((Date) context.getPropertyValue()).getTime(); long now = System.currentTimeMillis(); if (XMLMetaValue.TIMELAG_Future.equals(lag)) { @@ -83,8 +85,10 @@ public class StandardValidation implements Validation { protected <T extends ValidationListener> void validateRegExp(ValidationContext<T> context) { final MetaProperty meta = context.getMetaProperty(); final String regExp = (String) meta.getFeature(REG_EXP); - if (regExp == null) return; - if (context.getPropertyValue() == null) return; + if (regExp == null) + return; + if (context.getPropertyValue() == null) + return; final String value = String.valueOf(context.getPropertyValue()); try { @@ -97,15 +101,15 @@ public class StandardValidation implements Validation { context.getListener().addError(REG_EXP, context); } } catch (PatternSyntaxException e) { - throw new IllegalArgumentException( - "regular expression malformed. regexp " + regExp + " at " + context, e); + throw new IllegalArgumentException("regular expression malformed. regexp " + regExp + " at " + context, e); } } protected <T extends ValidationListener> void validateMinValue(ValidationContext<T> context) { @SuppressWarnings("unchecked") Comparable<Object> minValue = (Comparable<Object>) context.getMetaProperty().getFeature(MIN_VALUE); - if (minValue == null || context.getPropertyValue() == null) return; + if (minValue == null || context.getPropertyValue() == null) + return; if (compare(context, minValue, context.getPropertyValue()) > 0) { context.getListener().addError(MIN_VALUE, context); } @@ -114,14 +118,15 @@ public class StandardValidation implements Validation { protected <T extends ValidationListener> void validateMaxValue(ValidationContext<T> context) { @SuppressWarnings("unchecked") Comparable<Object> maxValue = (Comparable<Object>) context.getMetaProperty().getFeature(MAX_VALUE); - if (maxValue == null || context.getPropertyValue() == null) return; + if (maxValue == null || context.getPropertyValue() == null) + return; if (compare(context, maxValue, context.getPropertyValue()) < 0) { context.getListener().addError(MAX_VALUE, context); } } private <T extends ValidationListener> int compare(ValidationContext<T> context, Comparable<Object> constraintValue, - Object currentValue) { + Object currentValue) { int r; if (constraintValue.getClass().isAssignableFrom(currentValue.getClass())) { r = constraintValue.compareTo(context.getPropertyValue()); @@ -136,10 +141,11 @@ public class StandardValidation implements Validation { } protected <T extends ValidationListener> void validateMaxLength(ValidationContext<T> context) { - Integer maxLength = (Integer) context.getMetaProperty() - .getFeature(Features.Property.MAX_LENGTH); - if (maxLength == null) return; - if (context.getPropertyValue() == null) return; + Integer maxLength = (Integer) context.getMetaProperty().getFeature(Features.Property.MAX_LENGTH); + if (maxLength == null) + return; + if (context.getPropertyValue() == null) + return; final Object value = context.getPropertyValue(); int length = 0; @@ -154,10 +160,11 @@ public class StandardValidation implements Validation { } protected <T extends ValidationListener> void validateMinLength(ValidationContext<T> context) { - Integer maxLength = (Integer) context.getMetaProperty() - .getFeature(Features.Property.MIN_LENGTH); - if (maxLength == null) return; - if (context.getPropertyValue() == null) return; + Integer maxLength = (Integer) context.getMetaProperty().getFeature(Features.Property.MIN_LENGTH); + if (maxLength == null) + return; + if (context.getPropertyValue() == null) + return; final Object value = context.getPropertyValue(); int length = 0; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/MetaBeanEnricher.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/MetaBeanEnricher.java b/bval-xstream/src/main/java/org/apache/bval/xml/MetaBeanEnricher.java index e7438b3..5246b42 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/MetaBeanEnricher.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/MetaBeanEnricher.java @@ -16,7 +16,6 @@ */ package org.apache.bval.xml; - import org.apache.bval.model.MetaBean; import java.util.Map; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLFeaturesCapable.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLFeaturesCapable.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLFeaturesCapable.java index 3b6325a..d06f6d5 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLFeaturesCapable.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLFeaturesCapable.java @@ -45,7 +45,8 @@ public class XMLFeaturesCapable implements Serializable { public void putFeature(String key, Object value) { XMLMetaFeature anno = findFeature(key); - if (features == null) features = new ArrayList<XMLMetaFeature>(); + if (features == null) + features = new ArrayList<XMLMetaFeature>(); if (anno == null) { features.add(new XMLMetaFeature(key, value)); } else { @@ -66,9 +67,11 @@ public class XMLFeaturesCapable implements Serializable { } private XMLMetaFeature findFeature(String key) { - if (features == null) return null; + if (features == null) + return null; for (XMLMetaFeature anno : features) { - if (key.equals(anno.getKey())) return anno; + if (key.equals(anno.getKey())) + return anno; } return null; } @@ -82,7 +85,8 @@ public class XMLFeaturesCapable implements Serializable { } public void addValidator(String validatorId) { - if (validators == null) validators = new ArrayList<XMLMetaValidatorReference>(); + if (validators == null) + validators = new ArrayList<XMLMetaValidatorReference>(); validators.add(new XMLMetaValidatorReference(validatorId)); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMapper.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMapper.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMapper.java index 72284b7..69562b8 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMapper.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMapper.java @@ -28,10 +28,9 @@ public class XMLMapper { private XMLMapper() { xStream = new XStream(); - xStream.processAnnotations(new Class[] {XMLFeaturesCapable.class, - XMLMetaFeature.class, XMLMetaBean.class, XMLMetaBeanInfos.class, - XMLMetaBeanReference.class, XMLMetaElement.class, XMLMetaProperty.class, - XMLMetaValidator.class, XMLMetaValidatorReference.class}); + xStream.processAnnotations(new Class[] { XMLFeaturesCapable.class, XMLMetaFeature.class, XMLMetaBean.class, + XMLMetaBeanInfos.class, XMLMetaBeanReference.class, XMLMetaElement.class, XMLMetaProperty.class, + XMLMetaValidator.class, XMLMetaValidatorReference.class }); xStream.setMode(XStream.NO_REFERENCES); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBean.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBean.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBean.java index 9f516df..4aab9ab 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBean.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBean.java @@ -75,7 +75,8 @@ public class XMLMetaBean extends XMLFeaturesCapable { } public void addProperty(XMLMetaProperty property) { - if (properties == null) properties = new ArrayList<XMLMetaProperty>(); + if (properties == null) + properties = new ArrayList<XMLMetaProperty>(); properties.add(property); } @@ -102,9 +103,11 @@ public class XMLMetaBean extends XMLFeaturesCapable { } private XMLMetaProperty findProperty(String name) { - if (properties == null) return null; + if (properties == null) + return null; for (XMLMetaProperty prop : properties) { - if (name.equals(prop.getName())) return prop; + if (name.equals(prop.getName())) + return prop; } return null; } @@ -117,9 +120,9 @@ public class XMLMetaBean extends XMLFeaturesCapable { this.beanRelations = beanRelations; } - public void addBeanRef(XMLMetaBeanReference beanRelation) { - if (beanRelations == null) beanRelations = new ArrayList<XMLMetaBeanReference>(); + if (beanRelations == null) + beanRelations = new ArrayList<XMLMetaBeanReference>(); beanRelations.add(beanRelation); } @@ -146,9 +149,11 @@ public class XMLMetaBean extends XMLFeaturesCapable { } private XMLMetaBeanReference findBeanRef(String name) { - if (beanRelations == null) return null; + if (beanRelations == null) + return null; for (XMLMetaBeanReference relation : beanRelations) { - if (name.equals(relation.getName())) return relation; + if (name.equals(relation.getName())) + return relation; } return null; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java index 1439c34..27407d9 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java @@ -42,7 +42,7 @@ public class XMLMetaBeanFactory implements MetaBeanFactory { // use LinkedHashMap to keep sequence of loaders private final Map<XMLMetaBeanLoader, XMLMetaBeanInfos> resources = - new LinkedHashMap<XMLMetaBeanLoader, XMLMetaBeanInfos>(); + new LinkedHashMap<XMLMetaBeanLoader, XMLMetaBeanInfos>(); private StandardValidation standardValidation = StandardValidation.getInstance(); @@ -72,11 +72,11 @@ public class XMLMetaBeanFactory implements MetaBeanFactory { @Override public void buildMetaBean(final MetaBean metaBean) throws Exception { - if(metaBean.getId() == null) return; - visitXMLBeanMeta(metaBean.getId(), new Visitor() { + if (metaBean.getId() == null) + return; + visitXMLBeanMeta(metaBean.getId(), new Visitor() { @Override - public void visit(XMLMetaBean xmlMeta, XMLMetaBeanInfos xmlInfos) - throws Exception { + public void visit(XMLMetaBean xmlMeta, XMLMetaBeanInfos xmlInfos) throws Exception { enrichMetaBean(metaBean, new XMLResult(xmlMeta, xmlInfos)); } @@ -112,7 +112,7 @@ public class XMLMetaBeanFactory implements MetaBeanFactory { if (result.xmlMeta.getName() != null) { meta.setName(result.xmlMeta.getName()); } -/* if (meta.getBeanClass() == null && result.xmlMeta.getImpl() != null) { + /* if (meta.getBeanClass() == null && result.xmlMeta.getImpl() != null) { meta.setBeanClass(findLocalClass(result.xmlMeta.getImpl())); }*/ result.xmlMeta.mergeFeaturesInto(meta); @@ -130,51 +130,44 @@ public class XMLMetaBeanFactory implements MetaBeanFactory { } @SuppressWarnings("deprecation") - protected void enrichValidations(FeaturesCapable prop, XMLFeaturesCapable xmlProp, - XMLResult result, boolean addStandard) - throws Exception { + protected void enrichValidations(FeaturesCapable prop, XMLFeaturesCapable xmlProp, XMLResult result, + boolean addStandard) throws Exception { if (xmlProp.getValidators() != null) { // obsolete code? remove from here ---> String[] func = prop.getFeature(JAVASCRIPT_VALIDATION_FUNCTIONS); - List<String> jsValidators = new ArrayList<String>( - xmlProp.getValidators().size() + (func == null ? 0 : func.length)); + List<String> jsValidators = + new ArrayList<String>(xmlProp.getValidators().size() + (func == null ? 0 : func.length)); if (func != null && func.length > 0) { jsValidators.addAll(Arrays.asList(func)); - } // <--- to here + } // <--- to here boolean useStandard = prop instanceof MetaProperty; for (XMLMetaValidatorReference valRef : xmlProp.getValidators()) { - if (standardValidation != null && - valRef.getRefId().equals(standardValidation.getValidationId())) { + if (standardValidation != null && valRef.getRefId().equals(standardValidation.getValidationId())) { useStandard = false; } - XMLMetaValidator validator = - result.xmlInfos.getValidator(valRef.getRefId()); + XMLMetaValidator validator = result.xmlInfos.getValidator(valRef.getRefId()); if (validator != null) { if (validator.getValidation() != null) { prop.addValidation(validator.getValidation()); } - if (validator.getJsFunction() != null && - !jsValidators.contains(validator.getJsFunction())) { + if (validator.getJsFunction() != null && !jsValidators.contains(validator.getJsFunction())) { jsValidators.add(validator.getJsFunction()); } } } if (!jsValidators.isEmpty()) { - prop.putFeature(JAVASCRIPT_VALIDATION_FUNCTIONS, - jsValidators.toArray(new String[jsValidators.size()])); + prop.putFeature(JAVASCRIPT_VALIDATION_FUNCTIONS, jsValidators.toArray(new String[jsValidators.size()])); } if (useStandard && standardValidation != null) { if (!prop.hasValidation(standardValidation)) prop.addValidation(standardValidation); } - } else if (addStandard && standardValidation != null && - !prop.hasValidation(standardValidation)) { + } else if (addStandard && standardValidation != null && !prop.hasValidation(standardValidation)) { prop.addValidation(standardValidation); } } - protected MetaProperty enrichElement(MetaBean meta, XMLMetaElement xmlProp, - XMLResult result) throws Exception { + protected MetaProperty enrichElement(MetaBean meta, XMLMetaElement xmlProp, XMLResult result) throws Exception { MetaProperty prop = meta.getProperty(xmlProp.getName()); if (prop == null) { prop = new MetaProperty(); @@ -186,10 +179,8 @@ public class XMLMetaBeanFactory implements MetaBeanFactory { return prop; } - public void visitXMLBeanMeta(String beanId, Visitor visitor) throws Exception { - for (Map.Entry<XMLMetaBeanLoader, XMLMetaBeanInfos> entry : resources - .entrySet()) { + for (Map.Entry<XMLMetaBeanLoader, XMLMetaBeanInfos> entry : resources.entrySet()) { if (entry.getValue() == null) { // load when not already loaded try { @@ -217,8 +208,7 @@ public class XMLMetaBeanFactory implements MetaBeanFactory { * @return null or the bean found from the first loader that has it. */ protected XMLResult findXMLBeanMeta(String beanId) { - for (Map.Entry<XMLMetaBeanLoader, XMLMetaBeanInfos> entry : resources - .entrySet()) { + for (Map.Entry<XMLMetaBeanLoader, XMLMetaBeanInfos> entry : resources.entrySet()) { if (entry.getValue() == null) { // load when not already loaded try { http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanInfos.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanInfos.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanInfos.java index ac8ed2f..7bbeac6 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanInfos.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanInfos.java @@ -89,8 +89,10 @@ public class XMLMetaBeanInfos { } public XMLMetaBean getBean(String id) { - if (beans == null) return null; - if (beanLookup == null) initBeanLookup(); + if (beans == null) + return null; + if (beanLookup == null) + initBeanLookup(); return beanLookup.get(id); } @@ -106,8 +108,7 @@ public class XMLMetaBeanInfos { final HashMap<String, XMLMetaValidator> map = new HashMap<String, XMLMetaValidator>(validators.size()); for (XMLMetaValidator xv : validators) { if (xv.getJava() != null) { - Validation validation = - (Validation) Reflection.toClass(xv.getJava()).newInstance(); + Validation validation = (Validation) Reflection.toClass(xv.getJava()).newInstance(); xv.setValidation(validation); map.put(xv.getId(), xv); } @@ -116,18 +117,22 @@ public class XMLMetaBeanInfos { } public void addBean(XMLMetaBean bean) { - if (beans == null) beans = new ArrayList<XMLMetaBean>(); + if (beans == null) + beans = new ArrayList<XMLMetaBean>(); beans.add(bean); } public XMLMetaValidator getValidator(String id) throws Exception { - if (validators == null) return null; - if (validationLookup == null) initValidationLookup(); + if (validators == null) + return null; + if (validationLookup == null) + initValidationLookup(); return validationLookup.get(id); } public void addValidator(XMLMetaValidator validator) { - if (validators == null) validators = new ArrayList<XMLMetaValidator>(); + if (validators == null) + validators = new ArrayList<XMLMetaValidator>(); validators.add(validator); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanManagerFactory.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanManagerFactory.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanManagerFactory.java index c7910e8..2fea938 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanManagerFactory.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanManagerFactory.java @@ -26,15 +26,15 @@ import org.apache.bval.MetaBeanFinder; */ public class XMLMetaBeanManagerFactory { private static XMLMetaBeanManager manager = new XMLMetaBeanManager(); - /** - * global meta bean finder. - * @return - */ + + /** + * global meta bean finder. + * @return + */ public static MetaBeanFinder getFinder() { return manager; } - /** * set global meta bean manager, that is responsible * for finding, caching, xml registry and enrichment algorithm. http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanReference.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanReference.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanReference.java index b26fade..9bc1153 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanReference.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanReference.java @@ -50,7 +50,7 @@ public class XMLMetaBeanReference extends XMLMetaElement { @Override public void mergeInto(MetaProperty prop) throws ClassNotFoundException { - super.mergeInto(prop); // call super! + super.mergeInto(prop); // call super! if (getBeanId() != null) { prop.putFeature(Features.Property.REF_BEAN_ID, getBeanId()); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanURLLoader.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanURLLoader.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanURLLoader.java index b06418c..d26d0ef 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanURLLoader.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanURLLoader.java @@ -27,7 +27,8 @@ public class XMLMetaBeanURLLoader implements XMLMetaBeanLoader { private final URL url; public XMLMetaBeanURLLoader(URL url) { - if (url == null) throw new NullPointerException("URL required"); + if (url == null) + throw new NullPointerException("URL required"); this.url = url; } @@ -35,8 +36,7 @@ public class XMLMetaBeanURLLoader implements XMLMetaBeanLoader { public XMLMetaBeanInfos load() throws IOException { InputStream stream = url.openStream(); try { - XMLMetaBeanInfos beanInfos = (XMLMetaBeanInfos) XMLMapper.getInstance() - .getXStream().fromXML(stream); + XMLMetaBeanInfos beanInfos = (XMLMetaBeanInfos) XMLMapper.getInstance().getXStream().fromXML(stream); beanInfos.setId(url.toExternalForm()); return beanInfos; } finally { http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaFeature.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaFeature.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaFeature.java index a500003..79776b7 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaFeature.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaFeature.java @@ -50,7 +50,6 @@ public class XMLMetaFeature implements Serializable { this.key = key; } - public Object getValue() { return value; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaProperty.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaProperty.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaProperty.java index 2f49deb..4b22f37 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaProperty.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaProperty.java @@ -53,7 +53,6 @@ public class XMLMetaProperty extends XMLMetaElement { @XStreamAsAttribute() private String timeLag; - public Integer getMaxValue() { return maxValue; } @@ -88,7 +87,7 @@ public class XMLMetaProperty extends XMLMetaElement { @Override public void mergeInto(MetaProperty prop) throws ClassNotFoundException { - super.mergeInto(prop); // call super! + super.mergeInto(prop); // call super! if (getMaxValue() != null) { prop.putFeature(MAX_VALUE, getMaxValue()); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaValidator.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaValidator.java b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaValidator.java index 399d8a4..9bb7f95 100644 --- a/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaValidator.java +++ b/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaValidator.java @@ -35,7 +35,7 @@ public class XMLMetaValidator implements Serializable { @XStreamAsAttribute private String id; @XStreamAsAttribute - private String java; // implementation of Validation + private String java; // implementation of Validation @XStreamAsAttribute private String jsFunction; // name of java script function http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/test/java/org/apache/bval/example/BusinessEnum.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/test/java/org/apache/bval/example/BusinessEnum.java b/bval-xstream/src/test/java/org/apache/bval/example/BusinessEnum.java index 035771d..1d793f6 100644 --- a/bval-xstream/src/test/java/org/apache/bval/example/BusinessEnum.java +++ b/bval-xstream/src/test/java/org/apache/bval/example/BusinessEnum.java @@ -20,5 +20,5 @@ package org.apache.bval.example; * Description: <br/> */ public enum BusinessEnum { - VALUE1, VALUE2, VALUE3 + VALUE1, VALUE2, VALUE3 } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/test/java/org/apache/bval/example/BusinessObjectBeanInfo.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/test/java/org/apache/bval/example/BusinessObjectBeanInfo.java b/bval-xstream/src/test/java/org/apache/bval/example/BusinessObjectBeanInfo.java index 61b06e5..2d6fb78 100644 --- a/bval-xstream/src/test/java/org/apache/bval/example/BusinessObjectBeanInfo.java +++ b/bval-xstream/src/test/java/org/apache/bval/example/BusinessObjectBeanInfo.java @@ -33,16 +33,16 @@ public class BusinessObjectBeanInfo extends SimpleBeanInfo { public BeanInfo[] getAdditionalBeanInfo() { ExplicitBeanInfo bi = new ExplicitBeanInfo(); bi.setPropertyDescriptors(_getPropertyDescriptors()); - return new BeanInfo[]{bi}; + return new BeanInfo[] { bi }; } public PropertyDescriptor[] _getPropertyDescriptors() { try { - PropertyDescriptor numericValue = new PropertyDescriptor("numericValue", - targetClass, "getNumericValue", "setNumericValue"); + PropertyDescriptor numericValue = + new PropertyDescriptor("numericValue", targetClass, "getNumericValue", "setNumericValue"); numericValue.setValue(Features.Property.MAX_VALUE, new Integer(100)); numericValue.setValue(Features.Property.MIN_VALUE, new Integer(-100)); - return new PropertyDescriptor[]{numericValue}; + return new PropertyDescriptor[] { numericValue }; } catch (IntrospectionException ex) { ex.printStackTrace(); return null; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/test/java/org/apache/bval/routines/StandardValidationTest.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/test/java/org/apache/bval/routines/StandardValidationTest.java b/bval-xstream/src/test/java/org/apache/bval/routines/StandardValidationTest.java index 5628c46..862d39b 100644 --- a/bval-xstream/src/test/java/org/apache/bval/routines/StandardValidationTest.java +++ b/bval-xstream/src/test/java/org/apache/bval/routines/StandardValidationTest.java @@ -155,11 +155,11 @@ public class StandardValidationTest implements ValidationListener { metaProperty.setName("dateValue"); Date dt = new Date(); metaProperty.putFeature(Features.Property.MIN_VALUE, dt); - dateValue = new Timestamp(dt.getTime()+1000); + dateValue = new Timestamp(dt.getTime() + 1000); validation.validateMinValue(context); assertTrue(reasons.isEmpty()); context.unknownValue(); - dateValue = new Timestamp(dt.getTime()-1000); + dateValue = new Timestamp(dt.getTime() - 1000); validation.validateMinValue(context); assertTrue(reasons.contains(Property.MIN_VALUE)); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/test/java/org/apache/bval/xml/BeanValidatorTest.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/test/java/org/apache/bval/xml/BeanValidatorTest.java b/bval-xstream/src/test/java/org/apache/bval/xml/BeanValidatorTest.java index b9de094..e7ea584 100644 --- a/bval-xstream/src/test/java/org/apache/bval/xml/BeanValidatorTest.java +++ b/bval-xstream/src/test/java/org/apache/bval/xml/BeanValidatorTest.java @@ -40,25 +40,22 @@ public class BeanValidatorTest { @Test public void testValidateMapAsBean() { - XMLMetaBeanManagerFactory.getRegistry().addLoader(new XMLMetaBeanURLLoader( - BusinessObject.class.getResource("test-beanInfos.xml"))); + XMLMetaBeanManagerFactory.getRegistry() + .addLoader(new XMLMetaBeanURLLoader(BusinessObject.class.getResource("test-beanInfos.xml"))); - MetaBean mb = XMLMetaBeanManagerFactory.getFinder() - .findForId("org.apache.bval.example.Address"); + MetaBean mb = XMLMetaBeanManagerFactory.getFinder().findForId("org.apache.bval.example.Address"); // 1. validate a bean BusinessObjectAddress adr = new BusinessObjectAddress(); BeanValidator<ValidationResults> validator = new BeanValidator<ValidationResults>(); ValidationResults results = validator.validate(adr, mb); - assertEquals(2, - results.getErrorsByReason().get(Features.Property.MANDATORY).size()); + assertEquals(2, results.getErrorsByReason().get(Features.Property.MANDATORY).size()); // 2. validate a map with the same metabean validator.setTreatMapsLikeBeans(true); results = validator.validate(new HashMap<String, Object>(), mb); assertFalse(results.isEmpty()); - assertEquals(2, - results.getErrorsByReason().get(Features.Property.MANDATORY).size()); + assertEquals(2, results.getErrorsByReason().get(Features.Property.MANDATORY).size()); // 3. validate as empty map (jsr303 behavior) validator.setTreatMapsLikeBeans(false); @@ -69,8 +66,8 @@ public class BeanValidatorTest { @Test public void testValidate() { MetaBeanFinder finder = XMLMetaBeanManagerFactory.getFinder(); - XMLMetaBeanManagerFactory.getRegistry().addLoader(new XMLMetaBeanURLLoader( - BusinessObject.class.getResource("test-beanInfos.xml"))); + XMLMetaBeanManagerFactory.getRegistry() + .addLoader(new XMLMetaBeanURLLoader(BusinessObject.class.getResource("test-beanInfos.xml"))); MetaBean info = finder.findForClass(BusinessObject.class); BusinessObject object = new BusinessObject(); object.setAddress(new BusinessObjectAddress()); @@ -81,9 +78,7 @@ public class BeanValidatorTest { assertTrue(results.hasError(object, null)); assertTrue(results.hasError(object.getAddress(), null)); - assertTrue( - validator.validateProperty(object, info.getProperty("firstName")).hasError( - object, "firstName")); + assertTrue(validator.validateProperty(object, info.getProperty("firstName")).hasError(object, "firstName")); object.setUserId(1L); object.setFirstName("Hans"); @@ -104,8 +99,7 @@ public class BeanValidatorTest { // 4th address is too much! object.getAddresses().add(object.getAddress()); - assertFalse( - validator.validate(object, info).isEmpty()); // cardinality error found + assertFalse(validator.validate(object, info).isEmpty()); // cardinality error found } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanInfosTest.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanInfosTest.java b/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanInfosTest.java index 95ed7e3..d6e96f8 100644 --- a/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanInfosTest.java +++ b/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanInfosTest.java @@ -125,25 +125,19 @@ public class XMLMetaBeanInfosTest { infos.getBeans().add(bean2); String xml = XMLMapper.getInstance().getXStream().toXML(infos); - XMLMetaBeanInfos infos2 = - (XMLMetaBeanInfos) XMLMapper.getInstance().getXStream().fromXML(xml); + XMLMetaBeanInfos infos2 = (XMLMetaBeanInfos) XMLMapper.getInstance().getXStream().fromXML(xml); assertEquals(2, infos2.getBeans().size()); } @Test public void testMaxValueParsing() { - String xml = "\n" + - "<beanInfos> <bean id=\"org.apache.bval.test.model.Profile\">\n" + - " <property name=\"activationDay\" minValue=\"1\" maxValue=\"31\"/>\n" + - " <property name=\"activationMonth\" minValue=\"1\" maxValue=\"12\"/>\n" + - " </bean></beanInfos>"; - XMLMetaBeanInfos beanInfos = (XMLMetaBeanInfos) XMLMapper.getInstance() - .getXStream().fromXML(xml); + String xml = "\n" + "<beanInfos> <bean id=\"org.apache.bval.test.model.Profile\">\n" + + " <property name=\"activationDay\" minValue=\"1\" maxValue=\"31\"/>\n" + + " <property name=\"activationMonth\" minValue=\"1\" maxValue=\"12\"/>\n" + " </bean></beanInfos>"; + XMLMetaBeanInfos beanInfos = (XMLMetaBeanInfos) XMLMapper.getInstance().getXStream().fromXML(xml); assertNotNull(beanInfos); - assertEquals(Integer.valueOf(31), - beanInfos.getBeans().get(0).getProperty("activationDay").getMaxValue()); - assertEquals(Integer.valueOf(1), - beanInfos.getBeans().get(0).getProperty("activationDay").getMinValue()); + assertEquals(Integer.valueOf(31), beanInfos.getBeans().get(0).getProperty("activationDay").getMaxValue()); + assertEquals(Integer.valueOf(1), beanInfos.getBeans().get(0).getProperty("activationDay").getMinValue()); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanManagerTest.java ---------------------------------------------------------------------- diff --git a/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanManagerTest.java b/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanManagerTest.java index 25064a4..e200d41 100644 --- a/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanManagerTest.java +++ b/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanManagerTest.java @@ -46,9 +46,8 @@ public class XMLMetaBeanManagerTest { @Test public void testEnrichCopies() throws Exception { - Map<String, MetaBean> copies = - mbm.enrichCopies(new XMLMetaBeanURLLoader(BusinessObject.class.getResource("test-beanInfos-custom.xml")) - .load()); + Map<String, MetaBean> copies = mbm.enrichCopies( + new XMLMetaBeanURLLoader(BusinessObject.class.getResource("test-beanInfos-custom.xml")).load()); assertNotNull(copies); MetaBean mb = copies.get(BusinessObject.class.getName()); assertFalse(mb.getProperty("lastName").isMandatory());
