services updated

imertetsu · Aug 13, 2024 · eded600 · eded600
2 parents 728a9b5 + bd3d21a
commit eded600
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/main/java/com/spacecraft/services/EventService.java b/src/main/java/com/spacecraft/services/EventService.java
@@ -3,16 +3,13 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.spacecraft.dtos.EventDTO;
-import com.spacecraft.dtos.LongitudeDTO;
 import jakarta.annotation.PostConstruct;
 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.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 
 @Service
@@ -26,8 +23,12 @@ 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
@@ -2,17 +2,14 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.spacecraft.dtos.EventDTO;
 import com.spacecraft.dtos.LatitudeDTO;
 import jakarta.annotation.PostConstruct;
 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.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 
 @Service

diff --git a/src/main/java/com/spacecraft/services/LongitudeService.java b/src/main/java/com/spacecraft/services/LongitudeService.java
@@ -2,17 +2,14 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.spacecraft.dtos.EventDTO;
 import com.spacecraft.dtos.LongitudeDTO;
 import jakarta.annotation.PostConstruct;
 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.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 
 @Service