Make Arguments1ValidatorBuilder return Arguments1Validator instead …

…of `ValueValidator` for the consistency (#397)
making · Jun 18, 2024 · 9bfa18e · 9bfa18e
1 parent 5880d79
commit 9bfa18e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/scripts/generate-args.sh b/scripts/generate-args.sh
@@ -752,6 +752,10 @@ import am.ik.yavi.arguments.Arguments1;
 $(if [ "${i}" -gt 1 ];then
 cat <<EOD
 import am.ik.yavi.arguments.ArgumentsValidators;
+EOD
+fi)
+$(if [ "${i}" -gt 0 ];then
+cat <<EOD
 import am.ik.yavi.arguments.Arguments${i}Validator;
 EOD
 fi)
@@ -1050,12 +1054,12 @@ EOD
 fi)
 $(if [ "${i}" == "1" ];then
 cat <<EOD
-	public <X> ValueValidator<A1, X> apply(Function1<? super R1, ? extends X> f) {
-		return this.v1.andThen(f::apply);
+	public <X> Arguments1Validator<A1, X> apply(Function1<? super R1, ? extends X> f) {
+		return Arguments1Validator.from(this.v1.andThen(f::apply));
 	}
 
-	public ValueValidator<A1, R1> get() {
-		return this.v1;
+	public Arguments1Validator<A1, R1> get() {
+		return Arguments1Validator.from(this.v1);
 	}
 EOD
 fi)

diff --git a/src/main/java/am/ik/yavi/builder/Arguments1ValidatorBuilder.java b/src/main/java/am/ik/yavi/builder/Arguments1ValidatorBuilder.java
@@ -28,6 +28,7 @@
 
 import am.ik.yavi.arguments.Arguments1;
 
+import am.ik.yavi.arguments.Arguments1Validator;
 import am.ik.yavi.constraint.BigDecimalConstraint;
 import am.ik.yavi.constraint.BigIntegerConstraint;
 import am.ik.yavi.constraint.BooleanConstraint;
@@ -332,11 +333,11 @@ public Arguments2ValidatorBuilder<A1, ZonedDateTime, R1, ZonedDateTime> _zonedDa
 		return this._zonedDateTime(name, Function.identity());
 	}
 
-	public <X> ValueValidator<A1, X> apply(Function1<? super R1, ? extends X> f) {
-		return this.v1.andThen(f::apply);
+	public <X> Arguments1Validator<A1, X> apply(Function1<? super R1, ? extends X> f) {
+		return Arguments1Validator.from(this.v1.andThen(f::apply));
 	}
 
-	public ValueValidator<A1, R1> get() {
-		return this.v1;
+	public Arguments1Validator<A1, R1> get() {
+		return Arguments1Validator.from(this.v1);
 	}
 }