Use LiveStreamsQueryBuilder to construct queries regarding livestreams

A query builder is used to avoid the need for adding null checks or nullable decorators to HolodexService.java

1 files changed, 11 insertions, 4 deletions

diff --git a/src/main/java/com/pina/Holodex.java b/src/main/java/com/pina/Holodex.java
index 38c519a..48e3e9c 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.query.LiveStreamsQueryBuilder;
 import retrofit2.Call;
 import retrofit2.Response;
 import retrofit2.Retrofit;
@@ -18,13 +19,19 @@ public class Holodex {
                 .build();
         service = retrofit.create(HolodexService.class);
     }
-    public List<LiveStream> getLiveStreams() throws HolodexException {
-        Call<List<LiveStream>> call = service.getLiveStreams("channel,clip");
+    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(),
+                queryBuilder.getOrder(), queryBuilder.getOrg(),
+                queryBuilder.getPaginated(), queryBuilder.getSort(),
+                queryBuilder.getStatus(), queryBuilder.getTopic(),
+                queryBuilder.getType());
         return executeCall(call);
     }
-
     public List<UpcomingStream> getUpcomingStreams() throws HolodexException {
-        Call<List<UpcomingStream>> call = service.getUpcomingStreams("channel,clip");
+        Call<List<UpcomingStream>> call = service.getUpcomingStreams("channel");
         return executeCall(call);
     }