Skip to content

Commit fcd4428

Browse files
committed
🐛validationの対象がメソッドの場合に引数が出なくなっていたのを修正
1 parent 66a3992 commit fcd4428

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

jig-core/src/main/java/org/dddjava/jig/domain/model/data/members/JigMethodHeader.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ public String name() {
1515
}
1616

1717
public String asSignatureAndReturnTypeSimpleText() {
18-
return "%s(%s):%s".formatted(
18+
return nameAndArgumentSimpleText() + ':' + jigMethodAttribute.returnType().simpleNameWithGenerics();
19+
}
20+
21+
public String nameAndArgumentSimpleText() {
22+
return "%s(%s)".formatted(
1923
id().name(),
2024
jigMethodAttribute.argumentList().stream()
2125
.map(JigTypeReference::simpleNameWithGenerics)
22-
.collect(Collectors.joining(", ")),
23-
jigMethodAttribute.returnType().simpleNameWithGenerics()
24-
);
26+
.collect(Collectors.joining(", ")));
2527
}
2628
}

jig-core/src/main/java/org/dddjava/jig/domain/model/knowledge/validations/Validations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static Stream<Validation> validationAnnotatedMembers(JigType jigType) {
3636
.map(jigAnnotationReference -> {
3737
return new Validation(
3838
jigType.identifier(),
39-
jigMethodDeclaration.name(),
39+
jigMethodDeclaration.header().nameAndArgumentSimpleText(),
4040
jigMethodDeclaration.header().jigMethodAttribute().returnType().id(),
4141
jigAnnotationReference.id(),
4242
jigAnnotationReference.asText()

jig-core/src/test/java/org/dddjava/jig/domain/model/knowledge/validations/ValidationsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static Stream<Arguments> name() {
2222
new TypeAndDescription("NotNull", "[]"))),
2323
Arguments.arguments("minAndMax", List.of(
2424
new TypeAndDescription("Min", "[value=12]"), new TypeAndDescription("Max", "[value=34]"))),
25-
Arguments.arguments("email", List.of(
25+
Arguments.arguments("email()", List.of(
2626
new TypeAndDescription("Email", "[message=めっせーじ, regexp=.+@.+, flags={Flag.CANON_EQ}]")))
2727
);
2828
}

0 commit comments

Comments
 (0)