From eb9c6a7d0cbeaf3f0598bcd4de0d6cd651f5c963 Mon Sep 17 00:00:00 2001 From: ilikly Date: Thu, 16 Mar 2023 16:35:48 +0800 Subject: [PATCH 01/13] HV-1942 Update DefaultGroupSequenceProvider add default method provide the class of instance --- .../metadata/aggregated/BeanMetaDataImpl.java | 4 ++-- .../spi/group/DefaultGroupSequenceProvider.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/BeanMetaDataImpl.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/BeanMetaDataImpl.java index 34adb58879..db7a0eda4e 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/BeanMetaDataImpl.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/BeanMetaDataImpl.java @@ -325,7 +325,7 @@ public Optional getMetaDataFor(Executable executable) { @Override public List> getDefaultGroupSequence(T beanState) { if ( hasDefaultGroupSequenceProvider() ) { - List> providerDefaultGroupSequence = defaultGroupSequenceProvider.getValidationGroups( beanState ); + List> providerDefaultGroupSequence = defaultGroupSequenceProvider.getValidationGroups( beanClass, beanState ); return getValidDefaultGroupSequence( beanClass, providerDefaultGroupSequence ); } @@ -335,7 +335,7 @@ public List> getDefaultGroupSequence(T beanState) { @Override public Iterator getDefaultValidationSequence(T beanState) { if ( hasDefaultGroupSequenceProvider() ) { - List> providerDefaultGroupSequence = defaultGroupSequenceProvider.getValidationGroups( beanState ); + List> providerDefaultGroupSequence = defaultGroupSequenceProvider.getValidationGroups( beanClass, beanState ); return validationOrderGenerator.getDefaultValidationOrder( beanClass, getValidDefaultGroupSequence( beanClass, providerDefaultGroupSequence ) diff --git a/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java b/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java index 8ad97d9ca6..59f4af9b96 100644 --- a/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java +++ b/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java @@ -39,6 +39,22 @@ public interface DefaultGroupSequenceProvider { * The object parameter allows to dynamically compose the default group sequence in function of the validated value state. *

* + * @param clazz the instance class being validated. + * @param object the instance being validated. This value can be {@code null} in case this method was called as part of + * {@linkplain jakarta.validation.Validator#validateValue(Class, String, Object, Class[]) Validator#validateValue}. + * + * @return a list of classes specifying the default group sequence. The same constraints to the redefined group list + * apply as for lists defined via {@code GroupSequence}. In particular the list has to contain the type T. + */ + default List> getValidationGroups(Class clazz, T object){ + return getValidationGroups(object); + } + /** + * This method returns the default group sequence for the given instance. + *

+ * The object parameter allows to dynamically compose the default group sequence in function of the validated value state. + *

+ * * @param object the instance being validated. This value can be {@code null} in case this method was called as part of * {@linkplain jakarta.validation.Validator#validateValue(Class, String, Object, Class[]) Validator#validateValue}. * From 86574944261a3e689e290cd07ea7cf342116f03d Mon Sep 17 00:00:00 2001 From: ilikly Date: Thu, 16 Mar 2023 16:40:15 +0800 Subject: [PATCH 02/13] HV-1942 Update DefaultGroupSequenceProvider checkstyle --- .../validator/spi/group/DefaultGroupSequenceProvider.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java b/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java index 59f4af9b96..df2c244f61 100644 --- a/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java +++ b/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java @@ -46,9 +46,10 @@ public interface DefaultGroupSequenceProvider { * @return a list of classes specifying the default group sequence. The same constraints to the redefined group list * apply as for lists defined via {@code GroupSequence}. In particular the list has to contain the type T. */ - default List> getValidationGroups(Class clazz, T object){ - return getValidationGroups(object); - } + default List> getValidationGroups(Class clazz, T object) { + return getValidationGroups( object ); + } + /** * This method returns the default group sequence for the given instance. *

From 986b052723c0306e894a8375a0c5f2caa247029b Mon Sep 17 00:00:00 2001 From: ilikly Date: Thu, 16 Mar 2023 16:44:20 +0800 Subject: [PATCH 03/13] HV-1942 Update DefaultGroupSequenceProvider checkstyle --- .../validator/spi/group/DefaultGroupSequenceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java b/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java index df2c244f61..7af6bbddca 100644 --- a/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java +++ b/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java @@ -47,7 +47,7 @@ public interface DefaultGroupSequenceProvider { * apply as for lists defined via {@code GroupSequence}. In particular the list has to contain the type T. */ default List> getValidationGroups(Class clazz, T object) { - return getValidationGroups( object ); + return getValidationGroups( object ); } /** From ccd52a4f797b34009ca4263086599b28ea533d57 Mon Sep 17 00:00:00 2001 From: ilikly Date: Fri, 23 Jun 2023 12:54:10 +0800 Subject: [PATCH 04/13] HV-1942 Add DefaultGroupSequenceProvider test --- .../DefaultGroupSequenceProviderTest.java | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java diff --git a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java new file mode 100644 index 0000000000..4d783f7e61 --- /dev/null +++ b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java @@ -0,0 +1,127 @@ +package org.hibernate.validator.spi.group; + +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotNull; +import org.hibernate.validator.group.GroupSequenceProvider; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + + +/** + * DefaultGroupSequenceProviderTest. + * + * @author ilikly + */ +public class DefaultGroupSequenceProviderTest { + + @Test + public void withoutClassParam() { + Assert.assertThrows(() -> { + final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); + final Validator validator = validatorFactory.getValidator(); + validator.validate(new A1()); + }); + } + + @Test + public void withClassParam() { + final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); + final Validator validator = validatorFactory.getValidator(); + validator.validate(new A2()); + } + + + public static class DefaultGroupSequenceProvider1 implements DefaultGroupSequenceProvider { + + @Override + public List> getValidationGroups(Object object) { + List> groups = new ArrayList<>(); + if (Objects.nonNull(object)) { + groups.add(object.getClass()); + } + return groups; + } + } + + + public static class DefaultGroupSequenceProvider2 implements DefaultGroupSequenceProvider { + + @Override + public List> getValidationGroups(Class clazz, Object object) { + List> groups = new ArrayList<>(); + if (Objects.nonNull(clazz)) { + groups.add(clazz); + } + return groups; + } + + @Override + public List> getValidationGroups(Object object) { + throw new IllegalArgumentException(""); + } + } + + + @GroupSequenceProvider(DefaultGroupSequenceProvider1.class) + public static class A1 { + @NotNull + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + @GroupSequenceProvider(DefaultGroupSequenceProvider1.class) + public static class B1 { + @NotNull + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + @GroupSequenceProvider(DefaultGroupSequenceProvider2.class) + public static class A2 { + @NotNull + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + @GroupSequenceProvider(DefaultGroupSequenceProvider2.class) + public static class B2 { + @NotNull + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + +} \ No newline at end of file From fd2af60fa8cb2a52ad7d5d336d19ef8e423fa8ee Mon Sep 17 00:00:00 2001 From: ilikly Date: Fri, 23 Jun 2023 13:19:14 +0800 Subject: [PATCH 05/13] HV-1942 Add DefaultGroupSequenceProvider test license --- .../spi/group/DefaultGroupSequenceProviderTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java index 4d783f7e61..22c99588e0 100644 --- a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java +++ b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java @@ -1,3 +1,9 @@ +/* + * Hibernate Validator, declare and validate application constraints + * + * License: Apache License, Version 2.0 + * See the license.txt file in the root directory or . + */ package org.hibernate.validator.spi.group; import jakarta.validation.Validation; From 8f102f9ba2f767d3764069a938e3ec7b6ad66ef6 Mon Sep 17 00:00:00 2001 From: ilikly Date: Fri, 23 Jun 2023 15:55:43 +0800 Subject: [PATCH 06/13] HV-1942 update DefaultGroupSequenceProvider test checkstyle --- .../DefaultGroupSequenceProviderTest.java | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java index 22c99588e0..bc954505c0 100644 --- a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java +++ b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java @@ -27,29 +27,29 @@ public class DefaultGroupSequenceProviderTest { @Test - public void withoutClassParam() { - Assert.assertThrows(() -> { - final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); - final Validator validator = validatorFactory.getValidator(); - validator.validate(new A1()); + public void withoutClassParam () { + Assert.assertThrows (() -> { + final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); + final Validator validator = validatorFactory.getValidator (); + validator.validate (new A1 ()); }); } @Test - public void withClassParam() { - final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); - final Validator validator = validatorFactory.getValidator(); - validator.validate(new A2()); + public void withClassParam () { + final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); + final Validator validator = validatorFactory.getValidator (); + validator.validate (new A2 ()); } public static class DefaultGroupSequenceProvider1 implements DefaultGroupSequenceProvider { @Override - public List> getValidationGroups(Object object) { - List> groups = new ArrayList<>(); - if (Objects.nonNull(object)) { - groups.add(object.getClass()); + public List> getValidationGroups (Object object) { + List> groups = new ArrayList<> (); + if (Objects.nonNull (object)) { + groups.add (object.getClass ()); } return groups; } @@ -59,17 +59,17 @@ public List> getValidationGroups(Object object) { public static class DefaultGroupSequenceProvider2 implements DefaultGroupSequenceProvider { @Override - public List> getValidationGroups(Class clazz, Object object) { - List> groups = new ArrayList<>(); - if (Objects.nonNull(clazz)) { - groups.add(clazz); + public List> getValidationGroups (Class clazz, Object object) { + List> groups = new ArrayList<> (); + if (Objects.nonNull (clazz)) { + groups.add (clazz); } return groups; } @Override - public List> getValidationGroups(Object object) { - throw new IllegalArgumentException(""); + public List> getValidationGroups (Object object) { + throw new IllegalArgumentException (""); } } @@ -79,11 +79,11 @@ public static class A1 { @NotNull private String name; - public String getName() { + public String getName () { return name; } - public void setName(String name) { + public void setName (String name) { this.name = name; } } @@ -93,11 +93,11 @@ public static class B1 { @NotNull private String name; - public String getName() { + public String getName () { return name; } - public void setName(String name) { + public void setName (String name) { this.name = name; } } @@ -107,11 +107,11 @@ public static class A2 { @NotNull private String name; - public String getName() { + public String getName () { return name; } - public void setName(String name) { + public void setName (String name) { this.name = name; } } @@ -121,13 +121,13 @@ public static class B2 { @NotNull private String name; - public String getName() { + public String getName () { return name; } - public void setName(String name) { + public void setName (String name) { this.name = name; } } -} \ No newline at end of file +} From ace9dec1cafb35f81ed206ef9c288243747092ae Mon Sep 17 00:00:00 2001 From: ilikly Date: Fri, 23 Jun 2023 16:19:20 +0800 Subject: [PATCH 07/13] HV-1942 update DefaultGroupSequenceProvider test checkstyle --- .../DefaultGroupSequenceProviderTest.java | 206 +++++++++--------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java index bc954505c0..c047ee0f08 100644 --- a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java +++ b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java @@ -26,108 +26,108 @@ */ public class DefaultGroupSequenceProviderTest { - @Test - public void withoutClassParam () { - Assert.assertThrows (() -> { - final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); - final Validator validator = validatorFactory.getValidator (); - validator.validate (new A1 ()); - }); - } - - @Test - public void withClassParam () { - final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); - final Validator validator = validatorFactory.getValidator (); - validator.validate (new A2 ()); - } - - - public static class DefaultGroupSequenceProvider1 implements DefaultGroupSequenceProvider { - - @Override - public List> getValidationGroups (Object object) { - List> groups = new ArrayList<> (); - if (Objects.nonNull (object)) { - groups.add (object.getClass ()); - } - return groups; - } - } - - - public static class DefaultGroupSequenceProvider2 implements DefaultGroupSequenceProvider { - - @Override - public List> getValidationGroups (Class clazz, Object object) { - List> groups = new ArrayList<> (); - if (Objects.nonNull (clazz)) { - groups.add (clazz); - } - return groups; - } - - @Override - public List> getValidationGroups (Object object) { - throw new IllegalArgumentException (""); - } - } - - - @GroupSequenceProvider(DefaultGroupSequenceProvider1.class) - public static class A1 { - @NotNull - private String name; - - public String getName () { - return name; - } - - public void setName (String name) { - this.name = name; - } - } - - @GroupSequenceProvider(DefaultGroupSequenceProvider1.class) - public static class B1 { - @NotNull - private String name; - - public String getName () { - return name; - } - - public void setName (String name) { - this.name = name; - } - } - - @GroupSequenceProvider(DefaultGroupSequenceProvider2.class) - public static class A2 { - @NotNull - private String name; - - public String getName () { - return name; - } - - public void setName (String name) { - this.name = name; - } - } - - @GroupSequenceProvider(DefaultGroupSequenceProvider2.class) - public static class B2 { - @NotNull - private String name; - - public String getName () { - return name; - } - - public void setName (String name) { - this.name = name; - } - } + @Test + public void withoutClassParam () { + Assert.assertThrows (() -> { + final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); + final Validator validator = validatorFactory.getValidator (); + validator.validate (new A1 ()); + }); + } + + @Test + public void withClassParam () { + final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); + final Validator validator = validatorFactory.getValidator (); + validator.validate (new A2 ()); + } + + + public static class DefaultGroupSequenceProvider1 implements DefaultGroupSequenceProvider { + + @Override + public List> getValidationGroups (Object object) { + List> groups = new ArrayList<> (); + if (Objects.nonNull (object)) { + groups.add (object.getClass ()); + } + return groups; + } + } + + + public static class DefaultGroupSequenceProvider2 implements DefaultGroupSequenceProvider { + + @Override + public List> getValidationGroups (Class clazz, Object object) { + List> groups = new ArrayList<> (); + if (Objects.nonNull (clazz)) { + groups.add (clazz); + } + return groups; + } + + @Override + public List> getValidationGroups (Object object) { + throw new IllegalArgumentException (""); + } + } + + + @GroupSequenceProvider(DefaultGroupSequenceProvider1.class) + public static class A1 { + @NotNull + private String name; + + public String getName () { + return name; + } + + public void setName (String name) { + this.name = name; + } + } + + @GroupSequenceProvider(DefaultGroupSequenceProvider1.class) + public static class B1 { + @NotNull + private String name; + + public String getName () { + return name; + } + + public void setName (String name) { + this.name = name; + } + } + + @GroupSequenceProvider(DefaultGroupSequenceProvider2.class) + public static class A2 { + @NotNull + private String name; + + public String getName () { + return name; + } + + public void setName (String name) { + this.name = name; + } + } + + @GroupSequenceProvider(DefaultGroupSequenceProvider2.class) + public static class B2 { + @NotNull + private String name; + + public String getName () { + return name; + } + + public void setName (String name) { + this.name = name; + } + } } From aa8070efda3347273f55f85b74d065fee26974ec Mon Sep 17 00:00:00 2001 From: ilikly Date: Fri, 23 Jun 2023 16:24:35 +0800 Subject: [PATCH 08/13] HV-1942 update DefaultGroupSequenceProvider test checkstyle --- .../validator/spi/group/DefaultGroupSequenceProviderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java index c047ee0f08..92d1b12c6c 100644 --- a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java +++ b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java @@ -48,7 +48,7 @@ public static class DefaultGroupSequenceProvider1 implements DefaultGroupSequenc @Override public List> getValidationGroups (Object object) { List> groups = new ArrayList<> (); - if (Objects.nonNull (object)) { + if ( Objects.nonNull (object) ) { groups.add (object.getClass ()); } return groups; @@ -61,7 +61,7 @@ public static class DefaultGroupSequenceProvider2 implements DefaultGroupSequenc @Override public List> getValidationGroups (Class clazz, Object object) { List> groups = new ArrayList<> (); - if (Objects.nonNull (clazz)) { + if ( Objects.nonNull (clazz) ) { groups.add (clazz); } return groups; From 4cd0714a6b7c7a6a7c1d42e8eae37ee7f5bbe10c Mon Sep 17 00:00:00 2001 From: ilikly Date: Fri, 23 Jun 2023 16:37:07 +0800 Subject: [PATCH 09/13] HV-1942 update DefaultGroupSequenceProvider test checkstyle --- .../DefaultGroupSequenceProviderTest.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java index 92d1b12c6c..9abc649fc0 100644 --- a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java +++ b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java @@ -27,7 +27,7 @@ public class DefaultGroupSequenceProviderTest { @Test - public void withoutClassParam () { + public void withoutClassParam() { Assert.assertThrows (() -> { final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); final Validator validator = validatorFactory.getValidator (); @@ -36,7 +36,7 @@ public void withoutClassParam () { } @Test - public void withClassParam () { + public void withClassParam() { final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); final Validator validator = validatorFactory.getValidator (); validator.validate (new A2 ()); @@ -46,7 +46,7 @@ public void withClassParam () { public static class DefaultGroupSequenceProvider1 implements DefaultGroupSequenceProvider { @Override - public List> getValidationGroups (Object object) { + public List> getValidationGroups(Object object) { List> groups = new ArrayList<> (); if ( Objects.nonNull (object) ) { groups.add (object.getClass ()); @@ -59,7 +59,7 @@ public List> getValidationGroups (Object object) { public static class DefaultGroupSequenceProvider2 implements DefaultGroupSequenceProvider { @Override - public List> getValidationGroups (Class clazz, Object object) { + public List> getValidationGroups(Class clazz, Object object) { List> groups = new ArrayList<> (); if ( Objects.nonNull (clazz) ) { groups.add (clazz); @@ -68,7 +68,7 @@ public List> getValidationGroups (Class clazz, Object object) { } @Override - public List> getValidationGroups (Object object) { + public List> getValidationGroups(Object object) { throw new IllegalArgumentException (""); } } @@ -79,11 +79,11 @@ public static class A1 { @NotNull private String name; - public String getName () { + public String getName() { return name; } - public void setName (String name) { + public void setName(String name) { this.name = name; } } @@ -93,11 +93,11 @@ public static class B1 { @NotNull private String name; - public String getName () { + public String getName() { return name; } - public void setName (String name) { + public void setName(String name) { this.name = name; } } @@ -107,11 +107,11 @@ public static class A2 { @NotNull private String name; - public String getName () { + public String getName() { return name; } - public void setName (String name) { + public void setName(String name) { this.name = name; } } @@ -121,11 +121,11 @@ public static class B2 { @NotNull private String name; - public String getName () { + public String getName() { return name; } - public void setName (String name) { + public void setName(String name) { this.name = name; } } From 2cec320a89478790a1b65b139713a63d3effb986 Mon Sep 17 00:00:00 2001 From: ilikly Date: Fri, 23 Jun 2023 16:45:10 +0800 Subject: [PATCH 10/13] HV-1942 update DefaultGroupSequenceProvider test checkstyle --- .../DefaultGroupSequenceProviderTest.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java index 9abc649fc0..d6b2c39882 100644 --- a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java +++ b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java @@ -28,18 +28,18 @@ public class DefaultGroupSequenceProviderTest { @Test public void withoutClassParam() { - Assert.assertThrows (() -> { - final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); - final Validator validator = validatorFactory.getValidator (); - validator.validate (new A1 ()); + Assert.assertThrows(() -> { + final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); + final Validator validator = validatorFactory.getValidator(); + validator.validate(new A1()); }); } @Test public void withClassParam() { - final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory (); - final Validator validator = validatorFactory.getValidator (); - validator.validate (new A2 ()); + final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); + final Validator validator = validatorFactory.getValidator(); + validator.validate(new A2()); } @@ -47,9 +47,9 @@ public static class DefaultGroupSequenceProvider1 implements DefaultGroupSequenc @Override public List> getValidationGroups(Object object) { - List> groups = new ArrayList<> (); - if ( Objects.nonNull (object) ) { - groups.add (object.getClass ()); + List> groups = new ArrayList<>(); + if ( Objects.nonNull(object) ) { + groups.add(object.getClass()); } return groups; } @@ -60,16 +60,16 @@ public static class DefaultGroupSequenceProvider2 implements DefaultGroupSequenc @Override public List> getValidationGroups(Class clazz, Object object) { - List> groups = new ArrayList<> (); - if ( Objects.nonNull (clazz) ) { - groups.add (clazz); + List> groups = new ArrayList<>(); + if ( Objects.nonNull(clazz) ) { + groups.add(clazz); } return groups; } @Override public List> getValidationGroups(Object object) { - throw new IllegalArgumentException (""); + throw new IllegalArgumentException(""); } } From 3e2c5a52a191ebc1756783be9222712713cc8619 Mon Sep 17 00:00:00 2001 From: ilikly Date: Fri, 23 Jun 2023 16:48:12 +0800 Subject: [PATCH 11/13] HV-1942 update DefaultGroupSequenceProvider test checkstyle --- .../validator/spi/group/DefaultGroupSequenceProviderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java index d6b2c39882..e2646e8231 100644 --- a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java +++ b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java @@ -28,7 +28,7 @@ public class DefaultGroupSequenceProviderTest { @Test public void withoutClassParam() { - Assert.assertThrows(() -> { + Assert.assertThrows(()->{ final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); final Validator validator = validatorFactory.getValidator(); validator.validate(new A1()); From 5e90f8b812910f11b5e9935f24794a43db9625f0 Mon Sep 17 00:00:00 2001 From: ilikly Date: Fri, 23 Jun 2023 17:01:38 +0800 Subject: [PATCH 12/13] HV-1942 update DefaultGroupSequenceProvider test checkstyle --- .../DefaultGroupSequenceProviderTest.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java index e2646e8231..069b35bb69 100644 --- a/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java +++ b/cdi/src/test/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProviderTest.java @@ -28,28 +28,28 @@ public class DefaultGroupSequenceProviderTest { @Test public void withoutClassParam() { - Assert.assertThrows(()->{ + Assert.assertThrows( () -> { final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); final Validator validator = validatorFactory.getValidator(); - validator.validate(new A1()); - }); + validator.validate( new A1() ); + } ); } @Test public void withClassParam() { final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory(); final Validator validator = validatorFactory.getValidator(); - validator.validate(new A2()); + validator.validate( new A2() ); } public static class DefaultGroupSequenceProvider1 implements DefaultGroupSequenceProvider { @Override - public List> getValidationGroups(Object object) { + public List> getValidationGroups( Object object ) { List> groups = new ArrayList<>(); - if ( Objects.nonNull(object) ) { - groups.add(object.getClass()); + if ( Objects.nonNull( object ) ) { + groups.add( object.getClass() ); } return groups; } @@ -59,17 +59,17 @@ public List> getValidationGroups(Object object) { public static class DefaultGroupSequenceProvider2 implements DefaultGroupSequenceProvider { @Override - public List> getValidationGroups(Class clazz, Object object) { + public List> getValidationGroups( Class clazz, Object object ) { List> groups = new ArrayList<>(); - if ( Objects.nonNull(clazz) ) { - groups.add(clazz); + if ( Objects.nonNull( clazz ) ) { + groups.add( clazz ); } return groups; } @Override - public List> getValidationGroups(Object object) { - throw new IllegalArgumentException(""); + public List> getValidationGroups( Object object ) { + throw new IllegalArgumentException( "" ); } } @@ -83,7 +83,7 @@ public String getName() { return name; } - public void setName(String name) { + public void setName( String name ) { this.name = name; } } @@ -97,7 +97,7 @@ public String getName() { return name; } - public void setName(String name) { + public void setName( String name ) { this.name = name; } } @@ -111,7 +111,7 @@ public String getName() { return name; } - public void setName(String name) { + public void setName( String name ) { this.name = name; } } @@ -125,7 +125,7 @@ public String getName() { return name; } - public void setName(String name) { + public void setName( String name ) { this.name = name; } } From 0d16b27e7b04342dbc574ceac9182d1045fe679f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B1=B3=E5=85=8B?= Date: Fri, 19 Jan 2024 11:45:40 +0800 Subject: [PATCH 13/13] Update DefaultGroupSequenceProvider.java --- .../validator/spi/group/DefaultGroupSequenceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java b/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java index 7af6bbddca..9e93cd57a9 100644 --- a/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java +++ b/engine/src/main/java/org/hibernate/validator/spi/group/DefaultGroupSequenceProvider.java @@ -39,7 +39,7 @@ public interface DefaultGroupSequenceProvider { * The object parameter allows to dynamically compose the default group sequence in function of the validated value state. *

* - * @param clazz the instance class being validated. + * @param clazz the instance class being validated. * @param object the instance being validated. This value can be {@code null} in case this method was called as part of * {@linkplain jakarta.validation.Validator#validateValue(Class, String, Object, Class[]) Validator#validateValue}. *