Skip to content

Commit 81b2e3f

Browse files
committed
コレクションの時点では順序をもたないのでリネーム
1 parent 8fe63cd commit 81b2e3f

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.dddjava.jig.domain.model.knowledge.adapter.DatasourceAngles;
2525
import org.dddjava.jig.domain.model.knowledge.core.ServiceAngles;
2626
import org.dddjava.jig.domain.model.knowledge.core.usecases.StringComparingMethodList;
27-
import org.dddjava.jig.domain.model.knowledge.smell.MethodSmellList;
27+
import org.dddjava.jig.domain.model.knowledge.smell.MethodSmells;
2828
import org.dddjava.jig.domain.model.knowledge.validations.Validations;
2929

3030
import java.nio.file.Path;
@@ -52,7 +52,7 @@ public ListAdapter(JigDocumentContext jigDocumentContext, JigService jigService)
5252
@HandleDocument(JigDocument.BusinessRuleList)
5353
public ReportBook businessRuleReports(JigRepository jigRepository) {
5454

55-
MethodSmellList methodSmellList = jigService.methodSmells(jigRepository);
55+
MethodSmells methodSmells = jigService.methodSmells(jigRepository);
5656
JigTypes jigTypes = jigService.jigTypes(jigRepository);
5757
var allClassRelations = TypeRelationships.from(jigTypes);
5858

@@ -133,7 +133,7 @@ public ReportBook businessRuleReports(JigRepository jigRepository) {
133133
ReportItem.ofString("NULL判定をしている", item -> markIfTrue(item.nullDecision())),
134134
ReportItem.ofString("真偽値を返している", item -> markIfTrue(item.returnsBoolean())),
135135
ReportItem.ofString("voidを返している", item -> markIfTrue(item.returnsVoid()))
136-
), methodSmellList.list())
136+
), methodSmells.list())
137137
);
138138
}
139139

jig-core/src/main/java/org/dddjava/jig/application/JigService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.dddjava.jig.domain.model.knowledge.adapter.DatasourceAngles;
2626
import org.dddjava.jig.domain.model.knowledge.core.ServiceAngles;
2727
import org.dddjava.jig.domain.model.knowledge.core.usecases.StringComparingMethodList;
28-
import org.dddjava.jig.domain.model.knowledge.smell.MethodSmellList;
28+
import org.dddjava.jig.domain.model.knowledge.smell.MethodSmells;
2929

3030
import java.util.List;
3131
import java.util.Map;
@@ -80,8 +80,8 @@ public JigTypes coreDomainJigTypes(JigRepository jigRepository) {
8080
});
8181
}
8282

83-
public MethodSmellList methodSmells(JigRepository jigRepository) {
84-
return MethodSmellList.from(coreDomainJigTypes(jigRepository));
83+
public MethodSmells methodSmells(JigRepository jigRepository) {
84+
return MethodSmells.from(coreDomainJigTypes(jigRepository));
8585
}
8686

8787
public JigTypes categoryTypes(JigRepository jigRepository) {

jig-core/src/main/java/org/dddjava/jig/domain/model/knowledge/smell/MethodSmellList.java renamed to jig-core/src/main/java/org/dddjava/jig/domain/model/knowledge/smell/MethodSmells.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
/**
1010
* メソッドの不吉なにおい一覧
1111
*/
12-
public record MethodSmellList(Collection<MethodSmell> smells) {
12+
public record MethodSmells(Collection<MethodSmell> smells) {
1313

14-
public static MethodSmellList from(JigTypes jigTypes) {
15-
return new MethodSmellList(jigTypes.orderedStream()
14+
public static MethodSmells from(JigTypes jigTypes) {
15+
return new MethodSmells(jigTypes.orderedStream()
1616
.flatMap(jigType -> jigType.instanceJigMethodStream()
1717
.flatMap(method -> MethodSmell.createMethodSmell(method, jigType).stream())
1818
)

jig-core/src/test/java/org/dddjava/jig/domain/model/knowledge/smell/MethodSmellListTest.java renamed to jig-core/src/test/java/org/dddjava/jig/domain/model/knowledge/smell/MethodSmellsTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323

2424
@JigServiceTest
25-
class MethodSmellListTest {
25+
class MethodSmellsTest {
2626

2727
@Test
2828
void 注意メソッドの抽出(JigService jigService, JigRepository jigRepository) {
29-
MethodSmellList methodSmellList = jigService.methodSmells(jigRepository);
29+
MethodSmells methodSmells = jigService.methodSmells(jigRepository);
3030

31-
var detectedSmells = methodSmellList.list().stream()
31+
var detectedSmells = methodSmells.list().stream()
3232
.filter(methodSmell -> methodSmell.method().declaringType().equals(TypeId.from(SmelledClass.class)))
3333
.toList();
3434

@@ -58,10 +58,10 @@ private static MethodSmell extractMethod(List<MethodSmell> detectedSmells, Strin
5858
@ParameterizedTest(name = "{index} {1} :: {0}")
5959
void メンバ未使用の判定(Class<?> clz, String name, boolean expected) {
6060
var jigType = TestSupport.buildJigType(clz);
61-
MethodSmellList methodSmellList = MethodSmellList.from(new JigTypes(List.of(jigType)));
61+
MethodSmells methodSmells = MethodSmells.from(new JigTypes(List.of(jigType)));
6262

6363
// smellListに入っていないものは警告なしの判定になるのでfilterとanyMatchで検証
64-
assertEquals(expected, methodSmellList.list().stream()
64+
assertEquals(expected, methodSmells.list().stream()
6565
.filter(methodSmell -> methodSmell.method().name().equals(name))
6666
.anyMatch(MethodSmell::notUseMember)
6767
);
@@ -103,9 +103,9 @@ private static MethodSmell extractMethod(List<MethodSmell> detectedSmells, Strin
103103
*/
104104
@Test
105105
void 注意メソッドの抽出_record(JigService jigService, JigRepository jigRepository) {
106-
MethodSmellList methodSmellList = jigService.methodSmells(jigRepository);
106+
MethodSmells methodSmells = jigService.methodSmells(jigRepository);
107107

108-
var detectedSmells = methodSmellList.list().stream()
108+
var detectedSmells = methodSmells.list().stream()
109109
.filter(methodSmell -> methodSmell.method().declaringType().equals(TypeId.from(SmelledRecord.class)))
110110
.toList();
111111

0 commit comments

Comments
 (0)