Try a fix for broken collection joining in query parameters

Author: rubengees

library/src/main/java/me/proxer/library/api/list/InternalApi.java

@@ -8,7 +8,6 @@
 
 import javax.annotation.ParametersAreNullableByDefault;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author Desnoo
@@ -30,9 +29,9 @@ ProxerCall<List<MediaListEntry>> mediaList(@Query("kat") Category category,
     ProxerCall<List<MediaListEntry>> mediaSearch(@Query("name") String name,
                                                  @Query("language") Language language,
                                                  @Query("type") MediaType type,
-                                                 @Query("genre") Set<Genre> genres,
-                                                 @Query("nogenre") Set<Genre> excludedGenres,
-                                                 @Query("fsk") Set<FskConstraint> fskConstraints,
+                                                 @Query("genre") String genres,
+                                                 @Query("nogenre") String excludedGenres,
+                                                 @Query("fsk") String fskConstraints,
                                                  @Query("sort") MediaSearchSortCriteria sort,
                                                  @Query("length") Integer length,
                                                  @Query("length-limit") LengthBound lengthLimit,

library/src/main/java/me/proxer/library/api/list/MediaSearchEndpoint.java

@@ -20,7 +20,7 @@
 @Accessors(fluent = true)
 public final class MediaSearchEndpoint implements PagingLimitEndpoint<List<MediaListEntry>> {
 
-    private static final String DELIMITER = " ";
+    private static final String DELIMITER = "+";
 
     private final InternalApi internalApi;
 
@@ -156,7 +156,11 @@ public MediaSearchEndpoint excludedTags(@Nullable final Set<String> excludedIds)
 
     @Override
     public ProxerCall<List<MediaListEntry>> build() {
-        return internalApi.mediaSearch(name, language, type, genres, excludedGenres, fskConstraints,
+        String joinedGenres = genres == null ? null : ProxerUtils.join(DELIMITER, genres);
+        String joinedExcludedGenres = excludedGenres == null ? null : ProxerUtils.join(DELIMITER, excludedGenres);
+        String joinedFskConstraints = fskConstraints == null ? null : ProxerUtils.join(DELIMITER, fskConstraints);
+
+        return internalApi.mediaSearch(name, language, type, joinedGenres, joinedExcludedGenres, joinedFskConstraints,
                 sort, length, lengthBound, tags, excludedTags, tagRateFilter, tagSpoilerFilter, page, limit);
     }
 }

library/src/test/java/me/proxer/library/api/list/MediaSearchEndpointTest.java

@@ -40,8 +40,8 @@ public void testPath() throws ProxerException, IOException, InterruptedException
                 .name("test")
                 .limit(10)
                 .page(3)
-                .genres(EnumSet.of(Genre.ADULT))
-                .excludedGenres(EnumSet.of(Genre.ACTION))
+                .genres(EnumSet.of(Genre.ADULT, Genre.ACTION))
+                .excludedGenres(EnumSet.of(Genre.DRAMA, Genre.FANTASY))
                 .tags(new HashSet<>(Arrays.asList("3", "7")))
                 .excludedTags(new HashSet<>(Arrays.asList("5", "20")))
                 .fskConstraints(EnumSet.of(FskConstraint.FEAR))
@@ -55,9 +55,10 @@ public void testPath() throws ProxerException, IOException, InterruptedException
                 .build()
                 .execute();
 
-        assertThat(server.takeRequest().getPath()).isEqualTo("/api/v1/list/entrysearch?name=test&language=en"
-                + "&type=all-manga&genre=Adult&nogenre=Action&fsk=fear&sort=clicks&length=300&length-limit=down"
-                + "&tags=3%207&notags=5%2020&tagratefilter=rate_1&tagspoilerfilter=spoiler_1&p=3&limit=10");
+        assertThat(server.takeRequest().getPath()).isEqualTo("/api/v1/list/entrysearch?name=test&language=en&"
+                + "type=all-manga&genre=ACTION%2BADULT&nogenre=DRAMA%2BFANTASY&fsk=FEAR&sort=clicks&length=300&"
+                + "length-limit=down&tags=3%2B7&notags=5%2B20&tagratefilter=rate_1&"
+                + "tagspoilerfilter=spoiler_1&p=3&limit=10");
     }
 
     @Test