Skip to content

Commit 41339af

Browse files
irofirof
committed
format
1 parent b38bc13 commit 41339af

9 files changed

Lines changed: 54 additions & 52 deletions

File tree

‎jig-core/src/main/java/org/dddjava/jig/adapter/mermaid/SequenceMermaidDiagram.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@ public static String mermaidSequenceDiagram(JigMethod jigMethod) {
2727
// Java標準ライブラリのクラスを除外
2828
.filter(methodCall -> methodCall.isNotJSL())
2929
.forEach(methodCall -> {
30-
TypeId callee = methodCall.methodOwner();
31-
String methodName = methodCall.methodName();
32-
TypeId returnType = methodCall.returnType();
30+
TypeId callee = methodCall.methodOwner();
31+
String methodName = methodCall.methodName();
32+
TypeId returnType = methodCall.returnType();
3333

34-
// Format arguments
35-
String args = methodCall.argumentTypes().isEmpty() ?
36-
"()" :
37-
"(" + methodCall.argumentTypes().stream()
38-
.map(TypeId::asSimpleText)
39-
.collect(joining(", ")) + ")";
34+
// Format arguments
35+
String args = methodCall.argumentTypes().isEmpty() ?
36+
"()" :
37+
"(" + methodCall.argumentTypes().stream()
38+
.map(TypeId::asSimpleText)
39+
.collect(joining(", ")) + ")";
4040

41-
// Add call line
42-
sb.append(" ").append(caller.asSimpleText())
43-
.append(" ->>+ ").append(callee.asSimpleText())
44-
.append(": ");
41+
// Add call line
42+
sb.append(" ").append(caller.asSimpleText())
43+
.append(" ->>+ ").append(callee.asSimpleText())
44+
.append(": ");
4545

46-
// Format method name - for constructors, use "new ClassName" instead of "<init>"
47-
if (methodCall.isConstructor()) {
48-
sb.append("new ").append(callee.asSimpleText());
49-
} else {
50-
sb.append(methodName);
51-
}
46+
// Format method name - for constructors, use "new ClassName" instead of "<init>"
47+
if (methodCall.isConstructor()) {
48+
sb.append("new ").append(callee.asSimpleText());
49+
} else {
50+
sb.append(methodName);
51+
}
5252

53-
sb.append(args).append("\n");
53+
sb.append(args).append("\n");
5454

55-
// For void return types, use deactivate instead of return arrow
56-
if (returnType.asSimpleText().equals("void")) {
57-
sb.append(" deactivate ").append(callee.asSimpleText()).append("\n");
58-
} else {
59-
// Add return line for non-void return types
60-
sb.append(" ").append(callee.asSimpleText())
61-
.append(" -->>- ").append(caller.asSimpleText())
62-
.append(": ").append(returnType.asSimpleText()).append("\n");
63-
}
64-
});
55+
// For void return types, use deactivate instead of return arrow
56+
if (returnType.asSimpleText().equals("void")) {
57+
sb.append(" deactivate ").append(callee.asSimpleText()).append("\n");
58+
} else {
59+
// Add return line for non-void return types
60+
sb.append(" ").append(callee.asSimpleText())
61+
.append(" -->>- ").append(caller.asSimpleText())
62+
.append(": ").append(returnType.asSimpleText()).append("\n");
63+
}
64+
});
6565

6666
return sb.toString();
6767
}

‎jig-core/src/main/java/org/dddjava/jig/adapter/mermaid/TypeRelationMermaidDiagram.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
public class TypeRelationMermaidDiagram {
2323

2424
/**
25-
* @param jigPackage 出力対象パッケージ
25+
* @param jigPackage 出力対象パッケージ
2626
* @param coreTypesAndRelations 出力コンテキスト
2727
* @return Mermaidテキスト
2828
*/

‎jig-core/src/main/java/org/dddjava/jig/domain/model/data/enums/EnumConstant.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
* Enumの定数
77
*
88
* 定数名とコンストラクタの引数リストを持つ
9-
* @param name 定数名
9+
*
10+
* @param name 定数名
1011
* @param argumentExpressions 引数式（実装されているままのコード）のリスト
1112
*/
1213
public record EnumConstant(String name, List<String> argumentExpressions) {

‎jig-core/src/main/java/org/dddjava/jig/domain/model/data/types/JigAnnotationElementValue.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public String valueText() {
3333
*
3434
* <code>@Hoge(value = MyEnum.HOGE)</code>
3535
*
36-
* @param typeId enumの型
37-
* @param constantName 列挙値のname
36+
* @param typeId enumの型
37+
* @param constantName 列挙値のname
3838
*/
3939
record JigAnnotationElementEnumValue(TypeId typeId, String constantName)
4040
implements JigAnnotationElementValue {

‎jig-core/src/main/java/org/dddjava/jig/domain/model/data/types/JigAnnotationReference.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* 「参照」と言う名前をとっているが、アノテーションの要素値を持つため実体という方が正しい。
1313
* JigTypeReferenceと位置付けが近いから寄せている。
1414
*
15-
* @param id アノテーションの型を示すID
15+
* @param id アノテーションの型を示すID
1616
* @param elements 要素のコレクション
1717
* @see JigTypeReference
1818
*/

‎jig-core/src/main/java/org/dddjava/jig/domain/model/data/types/JigTypeParameter.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
*/
1313
public record JigTypeParameter(String name, List<JigTypeArgument> bounds) {
1414

15-
public String nameAndBounds() {
16-
List<JigTypeArgument> meaningfulBounds = bounds.stream()
17-
.filter(JigTypeArgument::notObject)
18-
.toList();
15+
public String nameAndBounds() {
16+
List<JigTypeArgument> meaningfulBounds = bounds.stream()
17+
.filter(JigTypeArgument::notObject)
18+
.toList();
1919

20-
if (meaningfulBounds.isEmpty()) {
21-
return name;
22-
}
20+
if (meaningfulBounds.isEmpty()) {
21+
return name;
22+
}
2323

24-
String boundsString = meaningfulBounds.stream()
25-
.map(JigTypeArgument::simpleNameWithGenerics)
26-
.collect(joining(" & "));
24+
String boundsString = meaningfulBounds.stream()
25+
.map(JigTypeArgument::simpleNameWithGenerics)
26+
.collect(joining(" & "));
2727

28-
return name + " extends " + boundsString;
29-
}
28+
return name + " extends " + boundsString;
3029
}
30+
}

‎jig-core/src/main/java/org/dddjava/jig/domain/model/documents/stationery/JigDiagramOption.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
/**
88
* ダイアグラム出力オプション
9+
*
910
* @param graphvizOutputFormat graphvizの出力フォーマット
10-
* @param graphvizTimeout dotコマンドのタイムアウト
11-
* @param transitiveReduction 推移簡約をするかどうか
11+
* @param graphvizTimeout dotコマンドのタイムアウト
12+
* @param transitiveReduction 推移簡約をするかどうか
1213
*/
1314
public record JigDiagramOption(
1415
JigDiagramFormat graphvizOutputFormat,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/**
1414
* メソッド定義
1515
*
16-
* @param header メソッドヘッダ。JLSのModifierを含む。
16+
* @param header メソッドヘッダ。JLSのModifierを含む。
1717
* @param instructions メソッドで実行される命令
1818
* @see <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-8.html#jls-8.4">Method Declaration</a>
1919
*/

‎jig-core/src/main/java/org/dddjava/jig/domain/model/information/relation/graph/Edge.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/**
66
* 有向グラフの辺
77
*
8-
* @param from 始点
9-
* @param to 終点
8+
* @param from 始点
9+
* @param to 終点
1010
* @param <NODE> ノードの型
1111
*/
1212
public record Edge<NODE>(NODE from, NODE to) implements Comparable<Edge<NODE>> {

0 commit comments

Comments
 (0)