Make getCommentText @nonnull

TeamNewPipe · Mar 27, 2024 · c57016b · c57016b
1 parent adcc1f1
commit c57016b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItem.java
@@ -13,7 +13,8 @@
 public class CommentsInfoItem extends InfoItem {
 
     private String commentId;
-    private Description commentText;
+    @Nonnull
+    private Description commentText = Description.EMPTY_DESCRIPTION;
     private String uploaderName;
     @Nonnull
     private List<Image> uploaderAvatars = List.of();
@@ -50,11 +51,12 @@ public void setCommentId(final String commentId) {
         this.commentId = commentId;
     }
 
+    @Nonnull
     public Description getCommentText() {
         return commentText;
     }
 
-    public void setCommentText(final Description commentText) {
+    public void setCommentText(@Nonnull final Description commentText) {
         this.commentText = commentText;
     }
 

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemExtractor.java
@@ -45,6 +45,7 @@ default String getTextualLikeCount() throws ParsingException {
     /**
      * The text of the comment
      */
+    @Nonnull
     default Description getCommentText() throws ParsingException {
         return Description.EMPTY_DESCRIPTION;
     }

diff --git a/...abi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsInfoItemExtractor.java b/...abi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsInfoItemExtractor.java
@@ -38,6 +38,7 @@ public List<Image> getThumbnails() throws ParsingException {
         return getUploaderAvatars();
     }
 
+    @Nonnull
     @Override
     public Description getCommentText() throws ParsingException {
         return new Description(review.getString("why"), Description.PLAIN_TEXT);

diff --git a/...abi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java b/...abi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java
@@ -77,6 +77,7 @@ public DateWrapper getUploadDate() throws ParsingException {
         return new DateWrapper(parseDateFrom(textualUploadDate));
     }
 
+    @Nonnull
     @Override
     public Description getCommentText() throws ParsingException {
         final String htmlText = JsonUtils.getString(item, "text");

diff --git a/...newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java b/...newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java
@@ -29,6 +29,7 @@ public String getCommentId() {
         return Objects.toString(json.getLong("id"), null);
     }
 
+    @Nonnull
     @Override
     public Description getCommentText() {
         return new Description(json.getString("body"), Description.PLAIN_TEXT);

diff --git a/...chabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java b/...chabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java
@@ -184,6 +184,7 @@ public String getTextualLikeCount() throws ParsingException {
         }
     }
 
+    @Nonnull
     @Override
     public Description getCommentText() throws ParsingException {
         try {
-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * The text of the comment
          */
+        @Nonnull
         default Description getCommentText() throws ParsingException {
             return Description.EMPTY_DESCRIPTION;
         }
@@ Expand Down @@