diff --git a/src/main/java/de/thm/arsnova/entities/Answer.java b/src/main/java/de/thm/arsnova/entities/Answer.java index 58893fc34fb2b7bf05640da6448725cb40719a99..f3a251d33d81ac9ac33e6f10b6abfd30f4b479ec 100644 --- a/src/main/java/de/thm/arsnova/entities/Answer.java +++ b/src/main/java/de/thm/arsnova/entities/Answer.java @@ -3,6 +3,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.Map; import java.util.Objects; @@ -89,4 +90,13 @@ public abstract class Answer extends Entity { Objects.equals(roomId, answer.roomId) && Objects.equals(creatorId, answer.creatorId); } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("contentId", contentId) + .append("roomId", roomId) + .append("creatorId", creatorId) + .append("round", round); + } } diff --git a/src/main/java/de/thm/arsnova/entities/Attachment.java b/src/main/java/de/thm/arsnova/entities/Attachment.java index b85fd3b2e3f989591a1947a01cc4805fdd2bc7ea..1f8d2e4fe9b13c630d0ec4865b6f37679fd035a0 100644 --- a/src/main/java/de/thm/arsnova/entities/Attachment.java +++ b/src/main/java/de/thm/arsnova/entities/Attachment.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.Objects; @@ -95,4 +96,13 @@ public class Attachment extends Entity { Objects.equals(originalSourceUrl, that.originalSourceUrl) && Objects.equals(storageLocation, that.storageLocation); } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("mediaType", mediaType) + .append("size", size) + .append("originalSourceUrl", originalSourceUrl) + .append("storageLocation", storageLocation); + } } diff --git a/src/main/java/de/thm/arsnova/entities/ChoiceAnswer.java b/src/main/java/de/thm/arsnova/entities/ChoiceAnswer.java index 242e5e54550d51eedb00130108367196a9251838..f11f5b4f5f8271f349f5d20d476e4008e63ada30 100644 --- a/src/main/java/de/thm/arsnova/entities/ChoiceAnswer.java +++ b/src/main/java/de/thm/arsnova/entities/ChoiceAnswer.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.List; @@ -17,4 +18,10 @@ public class ChoiceAnswer extends Answer { public void setSelectedChoiceIndexes(final List<Integer> selectedChoiceIndexes) { this.selectedChoiceIndexes = selectedChoiceIndexes; } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("selectedChoiceIndexes", selectedChoiceIndexes); + } } diff --git a/src/main/java/de/thm/arsnova/entities/ChoiceQuestionContent.java b/src/main/java/de/thm/arsnova/entities/ChoiceQuestionContent.java index 7b0a81a9e00103b0db8aa82f79748eeb330b1c66..0b3e34b13d18f802d9a52afebf4c8f5255e728e6 100644 --- a/src/main/java/de/thm/arsnova/entities/ChoiceQuestionContent.java +++ b/src/main/java/de/thm/arsnova/entities/ChoiceQuestionContent.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.ArrayList; import java.util.List; @@ -30,6 +31,15 @@ public class ChoiceQuestionContent extends Content { public void setPoints(int points) { this.points = points; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("label", label) + .append("points", points) + .toString(); + } + } private List<AnswerOption> options = new ArrayList<>(); @@ -66,4 +76,12 @@ public class ChoiceQuestionContent extends Content { public void setMultiple(final boolean multiple) { this.multiple = multiple; } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("options", options) + .append("correctOptionIndexes", correctOptionIndexes) + .append("multiple", multiple); + } } diff --git a/src/main/java/de/thm/arsnova/entities/ClientAuthentication.java b/src/main/java/de/thm/arsnova/entities/ClientAuthentication.java index 0f2748732760f9f77a17ac77a51d3f9fffa2f64e..459df8a3004c82f62f4f833944d9a3c3d22449c0 100644 --- a/src/main/java/de/thm/arsnova/entities/ClientAuthentication.java +++ b/src/main/java/de/thm/arsnova/entities/ClientAuthentication.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; public class ClientAuthentication { private String userId; @@ -36,4 +37,14 @@ public class ClientAuthentication { public String getToken() { return token; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("userId", userId) + .append("loginId", loginId) + .append("authProvider", authProvider) + .append("token", token) + .toString(); + } } diff --git a/src/main/java/de/thm/arsnova/entities/Comment.java b/src/main/java/de/thm/arsnova/entities/Comment.java index 679f8ac20ffbf69a39f697a4fb42240f1d8b9e71..c8218c48ef997a5497c9018bf743233fc854dbaa 100644 --- a/src/main/java/de/thm/arsnova/entities/Comment.java +++ b/src/main/java/de/thm/arsnova/entities/Comment.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.Date; import java.util.Map; @@ -110,4 +111,15 @@ public class Comment extends Entity { Objects.equals(timestamp, comment.timestamp) && Objects.equals(extensions, comment.extensions); } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("roomId", roomId) + .append("creatorId", creatorId) + .append("subject", subject) + .append("body", body) + .append("timestamp", timestamp) + .append("read", read); + } } diff --git a/src/main/java/de/thm/arsnova/entities/Content.java b/src/main/java/de/thm/arsnova/entities/Content.java index aef47c63a0ddb76619465bf793e8ef66026b3ea6..2e4912e60f6907502274024835cd63d739c1e600 100644 --- a/src/main/java/de/thm/arsnova/entities/Content.java +++ b/src/main/java/de/thm/arsnova/entities/Content.java @@ -3,6 +3,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.Date; import java.util.HashSet; @@ -92,6 +93,18 @@ public class Content extends Entity { public void setResponsesVisible(final boolean responsesVisible) { this.responsesVisible = responsesVisible; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("round", round) + .append("roundEndTimestamp", roundEndTimestamp) + .append("visible", visible) + .append("solutionVisible", solutionVisible) + .append("responsesEnabled", responsesEnabled) + .append("responsesVisible", responsesVisible) + .toString(); + } } private String roomId; @@ -236,4 +249,18 @@ public class Content extends Entity { Objects.equals(groups, content.groups) && Objects.equals(timestamp, content.timestamp); } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("roomId", roomId) + .append("subject", subject) + .append("body", body) + .append("format", format) + .append("groups", groups) + .append("abstentionsAllowed", abstentionsAllowed) + .append("state", state) + .append("timestamp", timestamp) + .append("attachments", attachments); + } } diff --git a/src/main/java/de/thm/arsnova/entities/LoginCredentials.java b/src/main/java/de/thm/arsnova/entities/LoginCredentials.java index 9d86bc9471b7aad0751fd599febf54d03f7d5446..52668d3bf9550948d6706accf9172502d2b8a0f5 100644 --- a/src/main/java/de/thm/arsnova/entities/LoginCredentials.java +++ b/src/main/java/de/thm/arsnova/entities/LoginCredentials.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; public class LoginCredentials { private String loginId; @@ -24,4 +25,12 @@ public class LoginCredentials { public void setPassword(final String password) { this.password = password; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("loginId", loginId) + .append("password", password) + .toString(); + } } diff --git a/src/main/java/de/thm/arsnova/entities/Motd.java b/src/main/java/de/thm/arsnova/entities/Motd.java index ba4fbac53d939689c1958d83c22aca89c4de8c62..63c04acc2ca175b5f31435ba756c94d534ec4c1b 100644 --- a/src/main/java/de/thm/arsnova/entities/Motd.java +++ b/src/main/java/de/thm/arsnova/entities/Motd.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.Date; import java.util.Objects; @@ -116,4 +117,15 @@ public class Motd extends Entity { Objects.equals(body, motd.body) && audience == motd.audience; } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("roomId", roomId) + .append("startDate", startDate) + .append("endDate", endDate) + .append("title", title) + .append("body", body) + .append("audience", audience); + } } diff --git a/src/main/java/de/thm/arsnova/entities/Room.java b/src/main/java/de/thm/arsnova/entities/Room.java index 588f2e7165135181b2859aca98bb1dfd2705ae1b..c28276601a46e5792ec4389fda907ac0a1682098 100644 --- a/src/main/java/de/thm/arsnova/entities/Room.java +++ b/src/main/java/de/thm/arsnova/entities/Room.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.HashSet; import java.util.List; @@ -37,6 +38,14 @@ public class Room extends Entity { public void setAutoSort(final boolean autoSort) { this.autoSort = autoSort; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("contentIds", contentIds) + .append("autoSort", autoSort) + .toString(); + } } public static class Settings { @@ -150,6 +159,22 @@ public class Room extends Entity { public void setFeedbackLocked(final boolean feedbackLocked) { this.feedbackLocked = feedbackLocked; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("questionsEnabled", questionsEnabled) + .append("slidesEnabled", slidesEnabled) + .append("commentsEnabled", commentsEnabled) + .append("flashcardsEnabled", flashcardsEnabled) + .append("quickSurveyEnabled", quickSurveyEnabled) + .append("quickFeedbackEnabled", quickFeedbackEnabled) + .append("scoreEnabled", scoreEnabled) + .append("multipleRoundsEnabled", multipleRoundsEnabled) + .append("timerEnabled", timerEnabled) + .append("feedbackLocked", feedbackLocked) + .toString(); + } } public static class Author { @@ -208,6 +233,17 @@ public class Room extends Entity { public void setOrganizationUnit(final String organizationUnit) { this.organizationUnit = organizationUnit; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("name", name) + .append("mail", mail) + .append("organizationName", organizationName) + .append("organizationLogo", organizationLogo) + .append("organizationUnit", organizationUnit) + .toString(); + } } public static class PoolProperties { @@ -244,6 +280,15 @@ public class Room extends Entity { public void setLicense(final String license) { this.license = license; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("category", category) + .append("level", level) + .append("license", license) + .toString(); + } } private String shortId; @@ -417,4 +462,21 @@ public class Room extends Entity { Objects.equals(abbreviation, room.abbreviation) && Objects.equals(description, room.description); } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("shortId", shortId) + .append("ownerId", ownerId) + .append("name", name) + .append("abbreviation", abbreviation) + .append("description", description) + .append("closed", closed) + .append("contentGroups", contentGroups) + .append("settings", settings) + .append("author", author) + .append("poolProperties", poolProperties) + .append("attachments", attachments) + .append("statistics", statistics); + } } diff --git a/src/main/java/de/thm/arsnova/entities/RoomStatistics.java b/src/main/java/de/thm/arsnova/entities/RoomStatistics.java index ba07a03d7f54178a9f8e8221af45b6720722e5d8..6358e1cf923dacbb02c8d99d20b72dfd13f715c2 100644 --- a/src/main/java/de/thm/arsnova/entities/RoomStatistics.java +++ b/src/main/java/de/thm/arsnova/entities/RoomStatistics.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; public class RoomStatistics { private int contentCount = 0; @@ -65,4 +66,16 @@ public class RoomStatistics { public void setUnreadCommentCount(final int unreadCommentCount) { this.unreadCommentCount = unreadCommentCount; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("contentCount", contentCount) + .append("unansweredContentCount", unansweredContentCount) + .append("answerCount", answerCount) + .append("unreadAnswerCount", unreadAnswerCount) + .append("commentCount", commentCount) + .append("unreadCommentCount", unreadCommentCount) + .toString(); + } } diff --git a/src/main/java/de/thm/arsnova/entities/TextAnswer.java b/src/main/java/de/thm/arsnova/entities/TextAnswer.java index 14a32c2878347fb8547430d5be820d5815aa0e9f..ce959de9b2d330285ddae89e7fa44b090a7d1a47 100644 --- a/src/main/java/de/thm/arsnova/entities/TextAnswer.java +++ b/src/main/java/de/thm/arsnova/entities/TextAnswer.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.Date; @@ -45,4 +46,12 @@ public class TextAnswer extends Answer { public Date getCreationTimestamp() { return creationTimestamp; } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("subject", subject) + .append("body", body) + .append("read", read); + } } diff --git a/src/main/java/de/thm/arsnova/entities/UserProfile.java b/src/main/java/de/thm/arsnova/entities/UserProfile.java index 0da4117e56fdd69d927ee39272b095ffe1bbaf08..1fbb2acc7f87e2f9bfa848407830e97581c065bc 100644 --- a/src/main/java/de/thm/arsnova/entities/UserProfile.java +++ b/src/main/java/de/thm/arsnova/entities/UserProfile.java @@ -2,6 +2,7 @@ package de.thm.arsnova.entities; import com.fasterxml.jackson.annotation.JsonView; import de.thm.arsnova.entities.serialization.View; +import org.springframework.core.style.ToStringCreator; import java.util.Date; import java.util.HashSet; @@ -67,6 +68,16 @@ public class UserProfile extends Entity { public void setPasswordResetTime(final Date passwordResetTime) { this.passwordResetTime = passwordResetTime; } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("password", password) + .append("activationKey", activationKey) + .append("passwordResetKey", passwordResetKey) + .append("passwordResetTime", passwordResetTime) + .toString(); + } } public static class RoomHistoryEntry { @@ -119,6 +130,14 @@ public class UserProfile extends Entity { public int hashCode() { return Objects.hash(roomId); } + + @Override + public String toString() { + return new ToStringCreator(this) + .append("roomId", roomId) + .append("lastVisit", lastVisit) + .toString(); + } } private AuthProvider authProvider; @@ -232,4 +251,15 @@ public class UserProfile extends Entity { Objects.equals(loginId, that.loginId) && Objects.equals(lastLoginTimestamp, that.lastLoginTimestamp); } + + @Override + protected ToStringCreator buildToString() { + return super.buildToString() + .append("authProvider", authProvider) + .append("loginId", loginId) + .append("lastLoginTimestamp", lastLoginTimestamp) + .append("account", account) + .append("roomHistory", roomHistory) + .append("acknowledgedMotds", acknowledgedMotds); + } }