From eef0dbff3e14da307b0b3c0a2bee482f048e5f28 Mon Sep 17 00:00:00 2001
From: imertetsu <imertpro@gmail.com>
Date: Tue, 13 Aug 2024 17:02:09 -0400
Subject: [PATCH] services path updated

---
 src/main/java/com/spacecraft/services/EventService.java   | 8 +-------
 .../java/com/spacecraft/services/LatitudeService.java     | 1 -
 .../java/com/spacecraft/services/LongitudeService.java    | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/main/java/com/spacecraft/services/EventService.java b/src/main/java/com/spacecraft/services/EventService.java
index 137c086..de36bb5 100644
--- a/src/main/java/com/spacecraft/services/EventService.java
+++ b/src/main/java/com/spacecraft/services/EventService.java
@@ -7,7 +7,6 @@
 import lombok.Getter;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
-import org.springframework.core.io.ClassPathResource;
 
 import java.io.IOException;
 import java.util.List;
@@ -22,13 +21,8 @@ public class EventService {
     public void loadData() throws IOException {
         ObjectMapper objectMapper = new ObjectMapper();
         ClassPathResource resource = new ClassPathResource("persistence/events.json");
-
-<<<<<<< HEAD
-	events = objectMapper.readValue(resource.getInputStream(), new TypeReference<List<EventDTO>>() {});
-
-=======
         events = objectMapper.readValue(resource.getInputStream(), new TypeReference<List<EventDTO>>() {});
->>>>>>> bd3d21a54cffe516cfd463f05ce7ebf842f2e754
+
         for (EventDTO event : events) {
             System.out.println(event);
         }
diff --git a/src/main/java/com/spacecraft/services/LatitudeService.java b/src/main/java/com/spacecraft/services/LatitudeService.java
index 6488d12..2c37290 100644
--- a/src/main/java/com/spacecraft/services/LatitudeService.java
+++ b/src/main/java/com/spacecraft/services/LatitudeService.java
@@ -7,7 +7,6 @@
 import lombok.Getter;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
-import org.springframework.core.io.ClassPathResource;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/main/java/com/spacecraft/services/LongitudeService.java b/src/main/java/com/spacecraft/services/LongitudeService.java
index 22a387a..17b77bf 100644
--- a/src/main/java/com/spacecraft/services/LongitudeService.java
+++ b/src/main/java/com/spacecraft/services/LongitudeService.java
@@ -7,7 +7,6 @@
 import lombok.Getter;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
-import org.springframework.core.io.ClassPathResource;
 
 import java.io.IOException;
 import java.util.List;