From 95cc8faffe8a66fed7a47f86408ff3efbcbd6d3f Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Tue, 4 Apr 2023 16:30:28 -0700 Subject: Refactored filestrucuture --- src/main/java/com/pina/Channel.java | 14 -------------- src/main/java/com/pina/Holodex.java | 9 +++------ src/main/java/com/pina/HolodexService.java | 6 +++--- src/main/java/com/pina/LiveStream.java | 24 ------------------------ src/main/java/com/pina/UpcomingStream.java | 10 ---------- src/main/java/com/pina/datatypes/Channel.java | 14 ++++++++++++++ src/main/java/com/pina/datatypes/Livestream.java | 24 ++++++++++++++++++++++++ src/test/java/HolodexServiceTest.java | 2 -- 8 files changed, 44 insertions(+), 59 deletions(-) delete mode 100644 src/main/java/com/pina/Channel.java delete mode 100644 src/main/java/com/pina/LiveStream.java delete mode 100644 src/main/java/com/pina/UpcomingStream.java create mode 100644 src/main/java/com/pina/datatypes/Channel.java create mode 100644 src/main/java/com/pina/datatypes/Livestream.java diff --git a/src/main/java/com/pina/Channel.java b/src/main/java/com/pina/Channel.java deleted file mode 100644 index 3f84a10..0000000 --- a/src/main/java/com/pina/Channel.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pina; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class Channel { - public String id; - public String english_name; - public String name; - public String org; - public String suborg; - public String photo; - public String type; -} 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 getLiveStreams(LiveStreamsQueryBuilder queryBuilder) throws HolodexException { - Call> call = service.getLiveStreams(queryBuilder.getChannelId(), queryBuilder.getId(), + public List getLiveStreams(LiveStreamsQueryBuilder queryBuilder) throws HolodexException { + Call> 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 getUpcomingStreams() throws HolodexException { - Call> call = service.getUpcomingStreams("channel"); - return executeCall(call); - } private T executeCall(Call 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> getLiveStreams( + Call> 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> getUpcomingStreams(@Query("include") String include); } diff --git a/src/main/java/com/pina/LiveStream.java b/src/main/java/com/pina/LiveStream.java deleted file mode 100644 index fa37148..0000000 --- a/src/main/java/com/pina/LiveStream.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.pina; - - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class LiveStream { - public String id; - public String title; - public String type; - public String topic; - public String published_at; - public String available_at; - public int duration; - public String status; - public String start_scheduled; - public String start_actual; - public String thumbnail; - public int live_viewers; - public Channel channel; -} - - - 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/datatypes/Channel.java b/src/main/java/com/pina/datatypes/Channel.java new file mode 100644 index 0000000..1305320 --- /dev/null +++ b/src/main/java/com/pina/datatypes/Channel.java @@ -0,0 +1,14 @@ +package com.pina.datatypes; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class Channel { + public String id; + public String english_name; + public String name; + public String org; + public String suborg; + public String photo; + public String type; +} diff --git a/src/main/java/com/pina/datatypes/Livestream.java b/src/main/java/com/pina/datatypes/Livestream.java new file mode 100644 index 0000000..c70d9d3 --- /dev/null +++ b/src/main/java/com/pina/datatypes/Livestream.java @@ -0,0 +1,24 @@ +package com.pina.datatypes; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class Livestream { + public String id; + public String title; + public String type; + public String topic; + public String published_at; + public String available_at; + public int duration; + public String status; + public String start_scheduled; + public String start_actual; + public String thumbnail; + public int live_viewers; + public Channel channel; +} + + + 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 { -- cgit v1.2.3