Skip to content

Commit 5760366

Browse files
committed
use JsonObject#isEmpty instead of JsonObject#equals(JsonUtils.EMPTY_OBJECT)
1 parent 93e8686 commit 5760366

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public String getUrl() throws ParsingException {
130130
public String getSearchSuggestion() throws ParsingException {
131131
final JsonObject itemSectionRenderer = initialData.getObject("contents").getObject("sectionListRenderer")
132132
.getArray("contents").getObject(0).getObject("itemSectionRenderer");
133-
if (itemSectionRenderer.equals(JsonUtils.EMPTY_OBJECT)) {
133+
if (itemSectionRenderer.isEmpty()) {
134134
return "";
135135
}
136136

@@ -139,9 +139,9 @@ public String getSearchSuggestion() throws ParsingException {
139139
final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents").getObject(0)
140140
.getObject("showingResultsForRenderer");
141141

142-
if (!didYouMeanRenderer.equals(JsonUtils.EMPTY_OBJECT)) {
142+
if (!didYouMeanRenderer.isEmpty()) {
143143
return getTextFromObject(didYouMeanRenderer.getObject("correctedQuery"));
144-
} else if (!showingResultsForRenderer.equals(JsonUtils.EMPTY_OBJECT)) {
144+
} else if (!showingResultsForRenderer.isEmpty()) {
145145
return JsonUtils.getString(showingResultsForRenderer, "correctedQueryEndpoint.searchEndpoint.query");
146146
} else {
147147
return "";
@@ -152,13 +152,13 @@ public String getSearchSuggestion() throws ParsingException {
152152
public boolean isCorrectedSearch() {
153153
final JsonObject itemSectionRenderer = initialData.getObject("contents").getObject("sectionListRenderer")
154154
.getArray("contents").getObject(0).getObject("itemSectionRenderer");
155-
if (itemSectionRenderer.equals(JsonUtils.EMPTY_OBJECT)) {
155+
if (itemSectionRenderer.isEmpty()) {
156156
return false;
157157
}
158158

159159
final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents").getObject(0)
160160
.getObject("showingResultsForRenderer");
161-
return !showingResultsForRenderer.equals(JsonUtils.EMPTY_OBJECT);
161+
return !showingResultsForRenderer.isEmpty();
162162
}
163163

164164
@Nonnull

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public String getSearchSuggestion() throws ParsingException {
7373
final JsonObject showingResultsForRenderer = itemSectionRenderer.getArray("contents").getObject(0)
7474
.getObject("showingResultsForRenderer");
7575

76-
if (!didYouMeanRenderer.equals(JsonUtils.EMPTY_OBJECT)) {
76+
if (!didYouMeanRenderer.isEmpty()) {
7777
return JsonUtils.getString(didYouMeanRenderer, "correctedQueryEndpoint.searchEndpoint.query");
7878
} else if (showingResultsForRenderer != null) {
7979
return getTextFromObject(showingResultsForRenderer.getObject("correctedQuery"));
@@ -89,7 +89,7 @@ public boolean isCorrectedSearch() {
8989
.getObject("sectionListRenderer").getArray("contents").getObject(0)
9090
.getObject("itemSectionRenderer").getArray("contents").getObject(0)
9191
.getObject("showingResultsForRenderer");
92-
return !showingResultsForRenderer.equals(JsonUtils.EMPTY_OBJECT);
92+
return !showingResultsForRenderer.isEmpty();
9393
}
9494

9595
@Nonnull

0 commit comments

Comments
 (0)