Skip to content

Commit 4ad744c

Browse files
[YouTube] Reuse string predicate
1 parent 43e9afb commit 4ad744c

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
import java.util.Optional;
7575
import java.util.Random;
7676
import java.util.Set;
77+
import java.util.function.Predicate;
7778
import java.util.regex.Pattern;
7879
import java.util.stream.Collectors;
7980
import java.util.stream.Stream;
@@ -197,6 +198,8 @@ private YoutubeParsingHelper() {
197198

198199
private static boolean consentAccepted = false;
199200

201+
private static final Predicate<String> STRING_PREDICATE = text -> !text.isEmpty();
202+
200203
public static boolean isGoogleURL(final String url) {
201204
final String cachedUrl = extractCachedUrlIfNeeded(url);
202205
try {
@@ -553,8 +556,8 @@ private static String getClientVersionFromServiceTrackingParam(
553556
.map(JsonObject.class::cast)
554557
.filter(param -> param.getString("key", "")
555558
.equals(clientVersionKey))
556-
.map(param -> param.getString("value"))
557-
.filter(paramValue -> !isNullOrEmpty(paramValue))
559+
.map(param -> param.getString("value", ""))
560+
.filter(STRING_PREDICATE)
558561
.findFirst()
559562
.orElse(null);
560563
}
@@ -765,7 +768,7 @@ public static Optional<String> getUrlFromNavigationEndpoint(
765768
return Optional.ofNullable(metadata.getString("url"))
766769
.map(url -> "https://www.youtube.com" + url);
767770
})
768-
.filter(url -> !url.isEmpty());
771+
.filter(STRING_PREDICATE);
769772
}
770773

771774
@Nonnull
@@ -836,7 +839,7 @@ public static Optional<String> getTextFromObject(@Nonnull final JsonObject textO
836839
}
837840
return Optional.of(string);
838841
})
839-
.filter(text -> !text.isEmpty());
842+
.filter(STRING_PREDICATE);
840843
}
841844

842845
@Nonnull
@@ -864,7 +867,7 @@ public static Optional<String> getUrlFromObject(@Nonnull final JsonObject textOb
864867
public static Optional<String> getTextAtKey(@Nonnull final JsonObject jsonObject,
865868
final String theKey) {
866869
return Optional.ofNullable(jsonObject.getString(theKey))
867-
.filter(text -> !text.isEmpty())
870+
.filter(STRING_PREDICATE)
868871
.or(() -> getTextFromObject(jsonObject.getObject(theKey)));
869872
}
870873

0 commit comments

Comments
 (0)