Fix missing imports and Checkstyle issues

AudricV · AudricV · commit dfa42396616b · 2022-03-27T22:10:57.000+02:00
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -589,7 +589,8 @@ private static void extractClientVersionAndKeyFromSwJs()
                     INNERTUBE_CONTEXT_CLIENT_VERSION_REGEXES, 1);
             key = getStringResultFromRegexArray(response, INNERTUBE_API_KEY_REGEXES, 1);
         } catch (final Parser.RegexException e) {
-            throw new ParsingException("Could not extract YouTube WEB InnerTube client version and API key from sw.js", e);
+            throw new ParsingException("Could not extract YouTube WEB InnerTube client version "
+                    + "and API key from sw.js", e);
         }
         keyAndVersionExtracted = true;
     }
@@ -649,8 +650,8 @@ private static void extractClientVersionAndKeyFromHtmlSearchResultsPage()
         try {
             key = getStringResultFromRegexArray(html, INNERTUBE_API_KEY_REGEXES, 1);
         } catch (final Parser.RegexException e) {
-            throw new ParsingException(
-                    "Could not extract YouTube WEB InnerTube client version and API key from HTML search results page", e);
+            throw new ParsingException("Could not extract YouTube WEB InnerTube client version "
+                    + "and API key from HTML search results page", e);
         }
         keyAndVersionExtracted = true;
     }
@@ -823,7 +824,7 @@ public static String[] getYoutubeMusicKey()
             musicClientName = Parser.matchGroup1(INNERTUBE_CLIENT_NAME_REGEX, html);
         }
 
-        youtubeMusicKey = new String[] { musicKey, musicClientName, musicClientVersion };
+        youtubeMusicKey = new String[] {musicKey, musicClientName, musicClientVersion};
         return youtubeMusicKey;
     }
 
@@ -1050,15 +1051,15 @@ private static JsonObject getMobilePostResponse(
             final byte[] body,
             @Nonnull final Localization localization,
             @Nonnull final String userAgent,
-            @Nonnull final String key,
+            @Nonnull final String innerTubeApiKey,
             @Nullable final String endPartOfUrlRequest) throws IOException, ExtractionException {
         final Map<String, List<String>> headers = new HashMap<>();
         headers.put("Content-Type", Collections.singletonList("application/json"));
         headers.put("User-Agent", Collections.singletonList(userAgent));
         headers.put("X-Goog-Api-Format-Version", Collections.singletonList("2"));
 
         final String baseEndpointUrl = "https://youtubei.googleapis.com/youtubei/v1/" + endpoint
-                + "?key=" + key + DISABLE_PRETTY_PRINT_PARAMETER;
+                + "?key=" + innerTubeApiKey + DISABLE_PRETTY_PRINT_PARAMETER;
 
         final Response response = getDownloader().post(isNullOrEmpty(endPartOfUrlRequest)
                         ? baseEndpointUrl : baseEndpointUrl + endPartOfUrlRequest,
@@ -1363,6 +1364,7 @@ public static void addClientInfoHeaders(@Nonnull final Map<String, List<String>>
      * @see #CONSENT_COOKIE
      * @param headers the headers which should be completed
      */
+    @SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
     public static void addCookieHeader(@Nonnull final Map<String, List<String>> headers) {
         if (headers.get("Cookie") == null) {
             headers.put("Cookie", Arrays.asList(generateConsentCookie()));
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.extractor.services.youtube.extractors;
 
+import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.YOUTUBEI_V1_URL;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.addClientInfoHeaders;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.fixThumbnailUrl;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMixPlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMixPlaylistExtractor.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.extractor.services.youtube.extractors;
 
+import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.YOUTUBEI_V1_URL;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.addClientInfoHeaders;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.extractCookieValue;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.extractor.services.youtube.extractors;
 
+import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.fixThumbnailUrl;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getTextFromObject;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getUrlFromNavigationEndpoint;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubePlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubePlaylistExtractor.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.extractor.services.youtube.extractors;
 
+import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.YOUTUBEI_V1_URL;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.addClientInfoHeaders;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.extractPlaylistTypeFromPlaylistUrl;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.extractor.services.youtube.extractors;
 
+import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.YOUTUBEI_V1_URL;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getJsonPostResponse;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getKey;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -1079,7 +1079,8 @@ private static void storePlayerJs() throws ParsingException {
         }
     }
 
-    private static String getDeobfuscationFuncName(final String thePlayerCode) throws DeobfuscateException {
+    private static String getDeobfuscationFuncName(final String thePlayerCode)
+            throws DeobfuscateException {
         Parser.RegexException exception = null;
         for (final String regex : REGEXES) {
             try {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/utils/RandomStringFromAlphabetGenerator.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/RandomStringFromAlphabetGenerator.java
@@ -17,7 +17,8 @@ private RandomStringFromAlphabetGenerator() {
      *
      * @param alphabet the characters' alphabet to use
      * @param length   the length of the returned string (> 0)
-     * @param random   {@link Random} (or better {@link java.security.SecureRandom}) used for generating the random string
+     * @param random   {@link Random} (or better {@link java.security.SecureRandom}) used for
+     *                 generating the random string
      * @return a random string of the requested length made of only characters from the provided
      * alphabet
      */
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java
@@ -282,7 +282,7 @@ public static boolean isNullOrEmpty(final Collection<?> collection) {
      * @param map the {@link Map map} on which check if it's null or empty
      * @return whether the {@link Map map} is null or empty
      */
-    public static <K,V> boolean isNullOrEmpty(final Map<K, V> map) {
+    public static <K, V> boolean isNullOrEmpty(final Map<K, V> map) {
         return map == null || map.isEmpty();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1079,7 +1079,8 @@ private static void storePlayerJs() throws ParsingException {`
`1079`	`1079`	`}`
`1080`	`1080`	`}`
`1081`	`1081`
`1082`		`- private static String getDeobfuscationFuncName(final String thePlayerCode) throws DeobfuscateException {`
	`1082`	`+ private static String getDeobfuscationFuncName(final String thePlayerCode)`
	`1083`	`+ throws DeobfuscateException {`
`1083`	`1084`	`Parser.RegexException exception = null;`
`1084`	`1085`	`for (final String regex : REGEXES) {`
`1085`	`1086`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ public static boolean isNullOrEmpty(final Collection<?> collection) {`
`282`	`282`	`* @param map the {@link Map map} on which check if it's null or empty`
`283`	`283`	`* @return whether the {@link Map map} is null or empty`
`284`	`284`	`*/`
`285`		`- public static <K,V> boolean isNullOrEmpty(final Map<K, V> map) {`
	`285`	`+ public static <K, V> boolean isNullOrEmpty(final Map<K, V> map) {`
`286`	`286`	`return map == null \|\| map.isEmpty();`
`287`	`287`	`}`
`288`	`288`