From 3c0d03abe88c670b91240a867c500ade266427d2 Mon Sep 17 00:00:00 2001
From: Owen Roberts <roberts.7@icloud.com>
Date: Mon, 5 Dec 2022 14:57:02 -0700
Subject: [PATCH] cleanup

---
 .../youtube/YoutubeParsingHelper.java         | 27 +++----------------
 1 file changed, 3 insertions(+), 24 deletions(-)

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
index e290cd877..2ea9a9ddd 100644
--- 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
@@ -71,7 +71,6 @@ import java.util.Optional;
 import java.util.Random;
 import java.util.Set;
 import java.util.regex.Pattern;
-import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -607,7 +606,7 @@ public final class YoutubeParsingHelper {
         final JsonArray serviceTrackingParams = initialData.getObject("responseContext")
                 .getArray("serviceTrackingParams");
 
-        clientVersion = getClientVersionFromServiceTrackingParams(
+        clientVersion = getClientVersionFromServiceTrackingParam(
                 serviceTrackingParams, "CSI", "cver");
 
         if (clientVersion == null) {
@@ -621,7 +620,7 @@ public final class YoutubeParsingHelper {
         // Fallback to get a shortened client version which does not contain the last two
         // digits
         if (isNullOrEmpty(clientVersion)) {
-            clientVersion = getClientVersionFromServiceTrackingParams(
+            clientVersion = getClientVersionFromServiceTrackingParam(
                     serviceTrackingParams, "ECATCHER", "client.version");
         }
 
@@ -648,7 +647,7 @@ public final class YoutubeParsingHelper {
     }
 
     @Nullable
-    private static String getClientVersionFromServiceTrackingParams(
+    private static String getClientVersionFromServiceTrackingParam(
             @Nonnull final JsonArray serviceTrackingParams,
             @Nonnull final String serviceName,
             @Nonnull final String clientVersionKey) {
@@ -667,26 +666,6 @@ public final class YoutubeParsingHelper {
         return null;
     }
 
-    @Nullable
-    private static String getClientVersionFromServiceTrackingParam(
-            @Nonnull final Stream<JsonObject> serviceTrackingParamsStream,
-            @Nonnull final String serviceName,
-            @Nonnull final String clientVersionKey) {
-        return serviceTrackingParamsStream.filter(serviceTrackingParam ->
-                        serviceTrackingParam.getString("service", "")
-                                .equals(serviceName))
-                .flatMap(serviceTrackingParam -> serviceTrackingParam.getArray("params")
-                        .stream())
-                .filter(JsonObject.class::isInstance)
-                .map(JsonObject.class::cast)
-                .filter(param -> param.getString("key", "")
-                        .equals(clientVersionKey))
-                .map(param -> param.getString("value"))
-                .filter(paramValue -> !isNullOrEmpty(paramValue))
-                .findFirst()
-                .orElse(null);
-    }
-
     /**
      * Get the client version used by YouTube website on InnerTube requests.
      */