diff --git a/build.gradle.kts b/build.gradle.kts index 085352ed67..41a56bc377 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ allprojects { extensions.configure { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } } @@ -29,7 +29,7 @@ subprojects { tasks.withType().configureEach { (options as StandardJavadocDocletOptions).apply { encoding = Charsets.UTF_8.toString() - links = listOf("https://docs.oracle.com/javase/11/docs/api/") + links = listOf("https://docs.oracle.com/javase/17/docs/api/") tags = listOf( "apiNote:a:API Note:", "implSpec:a:Implementation Requirements:", diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsInfoItemExtractor.java index 4c23c1e01a..b4b470022d 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsInfoItemExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsInfoItemExtractor.java @@ -24,7 +24,7 @@ public BandcampCommentsInfoItemExtractor(final JsonObject review, final String u @Override public String getName() throws ParsingException { - return getCommentText().getContent(); + return getCommentText().content(); } @Override @@ -41,7 +41,7 @@ public List getThumbnails() throws ParsingException { @Nonnull @Override public Description getCommentText() throws ParsingException { - return new Description(review.getString("why"), Description.PLAIN_TEXT); + return Description.of(review.getString("why"), Description.Type.PLAIN_TEXT); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampPlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampPlaylistExtractor.java index ee5dc92134..73872a0a48 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampPlaylistExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampPlaylistExtractor.java @@ -140,7 +140,7 @@ public Description getDescription() throws ParsingException { if (license != null) { sb.append(license.html()); } - return new Description(sb.toString(), Description.HTML); + return Description.of(sb.toString(), Description.Type.HTML); } @Nonnull diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java index 2b28f03a79..5f9f369c19 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java @@ -115,7 +115,7 @@ public List getUploaderAvatars() { @Nonnull @Override public Description getDescription() { - return new Description(showInfo.getString("desc"), Description.PLAIN_TEXT); + return Description.of(showInfo.getString("desc"), Description.Type.PLAIN_TEXT); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampStreamExtractor.java index dfdbb56965..4a823c5e18 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampStreamExtractor.java @@ -148,7 +148,7 @@ public List getUploaderAvatars() { public Description getDescription() { final String s = Utils.nonEmptyAndNullJoin("\n\n", current.getString("about"), current.getString("lyrics"), current.getString("credits")); - return new Description(s, Description.PLAIN_TEXT); + return Description.of(s, Description.Type.PLAIN_TEXT); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java index ba362f0bc7..e4470ce883 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java @@ -86,8 +86,8 @@ public List getThumbnails() throws ParsingException { @Nonnull @Override public Description getDescription() throws ParsingException { - return new Description(conference.getString("description") - + " - " + group, Description.PLAIN_TEXT); + final String text = conference.getString("description") + " - " + group; + return new Description(text, Description.Type.PLAIN_TEXT); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java index 0cb0ac4de8..1c48c292d3 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java @@ -67,7 +67,7 @@ public List getThumbnails() { @Nonnull @Override public Description getDescription() { - return new Description(data.getString("description"), Description.PLAIN_TEXT); + return Description.of(data.getString("description"), Description.Type.PLAIN_TEXT); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java index 80c8bbbc70..aaa3162eb4 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java @@ -82,10 +82,10 @@ public Description getCommentText() throws ParsingException { try { final Document doc = Jsoup.parse(htmlText); final var text = doc.body().text(); - return new Description(text, Description.PLAIN_TEXT); + return Description.of(text, Description.Type.PLAIN_TEXT); } catch (final Exception e) { final var text = htmlText.replaceAll("(?s)<[^>]*>(\\s*<[^>]*>)*", ""); - return new Description(text, Description.PLAIN_TEXT); + return Description.of(text, Description.Type.PLAIN_TEXT); } } diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistExtractor.java index e1d05417c2..063915eed6 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistExtractor.java @@ -74,11 +74,7 @@ public long getStreamCount() { @Nonnull @Override public Description getDescription() throws ParsingException { - final String description = playlistInfo.getString("description"); - if (isNullOrEmpty(description)) { - return Description.EMPTY_DESCRIPTION; - } - return new Description(description, Description.PLAIN_TEXT); + return Description.of(playlistInfo.getString("description"), Description.Type.PLAIN_TEXT); } @Nonnull diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistInfoItemExtractor.java index 6dbe0272a2..6659769e92 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistInfoItemExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistInfoItemExtractor.java @@ -10,7 +10,6 @@ import javax.annotation.Nonnull; import java.util.List; -import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getThumbnailsFromPlaylistOrVideoItem; public class PeertubePlaylistInfoItemExtractor implements PlaylistInfoItemExtractor { @@ -65,10 +64,6 @@ public long getStreamCount() throws ParsingException { @Nonnull @Override public Description getDescription() throws ParsingException { - final String description = item.getString("description"); - if (isNullOrEmpty(description)) { - return Description.EMPTY_DESCRIPTION; - } - return new Description(description, Description.PLAIN_TEXT); + return Description.of(item.getString("description"), Description.Type.PLAIN_TEXT); } } diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java index 99f409d845..449f139712 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java @@ -110,7 +110,7 @@ public Description getDescription() throws ParsingException { // Something went wrong when getting the full description, use the shortened one } } - return new Description(text, Description.MARKDOWN); + return Description.of(text, Description.Type.MARKDOWN); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java index d5446e56bb..487989c7cc 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java @@ -32,7 +32,7 @@ public String getCommentId() { @Nonnull @Override public Description getCommentText() { - return new Description(json.getString("body"), Description.PLAIN_TEXT); + return Description.of(json.getString("body"), Description.Type.PLAIN_TEXT); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudPlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudPlaylistExtractor.java index 443974408c..5fe842a227 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudPlaylistExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudPlaylistExtractor.java @@ -125,11 +125,7 @@ public long getStreamCount() { @Nonnull @Override public Description getDescription() throws ParsingException { - final String description = playlist.getString("description"); - if (isNullOrEmpty(description)) { - return Description.EMPTY_DESCRIPTION; - } - return new Description(description, Description.PLAIN_TEXT); + return Description.of(playlist.getString("description"), Description.Type.PLAIN_TEXT); } @Nonnull diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java index e0365e91dc..1af29b0dfe 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java @@ -109,7 +109,7 @@ public List getThumbnails() throws ParsingException { @Nonnull @Override public Description getDescription() { - return new Description(track.getString("description"), Description.PLAIN_TEXT); + return Description.of(track.getString("description"), Description.Type.PLAIN_TEXT); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeMetaInfoHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeMetaInfoHelper.java index bc8d9f85d0..7d8f533aa1 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeMetaInfoHelper.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeMetaInfoHelper.java @@ -74,7 +74,7 @@ private static MetaInfo getInfoPanelContent(@Nonnull final JsonObject infoPanelC } sb.append(getTextFromObject((JsonObject) paragraph)); } - metaInfo.setContent(new Description(sb.toString(), Description.HTML)); + metaInfo.setContent(Description.of(sb.toString(), Description.Type.HTML)); if (infoPanelContentRenderer.has("sourceEndpoint")) { final String metaInfoLinkUrl = getUrlFromNavigationEndpoint( infoPanelContentRenderer.getObject("sourceEndpoint")); @@ -115,7 +115,7 @@ private static MetaInfo getClarificationRenderer( throw new ParsingException("Could not extract clarification renderer content"); } metaInfo.setTitle(title); - metaInfo.setContent(new Description(text, Description.PLAIN_TEXT)); + metaInfo.setContent(new Description(text, Description.Type.PLAIN_TEXT)); if (clarificationRenderer.has("actionButton")) { final JsonObject actionButton = clarificationRenderer.getObject("actionButton") @@ -203,7 +203,7 @@ private static void getEmergencyOneboxRenderer( "urlText"); metaInfo.setTitle(title); - metaInfo.setContent(new Description(details + action, Description.PLAIN_TEXT)); + metaInfo.setContent(new Description(details + action, Description.Type.PLAIN_TEXT)); metaInfo.addUrlText(urlText); // usually the webpage of the association diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsEUVMInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsEUVMInfoItemExtractor.java index 90aa861346..bd94259844 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsEUVMInfoItemExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsEUVMInfoItemExtractor.java @@ -94,12 +94,13 @@ public String getTextualLikeCount() { .getString("likeCountNotliked"); } + @Nonnull @Override public Description getCommentText() throws ParsingException { // Comments' text work in the same way as an attributed video description - return new Description( - attributedDescriptionToHtml(commentEntityPayload.getObject(PROPERTIES) - .getObject("content")), Description.HTML); + final String text = attributedDescriptionToHtml(commentEntityPayload.getObject(PROPERTIES) + .getObject("content")); + return Description.of(text, Description.Type.HTML); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java index 7a001a1753..da4d230bfb 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java @@ -196,7 +196,7 @@ public Description getCommentText() throws ParsingException { // eg. https://www.youtube.com/watch?v=Nj4F63E59io final String commentTextBomRemoved = Utils.removeUTF8BOM(commentText); - return new Description(commentTextBomRemoved, Description.HTML); + return Description.of(commentTextBomRemoved, Description.Type.HTML); } catch (final Exception e) { throw new ParsingException("Could not get comment text", e); } 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 index 894ffdc038..b52920a5c0 100644 --- 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 @@ -348,7 +348,7 @@ public Description getDescription() throws ParsingException { true ); - return new Description(description, Description.HTML); + return Description.of(description, Description.Type.HTML); } @Nonnull 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 index 966568fce8..5603ac5c66 100644 --- 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 @@ -276,13 +276,13 @@ public Description getDescription() throws ParsingException { getVideoSecondaryInfoRenderer().getObject("description"), true); if (!isNullOrEmpty(videoSecondaryInfoRendererDescription)) { - return new Description(videoSecondaryInfoRendererDescription, Description.HTML); + return new Description(videoSecondaryInfoRendererDescription, Description.Type.HTML); } final String attributedDescription = attributedDescriptionToHtml( getVideoSecondaryInfoRenderer().getObject("attributedDescription")); if (!isNullOrEmpty(attributedDescription)) { - return new Description(attributedDescription, Description.HTML); + return new Description(attributedDescription, Description.Type.HTML); } String description = playerResponse.getObject(VIDEO_DETAILS) @@ -293,7 +293,7 @@ public Description getDescription() throws ParsingException { } // Raw non-html description - return new Description(description, Description.PLAIN_TEXT); + return Description.of(description, Description.Type.PLAIN_TEXT); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/Description.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/Description.java index 439609a2c1..a8343b7e74 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/Description.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/Description.java @@ -1,47 +1,24 @@ package org.schabi.newpipe.extractor.stream; -import java.io.Serializable; -import java.util.Objects; - +import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.io.Serializable; -public class Description implements Serializable { - - public static final int HTML = 1; - public static final int MARKDOWN = 2; - public static final int PLAIN_TEXT = 3; - public static final Description EMPTY_DESCRIPTION = new Description("", PLAIN_TEXT); - - private final String content; - private final int type; +import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; - public Description(@Nullable final String content, final int type) { - this.type = type; - this.content = Objects.requireNonNullElse(content, ""); - } +public record Description(@Nonnull String content, @Nonnull Type type) implements Serializable { + @Nonnull + public static final Description EMPTY_DESCRIPTION = new Description("", Type.PLAIN_TEXT); - public String getContent() { - return content; + public enum Type { + HTML, MARKDOWN, PLAIN_TEXT } - public int getType() { - return type; - } - - @Override - public boolean equals(final Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; + @Nonnull + public static Description of(@Nullable final String content, @Nonnull final Type type) { + if (isNullOrEmpty(content)) { + return EMPTY_DESCRIPTION; } - final Description that = (Description) o; - return type == that.type && Objects.equals(content, that.content); - } - - @Override - public int hashCode() { - return Objects.hash(content, type); + return new Description(content, type); } } diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultSearchExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultSearchExtractorTest.java index 818d70a814..1af3ad25b6 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultSearchExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultSearchExtractorTest.java @@ -66,7 +66,7 @@ public void testMetaInfo() throws Exception { for (final MetaInfo expectedMetaInfo : expectedMetaInfoList) { final List texts = metaInfoList.stream() - .map(metaInfo -> metaInfo.getContent().getContent()) + .map(metaInfo -> metaInfo.getContent().content()) .collect(Collectors.toList()); final List titles = metaInfoList.stream().map(MetaInfo::getTitle).collect(Collectors.toList()); final List urls = metaInfoList.stream().flatMap(info -> info.getUrls().stream()) @@ -74,7 +74,7 @@ public void testMetaInfo() throws Exception { final List urlTexts = metaInfoList.stream().flatMap(info -> info.getUrlTexts().stream()) .collect(Collectors.toList()); - assertTrue(texts.contains(expectedMetaInfo.getContent().getContent())); + assertTrue(texts.contains(expectedMetaInfo.getContent().content())); assertTrue(titles.contains(expectedMetaInfo.getTitle())); for (final String expectedUrlText : expectedMetaInfo.getUrlTexts()) { diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java index 12e19273ae..9170273adf 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java @@ -168,13 +168,13 @@ public void testDescription() throws Exception { assertNotNull(description); if (expectedDescriptionIsEmpty()) { - assertTrue(description.getContent().isEmpty(), "description is not empty"); + assertTrue(description.content().isEmpty(), "description is not empty"); } else { - assertFalse(description.getContent().isEmpty(), "description is empty"); + assertFalse(description.content().isEmpty(), "description is empty"); } for (final String s : expectedDescriptionContains()) { - ExtractorAsserts.assertContains(s, description.getContent()); + ExtractorAsserts.assertContains(s, description.content()); } } @@ -454,7 +454,7 @@ public void testMetaInfo() throws Exception { final List assertions = new ArrayList<>(); for (final MetaInfo expectedMetaInfo : expectedMetaInfoList) { final List texts = metaInfoList.stream() - .map((metaInfo) -> metaInfo.getContent().getContent()) + .map((metaInfo) -> metaInfo.getContent().content()) .collect(Collectors.toList()); final List titles = metaInfoList.stream().map(MetaInfo::getTitle).collect(Collectors.toList()); final List urls = metaInfoList.stream().flatMap(info -> info.getUrls().stream()) @@ -462,7 +462,7 @@ public void testMetaInfo() throws Exception { final List urlTexts = metaInfoList.stream().flatMap(info -> info.getUrlTexts().stream()) .collect(Collectors.toList()); - assertions.add(() -> assertContains(expectedMetaInfo.getContent().getContent(), texts)); + assertions.add(() -> assertContains(expectedMetaInfo.getContent().content(), texts)); assertions.add(() -> assertContains(expectedMetaInfo.getTitle(), titles)); for (final String expectedUrlText : expectedMetaInfo.getUrlTexts()) { diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampCommentsExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampCommentsExtractorTest.java index 61706ae065..372615fe13 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampCommentsExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampCommentsExtractorTest.java @@ -37,7 +37,7 @@ void testGetCommentsAllData() throws IOException, ExtractionException { for (final CommentsInfoItem c : comments.getItems()) { assertFalse(Utils.isBlank(c.getUploaderName())); BandcampTestUtils.testImages(c.getUploaderAvatars()); - assertFalse(Utils.isBlank(c.getCommentText().getContent())); + assertFalse(Utils.isBlank(c.getCommentText().content())); assertFalse(Utils.isBlank(c.getName())); BandcampTestUtils.testImages(c.getThumbnails()); assertFalse(Utils.isBlank(c.getUrl())); diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampPlaylistExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampPlaylistExtractorTest.java index 60336f8bdf..9d26da3b06 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampPlaylistExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampPlaylistExtractorTest.java @@ -154,10 +154,10 @@ public void testStreamCount() throws ParsingException { public void testDescription() throws ParsingException { final Description description = extractor().getDescription(); assertNotEquals(Description.EMPTY_DESCRIPTION, description); - assertContains("Artwork by Shona Radcliffe", description.getContent()); // about + assertContains("Artwork by Shona Radcliffe", description.content()); // about assertContains("All tracks written, produced and recorded by Mac Benson", - description.getContent()); // credits - assertContains("all rights reserved", description.getContent()); // license + description.content()); // credits + assertContains("all rights reserved", description.content()); // license } @Test diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java index 69dbf60e21..4398319085 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java @@ -73,7 +73,7 @@ void testGetCommentsAllData() throws IOException, ExtractionException { assertFalse(Utils.isBlank(commentsInfoItem.getUploaderName())); defaultTestImageCollection(commentsInfoItem.getUploaderAvatars()); assertFalse(Utils.isBlank(commentsInfoItem.getCommentId())); - assertFalse(Utils.isBlank(commentsInfoItem.getCommentText().getContent())); + assertFalse(Utils.isBlank(commentsInfoItem.getCommentText().content())); assertFalse(Utils.isBlank(commentsInfoItem.getName())); assertFalse(Utils.isBlank(commentsInfoItem.getTextualUploadDate())); defaultTestImageCollection(commentsInfoItem.getThumbnails()); @@ -92,7 +92,7 @@ private boolean findInComments(final List comments, final String comment) { return comments.stream() .anyMatch(commentsInfoItem -> - commentsInfoItem.getCommentText().getContent().contains(comment)); + commentsInfoItem.getCommentText().content().contains(comment)); } } diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubePlaylistExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubePlaylistExtractorTest.java index 52b67f6103..18e273196f 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubePlaylistExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubePlaylistExtractorTest.java @@ -51,7 +51,7 @@ void testGetStreamCount() throws ParsingException { @Test void testGetDescription() throws ParsingException { - ExtractorAsserts.assertContains("épisodes de Shocking", extractor().getDescription().getContent()); + ExtractorAsserts.assertContains("épisodes de Shocking", extractor().getDescription().content()); } @Test diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java index 18252899c0..5ebeeaf807 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java @@ -223,14 +223,14 @@ public void setUp() throws Exception { public void testGetEmptyDescription() throws Exception { final StreamExtractor extractorEmpty = PeerTube.getStreamExtractor("https://framatube.org/api/v1/videos/d5907aad-2252-4207-89ec-a4b687b9337d"); extractorEmpty.fetchPage(); - assertEquals("", extractorEmpty.getDescription().getContent()); + assertEquals("", extractorEmpty.getDescription().content()); } @Test public void testGetSmallDescription() throws Exception { final StreamExtractor extractorSmall = PeerTube.getStreamExtractor("https://peertube.cpy.re/videos/watch/d2a5ec78-5f85-4090-8ec5-dc1102e022ea"); extractorSmall.fetchPage(); - assertEquals("https://www.kickstarter.com/projects/1587081065/nothing-to-hide-the-documentary", extractorSmall.getDescription().getContent()); + assertEquals("https://www.kickstarter.com/projects/1587081065/nothing-to-hide-the-documentary", extractorSmall.getDescription().content()); } @Test diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeCommentsExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeCommentsExtractorTest.java index 713fb23611..57acd6a14d 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeCommentsExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeCommentsExtractorTest.java @@ -100,7 +100,7 @@ void testGetCommentsAllData() throws IOException, ExtractionException { assertFalse(Utils.isBlank(c.getUploaderName())); YoutubeTestsUtils.testImages(c.getUploaderAvatars()); assertFalse(Utils.isBlank(c.getCommentId())); - assertFalse(Utils.isBlank(c.getCommentText().getContent())); + assertFalse(Utils.isBlank(c.getCommentText().content())); assertFalse(Utils.isBlank(c.getName())); assertFalse(Utils.isBlank(c.getTextualUploadDate())); assertNotNull(c.getUploadDate()); @@ -116,7 +116,7 @@ private boolean findInComments(final InfoItemsPage comments, f private boolean findInComments(final List comments, final String comment) { for (final CommentsInfoItem c : comments) { - if (c.getCommentText().getContent().contains(comment)) { + if (c.getCommentText().content().contains(comment)) { return true; } } @@ -152,9 +152,9 @@ void testGetCommentsAllData() throws IOException, ExtractionException { assertFalse(Utils.isBlank(c.getUrl())); assertTrue(c.getLikeCount() >= 0); if (c.getCommentId().equals("Ugga_h1-EXdHB3gCoAEC")) { // comment without text - assertTrue(Utils.isBlank(c.getCommentText().getContent())); + assertTrue(Utils.isBlank(c.getCommentText().content())); } else { - assertFalse(Utils.isBlank(c.getCommentText().getContent())); + assertFalse(Utils.isBlank(c.getCommentText().content())); } } } @@ -188,7 +188,7 @@ void testGetCommentsAllData() throws IOException, ExtractionException { YoutubeTestsUtils.testImages(c.getThumbnails()); assertFalse(Utils.isBlank(c.getUrl())); assertTrue(c.getLikeCount() >= 0); - assertFalse(Utils.isBlank(c.getCommentText().getContent())); + assertFalse(Utils.isBlank(c.getCommentText().content())); if (c.isHeartedByUploader()) { heartedByUploader = true; } @@ -223,7 +223,7 @@ void testGetCommentsAllData() throws IOException, ExtractionException { YoutubeTestsUtils.testImages(c.getThumbnails()); assertFalse(Utils.isBlank(c.getUrl())); assertTrue(c.getLikeCount() >= 0); - assertFalse(Utils.isBlank(c.getCommentText().getContent())); + assertFalse(Utils.isBlank(c.getCommentText().content())); } assertTrue(comments.getItems().get(0).isPinned(), "First comment isn't pinned"); @@ -308,7 +308,7 @@ void testGetCommentsFirstReplies() throws IOException, ExtractionException { final InfoItemsPage replies = extractor().getPage(firstComment.getReplies()); - assertEquals("First", replies.getItems().get(0).getCommentText().getContent(), + assertEquals("First", replies.getItems().get(0).getCommentText().content(), "First reply comment did not match"); } @@ -357,7 +357,7 @@ void testGetCommentsAllData() throws IOException, ExtractionException { YoutubeTestsUtils.testImages(c.getThumbnails()); assertFalse(Utils.isBlank(c.getUrl())); assertTrue(c.getLikeCount() >= 0); - assertFalse(Utils.isBlank(c.getCommentText().getContent())); + assertFalse(Utils.isBlank(c.getCommentText().content())); if (c.isChannelOwner()) { channelOwner = true; } @@ -395,7 +395,7 @@ void testGetCommentsAllData() throws IOException, ExtractionException { YoutubeTestsUtils.testImages(c.getThumbnails()); assertFalse(Utils.isBlank(c.getUrl())); assertTrue(c.getLikeCount() >= 0); - assertFalse(Utils.isBlank(c.getCommentText().getContent())); + assertFalse(Utils.isBlank(c.getCommentText().content())); if (c.hasCreatorReply()) { creatorReply = true; } @@ -423,8 +423,8 @@ public void testGetCommentsFormatting() throws IOException, ExtractionException final CommentsInfoItem firstComment = comments.getItems().get(0); - assertContains("", firstComment.getCommentText().getContent()); - assertContains("", firstComment.getCommentText().getContent()); + assertContains("", firstComment.getCommentText().content()); + assertContains("", firstComment.getCommentText().content()); } } diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java index 819a92b37a..837f98e48f 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java @@ -161,7 +161,7 @@ void getPlaylistType() throws ParsingException { @Test public void testDescription() throws ParsingException { final Description description = extractor().getDescription(); - assertContains("pop songs list", description.getContent()); + assertContains("pop songs list", description.content()); } } @@ -275,7 +275,7 @@ void getPlaylistType() throws ParsingException { @Test public void testDescription() throws ParsingException { final Description description = extractor().getDescription(); - assertContains("I Wanna Rock Super Gigantic Playlist", description.getContent()); + assertContains("I Wanna Rock Super Gigantic Playlist", description.content()); } } @@ -377,7 +377,7 @@ void getPlaylistType() throws ParsingException { @Test public void testDescription() throws ParsingException { final Description description = extractor().getDescription(); - assertContains("47 episodes", description.getContent()); + assertContains("47 episodes", description.content()); } } @@ -476,7 +476,7 @@ void getPlaylistType() throws ParsingException { @Test void testDescription() throws ParsingException { - assertTrue(Utils.isNullOrEmpty(extractor().getDescription().getContent())); + assertTrue(Utils.isNullOrEmpty(extractor().getDescription().content())); } } diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorTest.java index 2cc45ea795..73eb98814f 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorTest.java @@ -229,7 +229,7 @@ protected SearchExtractor createExtractor() throws Exception { "COVID-19", new Description( "Get the latest information from the WHO about coronavirus.", - Description.PLAIN_TEXT), + Description.Type.PLAIN_TEXT), Collections.singletonList( new URL("https://www.who.int/emergencies/diseases/novel-coronavirus-2019")), Collections.singletonList("Learn more") diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java index ab3ffd7a81..61fdb385fd 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java @@ -400,7 +400,7 @@ protected StreamExtractor createExtractor() throws Exception { @Override public List expectedMetaInfo() throws MalformedURLException { return Collections.singletonList(new MetaInfo( "", - new Description("Arte is a French/German public broadcast service.", Description.PLAIN_TEXT), + new Description("Arte is a French/German public broadcast service.", Description.Type.PLAIN_TEXT), List.of(new URL("https://en.wikipedia.org/wiki/Arte?wprov=yicw1")), List.of("Wikipedia") )); @@ -448,7 +448,7 @@ protected StreamExtractor createExtractor() throws Exception { @Override public List expectedMetaInfo() throws MalformedURLException { return Collections.singletonList(new MetaInfo( "", - new Description("From a licensed doctor in Australia", Description.PLAIN_TEXT), + new Description("From a licensed doctor in Australia", Description.Type.PLAIN_TEXT), List.of(new URL("https://support.google.com/youtube/answer/9795167")), List.of("Learn more about how experts define health sources") ));