From ea0f28c922b5297fd9acae0f87a4f2c52166b4b9 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 18 Jun 2026 09:43:19 +0200 Subject: [PATCH 1/3] Changelog: prepare for next release --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73bab9ca..d1c6f27c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## Next release + ## 6.20.0 - 2026-05-21 * Add variants of watched methods that have an option to include special episodes. Deprecated the original variants. From 6154aac2b5287a5968778bf96752bcab6e0d2294 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 18 Jun 2026 09:19:09 +0200 Subject: [PATCH 2/3] Rating: return null instead of crashing for invalid values --- CHANGELOG.md | 2 ++ .../com/uwetrottmann/trakt5/enums/Rating.java | 12 +++++-- .../uwetrottmann/trakt5/enums/EnumTest.java | 35 +++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/uwetrottmann/trakt5/enums/EnumTest.java diff --git a/CHANGELOG.md b/CHANGELOG.md index d1c6f27c..82d9666a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Next release +* When parsing a `Rating` with an unknown value, return `null` instead of throwing `ArrayIndexOutOfBoundsException`. Background: the Trakt API was seen returning `0` as a rating value. + ## 6.20.0 - 2026-05-21 * Add variants of watched methods that have an option to include special episodes. Deprecated the original variants. diff --git a/src/main/java/com/uwetrottmann/trakt5/enums/Rating.java b/src/main/java/com/uwetrottmann/trakt5/enums/Rating.java index 85e26f36..40b2c178 100644 --- a/src/main/java/com/uwetrottmann/trakt5/enums/Rating.java +++ b/src/main/java/com/uwetrottmann/trakt5/enums/Rating.java @@ -16,6 +16,8 @@ package com.uwetrottmann.trakt5.enums; +import javax.annotation.Nullable; + public enum Rating implements TraktEnum { WEAKSAUCE(1), @@ -29,14 +31,20 @@ public enum Rating implements TraktEnum { SUPERB(9), TOTALLYNINJA(10); - public int value; + public final int value; Rating(int value) { this.value = value; } + @Nullable public static Rating fromValue(int value) { - return Rating.values()[value - 1]; + for (Rating rating : Rating.values()) { + if (rating.value == value) { + return rating; + } + } + return null; // Return null instead of an unknown enum value } @Override diff --git a/src/test/java/com/uwetrottmann/trakt5/enums/EnumTest.java b/src/test/java/com/uwetrottmann/trakt5/enums/EnumTest.java new file mode 100644 index 00000000..74848511 --- /dev/null +++ b/src/test/java/com/uwetrottmann/trakt5/enums/EnumTest.java @@ -0,0 +1,35 @@ +/* + * Copyright 2026 Uwe Trottmann + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.uwetrottmann.trakt5.enums; + +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class EnumTest { + + @Test + public void rating_fromValue() { + Rating[] values = Rating.values(); + for (Rating rating : values) { + assertThat(Rating.fromValue(rating.value)).isEqualTo(rating); + } + + assertThat(Rating.fromValue(0)).isNull(); + assertThat(Rating.fromValue(11)).isNull(); + } +} \ No newline at end of file From 7b3118e210160b1c1e4e7bd782924143ce2ff89f Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 18 Jun 2026 09:21:57 +0200 Subject: [PATCH 3/3] Enums: test null is returned for unknown values --- .../com/uwetrottmann/trakt5/enums/Audio.java | 2 + .../trakt5/enums/AudioChannels.java | 2 + .../com/uwetrottmann/trakt5/enums/Hdr.java | 2 + .../uwetrottmann/trakt5/enums/MediaType.java | 2 + .../trakt5/enums/ProgressLastActivity.java | 2 + .../uwetrottmann/trakt5/enums/Resolution.java | 2 + .../com/uwetrottmann/trakt5/enums/Status.java | 2 + .../uwetrottmann/trakt5/enums/EnumTest.java | 48 +++++++++++++++++++ 8 files changed, 62 insertions(+) diff --git a/src/main/java/com/uwetrottmann/trakt5/enums/Audio.java b/src/main/java/com/uwetrottmann/trakt5/enums/Audio.java index f0fd01f7..131260cf 100644 --- a/src/main/java/com/uwetrottmann/trakt5/enums/Audio.java +++ b/src/main/java/com/uwetrottmann/trakt5/enums/Audio.java @@ -16,6 +16,7 @@ package com.uwetrottmann.trakt5.enums; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -55,6 +56,7 @@ public enum Audio implements TraktEnum { } } + @Nullable public static Audio fromValue(String value) { return STRING_MAPPING.get(value); } diff --git a/src/main/java/com/uwetrottmann/trakt5/enums/AudioChannels.java b/src/main/java/com/uwetrottmann/trakt5/enums/AudioChannels.java index d5b9f98c..059837f0 100644 --- a/src/main/java/com/uwetrottmann/trakt5/enums/AudioChannels.java +++ b/src/main/java/com/uwetrottmann/trakt5/enums/AudioChannels.java @@ -16,6 +16,7 @@ package com.uwetrottmann.trakt5.enums; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -53,6 +54,7 @@ public enum AudioChannels implements TraktEnum { } } + @Nullable public static AudioChannels fromValue(String value) { return STRING_MAPPING.get(value); } diff --git a/src/main/java/com/uwetrottmann/trakt5/enums/Hdr.java b/src/main/java/com/uwetrottmann/trakt5/enums/Hdr.java index 30fd8ee9..35d79b97 100644 --- a/src/main/java/com/uwetrottmann/trakt5/enums/Hdr.java +++ b/src/main/java/com/uwetrottmann/trakt5/enums/Hdr.java @@ -16,6 +16,7 @@ package com.uwetrottmann.trakt5.enums; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -40,6 +41,7 @@ public enum Hdr implements TraktEnum { } } + @Nullable public static Hdr fromValue(String value) { return STRING_MAPPING.get(value); } diff --git a/src/main/java/com/uwetrottmann/trakt5/enums/MediaType.java b/src/main/java/com/uwetrottmann/trakt5/enums/MediaType.java index 6463e2ac..02f4f299 100644 --- a/src/main/java/com/uwetrottmann/trakt5/enums/MediaType.java +++ b/src/main/java/com/uwetrottmann/trakt5/enums/MediaType.java @@ -16,6 +16,7 @@ package com.uwetrottmann.trakt5.enums; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -44,6 +45,7 @@ public enum MediaType implements TraktEnum { } } + @Nullable public static MediaType fromValue(String value) { return STRING_MAPPING.get(value); } diff --git a/src/main/java/com/uwetrottmann/trakt5/enums/ProgressLastActivity.java b/src/main/java/com/uwetrottmann/trakt5/enums/ProgressLastActivity.java index 11fa5586..9627c7fc 100644 --- a/src/main/java/com/uwetrottmann/trakt5/enums/ProgressLastActivity.java +++ b/src/main/java/com/uwetrottmann/trakt5/enums/ProgressLastActivity.java @@ -16,6 +16,7 @@ package com.uwetrottmann.trakt5.enums; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -39,6 +40,7 @@ public enum ProgressLastActivity implements TraktEnum { } } + @Nullable public static ProgressLastActivity fromValue(String value) { return STRING_MAPPING.get(value.toUpperCase(Locale.ROOT)); } diff --git a/src/main/java/com/uwetrottmann/trakt5/enums/Resolution.java b/src/main/java/com/uwetrottmann/trakt5/enums/Resolution.java index 74a1145a..716dc8cd 100644 --- a/src/main/java/com/uwetrottmann/trakt5/enums/Resolution.java +++ b/src/main/java/com/uwetrottmann/trakt5/enums/Resolution.java @@ -16,6 +16,7 @@ package com.uwetrottmann.trakt5.enums; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -44,6 +45,7 @@ public enum Resolution implements TraktEnum { } } + @Nullable public static Resolution fromValue(String value) { return STRING_MAPPING.get(value); } diff --git a/src/main/java/com/uwetrottmann/trakt5/enums/Status.java b/src/main/java/com/uwetrottmann/trakt5/enums/Status.java index 5d4e8e93..3feff817 100644 --- a/src/main/java/com/uwetrottmann/trakt5/enums/Status.java +++ b/src/main/java/com/uwetrottmann/trakt5/enums/Status.java @@ -16,6 +16,7 @@ package com.uwetrottmann.trakt5.enums; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -41,6 +42,7 @@ public enum Status implements TraktEnum { } } + @Nullable public static Status fromValue(String value) { return STRING_MAPPING.get(value.toUpperCase(Locale.ROOT)); } diff --git a/src/test/java/com/uwetrottmann/trakt5/enums/EnumTest.java b/src/test/java/com/uwetrottmann/trakt5/enums/EnumTest.java index 74848511..248578d3 100644 --- a/src/test/java/com/uwetrottmann/trakt5/enums/EnumTest.java +++ b/src/test/java/com/uwetrottmann/trakt5/enums/EnumTest.java @@ -18,10 +18,48 @@ import org.junit.Test; +import java.util.function.Function; + import static org.assertj.core.api.Assertions.assertThat; public class EnumTest { + private static final String TEST_VALUE_INVALID = "invalid"; + + // Note: E extends TraktEnum is not technically necessary, but somewhat guarantees that toString is equal to value + private & TraktEnum> void testStringEnumFromValue(E[] values, Function fromValue) { + for (E value : values) { + assertThat(fromValue.apply(value.toString())).isEqualTo(value); + } + + assertThat(fromValue.apply(TEST_VALUE_INVALID)).isNull(); + } + + @Test + public void audio_fromValue() { + testStringEnumFromValue(Audio.values(), Audio::fromValue); + } + + @Test + public void audioChannels_fromValue() { + testStringEnumFromValue(AudioChannels.values(), AudioChannels::fromValue); + } + + @Test + public void hdr_fromValue() { + testStringEnumFromValue(Hdr.values(), Hdr::fromValue); + } + + @Test + public void mediaType_fromValue() { + testStringEnumFromValue(MediaType.values(), MediaType::fromValue); + } + + @Test + public void progressLastActivity_fromValue() { + testStringEnumFromValue(ProgressLastActivity.values(), ProgressLastActivity::fromValue); + } + @Test public void rating_fromValue() { Rating[] values = Rating.values(); @@ -32,4 +70,14 @@ public void rating_fromValue() { assertThat(Rating.fromValue(0)).isNull(); assertThat(Rating.fromValue(11)).isNull(); } + + @Test + public void resolution_fromValue() { + testStringEnumFromValue(Resolution.values(), Resolution::fromValue); + } + + @Test + public void status_fromValue() { + testStringEnumFromValue(Status.values(), Status::fromValue); + } } \ No newline at end of file