Remove LocaleCompat class

Author: Isira-Seneviratne

extractor/src/main/java/org/schabi/newpipe/extractor/localization/Localization.java

@@ -1,17 +1,15 @@
 package org.schabi.newpipe.extractor.localization;
 
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.utils.LocaleCompat;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -26,30 +24,24 @@ public class Localization implements Serializable {
     private final String countryCode;
 
     /**
-     * @param localizationCodeList a list of localization code, formatted like {@link
-     *                             #getLocalizationCode()}
-     * @throws IllegalArgumentException If any of the localizationCodeList is formatted incorrectly
+     * @param localizationCodes a list of localization code, formatted like
+     * {@link #getLocalizationCode()}
      * @return list of Localization objects
      */
     @Nonnull
-    public static List<Localization> listFrom(final String... localizationCodeList) {
-        final List<Localization> toReturn = new ArrayList<>();
-        for (final String localizationCode : localizationCodeList) {
-            toReturn.add(fromLocalizationCode(localizationCode)
-                    .orElseThrow(() -> new IllegalArgumentException(
-                            "Not a localization code: " + localizationCode
-                    )));
-        }
-        return Collections.unmodifiableList(toReturn);
+    public static List<Localization> listFrom(final String... localizationCodes) {
+        return Arrays.stream(localizationCodes)
+                .map(Localization::fromLocalizationCode)
+                .collect(Collectors.toUnmodifiableList());
     }
 
     /**
      * @param localizationCode a localization code, formatted like {@link #getLocalizationCode()}
      * @return A Localization, if the code was valid.
      */
     @Nonnull
-    public static Optional<Localization> fromLocalizationCode(final String localizationCode) {
-        return LocaleCompat.forLanguageTag(localizationCode).map(Localization::fromLocale);
+    public static Localization fromLocalizationCode(final String localizationCode) {
+        return Localization.fromLocale(Locale.forLanguageTag(localizationCode));
     }
 
     public Localization(@Nonnull final String languageCode, @Nullable final String countryCode) {

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java

@@ -28,7 +28,6 @@
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
-import org.schabi.newpipe.extractor.utils.LocaleCompat;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -130,10 +129,7 @@ public List<AudioStream> getAudioStreams() throws ExtractionException {
                 // track with multiple languages, so there is no specific language for this stream
                 // Don't set the audio language in this case
                 if (language != null && !language.contains("-")) {
-                    builder.setAudioLocale(LocaleCompat.forLanguageTag(language).orElseThrow(() ->
-                        new ParsingException(
-                                "Cannot convert this language to a locale: " + language)
-                    ));
+                    builder.setAudioLocale(Locale.forLanguageTag(language));
                 }
 
                 // Not checking containsSimilarStream here, since MediaCCC does not provide enough

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -79,7 +79,6 @@
 import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
-import org.schabi.newpipe.extractor.utils.LocaleCompat;
 import org.schabi.newpipe.extractor.utils.Pair;
 import org.schabi.newpipe.extractor.utils.Parser;
 import org.schabi.newpipe.extractor.utils.Utils;
@@ -1412,9 +1411,8 @@ private ItagInfo buildAndAddItagInfoToList(
                 final int audioTrackIdLastLocaleCharacter = audioTrackId.indexOf(".");
                 if (audioTrackIdLastLocaleCharacter != -1) {
                     // Audio tracks IDs are in the form LANGUAGE_CODE.TRACK_NUMBER
-                    LocaleCompat.forLanguageTag(
-                            audioTrackId.substring(0, audioTrackIdLastLocaleCharacter)
-                    ).ifPresent(itagItem::setAudioLocale);
+                    final String tag = audioTrackId.substring(0, audioTrackIdLastLocaleCharacter);
+                    itagItem.setAudioLocale(Locale.forLanguageTag(tag));
                 }
                 itagItem.setAudioTrackType(YoutubeParsingHelper.extractAudioTrackType(streamUrl));
             }

extractor/src/main/java/org/schabi/newpipe/extractor/stream/SubtitlesStream.java

@@ -3,7 +3,6 @@
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.services.youtube.ItagItem;
-import org.schabi.newpipe.extractor.utils.LocaleCompat;
 
 import java.util.Locale;
 
@@ -230,11 +229,9 @@ private SubtitlesStream(@Nonnull final String id,
                             @Nonnull final DeliveryMethod deliveryMethod,
                             @Nonnull final String languageCode,
                             final boolean autoGenerated,
-                            @Nullable final String manifestUrl) throws ParsingException {
+                            @Nullable final String manifestUrl) {
         super(id, content, isUrl, mediaFormat, deliveryMethod, manifestUrl);
-        this.locale = LocaleCompat.forLanguageTag(languageCode).orElseThrow(
-                () -> new ParsingException(
-                        "not a valid locale language code: " + languageCode));
+        this.locale = Locale.forLanguageTag(languageCode);
         this.code = languageCode;
         this.format = mediaFormat;
         this.autoGenerated = autoGenerated;