From 5760366d70ca5c6413f759af5b9be2c7e36c919a Mon Sep 17 00:00:00 2001 From: bopol Date: Thu, 7 May 2020 15:32:25 +0200 Subject: [PATCH] use JsonObject#isEmpty instead of JsonObject#equals(JsonUtils.EMPTY_OBJECT) --- .../extractors/YoutubeMusicSearchExtractor.java | 10 +++++----- .../youtube/extractors/YoutubeSearchExtractor.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) 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 index 0731f3041..39a6e94d4 100644 --- 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 @@ -130,7 +130,7 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor { public String getSearchSuggestion() throws ParsingException { final JsonObject itemSectionRenderer = initialData.getObject("contents").getObject("sectionListRenderer") .getArray("contents").getObject(0).getObject("itemSectionRenderer"); - if (itemSectionRenderer.equals(JsonUtils.EMPTY_OBJECT)) { + if (itemSectionRenderer.isEmpty()) { return ""; } @@ -139,9 +139,9 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor { final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents").getObject(0) .getObject("showingResultsForRenderer"); - if (!didYouMeanRenderer.equals(JsonUtils.EMPTY_OBJECT)) { + if (!didYouMeanRenderer.isEmpty()) { return getTextFromObject(didYouMeanRenderer.getObject("correctedQuery")); - } else if (!showingResultsForRenderer.equals(JsonUtils.EMPTY_OBJECT)) { + } else if (!showingResultsForRenderer.isEmpty()) { return JsonUtils.getString(showingResultsForRenderer, "correctedQueryEndpoint.searchEndpoint.query"); } else { return ""; @@ -152,13 +152,13 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor { public boolean isCorrectedSearch() { final JsonObject itemSectionRenderer = initialData.getObject("contents").getObject("sectionListRenderer") .getArray("contents").getObject(0).getObject("itemSectionRenderer"); - if (itemSectionRenderer.equals(JsonUtils.EMPTY_OBJECT)) { + if (itemSectionRenderer.isEmpty()) { return false; } final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents").getObject(0) .getObject("showingResultsForRenderer"); - return !showingResultsForRenderer.equals(JsonUtils.EMPTY_OBJECT); + return !showingResultsForRenderer.isEmpty(); } @Nonnull 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 index f35bc6c06..05c27d53d 100644 --- 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 @@ -73,7 +73,7 @@ public class YoutubeSearchExtractor extends SearchExtractor { final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents").getObject(0) .getObject("showingResultsForRenderer"); - if (!didYouMeanRenderer.equals(JsonUtils.EMPTY_OBJECT)) { + if (!didYouMeanRenderer.isEmpty()) { return JsonUtils.getString(didYouMeanRenderer, "correctedQueryEndpoint.searchEndpoint.query"); } else if (showingResultsForRenderer != null) { return getTextFromObject(showingResultsForRenderer.getObject("correctedQuery")); @@ -89,7 +89,7 @@ public class YoutubeSearchExtractor extends SearchExtractor { .getObject("sectionListRenderer").getArray("contents").getObject(0) .getObject("itemSectionRenderer").getArray("contents").getObject(0) .getObject("showingResultsForRenderer"); - return !showingResultsForRenderer.equals(JsonUtils.EMPTY_OBJECT); + return !showingResultsForRenderer.isEmpty(); } @Nonnull