diff --git a/lombok.config b/lombok.config index efd9271..95226a7 100644 --- a/lombok.config +++ b/lombok.config @@ -1 +1,2 @@ lombok.anyConstructor.addConstructorProperties = true +lombok.equalsAndHashCode.callSuper = call diff --git a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java index 52b9fb2..69d1443 100644 --- a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java @@ -1,7 +1,6 @@ package mops.gruppen2.domain.event; -import lombok.Getter; -import lombok.ToString; +import lombok.Value; import lombok.extern.log4j.Log4j2; import mops.gruppen2.domain.exception.EventException; import mops.gruppen2.domain.helper.ValidationHelper; @@ -12,16 +11,14 @@ import mops.gruppen2.domain.model.User; /** * Fügt einen einzelnen Nutzer einer Gruppe hinzu. */ -@Getter -@ToString + @Log4j2 +@Value public class AddUserEvent extends Event { - private String givenname; - private String familyname; - private String email; - - private AddUserEvent() {} + String givenname; + String familyname; + String email; public AddUserEvent(Group group, User user) { super(group.getId(), user.getId()); diff --git a/src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java b/src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java index 166f188..dbfb695 100644 --- a/src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java @@ -1,22 +1,18 @@ package mops.gruppen2.domain.event; -import lombok.Getter; -import lombok.ToString; +import lombok.Value; import lombok.extern.log4j.Log4j2; import mops.gruppen2.domain.model.Group; import mops.gruppen2.domain.model.Type; import java.util.UUID; -@Getter -@ToString @Log4j2 +@Value public class CreateGroupEvent extends Event { - private UUID groupParent; - private Type type; - - private CreateGroupEvent() {} + UUID groupParent; + Type type; public CreateGroupEvent(UUID groupId, String userId, UUID parent, Type type) { super(groupId, userId); diff --git a/src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java b/src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java index 9ef2256..0b62ad7 100644 --- a/src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java @@ -1,18 +1,14 @@ package mops.gruppen2.domain.event; -import lombok.Getter; -import lombok.ToString; +import lombok.Value; import lombok.extern.log4j.Log4j2; import mops.gruppen2.domain.model.Group; import mops.gruppen2.domain.model.User; -@Getter -@ToString @Log4j2 +@Value public class DeleteGroupEvent extends Event { - private DeleteGroupEvent() {} - public DeleteGroupEvent(Group group, User user) { super(group.getId(), user.getId()); } diff --git a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java index d142b49..12ba916 100644 --- a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java @@ -1,7 +1,6 @@ package mops.gruppen2.domain.event; -import lombok.Getter; -import lombok.ToString; +import lombok.Value; import lombok.extern.log4j.Log4j2; import mops.gruppen2.domain.exception.EventException; import mops.gruppen2.domain.helper.ValidationHelper; @@ -11,13 +10,10 @@ import mops.gruppen2.domain.model.User; /** * Entfernt ein einzelnes Mitglied einer Gruppe. */ -@Getter -@ToString @Log4j2 +@Value public class DeleteUserEvent extends Event { - private DeleteUserEvent() {} - public DeleteUserEvent(Group group, User user) { super(group.getId(), user.getId()); } diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java index 765b2c6..a3fc8ad 100644 --- a/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java @@ -1,7 +1,6 @@ package mops.gruppen2.domain.event; -import lombok.Getter; -import lombok.ToString; +import lombok.Value; import lombok.extern.log4j.Log4j2; import mops.gruppen2.domain.model.Description; import mops.gruppen2.domain.model.Group; @@ -10,14 +9,11 @@ import mops.gruppen2.domain.model.User; /** * Ändert nur die Gruppenbeschreibung. */ -@Getter -@ToString @Log4j2 +@Value public class UpdateGroupDescriptionEvent extends Event { - private Description groupDescription; - - private UpdateGroupDescriptionEvent() {} + Description groupDescription; public UpdateGroupDescriptionEvent(Group group, User user, Description groupDescription) { super(group.getId(), user.getId()); diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java index 5942a26..f698879 100644 --- a/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java @@ -1,7 +1,6 @@ package mops.gruppen2.domain.event; -import lombok.Getter; -import lombok.ToString; +import lombok.Value; import lombok.extern.log4j.Log4j2; import mops.gruppen2.domain.model.Group; import mops.gruppen2.domain.model.Title; @@ -10,14 +9,11 @@ import mops.gruppen2.domain.model.User; /** * Ändert nur den Gruppentitel. */ -@Getter -@ToString @Log4j2 +@Value public class UpdateGroupTitleEvent extends Event { - private Title newGroupTitle; - - private UpdateGroupTitleEvent() {} + Title newGroupTitle; public UpdateGroupTitleEvent(Group group, User user, Title newGroupTitle) { super(group.getId(), user.getId()); diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java index 089af1f..2fc57dd 100644 --- a/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java @@ -1,7 +1,6 @@ package mops.gruppen2.domain.event; -import lombok.Getter; -import lombok.ToString; +import lombok.Value; import lombok.extern.log4j.Log4j2; import mops.gruppen2.domain.exception.UserNotFoundException; import mops.gruppen2.domain.helper.ValidationHelper; @@ -14,14 +13,11 @@ import java.util.UUID; /** * Aktualisiert die Gruppenrolle eines Teilnehmers. */ -@Getter -@ToString @Log4j2 +@Value public class UpdateRoleEvent extends Event { - private Role newRole; - - private UpdateRoleEvent() {} + Role newRole; public UpdateRoleEvent(UUID groupId, String userId, Role newRole) { super(groupId, userId); diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateUserLimitEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateUserLimitEvent.java index a778295..030f48a 100644 --- a/src/main/java/mops/gruppen2/domain/event/UpdateUserLimitEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/UpdateUserLimitEvent.java @@ -1,7 +1,6 @@ package mops.gruppen2.domain.event; -import lombok.Getter; -import lombok.ToString; +import lombok.Value; import lombok.extern.log4j.Log4j2; import mops.gruppen2.domain.exception.BadParameterException; import mops.gruppen2.domain.exception.EventException; @@ -9,14 +8,11 @@ import mops.gruppen2.domain.model.Group; import mops.gruppen2.domain.model.Limit; import mops.gruppen2.domain.model.User; -@Getter -@ToString @Log4j2 +@Value public class UpdateUserLimitEvent extends Event { - private Limit userLimit; - - private UpdateUserLimitEvent() {} + Limit userLimit; public UpdateUserLimitEvent(Group group, User user, Limit userLimit) { super(group.getId(), user.getId());