diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/actor/Actor.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/actor/Actor.java index d77b4a7f..015677fc 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/actor/Actor.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/actor/Actor.java @@ -20,6 +20,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; @Entity @Table(name = "actor") @@ -27,6 +28,7 @@ @Setter @NoArgsConstructor @JsonInclude(JsonInclude.Include.NON_EMPTY) +@ToString public class Actor { /** * Unique identifier for a User entity. @@ -57,6 +59,7 @@ public class Actor { */ @OneToMany(cascade = CascadeType.ALL, mappedBy = "author") @JsonIgnore + @ToString.Exclude private Set pullrequests = new HashSet<>();; /** @@ -64,6 +67,7 @@ public class Actor { */ @OneToMany(cascade = CascadeType.ALL, mappedBy = "author") @JsonIgnore + @ToString.Exclude private Set comments = new HashSet<>();; public void addComment(Comment comment) { @@ -77,11 +81,4 @@ public void addPullrequest(Pullrequest pullrequest) { pullrequests.add(pullrequest); } } - - @Override - public String toString() { - return "Actor{id=" + id + ", login=" + login + ", email=" + email + ", url=" - + url + ", #pullrequests=" - + pullrequests.size() + ", #comments=" + comments.size() + "}"; - } } diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/comment/Comment.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/comment/Comment.java index 9787178d..0008b8eb 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/comment/Comment.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/comment/Comment.java @@ -18,6 +18,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; @Entity @Table(name = "comment") @@ -25,6 +26,7 @@ @Setter @NoArgsConstructor @JsonInclude(JsonInclude.Include.NON_EMPTY) +@ToString public class Comment { /** * Unique identifier for a Comment entity. @@ -62,6 +64,7 @@ public class Comment { */ @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "author_id") + @ToString.Exclude private Actor author; /** @@ -70,6 +73,7 @@ public class Comment { @ManyToOne(optional = false) @JoinColumn(name = "pullrequest_id", referencedColumnName = "id") @JsonIgnore + @ToString.Exclude private Pullrequest pullrequest; public Comment(String body, String createdAt, String updatedAt) { @@ -77,11 +81,4 @@ public Comment(String body, String createdAt, String updatedAt) { this.createdAt = createdAt; this.updatedAt = updatedAt; } - - @Override - public String toString() { - return "Comment{id=" + id + ", githubId=" + githubId + ", body=" + body + ", createdAt=" + createdAt - + ", updatedAt=" + updatedAt + ", author=" + author.getLogin() + ", pullrequest=" - + pullrequest.getTitle() + "}"; - } } diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/pullrequest/Pullrequest.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/pullrequest/Pullrequest.java index 40b000c1..77daaf07 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/pullrequest/Pullrequest.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/pullrequest/Pullrequest.java @@ -23,6 +23,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; @Entity @Table(name = "pullrequest") @@ -30,6 +31,7 @@ @Setter @NoArgsConstructor @JsonInclude(JsonInclude.Include.NON_EMPTY) +@ToString public class Pullrequest { /** @@ -88,9 +90,11 @@ public class Pullrequest { */ @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "author_id") + @ToString.Exclude private Actor author; @OneToMany(cascade = CascadeType.ALL, mappedBy = "pullrequest") + @ToString.Exclude private Set comments = new HashSet<>();; /** @@ -99,14 +103,6 @@ public class Pullrequest { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "repository_id", referencedColumnName = "id") @JsonIgnore + @ToString.Exclude private Repository repository; - - @Override - public String toString() { - return "Pullrequest{id=" + id + ", githubId=" + githubId + ", title=" + - title + ", url=" + url + ", state=" - + state + ", createdAt=" + createdAt + ", updatedAt=" + updatedAt + ", mergedAt=" + mergedAt - + ", author=" + author.getLogin() + ", #comments=" + comments.size() + ", repository=" + - repository.getNameWithOwner() + "}"; - } } diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/Repository.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/Repository.java index dad39581..f4e5b009 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/Repository.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/codereview/repository/Repository.java @@ -17,12 +17,14 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; @Entity @Table(name = "repository") @Getter @Setter @NoArgsConstructor +@ToString public class Repository { /** @@ -48,14 +50,9 @@ public class Repository { private String url; @OneToMany(cascade = CascadeType.ALL, mappedBy = "repository", fetch = FetchType.EAGER) + @ToString.Exclude private Set pullRequests = new HashSet<>();; @Column(name = "added_at") private Instant addedAt; - - public String toString() { - return "Repository{id=" + id + ", name=" + name + ", nameWithOwner=" + nameWithOwner + ", description=" - + description + ", url=" + url + ", #pullRequests=" + pullRequests.size() + ", addedAt=" + addedAt - + "}"; - } }