Skip to content

Commit 71dad97

Browse files
committed
TypeDeclaration廃止
1 parent caff5f3 commit 71dad97

File tree

4 files changed

+2
-50
lines changed

4 files changed

+2
-50
lines changed

jig-core/src/main/java/org/dddjava/jig/domain/model/data/classes/type/JigType.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,14 @@
1919
*/
2020
public class JigType {
2121
private final JigTypeHeader jigTypeHeader;
22-
private final TypeDeclaration typeDeclaration;
2322

2423
private final JigTypeAttribute jigTypeAttribute;
2524

2625
private final JigStaticMember jigStaticMember;
2726
private final JigInstanceMember jigInstanceMember;
2827

29-
public JigType(JigTypeHeader jigTypeHeader, TypeDeclaration typeDeclaration, JigTypeAttribute jigTypeAttribute, JigStaticMember jigStaticMember, JigInstanceMember jigInstanceMember) {
28+
public JigType(JigTypeHeader jigTypeHeader, JigTypeAttribute jigTypeAttribute, JigStaticMember jigStaticMember, JigInstanceMember jigInstanceMember) {
3029
this.jigTypeHeader = jigTypeHeader;
31-
this.typeDeclaration = typeDeclaration;
3230
this.jigTypeAttribute = jigTypeAttribute;
3331
this.jigStaticMember = jigStaticMember;
3432
this.jigInstanceMember = jigInstanceMember;

jig-core/src/main/java/org/dddjava/jig/domain/model/data/classes/type/TypeDeclaration.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

jig-core/src/main/java/org/dddjava/jig/domain/model/sources/JigTypeBuilder.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ public void registerClassComment(ClassComment classComment) {
7777
}
7878

7979
public JigType build(JigTypeHeader jigTypeHeader) {
80-
81-
TypeDeclaration typeDeclaration = new TypeDeclaration(type, superType, new ParameterizedTypes(interfaceTypes));
82-
8380
JigTypeAttribute jigTypeAttribute = new JigTypeAttribute(classComment, typeKind, visibility, annotations);
8481

8582
JigStaticMember jigStaticMember = new JigStaticMember(
@@ -91,7 +88,7 @@ public JigType build(JigTypeHeader jigTypeHeader) {
9188
new JigFields(instanceFields),
9289
new JigMethods(instanceJigMethodBuilders.stream().map(JigMethodBuilder::build).collect(toList())));
9390

94-
return new JigType(jigTypeHeader, typeDeclaration, jigTypeAttribute, jigStaticMember, jigInstanceMember);
91+
return new JigType(jigTypeHeader, jigTypeAttribute, jigStaticMember, jigInstanceMember);
9592
}
9693

9794
public JigTypeBuilder applyTextSource(JavaSourceModel javaSourceModel) {

jig-core/src/test/java/org/dddjava/jig/domain/model/information/jigobject/class_/JigTypesTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ private static JigType callerMethodsOfJigType(String fqn) {
5858
var typeIdentifier = TypeIdentifier.valueOf(fqn);
5959
return new JigType(
6060
JigTypeHeader.simple(fqn),
61-
new TypeDeclaration(
62-
new ParameterizedType(typeIdentifier),
63-
new ParameterizedType(TypeIdentifier.from(Object.class)),
64-
new ParameterizedTypes(List.of())),
6561
new JigTypeAttribute(
6662
new ClassComment(
6763
typeIdentifier,

0 commit comments

Comments
 (0)