Implemented getChannel method and added javadoc to VideoQueryBuilder

3 files changed, 30 insertions, 20 deletions

diff --git a/src/main/java/com/pina/Holodex.java b/src/main/java/com/pina/Holodex.java
index b3ce5ec..5ea09aa 100644
--- a/src/main/java/com/pina/Holodex.java
+++ b/src/main/java/com/pina/Holodex.java
@@ -45,6 +45,12 @@ public class Holodex {
         return executeCall(call);
     }
 
+    public Channel getChannel(String channelId) throws HolodexException {
+        Call<Channel> call = service.getChannel(channelId);
+        return executeCall(call);
+    }
+
+
 
 
     private <T> T executeCall(Call<T> call) throws HolodexException {
diff --git a/src/main/java/com/pina/HolodexService.java b/src/main/java/com/pina/HolodexService.java
index da2a62a..40a402c 100644
--- a/src/main/java/com/pina/HolodexService.java
+++ b/src/main/java/com/pina/HolodexService.java
@@ -2,6 +2,7 @@ package com.pina;
 
 import java.util.List;
 
+import com.pina.datatypes.Channel;
 import com.pina.datatypes.Video;
 import retrofit2.Call;
 import retrofit2.http.GET;
@@ -10,7 +11,7 @@ import retrofit2.http.Query;
 
 public interface HolodexService {
     @GET("/api/v2/live")
-    Call<List<Video>> getLiveVideo(
+    Call<List<Video>> getLiveVideos(
             @Query("channelID") String channelID,
             @Query("id") String id,
             @Query("include") String include,
@@ -48,12 +49,12 @@ public interface HolodexService {
     );
 
     @GET("/api/v2/channels/{channelID}")
-    Call<List<Video>> getChannel(
+    Call<Channel> getChannel(
             @Path("channelID") String channelID
     );
 
     @GET("/api/v2/channels/{channelID}/{type}")
-    Call<List<Video>> getChannelType(
+    Call<List<Video>> getVideosByChannelId(
             @Path("channelID") String channelID,
             @Path("type") String type,
             @Query("include") String include,
@@ -64,7 +65,7 @@ public interface HolodexService {
     );
 
     @GET("/api/v2/channels/users/live")
-    Call<List<Video>> getLiveChannels(
+    Call<List<Video>> getVideosFromChannels(
             @Query("channels") String[] channels
     );
 
diff --git a/src/main/java/com/pina/query/LiveStreamsQueryBuilder.java b/src/main/java/com/pina/query/VideoQueryBuilder.java
index ca7f86e..e65a04c 100644
--- a/src/main/java/com/pina/query/LiveStreamsQueryBuilder.java
+++ b/src/main/java/com/pina/query/VideoQueryBuilder.java
@@ -1,6 +1,9 @@
 package com.pina.query;
 
-public class LiveStreamsQueryBuilder {
+public class VideoQueryBuilder {
+    /***
+     * Query parameters for /api/v2/live and /api/v2/videos
+     */
     private String channelId;
     private String id;
     private String include;
@@ -17,77 +20,77 @@ public class LiveStreamsQueryBuilder {
     private String topic;
     private String type;
 
-    public LiveStreamsQueryBuilder setChannelId(String channelId) {
+    public VideoQueryBuilder setChannelId(String channelId) {
         this.channelId = channelId;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setId(String id) {
+    public VideoQueryBuilder setId(String id) {
         this.id = id;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setInclude(String include) {
+    public VideoQueryBuilder setInclude(String include) {
         this.include = include;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setLang(String lang) {
+    public VideoQueryBuilder setLang(String lang) {
         this.lang = lang;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setLimit(Integer limit) {
+    public VideoQueryBuilder setLimit(Integer limit) {
         this.limit = limit;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setMaxUpcomingHours(Integer maxUpcomingHours) {
+    public VideoQueryBuilder setMaxUpcomingHours(Integer maxUpcomingHours) {
         this.maxUpcomingHours = maxUpcomingHours;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setMentionedChannelId(String mentionedChannelId) {
+    public VideoQueryBuilder setMentionedChannelId(String mentionedChannelId) {
         this.mentionedChannelId = mentionedChannelId;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setOffset(Integer offset) {
+    public VideoQueryBuilder setOffset(Integer offset) {
         this.offset = offset;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setOrder(String order) {
+    public VideoQueryBuilder setOrder(String order) {
         this.order = order;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setOrg(String org) {
+    public VideoQueryBuilder setOrg(String org) {
         this.org = org;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setPaginated(String paginated) {
+    public VideoQueryBuilder setPaginated(String paginated) {
         this.paginated = paginated;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setSort(String sort) {
+    public VideoQueryBuilder setSort(String sort) {
         this.sort = sort;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setStatus(String status) {
+    public VideoQueryBuilder setStatus(String status) {
         this.status = status;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setTopic(String topic) {
+    public VideoQueryBuilder setTopic(String topic) {
         this.topic = topic;
         return this;
     }
 
-    public LiveStreamsQueryBuilder setType(String type) {
+    public VideoQueryBuilder setType(String type) {
         this.type = type;
         return this;
     }