Refactored filestrucuture

6 files changed, 9 insertions, 24 deletions

diff --git a/src/main/java/com/pina/Holodex.java b/src/main/java/com/pina/Holodex.java
index 48e3e9c..762b0b1 100644
--- a/src/main/java/com/pina/Holodex.java
+++ b/src/main/java/com/pina/Holodex.java
@@ -1,5 +1,6 @@
 package com.pina;
 
+import com.pina.datatypes.Livestream;
 import com.pina.query.LiveStreamsQueryBuilder;
 import retrofit2.Call;
 import retrofit2.Response;
@@ -19,8 +20,8 @@ public class Holodex {
                 .build();
         service = retrofit.create(HolodexService.class);
     }
-    public List<LiveStream> getLiveStreams(LiveStreamsQueryBuilder queryBuilder) throws HolodexException {
-        Call<List<LiveStream>> call = service.getLiveStreams(queryBuilder.getChannelId(), queryBuilder.getId(),
+    public List<Livestream> getLiveStreams(LiveStreamsQueryBuilder queryBuilder) throws HolodexException {
+        Call<List<Livestream>> call = service.getLiveStreams(queryBuilder.getChannelId(), queryBuilder.getId(),
                 queryBuilder.getInclude(), queryBuilder.getLang(),
                 queryBuilder.getLimit(), queryBuilder.getMaxUpcomingHours(),
                 queryBuilder.getMentionedChannelId(), queryBuilder.getOffset(),
@@ -30,10 +31,6 @@ public class Holodex {
                 queryBuilder.getType());
         return executeCall(call);
     }
-    public List<UpcomingStream> getUpcomingStreams() throws HolodexException {
-        Call<List<UpcomingStream>> call = service.getUpcomingStreams("channel");
-        return executeCall(call);
-    }
 
     private <T> T executeCall(Call<T> call) throws HolodexException {
         try {
diff --git a/src/main/java/com/pina/HolodexService.java b/src/main/java/com/pina/HolodexService.java
index e12c13e..ca7d0d5 100644
--- a/src/main/java/com/pina/HolodexService.java
+++ b/src/main/java/com/pina/HolodexService.java
@@ -1,13 +1,15 @@
 package com.pina;
 
 import java.util.List;
+
+import com.pina.datatypes.Livestream;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 
 public interface HolodexService {
     @GET("/api/v2/live")
-    Call<List<LiveStream>> getLiveStreams(
+    Call<List<Livestream>> getLiveStreams(
             @Query("channel_id") String channel_id,
             @Query("id") String id,
             @Query("include") String include,
@@ -25,8 +27,6 @@ public interface HolodexService {
             @Query("type") String type
     );
 
-    @GET("/api/v2/upcoming")
-    Call<List<UpcomingStream>> getUpcomingStreams(@Query("include") String include);
 
 }
 
diff --git a/src/main/java/com/pina/UpcomingStream.java b/src/main/java/com/pina/UpcomingStream.java
deleted file mode 100644
index dbdcc9b..0000000
--- a/src/main/java/com/pina/UpcomingStream.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.pina;
-
-public class UpcomingStream {
-    public String id;
-    public String title;
-    public String thumbnail;
-    public String scheduled_start_time;
-    public String channel_id;
-    public String channel_name;
-}
diff --git a/src/main/java/com/pina/Channel.java b/src/main/java/com/pina/datatypes/Channel.java
index 3f84a10..1305320 100644
--- a/src/main/java/com/pina/Channel.java
+++ b/src/main/java/com/pina/datatypes/Channel.java
@@ -1,4 +1,4 @@
-package com.pina;
+package com.pina.datatypes;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/src/main/java/com/pina/LiveStream.java b/src/main/java/com/pina/datatypes/Livestream.java
index fa37148..c70d9d3 100644
--- a/src/main/java/com/pina/LiveStream.java
+++ b/src/main/java/com/pina/datatypes/Livestream.java
@@ -1,10 +1,10 @@
-package com.pina;
+package com.pina.datatypes;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class LiveStream {
+public class Livestream {
     public String id;
     public String title;
     public String type;
diff --git a/src/test/java/HolodexServiceTest.java b/src/test/java/HolodexServiceTest.java
index a05913e..f749000 100644
--- a/src/test/java/HolodexServiceTest.java
+++ b/src/test/java/HolodexServiceTest.java
@@ -1,5 +1,3 @@
-import com.pina.HolodexService;
-import com.pina.LiveStream;
 import org.junit.jupiter.api.Test;
 
 public class HolodexServiceTest {