From c8eeb12a31f68fde1c980f2b346398dc1ba22949 Mon Sep 17 00:00:00 2001 From: Egil Ballestad Date: Tue, 1 Oct 2024 13:41:15 +0200 Subject: [PATCH] refactor --- .../fintlabs/{EventTopicNames.java => EventNames.java} | 4 ++-- src/main/java/no/fintlabs/EventService.java | 6 ++++-- .../consumers/ErrorEventConsumerConfiguration.java | 2 +- .../consumers/InfoEventConsumerConfiguration.java | 2 +- ...RegisteredInstanceRequestConsumerConfiguration.java | 2 +- .../java/no/fintlabs/repositories/EventRepository.java | 2 +- .../no/fintlabs/repositories/EventRepositoryTest.java | 10 +++++----- 7 files changed, 15 insertions(+), 13 deletions(-) rename src/main/java/no/fintlabs/{EventTopicNames.java => EventNames.java} (93%) diff --git a/src/main/java/no/fintlabs/EventTopicNames.java b/src/main/java/no/fintlabs/EventNames.java similarity index 93% rename from src/main/java/no/fintlabs/EventTopicNames.java rename to src/main/java/no/fintlabs/EventNames.java index a52f0aa..d00f287 100644 --- a/src/main/java/no/fintlabs/EventTopicNames.java +++ b/src/main/java/no/fintlabs/EventNames.java @@ -1,8 +1,8 @@ package no.fintlabs; -public class EventTopicNames { +public class EventNames { - private EventTopicNames() { + private EventNames() { } public static String INSTANCE_RECEIVED = "instance-received"; diff --git a/src/main/java/no/fintlabs/EventService.java b/src/main/java/no/fintlabs/EventService.java index f74a9c3..92f7dd0 100644 --- a/src/main/java/no/fintlabs/EventService.java +++ b/src/main/java/no/fintlabs/EventService.java @@ -16,6 +16,8 @@ import java.util.Optional; import java.util.stream.Collectors; +import static no.fintlabs.EventNames.INSTANCE_DELETED; + @Service @AllArgsConstructor public class EventService { @@ -71,12 +73,12 @@ private PageImpl getEventDtos(Pageable pageable, List latestNon List mergedEvents = new ArrayList<>(); for (Event latestEvent : latestEvents) { - if ("instance-deleted".equals(latestEvent.getName())) { + if (INSTANCE_DELETED.equals(latestEvent.getName())) { Event nonDeletedEvent = nonDeletedEventMap .get(latestEvent.getInstanceFlowHeaders().getSourceApplicationInstanceId()); if (nonDeletedEvent != null) { EventDto updatedEventDto = EventToEventDto(nonDeletedEvent); - updatedEventDto.setStatus("deleted"); + updatedEventDto.setStatus(INSTANCE_DELETED); mergedEvents.add(updatedEventDto); } } else { diff --git a/src/main/java/no/fintlabs/consumers/ErrorEventConsumerConfiguration.java b/src/main/java/no/fintlabs/consumers/ErrorEventConsumerConfiguration.java index 480e3b7..2ace5c9 100644 --- a/src/main/java/no/fintlabs/consumers/ErrorEventConsumerConfiguration.java +++ b/src/main/java/no/fintlabs/consumers/ErrorEventConsumerConfiguration.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.stream.Collectors; -import static no.fintlabs.EventTopicNames.*; +import static no.fintlabs.EventNames.*; @Configuration public class ErrorEventConsumerConfiguration { diff --git a/src/main/java/no/fintlabs/consumers/InfoEventConsumerConfiguration.java b/src/main/java/no/fintlabs/consumers/InfoEventConsumerConfiguration.java index e9e3965..8d34992 100644 --- a/src/main/java/no/fintlabs/consumers/InfoEventConsumerConfiguration.java +++ b/src/main/java/no/fintlabs/consumers/InfoEventConsumerConfiguration.java @@ -15,7 +15,7 @@ import java.time.Instant; import java.time.ZoneOffset; -import static no.fintlabs.EventTopicNames.*; +import static no.fintlabs.EventNames.*; @Configuration public class InfoEventConsumerConfiguration { diff --git a/src/main/java/no/fintlabs/consumers/InstanceFlowHeadersForRegisteredInstanceRequestConsumerConfiguration.java b/src/main/java/no/fintlabs/consumers/InstanceFlowHeadersForRegisteredInstanceRequestConsumerConfiguration.java index 35f68a6..b5a0106 100644 --- a/src/main/java/no/fintlabs/consumers/InstanceFlowHeadersForRegisteredInstanceRequestConsumerConfiguration.java +++ b/src/main/java/no/fintlabs/consumers/InstanceFlowHeadersForRegisteredInstanceRequestConsumerConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.kafka.listener.ConcurrentMessageListenerContainer; -import static no.fintlabs.EventTopicNames.INSTANCE_REGISTERED; +import static no.fintlabs.EventNames.INSTANCE_REGISTERED; @Configuration public class InstanceFlowHeadersForRegisteredInstanceRequestConsumerConfiguration { diff --git a/src/main/java/no/fintlabs/repositories/EventRepository.java b/src/main/java/no/fintlabs/repositories/EventRepository.java index 5f1018f..15ceb8d 100644 --- a/src/main/java/no/fintlabs/repositories/EventRepository.java +++ b/src/main/java/no/fintlabs/repositories/EventRepository.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Optional; -import static no.fintlabs.EventTopicNames.INSTANCE_DISPATCHED; +import static no.fintlabs.EventNames.INSTANCE_DISPATCHED; @Repository public interface EventRepository extends JpaRepository { diff --git a/src/test/java/no/fintlabs/repositories/EventRepositoryTest.java b/src/test/java/no/fintlabs/repositories/EventRepositoryTest.java index cbf25d2..c42280d 100644 --- a/src/test/java/no/fintlabs/repositories/EventRepositoryTest.java +++ b/src/test/java/no/fintlabs/repositories/EventRepositoryTest.java @@ -16,7 +16,7 @@ import java.time.ZoneOffset; import java.util.*; -import static no.fintlabs.EventTopicNames.*; +import static no.fintlabs.EventNames.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -54,16 +54,16 @@ public void setup() { @Test public void shouldReturnOnlyLatestEventForEachSourceApplicationInstanceId() { Event event1 = createUnnamedTimestampEvent("1", "1", EventType.INFO, LocalDateTime.of(2001, 1, 1, 13, 30)); - event1.setName("instance-received"); + event1.setName(INSTANCE_RECEIVED); Event event2 = createUnnamedTimestampEvent("1", "1", EventType.INFO, LocalDateTime.of(2001, 1, 1, 13, 32)); - event2.setName("instance-received"); + event2.setName(INSTANCE_RECEIVED); Event event3 = createUnnamedTimestampEvent("1", "1", EventType.ERROR, LocalDateTime.of(2001, 1, 1, 13, 31)); - event3.setName("instance-deleted"); + event3.setName(INSTANCE_DELETED); Event event4 = createUnnamedTimestampEvent("1", "2", EventType.ERROR, LocalDateTime.of(2001, 1, 1, 13, 29)); - event4.setName("instance-received"); + event4.setName(INSTANCE_RECEIVED); eventRepository.saveAll(List.of(event1, event2, event3, event4));