メソッド名が冗長なのでメソッドシグネチャ、メソッド定義と呼んでみる

Author: irof

jig-core/src/main/java/org/dddjava/jig/adapter/poi/ListAdapter.java

@@ -113,7 +113,7 @@ public List<Path> businessRuleReports(JigRepository jigRepository, JigDocument j
                         ReportItem.ofNumber("使用箇所数", item -> allClassRelations.collectTypeIdWhichRelationTo(item.id()).size()),
                         ReportItem.ofString("使用箇所", item -> allClassRelations.collectTypeIdWhichRelationTo(item.id()).asSimpleText()),
                         ReportItem.ofNumber("メソッド数", item -> item.instanceJigMethods().list().size()),
-                        ReportItem.ofString("メソッド一覧", item -> item.instanceJigMethods().stream().map(JigMethod::nameArgumentsReturnSimpleText).sorted().collect(STREAM_COLLECTOR))
+                        ReportItem.ofString("メソッド一覧", item -> item.instanceJigMethods().stream().map(JigMethod::simpleMethodDeclarationText).sorted().collect(STREAM_COLLECTOR))
                 ), coreDomainJigTypes.listCollectionType()),
                 new ReportSheet<>("VALIDATION", List.of(
                         ReportItem.ofString("パッケージ名", item -> item.typeId().packageId().asText()),
@@ -127,7 +127,7 @@ public List<Path> businessRuleReports(JigRepository jigRepository, JigDocument j
                 new ReportSheet<>("注意メソッド", List.of(
                         ReportItem.ofString("パッケージ名", item -> item.method().declaringType().packageId().asText()),
                         ReportItem.ofString("クラス名", item -> item.method().declaringType().asSimpleText()),
-                        ReportItem.ofString("メソッドシグネチャ", item -> item.method().nameAndArgumentSimpleText()),
+                        ReportItem.ofString("メソッドシグネチャ", item -> item.method().simpleMethodSignatureText()),
                         ReportItem.ofString("メソッド戻り値の型", item -> item.methodReturnType().asSimpleText()),
                         ReportItem.ofString("クラス別名", item -> item.declaringJigType().label()),
                         ReportItem.ofString("メンバを使用していない", item -> markIfTrue(item.notUseMember())),
@@ -152,7 +152,7 @@ public List<Path> applicationReports(JigRepository jigRepository, JigDocument ji
                 new ReportSheet<>("CONTROLLER", List.of(
                         ReportItem.ofString("パッケージ名", item -> item.packageId().asText()),
                         ReportItem.ofString("クラス名", item -> item.typeId().asSimpleText()),
-                        ReportItem.ofString("メソッドシグネチャ", item -> item.jigMethod().nameAndArgumentSimpleText()),
+                        ReportItem.ofString("メソッドシグネチャ", item -> item.jigMethod().simpleMethodSignatureText()),
                         ReportItem.ofString("メソッド戻り値の型", item -> item.jigMethod().returnType().simpleName()),
                         ReportItem.ofString("クラス別名", item -> item.jigType().label()),
                         ReportItem.ofString("使用しているフィールドの型", item -> item.jigMethod().usingFields().jigFieldIds().stream()
@@ -166,7 +166,7 @@ public List<Path> applicationReports(JigRepository jigRepository, JigDocument ji
                 new ReportSheet<>("SERVICE", List.of(
                         ReportItem.ofString("パッケージ名", item -> item.serviceMethod().declaringType().packageId().asText()),
                         ReportItem.ofString("クラス名", item -> item.serviceMethod().declaringType().asSimpleText()),
-                        ReportItem.ofString("メソッドシグネチャ", item -> item.serviceMethod().method().nameAndArgumentSimpleText()),
+                        ReportItem.ofString("メソッドシグネチャ", item -> item.serviceMethod().method().simpleMethodSignatureText()),
                         ReportItem.ofString("メソッド戻り値の型", item -> item.serviceMethod().method().returnType().simpleName()),
                         ReportItem.ofString("イベントハンドラ", item -> markIfTrue(item.usingFromController())),
                         ReportItem.ofString("クラス別名", item -> jigDocumentContext.typeTerm(item.serviceMethod().declaringType()).title()),
@@ -189,15 +189,15 @@ public List<Path> applicationReports(JigRepository jigRepository, JigDocument ji
                         ReportItem.ofNumber("循環的複雑度", item -> item.serviceMethod().method().instructions().cyclomaticComplexity()),
                         ReportItem.ofString("使用しているサービスのメソッド", item -> item.usingServiceMethods().stream().map(invokedMethod -> invokedMethod.asSignatureAndReturnTypeSimpleText()).collect(STREAM_COLLECTOR)),
                         ReportItem.ofString("使用しているリポジトリのメソッド", item -> item.usingRepositoryMethods().list().stream()
-                                .map(JigMethod::nameAndArgumentSimpleText)
+                                .map(JigMethod::simpleMethodSignatureText)
                                 .collect(STREAM_COLLECTOR)),
                         ReportItem.ofString("null使用", item -> markIfTrue(item.useNull())),
                         ReportItem.ofString("stream使用", item -> markIfTrue(item.useStream()))
                 ), serviceAngles.list()),
                 new ReportSheet<>("REPOSITORY", List.of(
                         ReportItem.ofString("パッケージ名", DatasourceAngle::packageText),
                         ReportItem.ofString("クラス名", DatasourceAngle::typeSimpleName),
-                        ReportItem.ofString("メソッドシグネチャ", DatasourceAngle::nameAndArgumentSimpleText),
+                        ReportItem.ofString("メソッドシグネチャ", DatasourceAngle::simpleMethodSignatureText),
                         ReportItem.ofString("メソッド戻り値の型", item -> item.methodReturnType().simpleNameWithGenerics()),
                         ReportItem.ofString("クラス別名", DatasourceAngle::typeLabel),
                         ReportItem.ofString("メソッド戻り値の型の別名", item ->
@@ -221,7 +221,7 @@ public List<Path> applicationReports(JigRepository jigRepository, JigDocument ji
                 new ReportSheet<>("文字列比較箇所", List.of(
                         ReportItem.ofString("パッケージ名", item -> item.jigMethodDeclaration().declaringTypeId().packageId().asText()),
                         ReportItem.ofString("クラス名", item -> item.jigMethodDeclaration().declaringTypeId().asSimpleText()),
-                        ReportItem.ofString("メソッドシグネチャ", item -> item.nameAndArgumentSimpleText())
+                        ReportItem.ofString("メソッドシグネチャ", item -> item.simpleMethodSignatureText())
                 ), stringComparingMethodList.list())
         );
         return result.writeXlsx(jigDocument, jigDocumentContext.outputDirectory());

jig-core/src/main/java/org/dddjava/jig/adapter/thymeleaf/dialect/JigExpressionObject.java

@@ -88,8 +88,8 @@ public boolean hasArgument(JigMethod jigMethod) {
         return jigMethod.jigMethodDeclaration().argumentStream().findAny().isPresent();
     }
 
-    public String nameAndArgumentsAndReturnSimpleText(JigMethod jigMethod) {
-        return jigMethod.nameArgumentsReturnSimpleText();
+    public String simpleMethodDeclarationText(JigMethod jigMethod) {
+        return jigMethod.simpleMethodDeclarationText();
     }
 
     public String methodReturnLinkText(JigMethod jigMethod) {

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

@@ -35,11 +35,17 @@ public String name() {
         return id.name();
     }
 
-    public String nameArgumentsReturnSimpleText() {
-        return nameAndArgumentSimpleText() + ':' + jigMethodAttribute.returnType().simpleNameWithGenerics();
+    /**
+     * メソッド定義（メソッドシグネチャと戻り値型）をシンプルな形式（クラス単純名）で返す
+     */
+    public String simpleMethodDeclarationText() {
+        return simpleMethodSignatureText() + ':' + jigMethodAttribute.returnType().simpleNameWithGenerics();
     }
 
-    public String nameAndArgumentSimpleText() {
+    /**
+     * メソッドシグネチャ（メソッド名と引数型リスト）をシンプルな形式（クラス単純名）で返す
+     */
+    public String simpleMethodSignatureText() {
         return "%s(%s)".formatted(
                 id.name(),
                 jigMethodAttribute.parameterTypeList().stream()

jig-core/src/main/java/org/dddjava/jig/domain/model/information/members/JigMethod.java

@@ -118,8 +118,8 @@ public boolean isAbstract() {
         return header().isAbstract();
     }
 
-    public String nameArgumentsReturnSimpleText() {
-        return header().nameArgumentsReturnSimpleText();
+    public String simpleMethodDeclarationText() {
+        return header().simpleMethodDeclarationText();
     }
 
     public boolean isCall(JigMethodId jigMethodId) {
@@ -130,8 +130,8 @@ public JigTypeReference returnType() {
         return header().returnType();
     }
 
-    public String nameAndArgumentSimpleText() {
-        return header().nameAndArgumentSimpleText();
+    public String simpleMethodSignatureText() {
+        return header().simpleMethodSignatureText();
     }
 
     public Stream<JigTypeReference> parameterTypeStream() {

jig-core/src/main/java/org/dddjava/jig/domain/model/knowledge/datasource/DatasourceAngle.java

@@ -32,8 +32,8 @@ public JigMethod interfaceMethod() {
         return outputImplementation.outputPortGateway();
     }
 
-    public String nameAndArgumentSimpleText() {
-        return interfaceMethod().nameAndArgumentSimpleText();
+    public String simpleMethodSignatureText() {
+        return interfaceMethod().simpleMethodSignatureText();
     }
 
     public JigTypeReference methodReturnType() {

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

@@ -29,7 +29,7 @@ static Stream<Validation> validationAnnotatedMembers(JigType jigType) {
                         .map(jigAnnotationReference -> {
                             return new Validation(
                                     jigType.id(),
-                                    jigMethodDeclaration.header().nameAndArgumentSimpleText(),
+                                    jigMethodDeclaration.header().simpleMethodSignatureText(),
                                     jigMethodDeclaration.header().returnType().id(),
                                     jigAnnotationReference.id(),
                                     jigAnnotationReference.asText()

jig-core/src/main/resources/templates/usecase.html

@@ -25,7 +25,7 @@ <h2><a th:id="${item.fqn()}" th:text="${item.label()}">XXXクラス</a></h2>
                 <section class="method" th:each="method : ${#jig.listRemarkableInstanceMethods(item)}">
                     <h3 th:id="${#jig.htmlIdText(method)}" th:text="${method.labelText()}">XXXメソッド</h3>
                     <div class="fully-qualified-name"
-                         th:text="${#jig.nameAndArgumentsAndReturnSimpleText(method)}">
+                         th:text="${#jig.simpleMethodDeclarationText(method)}">
                         availableRoomList(OffsetDateTime):List
                     </div>
 

jig-core/src/test/java/org/dddjava/jig/application/ReadableLabelTest.java

@@ -75,7 +75,7 @@ public ReadableLabelTest(JigDocumentContext jigDocumentContext) {
 
     JigMethod resolveMethodBySignature(JigType jigType, String methodText) {
         return jigType.allJigMethodStream()
-                .filter(jigMethod -> jigMethod.nameAndArgumentSimpleText().equals(methodText))
+                .filter(jigMethod -> jigMethod.simpleMethodSignatureText().equals(methodText))
                 .findFirst()
                 .orElseThrow(NoSuchElementException::new);
     }

jig-core/src/test/java/org/dddjava/jig/infrastructure/asm/AsmMethodVisitorTest.java

@@ -271,7 +271,7 @@ void varargsMethod(LocalDate... localDates) {
     void 引数型のジェネリクスが取得できる() {
         JigMethod actual = TestSupport.JigMethod準備(MethodVisitorSut.class, "引数型のジェネリクスが取得できる");
 
-        assertEquals("引数型のジェネリクスが取得できる(List<String>)", actual.nameAndArgumentSimpleText());
+        assertEquals("引数型のジェネリクスが取得できる(List<String>)", actual.simpleMethodSignatureText());
     }
 
     @CsvSource({
@@ -302,7 +302,7 @@ void varargsMethod(LocalDate... localDates) {
     @ParameterizedTest
     void 引数と戻り値を文字列表示できる(String methodName, String expectedText) {
         JigMethod actual = TestSupport.JigMethod準備(MethodReturnAndArgumentsSut.class, methodName);
-        assertEquals(expectedText, actual.nameArgumentsReturnSimpleText());
+        assertEquals(expectedText, actual.simpleMethodDeclarationText());
     }
 
     @Test