Edit search methods return type: SzurubooruResource[] -> List<Szurubo…

…oruResource>
G1org1owo · Mar 19, 2023 · 8fca183 · 8fca183
1 parent 542a37c
commit 8fca183
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/jszuru/SzurubooruAPI.java b/src/jszuru/SzurubooruAPI.java
@@ -312,11 +312,14 @@ public SzurubooruPost createPost(FileToken content, String safety) throws IOExce
         post.push();
         return post;
     }
-    public SzurubooruPost[] searchPost(String searchQuery) throws IOException, SzurubooruHTTPException {
+    public List<SzurubooruPost> searchPost(String searchQuery) throws IOException, SzurubooruHTTPException {
         return searchPost(searchQuery, 20, false);
     }
-    public SzurubooruPost[] searchPost(String searchQuery, int pageSize, boolean eagerLoad) throws IOException, SzurubooruHTTPException {
-        return (SzurubooruPost[]) SzurubooruSearch.searchGeneric(this, searchQuery, new SzurubooruPost(this, new HashMap<>()), pageSize, eagerLoad);
+    public List<SzurubooruPost> searchPost(String searchQuery, int pageSize, boolean eagerLoad) throws IOException, SzurubooruHTTPException {
+        return SzurubooruSearch.searchGeneric(this, searchQuery, new SzurubooruPost(this, new HashMap<>()), pageSize, eagerLoad)
+                .stream()
+                .map(x -> (SzurubooruPost) x)
+                .toList();
     }
 
     public SzurubooruTag getTag(String id) throws IOException, SzurubooruHTTPException, SzurubooruResourceNotSynchronizedException {
@@ -342,11 +345,14 @@ public SzurubooruTag createTag(String name) throws IOException, SzurubooruHTTPEx
         tag.push();
         return tag;
     }
-    public SzurubooruTag[] searchTag(String searchQuery) throws IOException, SzurubooruHTTPException {
+    public List<SzurubooruTag> searchTag(String searchQuery) throws IOException, SzurubooruHTTPException {
         return searchTag(searchQuery, 20, false);
     }
-    public SzurubooruTag[] searchTag(String searchQuery, int pageSize, boolean eagerLoad) throws IOException, SzurubooruHTTPException {
-        return (SzurubooruTag[])SzurubooruSearch.searchGeneric(this, searchQuery, new SzurubooruTag(this, new HashMap<>()), pageSize, eagerLoad);
+    public List<SzurubooruTag> searchTag(String searchQuery, int pageSize, boolean eagerLoad) throws IOException, SzurubooruHTTPException {
+        return SzurubooruSearch.searchGeneric(this, searchQuery, new SzurubooruTag(this, new HashMap<>()), pageSize, eagerLoad)
+                .stream()
+                .map(x -> (SzurubooruTag) x)
+                .toList();
     }
 
     public List<SzurubooruSearchResult> searchByImage(FileToken image) throws IOException, SzurubooruHTTPException {

diff --git a/src/jszuru/search/SzurubooruSearch.java b/src/jszuru/search/SzurubooruSearch.java
@@ -12,13 +12,13 @@
 
 @SuppressWarnings("unused")
 public class SzurubooruSearch {
-    public static SzurubooruResource[] searchGeneric(SzurubooruAPI api,
+    public static List<SzurubooruResource> searchGeneric(SzurubooruAPI api,
                                                      String searchQuery,
                                                      SzurubooruResource transformingClass,
                                                      int pageSize) throws IOException, SzurubooruHTTPException {
         return searchGeneric(api, searchQuery, transformingClass, pageSize, false);
     }
-    public static SzurubooruResource[] searchGeneric(SzurubooruAPI api,
+    public static List<SzurubooruResource> searchGeneric(SzurubooruAPI api,
                                                      String searchQuery,
                                                      SzurubooruResource transformingClass,
                                                      int pageSize,
@@ -45,6 +45,6 @@ public static SzurubooruResource[] searchGeneric(SzurubooruAPI api,
             results.addAll((List<? extends SzurubooruResource>)page.get("results"));
         }
 
-        return results.toArray(new SzurubooruResource[0]);
+        return results;
     }
 }