refactor

FINTLabs · Oct 1, 2024 · c8eeb12 · c8eeb12
1 parent 67b5ee7
commit c8eeb12
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/...ain/java/no/fintlabs/EventTopicNames.java → src/main/java/no/fintlabs/EventNames.java b/...ain/java/no/fintlabs/EventTopicNames.java → 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
@@ -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<EventDto> getEventDtos(Pageable pageable, List<Event> latestNon
         List<EventDto> 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
@@ -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
@@ -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/...tlabs/consumers/InstanceFlowHeadersForRegisteredInstanceRequestConsumerConfiguration.java b/...tlabs/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
@@ -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<Event, Long> {

diff --git 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));