Skip to content

Commit f0ba625

Browse files
authored
Introduce new type of builder to create an ArgumentValidator easily (#367)
1 parent 4ccfd23 commit f0ba625

File tree

73 files changed

+4729
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+4729
-94
lines changed

scripts/generate-args.sh

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,45 @@ fi)
419419
EOF
420420
done
421421
422+
for i in `seq 1 ${n}`;do
423+
class="Validator${i}"
424+
interface="Arguments${i}Validator"
425+
file="$(dirname $0)/../src/main/java/am/ik/yavi/arguments/${class}.java"
426+
arguments="Arguments${i}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//')>"
427+
args="$(echo $(for j in `seq 1 ${i}`;do echo -n "@Nullable A${j} a${j}, ";done) | sed 's/,$//')"
428+
as="$(echo $(for j in `seq 1 ${i}`;do echo -n "a${j}, ";done) | sed 's/,$//')"
429+
echo $file
430+
cat <<EOF > ${file}
431+
/*
432+
* Copyright (C) 2018-2024 Toshiaki Maki <makingx@gmail.com>
433+
*
434+
* Licensed under the Apache License, Version 2.0 (the "License");
435+
* you may not use this file except in compliance with the License.
436+
* You may obtain a copy of the License at
437+
*
438+
* http://www.apache.org/licenses/LICENSE-2.0
439+
*
440+
* Unless required by applicable law or agreed to in writing, software
441+
* distributed under the License is distributed on an "AS IS" BASIS,
442+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
443+
* See the License for the specific language governing permissions and
444+
* limitations under the License.
445+
*/
446+
package am.ik.yavi.arguments;
447+
448+
/**
449+
* Shortened class name version of {@link ${interface}}
450+
*
451+
* Generated by https://github.com/making/yavi/blob/develop/scripts/generate-args.sh
452+
*
453+
* @since 0.14.0
454+
*/
455+
public interface ${class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), X> extends ${interface}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), X> {
456+
457+
}
458+
EOF
459+
done
460+
422461
for i in `seq 1 ${n}`;do
423462
class="DefaultArguments${i}Validator"
424463
interface="Arguments${i}Validator"
@@ -533,12 +572,12 @@ $(for j in `seq 1 ${i}`;do echo " protected final ValueValidator<? super A${j},
533572
$(for j in `seq 1 ${i}`;do echo " this.v${j} = v${j};";done)
534573
}
535574
536-
public <X> Arguments${i}Validator<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), X> apply(
575+
public <X> Validator${i}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), X> apply(
537576
Function${i}<$(echo $(for j in `seq 1 ${i}`;do echo -n "? super R${j}, ";done) | sed 's/,$//'), ? extends X> f) {
538-
return new Arguments${i}Validator<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), X>() {
577+
return new Validator${i}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), X>() {
539578
540579
@Override
541-
public Arguments${i}Validator<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Supplier<X>> lazy() {
580+
public Validator${i}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Supplier<X>> lazy() {
542581
return (($(echo $(for j in `seq 1 ${i}`;do echo -n "a${j}, ";done) | sed 's/,$//'), locale, constraintContext) -> Validations.apply(
543582
($(echo $(for j in `seq 1 ${i}`;do echo -n "r${j}, ";done) | sed 's/,$//')) -> () -> f.apply($(echo $(for j in `seq 1 ${i}`;do echo -n "r${j}, ";done) | sed 's/,$//')),
544583
$(echo $(for j in `seq 1 ${i}`;do echo -n "v${j}.validate(a${j}, locale, constraintContext), ";done) | sed 's/,$//')));
Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,210 @@
1+
#!/bin/bash
2+
set -e
3+
n=16
4+
5+
for i in `seq 1 ${n}`;do
6+
class="Validator${i}ChainedBuilder"
7+
next_class="Validator$((i + 1))ChainedBuilder"
8+
file="$(dirname $0)/../src/main/java/am/ik/yavi/builder/chained/${class}.java"
9+
echo $file
10+
cat <<EOF > ${file}
11+
/*
12+
* Copyright (C) 2018-2024 Toshiaki Maki <makingx@gmail.com>
13+
*
14+
* Licensed under the Apache License, Version 2.0 (the "License");
15+
* you may not use this file except in compliance with the License.
16+
* You may obtain a copy of the License at
17+
*
18+
* http://www.apache.org/licenses/LICENSE-2.0
19+
*
20+
* Unless required by applicable law or agreed to in writing, software
21+
* distributed under the License is distributed on an "AS IS" BASIS,
22+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
23+
* See the License for the specific language governing permissions and
24+
* limitations under the License.
25+
*/
26+
package am.ik.yavi.builder.chained;
27+
28+
import java.math.BigDecimal;
29+
import java.math.BigInteger;
30+
import java.time.Instant;
31+
import java.time.LocalDateTime;
32+
import java.time.LocalTime;
33+
import java.time.OffsetDateTime;
34+
import java.time.Year;
35+
import java.time.YearMonth;
36+
import java.time.ZonedDateTime;
37+
import java.util.function.Function;
38+
39+
import am.ik.yavi.arguments.Arguments1;
40+
import am.ik.yavi.arguments.ArgumentsValidators;
41+
import am.ik.yavi.arguments.Validator${i};
42+
import am.ik.yavi.builder.BigDecimalValidatorBuilder;
43+
import am.ik.yavi.builder.BigIntegerValidatorBuilder;
44+
import am.ik.yavi.builder.BooleanValidatorBuilder;
45+
import am.ik.yavi.builder.DoubleValidatorBuilder;
46+
import am.ik.yavi.builder.FloatValidatorBuilder;
47+
import am.ik.yavi.builder.InstantValidatorBuilder;
48+
import am.ik.yavi.builder.IntegerValidatorBuilder;
49+
import am.ik.yavi.builder.LocalDateTimeValidatorBuilder;
50+
import am.ik.yavi.builder.LocalTimeValidatorBuilder;
51+
import am.ik.yavi.builder.LongValidatorBuilder;
52+
import am.ik.yavi.builder.ObjectValidatorBuilder;
53+
import am.ik.yavi.builder.OffsetDateTimeValidatorBuilder;
54+
import am.ik.yavi.builder.ShortValidatorBuilder;
55+
import am.ik.yavi.builder.StringValidatorBuilder;
56+
import am.ik.yavi.builder.YearMonthValidatorBuilder;
57+
import am.ik.yavi.builder.YearValidatorBuilder;
58+
import am.ik.yavi.builder.ZonedDateTimeValidatorBuilder;
59+
import am.ik.yavi.constraint.BigDecimalConstraint;
60+
import am.ik.yavi.constraint.BigIntegerConstraint;
61+
import am.ik.yavi.constraint.BooleanConstraint;
62+
import am.ik.yavi.constraint.CharSequenceConstraint;
63+
import am.ik.yavi.constraint.DoubleConstraint;
64+
import am.ik.yavi.constraint.FloatConstraint;
65+
import am.ik.yavi.constraint.InstantConstraint;
66+
import am.ik.yavi.constraint.IntegerConstraint;
67+
import am.ik.yavi.constraint.LocalDateTimeConstraint;
68+
import am.ik.yavi.constraint.LocalTimeConstraint;
69+
import am.ik.yavi.constraint.LongConstraint;
70+
import am.ik.yavi.constraint.ObjectConstraint;
71+
import am.ik.yavi.constraint.OffsetDateTimeConstraint;
72+
import am.ik.yavi.constraint.ShortConstraint;
73+
import am.ik.yavi.constraint.YearConstraint;
74+
import am.ik.yavi.constraint.YearMonthConstraint;
75+
import am.ik.yavi.constraint.ZonedDateTimeConstraint;
76+
import am.ik.yavi.core.ValueValidator;
77+
import am.ik.yavi.fn.Function${i};
78+
79+
/**
80+
* Generated by
81+
* https://github.com/making/yavi/blob/develop/scripts/generate-chained-builder.sh
82+
*
83+
* @since 0.14.0
84+
*/
85+
public final class ${class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//')> {
86+
87+
$(for j in `seq 1 ${i}`;do echo " final ValueValidator<A${j}, A${j}> v${j};";echo;done)
88+
89+
public ${class}($(echo $(for j in `seq 1 ${i}`;do echo -n "ValueValidator<A${j}, A${j}> v${j}, ";done) | sed 's/,$//')) {
90+
$(for j in `seq 1 ${i}`;do echo " this.v${j} = v${j};";done)
91+
}
92+
93+
$(if [ "${i}" != "${n}" ];then
94+
cat <<EOD
95+
96+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), BigDecimal> _bigDecimal(String name,
97+
Function<BigDecimalConstraint<Arguments1<BigDecimal>>, BigDecimalConstraint<Arguments1<BigDecimal>>> constraints) {
98+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
99+
BigDecimalValidatorBuilder.of(name, constraints).build());
100+
}
101+
102+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), BigInteger> _bigInteger(String name,
103+
Function<BigIntegerConstraint<Arguments1<BigInteger>>, BigIntegerConstraint<Arguments1<BigInteger>>> constraints) {
104+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
105+
BigIntegerValidatorBuilder.of(name, constraints).build());
106+
}
107+
108+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Boolean> _boolean(String name,
109+
Function<BooleanConstraint<Arguments1<Boolean>>, BooleanConstraint<Arguments1<Boolean>>> constraints) {
110+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
111+
BooleanValidatorBuilder.of(name, constraints).build());
112+
}
113+
114+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Double> _double(String name,
115+
Function<DoubleConstraint<Arguments1<Double>>, DoubleConstraint<Arguments1<Double>>> constraints) {
116+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
117+
DoubleValidatorBuilder.of(name, constraints).build());
118+
}
119+
120+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Float> _float(String name,
121+
Function<FloatConstraint<Arguments1<Float>>, FloatConstraint<Arguments1<Float>>> constraints) {
122+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
123+
FloatValidatorBuilder.of(name, constraints).build());
124+
}
125+
126+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Instant> _instant(String name,
127+
Function<InstantConstraint<Arguments1<Instant>>, InstantConstraint<Arguments1<Instant>>> constraints) {
128+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
129+
InstantValidatorBuilder.of(name, constraints).build());
130+
}
131+
132+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Integer> _integer(String name,
133+
Function<IntegerConstraint<Arguments1<Integer>>, IntegerConstraint<Arguments1<Integer>>> constraints) {
134+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
135+
IntegerValidatorBuilder.of(name, constraints).build());
136+
}
137+
138+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), LocalDateTime> _localDateTime(String name,
139+
Function<LocalDateTimeConstraint<Arguments1<LocalDateTime>>, LocalDateTimeConstraint<Arguments1<LocalDateTime>>> constraints) {
140+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
141+
LocalDateTimeValidatorBuilder.of(name, constraints).build());
142+
}
143+
144+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), LocalTime> _localTime(String name,
145+
Function<LocalTimeConstraint<Arguments1<LocalTime>>, LocalTimeConstraint<Arguments1<LocalTime>>> constraints) {
146+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
147+
LocalTimeValidatorBuilder.of(name, constraints).build());
148+
}
149+
150+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Long> _long(String name,
151+
Function<LongConstraint<Arguments1<Long>>, LongConstraint<Arguments1<Long>>> constraints) {
152+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
153+
LongValidatorBuilder.of(name, constraints).build());
154+
}
155+
156+
public <T> ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), T> _object(String name,
157+
Function<ObjectConstraint<Arguments1<T>, T>, ObjectConstraint<Arguments1<T>, T>> constraints) {
158+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
159+
ObjectValidatorBuilder.of(name, constraints).build());
160+
}
161+
162+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), OffsetDateTime> _offsetDateTime(String name,
163+
Function<OffsetDateTimeConstraint<Arguments1<OffsetDateTime>>, OffsetDateTimeConstraint<Arguments1<OffsetDateTime>>> constraints) {
164+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
165+
OffsetDateTimeValidatorBuilder.of(name, constraints).build());
166+
}
167+
168+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Short> _short(String name,
169+
Function<ShortConstraint<Arguments1<Short>>, ShortConstraint<Arguments1<Short>>> constraints) {
170+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
171+
ShortValidatorBuilder.of(name, constraints).build());
172+
}
173+
174+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), String> _string(String name,
175+
Function<CharSequenceConstraint<Arguments1<String>, String>, CharSequenceConstraint<Arguments1<String>, String>> constraints) {
176+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
177+
StringValidatorBuilder.of(name, constraints).build());
178+
}
179+
180+
181+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), YearMonth> _yearMonth(String name,
182+
Function<YearMonthConstraint<Arguments1<YearMonth>>, YearMonthConstraint<Arguments1<YearMonth>>> constraints) {
183+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
184+
YearMonthValidatorBuilder.of(name, constraints).build());
185+
}
186+
187+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), Year> _year(String name,
188+
Function<YearConstraint<Arguments1<Year>>, YearConstraint<Arguments1<Year>>> constraints) {
189+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
190+
YearValidatorBuilder.of(name, constraints).build());
191+
}
192+
193+
public ${next_class}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), ZonedDateTime> _zonedDateTime(String name,
194+
Function<ZonedDateTimeConstraint<Arguments1<ZonedDateTime>>, ZonedDateTimeConstraint<Arguments1<ZonedDateTime>>> constraints) {
195+
return new ${next_class}<>($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//'),
196+
ZonedDateTimeValidatorBuilder.of(name, constraints).build());
197+
}
198+
EOD
199+
fi)
200+
201+
$(if [ "${i}" != "1" ];then
202+
cat <<EOD
203+
public <R> Validator${i}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), R> apply(Function${i}<$(echo $(for j in `seq 1 ${i}`;do echo -n "A${j}, ";done) | sed 's/,$//'), R> f) {
204+
return ArgumentsValidators.split($(echo $(for j in `seq 1 ${i}`;do echo -n "this.v${j}, ";done) | sed 's/,$//')).apply(f);
205+
}
206+
EOD
207+
fi)
208+
}
209+
EOF
210+
done

src/main/java/am/ik/yavi/arguments/Arguments10Splitting.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ public Arguments10Splitting(ValueValidator<? super A1, ? extends R1> v1,
7373
this.v10 = v10;
7474
}
7575

76-
public <X> Arguments10Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, X> apply(
76+
public <X> Validator10<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, X> apply(
7777
Function10<? super R1, ? super R2, ? super R3, ? super R4, ? super R5, ? super R6, ? super R7, ? super R8, ? super R9, ? super R10, ? extends X> f) {
78-
return new Arguments10Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, X>() {
78+
return new Validator10<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, X>() {
7979

8080
@Override
81-
public Arguments10Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, Supplier<X>> lazy() {
81+
public Validator10<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, Supplier<X>> lazy() {
8282
return ((a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, locale,
8383
constraintContext) -> Validations.apply(
8484
(r1, r2, r3, r4, r5, r6, r7, r8, r9,

src/main/java/am/ik/yavi/arguments/Arguments11Splitting.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ public Arguments11Splitting(ValueValidator<? super A1, ? extends R1> v1,
7777
this.v11 = v11;
7878
}
7979

80-
public <X> Arguments11Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, X> apply(
80+
public <X> Validator11<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, X> apply(
8181
Function11<? super R1, ? super R2, ? super R3, ? super R4, ? super R5, ? super R6, ? super R7, ? super R8, ? super R9, ? super R10, ? super R11, ? extends X> f) {
82-
return new Arguments11Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, X>() {
82+
return new Validator11<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, X>() {
8383

8484
@Override
85-
public Arguments11Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, Supplier<X>> lazy() {
85+
public Validator11<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, Supplier<X>> lazy() {
8686
return ((a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, locale,
8787
constraintContext) -> Validations.apply(
8888
(r1, r2, r3, r4, r5, r6, r7, r8, r9, r10,

src/main/java/am/ik/yavi/arguments/Arguments12Splitting.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ public Arguments12Splitting(ValueValidator<? super A1, ? extends R1> v1,
8181
this.v12 = v12;
8282
}
8383

84-
public <X> Arguments12Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, X> apply(
84+
public <X> Validator12<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, X> apply(
8585
Function12<? super R1, ? super R2, ? super R3, ? super R4, ? super R5, ? super R6, ? super R7, ? super R8, ? super R9, ? super R10, ? super R11, ? super R12, ? extends X> f) {
86-
return new Arguments12Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, X>() {
86+
return new Validator12<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, X>() {
8787

8888
@Override
89-
public Arguments12Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, Supplier<X>> lazy() {
89+
public Validator12<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, Supplier<X>> lazy() {
9090
return ((a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, locale,
9191
constraintContext) -> Validations.apply(
9292
(r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11,

src/main/java/am/ik/yavi/arguments/Arguments13Splitting.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ public Arguments13Splitting(ValueValidator<? super A1, ? extends R1> v1,
8585
this.v13 = v13;
8686
}
8787

88-
public <X> Arguments13Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, X> apply(
88+
public <X> Validator13<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, X> apply(
8989
Function13<? super R1, ? super R2, ? super R3, ? super R4, ? super R5, ? super R6, ? super R7, ? super R8, ? super R9, ? super R10, ? super R11, ? super R12, ? super R13, ? extends X> f) {
90-
return new Arguments13Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, X>() {
90+
return new Validator13<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, X>() {
9191

9292
@Override
93-
public Arguments13Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, Supplier<X>> lazy() {
93+
public Validator13<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, Supplier<X>> lazy() {
9494
return ((a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, locale,
9595
constraintContext) -> Validations.apply(
9696
(r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12,

src/main/java/am/ik/yavi/arguments/Arguments14Splitting.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ public Arguments14Splitting(ValueValidator<? super A1, ? extends R1> v1,
8989
this.v14 = v14;
9090
}
9191

92-
public <X> Arguments14Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, X> apply(
92+
public <X> Validator14<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, X> apply(
9393
Function14<? super R1, ? super R2, ? super R3, ? super R4, ? super R5, ? super R6, ? super R7, ? super R8, ? super R9, ? super R10, ? super R11, ? super R12, ? super R13, ? super R14, ? extends X> f) {
94-
return new Arguments14Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, X>() {
94+
return new Validator14<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, X>() {
9595

9696
@Override
97-
public Arguments14Validator<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, Supplier<X>> lazy() {
97+
public Validator14<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, Supplier<X>> lazy() {
9898
return ((a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14,
9999
locale, constraintContext) -> Validations.apply(
100100
(r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13,

0 commit comments

Comments
 (0)