Arguments7Validator.unwrap to group 'At' and 'By' fields by auditInfoValidator

Author: making

todo-api/pom.xml

@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>am.ik.yavi</groupId>
 			<artifactId>yavi</artifactId>
-			<version>0.15.0</version>
+			<version>0.16.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>

todo-api/src/main/java/lol/maki/dev/todo/Todo.java

@@ -1,12 +1,16 @@
 package lol.maki.dev.todo;
 
+import am.ik.yavi.arguments.Arguments;
+import am.ik.yavi.arguments.Arguments2;
+import am.ik.yavi.arguments.Arguments2Validator;
+import am.ik.yavi.arguments.Arguments7;
 import am.ik.yavi.arguments.Arguments7Validator;
 import am.ik.yavi.arguments.BooleanValidator;
-import am.ik.yavi.arguments.InstantValidator;
 import am.ik.yavi.arguments.StringValidator;
 import am.ik.yavi.builder.BooleanValidatorBuilder;
-import am.ik.yavi.builder.InstantValidatorBuilder;
 import am.ik.yavi.builder.StringValidatorBuilder;
+import am.ik.yavi.core.Constraint;
+import am.ik.yavi.validator.Yavi;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import java.time.Instant;
 import java.util.function.Function;
@@ -16,12 +20,6 @@
 public record Todo(String todoId, String todoTitle, boolean finished, Instant createdAt, String createdBy,
 		Instant updatedAt, String updatedBy) {
 
-	private static Function<String, InstantValidator<Instant>> instantValidator = (
-			name) -> InstantValidatorBuilder.of(name, c -> c.notNull()).build();
-
-	private static Function<String, StringValidator<String>> usernameValidator = (
-			name) -> StringValidatorBuilder.of(name, c -> c.notBlank().lessThanOrEqual(255)).build();
-
 	public static StringValidator<String> todoIdValidator = StringValidatorBuilder
 		.of("todoId", c -> c.notBlank().lessThanOrEqual(255))
 		.build();
@@ -33,22 +31,27 @@ public record Todo(String todoId, String todoTitle, boolean finished, Instant cr
 	public static BooleanValidator<Boolean> finishedValidator = BooleanValidatorBuilder.of("finished", c -> c.notNull())
 		.build();
 
-	public static InstantValidator<Instant> createdAtValidator = instantValidator.apply("createdAt");
-
-	public static InstantValidator<Instant> updatedAtValidator = instantValidator.apply("updatedAt");
-
-	public static StringValidator<String> createdByValidator = usernameValidator.apply("createdBy");
-
-	public static StringValidator<String> updatedByValidator = usernameValidator.apply("updatedBy");
-
-	public static Arguments7Validator<String, String, Boolean, Instant, String, Instant, String, Todo> validator = todoIdValidator
-		.split(todoTitleValidator)
-		.split(finishedValidator)
-		.split(createdAtValidator)
-		.split(createdByValidator)
-		.split(updatedAtValidator)
-		.split(updatedByValidator)
-		.apply(Todo::new);
+	private static final Function<String, Arguments2Validator<Instant, String, Arguments2<Instant, String>>> auditInfoValidator = name -> Yavi
+		.arguments()
+		._instant(name + "At", Constraint::notNull)
+		._string(name + "By", c -> c.notBlank().lessThanOrEqual(255))
+		.apply(Arguments::of);
+
+	public static final Arguments2Validator<Instant, String, Arguments2<Instant, String>> createdValidator = auditInfoValidator
+		.apply("created");
+
+	public static final Arguments2Validator<Instant, String, Arguments2<Instant, String>> updatedValidator = auditInfoValidator
+		.apply("updated");
+
+	public static Arguments7Validator<String, String, Boolean, Instant, String, Instant, String, Todo> validator = Arguments7Validator
+		.unwrap(todoTitleValidator.split(todoTitleValidator)
+			.split(finishedValidator)
+			.apply(Arguments::of)
+			.<Arguments7<String, String, Boolean, Instant, String, Instant, String>>compose(Arguments7::first3)
+			.combine(createdValidator.compose(args -> Arguments.of(args.arg4(), args.arg5())))
+			.combine(updatedValidator.compose(args -> Arguments.of(args.arg6(), args.arg7())))
+			.apply((a1, a2, a3) -> new Todo(a1.arg1(), a1.arg2(), a1.arg3(), a2.arg1(), a2.arg2(), a3.arg1(),
+					a3.arg2())));
 
 	@Builder(className = "TodoBuilder", factoryMethod = "todo", toBuilder = "from", packageName = "lol.maki.dev.todo")
 	public static Todo create(String todoId, String todoTitle, boolean finished, Instant createdAt, String createdBy,