services path updated

imertetsu · Aug 13, 2024 · eef0dbf · eef0dbf
1 parent eded600
commit eef0dbf
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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
@@ -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;