From b7faa1aa9e67aa2efbcca3e8ab322b1d0a15299d Mon Sep 17 00:00:00 2001 From: Mohamed Mohamed Date: Fri, 5 Jan 2024 11:41:42 -0500 Subject: [PATCH 1/2] GROUP-78 Reverted request field visibilities to private, actually updated toString method --- .../grouphq/groupservice/group/event/GroupEventHandler.java | 3 ++- .../org/grouphq/groupservice/group/event/daos/Event.java | 6 +++--- .../event/daos/requestevent/GroupCreateRequestEvent.java | 2 ++ .../event/daos/requestevent/GroupJoinRequestEvent.java | 2 ++ .../event/daos/requestevent/GroupLeaveRequestEvent.java | 2 ++ .../event/daos/requestevent/GroupStatusRequestEvent.java | 2 ++ .../group/event/daos/requestevent/RequestEvent.java | 4 +++- .../group/event/GroupEventGroupIntegrationTest.java | 2 +- 8 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/grouphq/groupservice/group/event/GroupEventHandler.java b/src/main/java/org/grouphq/groupservice/group/event/GroupEventHandler.java index 693d24d..e2f1561 100644 --- a/src/main/java/org/grouphq/groupservice/group/event/GroupEventHandler.java +++ b/src/main/java/org/grouphq/groupservice/group/event/GroupEventHandler.java @@ -152,6 +152,7 @@ public Consumer> groupStatusRequests() { } private Mono validateRequest(T requestEvent) { + log.info("Validating request: {}", requestEvent); final Set> violations = validator.validate(requestEvent); final List violationInfo = violations.stream() @@ -159,6 +160,6 @@ private Mono validateRequest(T requestEve .toList(); return violations.isEmpty() ? Mono.just(requestEvent) : - Mono.error(new IllegalArgumentException(violationInfo + " for event: " + requestEvent)); + Mono.error(new IllegalArgumentException(violationInfo.toString())); } } diff --git a/src/main/java/org/grouphq/groupservice/group/event/daos/Event.java b/src/main/java/org/grouphq/groupservice/group/event/daos/Event.java index 0a2c743..0aa8488 100644 --- a/src/main/java/org/grouphq/groupservice/group/event/daos/Event.java +++ b/src/main/java/org/grouphq/groupservice/group/event/daos/Event.java @@ -21,12 +21,12 @@ @Data public abstract class Event { @NotNull(message = "Event ID must be provided") - protected final UUID eventId; + private final UUID eventId; @Positive(message = "Aggregate ID must be a positive value") - protected final Long aggregateId; + private final Long aggregateId; @NotNull(message = "Created date must be provided") @PastOrPresent(message = "Created date must be in the past or present") - protected final Instant createdDate; + private final Instant createdDate; } diff --git a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupCreateRequestEvent.java b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupCreateRequestEvent.java index c671fc2..7eda35a 100644 --- a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupCreateRequestEvent.java +++ b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupCreateRequestEvent.java @@ -6,6 +6,7 @@ import java.util.UUID; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.validator.constraints.Length; /** @@ -14,6 +15,7 @@ */ @EqualsAndHashCode(callSuper = true) @Data +@ToString(callSuper = true) public class GroupCreateRequestEvent extends RequestEvent { @NotBlank(message = "Title must be provided and not blank") diff --git a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupJoinRequestEvent.java b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupJoinRequestEvent.java index a451dcd..ec48914 100644 --- a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupJoinRequestEvent.java +++ b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupJoinRequestEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.validator.constraints.Length; /** @@ -13,6 +14,7 @@ */ @EqualsAndHashCode(callSuper = true) @Data +@ToString(callSuper = true) public class GroupJoinRequestEvent extends RequestEvent { @NotBlank(message = "Username must be provided and not blank") diff --git a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupLeaveRequestEvent.java b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupLeaveRequestEvent.java index fda7d0d..40fcaea 100644 --- a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupLeaveRequestEvent.java +++ b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupLeaveRequestEvent.java @@ -6,6 +6,7 @@ import java.util.UUID; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; /** * Data class for the group leave request event. @@ -13,6 +14,7 @@ */ @EqualsAndHashCode(callSuper = true) @Data +@ToString(callSuper = true) public class GroupLeaveRequestEvent extends RequestEvent { @NotNull(message = "Member ID must be provided") diff --git a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupStatusRequestEvent.java b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupStatusRequestEvent.java index c87ae48..9b3dd8a 100644 --- a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupStatusRequestEvent.java +++ b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/GroupStatusRequestEvent.java @@ -5,6 +5,7 @@ import java.util.UUID; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.grouphq.groupservice.group.domain.groups.GroupStatus; /** @@ -13,6 +14,7 @@ */ @EqualsAndHashCode(callSuper = true) @Data +@ToString(callSuper = true) public class GroupStatusRequestEvent extends RequestEvent { @NotNull(message = "New status must be provided") diff --git a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/RequestEvent.java b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/RequestEvent.java index 6ed1a26..bc755f4 100644 --- a/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/RequestEvent.java +++ b/src/main/java/org/grouphq/groupservice/group/event/daos/requestevent/RequestEvent.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.ToString; import org.grouphq.groupservice.group.event.daos.Event; /** @@ -15,9 +16,10 @@ @EqualsAndHashCode(callSuper = true) @NoArgsConstructor(force = true) @Data +@ToString(callSuper = true) public abstract class RequestEvent extends Event { - protected final String websocketId; + private final String websocketId; public RequestEvent( UUID eventId, diff --git a/src/test/java/org/grouphq/groupservice/group/event/GroupEventGroupIntegrationTest.java b/src/test/java/org/grouphq/groupservice/group/event/GroupEventGroupIntegrationTest.java index b12c8df..bf34982 100644 --- a/src/test/java/org/grouphq/groupservice/group/event/GroupEventGroupIntegrationTest.java +++ b/src/test/java/org/grouphq/groupservice/group/event/GroupEventGroupIntegrationTest.java @@ -331,6 +331,6 @@ void checkValidationsForGroupCreateRequest() throws IOException { actual -> assertThat(actual.getWebsocketId()).isEqualTo(requestEvent.getWebsocketId()) ); - assertThat(errorData.error()).startsWith("[Max group size must be a positive value]"); + assertThat(errorData.error()).isEqualTo("[Max group size must be a positive value]"); } } From 98cb7882ecda9b84350e8bc0507d60b6a44d8a7a Mon Sep 17 00:00:00 2001 From: Mohamed Mohamed Date: Fri, 5 Jan 2024 11:43:42 -0500 Subject: [PATCH 2/2] GROUP-78 Checkstyle --- .../group/event/GroupEventMemberIntegrationTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/grouphq/groupservice/group/event/GroupEventMemberIntegrationTest.java b/src/test/java/org/grouphq/groupservice/group/event/GroupEventMemberIntegrationTest.java index 07ac85f..d81770e 100644 --- a/src/test/java/org/grouphq/groupservice/group/event/GroupEventMemberIntegrationTest.java +++ b/src/test/java/org/grouphq/groupservice/group/event/GroupEventMemberIntegrationTest.java @@ -23,7 +23,10 @@ import org.grouphq.groupservice.group.event.daos.requestevent.GroupJoinRequestEvent; import org.grouphq.groupservice.group.event.daos.requestevent.GroupLeaveRequestEvent; import org.grouphq.groupservice.group.testutility.GroupTestUtility; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.SpringBootTest;