Skip to content

Commit e229d6b

Browse files
authored
fix list name clash (#264)
1 parent 32697da commit e229d6b

File tree

12 files changed

+22
-45
lines changed

12 files changed

+22
-45
lines changed

validator-constraints/src/main/java/io/avaje/validation/constraints/DateRange.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
@Constraint(unboxPrimitives = true)
6262
@Documented
6363
@Retention(RUNTIME)
64-
@Repeatable(DateRange.List.class)
64+
@Repeatable(DateRange.DateRanges.class)
6565
@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
6666
public @interface DateRange {
6767

@@ -79,7 +79,7 @@
7979
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
8080
@Retention(RUNTIME)
8181
@Documented
82-
@interface List {
82+
@interface DateRanges {
8383
DateRange[] value();
8484
}
8585
}

validator-constraints/src/main/java/io/avaje/validation/constraints/DecimalMax.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
import java.lang.annotation.Retention;
1212
import java.lang.annotation.Target;
1313

14-
import io.avaje.validation.constraints.DecimalMax.List;
15-
1614
/**
1715
* The annotated element must be a number whose value must be lower or equal to the specified
1816
* maximum.
@@ -36,7 +34,7 @@
3634
@Constraint
3735
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
3836
@Retention(RUNTIME)
39-
@Repeatable(List.class)
37+
@Repeatable(DecimalMax.DecimalMaxs.class)
4038
public @interface DecimalMax {
4139

4240
String message() default "{avaje.DecimalMax.message}";
@@ -67,7 +65,7 @@
6765
*/
6866
@Target({METHOD, FIELD})
6967
@Retention(RUNTIME)
70-
@interface List {
68+
@interface DecimalMaxs {
7169

7270
DecimalMax[] value();
7371
}

validator-constraints/src/main/java/io/avaje/validation/constraints/DecimalMin.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import java.lang.annotation.Retention;
1818
import java.lang.annotation.Target;
1919

20-
import io.avaje.validation.constraints.DecimalMin.List;
21-
2220
/**
2321
* The annotated element must be a number whose value must be higher or equal to the specified
2422
* minimum.
@@ -42,7 +40,7 @@
4240
@Constraint
4341
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
4442
@Retention(RUNTIME)
45-
@Repeatable(List.class)
43+
@Repeatable(DecimalMin.DecimalMins.class)
4644
public @interface DecimalMin {
4745

4846
String message() default "{avaje.DecimalMin.message}";
@@ -73,7 +71,7 @@
7371
*/
7472
@Target({METHOD, FIELD})
7573
@Retention(RUNTIME)
76-
@interface List {
74+
@interface DecimalMins {
7775

7876
DecimalMin[] value();
7977
}

validator-constraints/src/main/java/io/avaje/validation/constraints/Digits.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@Constraint
3333
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
3434
@Retention(RetentionPolicy.RUNTIME)
35-
@Repeatable(Digits.List.class)
35+
@Repeatable(Digits.Digitses.class)
3636
public @interface Digits {
3737
String message() default "{avaje.Digits.message}";
3838

@@ -45,7 +45,7 @@
4545
@Target({ElementType.METHOD, ElementType.FIELD})
4646
@Retention(RetentionPolicy.RUNTIME)
4747
@Documented
48-
public @interface List {
48+
public @interface Digitses {
4949
Digits[] value();
5050
}
5151
}

validator-constraints/src/main/java/io/avaje/validation/constraints/Length.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@Constraint
1717
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
1818
@Retention(RetentionPolicy.RUNTIME)
19-
@Repeatable(Length.List.class)
19+
@Repeatable(Length.Lengths.class)
2020
public @interface Length {
2121

2222
String message() default "{avaje.Length.message}";
@@ -30,7 +30,7 @@
3030
@Target({ElementType.METHOD, ElementType.FIELD})
3131
@Retention(RetentionPolicy.RUNTIME)
3232
@Documented
33-
@interface List {
33+
@interface Lengths {
3434
Length[] value();
3535
}
3636
}

validator-constraints/src/main/java/io/avaje/validation/constraints/Max.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@Constraint(unboxPrimitives = true)
3636
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
3737
@Retention(RetentionPolicy.RUNTIME)
38-
@Repeatable(Max.List.class)
38+
@Repeatable(Max.Maxs.class)
3939
public @interface Max {
4040
String message() default "{avaje.Max.message}";
4141

@@ -46,7 +46,7 @@
4646
@Target({ElementType.METHOD, ElementType.FIELD})
4747
@Retention(RetentionPolicy.RUNTIME)
4848
@Documented
49-
@interface List {
49+
@interface Maxs {
5050
Max[] value();
5151
}
5252
}

validator-constraints/src/main/java/io/avaje/validation/constraints/Min.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@Constraint(unboxPrimitives = true)
3636
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
3737
@Retention(RetentionPolicy.RUNTIME)
38-
@Repeatable(Min.List.class)
38+
@Repeatable(Min.Mins.class)
3939
public @interface Min {
4040
String message() default "{avaje.Min.message}";
4141

@@ -46,7 +46,7 @@
4646
@Target({ElementType.METHOD, ElementType.FIELD})
4747
@Retention(RetentionPolicy.RUNTIME)
4848
@Documented
49-
@interface List {
49+
@interface Mins {
5050
Min[] value();
5151
}
5252
}

validator-constraints/src/main/java/io/avaje/validation/constraints/Pattern.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import java.lang.annotation.Retention;
1313
import java.lang.annotation.Target;
1414

15-
import io.avaje.validation.constraints.Pattern.List;
16-
1715
/**
1816
* The annotated {@code CharSequence} must match the specified regular expression. The regular
1917
* expression follows the Java regular expression conventions see {@link java.util.regex.Pattern}.
@@ -25,7 +23,7 @@
2523
@Constraint
2624
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
2725
@Retention(RUNTIME)
28-
@Repeatable(List.class)
26+
@Repeatable(Pattern.Patterns.class)
2927
@Documented
3028
public @interface Pattern {
3129

@@ -49,7 +47,7 @@
4947
@Target({METHOD, FIELD})
5048
@Retention(RUNTIME)
5149
@Documented
52-
@interface List {
50+
@interface Patterns {
5351

5452
Pattern[] value();
5553
}

validator-constraints/src/main/java/io/avaje/validation/constraints/Positive.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import java.lang.annotation.Retention;
1313
import java.lang.annotation.Target;
1414

15-
import io.avaje.validation.constraints.Positive.List;
16-
1715
/**
1816
* The annotated element must be a strictly positive number (i.e. 0 is considered as an invalid
1917
* value).
@@ -34,24 +32,11 @@
3432
@Constraint(unboxPrimitives = true)
3533
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
3634
@Retention(RUNTIME)
37-
@Repeatable(List.class)
3835
@Documented
3936
public @interface Positive {
4037

4138
String message() default "{avaje.Positive.message}";
4239

4340
Class<?>[] groups() default {};
4441

45-
/**
46-
* Defines several {@link Positive} constraints on the same element.
47-
*
48-
* @see Positive
49-
*/
50-
@Target({METHOD, FIELD})
51-
@Retention(RUNTIME)
52-
@Documented
53-
@interface List {
54-
55-
Positive[] value();
56-
}
5742
}

validator-constraints/src/main/java/io/avaje/validation/constraints/Range.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import java.lang.annotation.Retention;
1414
import java.lang.annotation.Target;
1515

16-
import io.avaje.validation.constraints.Range.List;
17-
1816
/**
1917
* The annotated element has to be in the appropriate range. Apply on numeric values or string
2018
* representation of the numeric value.
@@ -24,7 +22,7 @@
2422
@Constraint(unboxPrimitives = true)
2523
@Documented
2624
@Retention(RUNTIME)
27-
@Repeatable(List.class)
25+
@Repeatable(Range.Ranges.class)
2826
@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
2927
public @interface Range {
3028
long min() default 0;
@@ -39,7 +37,7 @@
3937
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
4038
@Retention(RUNTIME)
4139
@Documented
42-
public @interface List {
40+
public @interface Ranges {
4341
Range[] value();
4442
}
4543
}

validator-constraints/src/main/java/io/avaje/validation/constraints/Size.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@Constraint
3333
@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
3434
@Retention(RetentionPolicy.RUNTIME)
35-
@Repeatable(Size.List.class)
35+
@Repeatable(Size.Sizes.class)
3636
public @interface Size {
3737
String message() default "{avaje.Size.message}";
3838

@@ -45,7 +45,7 @@
4545
@Target({ElementType.METHOD, ElementType.FIELD})
4646
@Retention(RetentionPolicy.RUNTIME)
4747
@Documented
48-
@interface List {
48+
@interface Sizes {
4949
Size[] value();
5050
}
5151
}

validator/src/main/java/io/avaje/validation/CrossParamConstraint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import java.lang.annotation.Target;
88

99
/**
10-
* Marks an method annotation as a CrossParamConstraint used for validating multiple method
10+
* Marks a method annotation as a CrossParamConstraint used for validating multiple method
1111
* parameters
1212
*/
1313
@Retention(CLASS)
14-
@Target({ANNOTATION_TYPE})
14+
@Target(ANNOTATION_TYPE)
1515
public @interface CrossParamConstraint {}

0 commit comments

Comments
 (0)