Watched: support combining extended parameters

Author: UweTrottmann

src/main/java/com/uwetrottmann/trakt5/enums/ExtendedMoviesWatched.java

@@ -16,19 +16,22 @@
 
 package com.uwetrottmann.trakt5.enums;
 
-public enum ExtendedMoviesWatched implements TraktEnum {
+/**
+ * Extended info options for the watched movies endpoint.
+ */
+public class ExtendedMoviesWatched implements TraktEnum {
 
     /**
      * Return movie details, like overview and rating.
      *
      * @deprecated Starting 2026-05-30, this will be the default.
      */
     @Deprecated
-    FULL("full");
+    public static final ExtendedMoviesWatched FULL = new ExtendedMoviesWatched("full");
 
     private final String value;
 
-    ExtendedMoviesWatched(String value) {
+    private ExtendedMoviesWatched(String value) {
         this.value = value;
     }
 

src/main/java/com/uwetrottmann/trakt5/enums/ExtendedShowsWatched.java

@@ -16,34 +16,55 @@
 
 package com.uwetrottmann.trakt5.enums;
 
-public enum ExtendedShowsWatched implements TraktEnum {
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+/**
+ * Extended info options for the watched shows endpoint. Use {@link #of(ExtendedShowsWatched...)}
+ * to combine multiple values into a comma-separated parameter.
+ */
+public class ExtendedShowsWatched implements TraktEnum {
 
     /**
      * Return show details, like overview and rating.
      *
      * @deprecated Starting 2026-05-30, this will be the default.
      */
     @Deprecated
-    FULL("full"),
+    public static final ExtendedShowsWatched FULL = new ExtendedShowsWatched("full");
 
     /**
      * Exclude watched info for seasons and episodes.
      *
      * @deprecated Starting 2026-05-30, this will be the default.
      */
     @Deprecated
-    NOSEASONS("noseasons"),
+    public static final ExtendedShowsWatched NOSEASONS = new ExtendedShowsWatched("noseasons");
 
     /**
      * Include season progress information.
      * <p>
      * Note: until 2026-05-30 this is the default and won't have any effect.
      */
-    PROGRESS("progress");
+    public static final ExtendedShowsWatched PROGRESS = new ExtendedShowsWatched("progress");
+
+    /**
+     * Combine multiple extended values into a single comma-separated parameter.
+     * <p>
+     * Example: {@code ExtendedShowsWatched.of(FULL, NOSEASONS)} produces {@code "full,noseasons"}.
+     */
+    public static ExtendedShowsWatched of(ExtendedShowsWatched... values) {
+        if (values == null || values.length == 0) {
+            throw new IllegalArgumentException("At least one value is required.");
+        }
+        return new ExtendedShowsWatched(
+                Arrays.stream(values).map(ExtendedShowsWatched::toString).collect(Collectors.joining(","))
+        );
+    }
 
     private final String value;
 
-    ExtendedShowsWatched(String value) {
+    private ExtendedShowsWatched(String value) {
         this.value = value;
     }
 

src/test/java/com/uwetrottmann/trakt5/BaseTestCase.java

@@ -266,6 +266,27 @@ protected static void assertSyncShows(List<BaseShow> shows, String type) {
         }
     }
 
+    public static void assertWatchedMoviesFull(List<BaseMovie> movies) {
+        assertThat(movies)
+                .isNotEmpty()
+                .allSatisfy(movie -> {
+                    assertThat(movie.movie).isNotNull();
+                    assertThat(movie.movie.rating).isPositive();
+                });
+    }
+
+    public static void assertWatchedShowsFullNoSeasons(List<BaseShow> shows) {
+        assertThat(shows)
+                .isNotEmpty()
+                .allSatisfy(show -> {
+                    // Check it returns full show info
+                    assertThat(show.show).isNotNull();
+                    assertThat(show.show.rating).isPositive();
+                    // Check on season info is returned
+                    assertThat(show.seasons).isNull();
+                });
+    }
+
     public static void assertWatchlistShows(List<BaseShow> shows) {
         assertThat(shows).isNotEmpty();
         for (BaseShow show : shows) {

src/test/java/com/uwetrottmann/trakt5/services/SyncTest.java

@@ -46,6 +46,7 @@
 import com.uwetrottmann.trakt5.entities.WatchlistedEpisode;
 import com.uwetrottmann.trakt5.entities.WatchlistedSeason;
 import com.uwetrottmann.trakt5.enums.Extended;
+import com.uwetrottmann.trakt5.enums.ExtendedMoviesWatched;
 import com.uwetrottmann.trakt5.enums.ExtendedShowsWatched;
 import com.uwetrottmann.trakt5.enums.HistoryType;
 import com.uwetrottmann.trakt5.enums.Rating;
@@ -332,6 +333,15 @@ public void test_watchedMovies() throws IOException {
         assertSyncMovies(response.body(), "watched");
     }
 
+    @Test
+    public void test_watchedMovies_extended() throws IOException {
+        // Note: Starting 2026-05-30 this extended value will be the default
+        List<BaseMovie> movies = executeCall(
+                getTrakt().sync().watchedMovies(PAGE_ONE, LIMIT_MAX, ExtendedMoviesWatched.FULL));
+
+        assertWatchedMoviesFull(movies);
+    }
+
     @Test
     public void test_watchedShows() throws IOException {
         Response<List<BaseShow>> response = executeCallWithoutReadingBody(
@@ -342,6 +352,16 @@ public void test_watchedShows() throws IOException {
         assertSyncShows(response.body(), "watched");
     }
 
+    @Test
+    public void test_watchedShows_extended() throws IOException {
+        // Note: Starting 2026-05-30 these extended values will be the default
+        List<BaseShow> shows = executeCall(
+                getTrakt().sync().watchedShows(PAGE_ONE, LIMIT_MAX,
+                        ExtendedShowsWatched.of(ExtendedShowsWatched.FULL, ExtendedShowsWatched.NOSEASONS)));
+
+        assertWatchedShowsFullNoSeasons(shows);
+    }
+
     @Test
     public void test_addItemsToWatchedHistory() throws IOException {
         // movie

src/test/java/com/uwetrottmann/trakt5/services/UsersTest.java

@@ -48,6 +48,7 @@
 import com.uwetrottmann.trakt5.entities.WatchlistedEpisode;
 import com.uwetrottmann.trakt5.entities.WatchlistedSeason;
 import com.uwetrottmann.trakt5.enums.Extended;
+import com.uwetrottmann.trakt5.enums.ExtendedMoviesWatched;
 import com.uwetrottmann.trakt5.enums.ExtendedShowsWatched;
 import com.uwetrottmann.trakt5.enums.HistoryType;
 import com.uwetrottmann.trakt5.enums.ListPrivacy;
@@ -550,6 +551,15 @@ public void test_watchedMovies() throws IOException {
         assertSyncMovies(response.body(), "watched");
     }
 
+    @Test
+    public void test_watchedMovies_extended() throws IOException {
+        // Note: Starting 2026-05-30 this extended value will be the default
+        List<BaseMovie> movies = executeCall(
+                getTrakt().users().watchedMovies(TestData.USER_SLUG, PAGE_ONE, LIMIT_MAX, ExtendedMoviesWatched.FULL));
+
+        assertWatchedMoviesFull(movies);
+    }
+
     @Test
     public void test_watchedShows() throws IOException {
         Response<List<BaseShow>> response = executeCallWithoutReadingBody(
@@ -560,4 +570,14 @@ public void test_watchedShows() throws IOException {
         assertSyncShows(response.body(), "watched");
     }
 
+    @Test
+    public void test_watchedShows_extended() throws IOException {
+        // Note: Starting 2026-05-30 these extended values will be the default
+        List<BaseShow> shows = executeCall(
+                getTrakt().users().watchedShows(TestData.USER_SLUG, PAGE_ONE, LIMIT_MAX,
+                        ExtendedShowsWatched.of(ExtendedShowsWatched.FULL, ExtendedShowsWatched.NOSEASONS)));
+
+        assertWatchedShowsFullNoSeasons(shows);
+    }
+
 }