Merge pull request #525 from B0pol/rename

rename getHeartedByCreator and getPinned to isPinned and isHeartedByC…
TeamNewPipe · Jan 23, 2021 · c00ee75 · c00ee75
2 parents 10e8c54 + 2662cec
commit c00ee75
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 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
@@ -92,11 +92,11 @@ public void setHeartedByUploader(boolean isHeartedByUploader) {
         this.heartedByUploader = isHeartedByUploader;
     }
 
-    public boolean getHeartedByUploader() {
+    public boolean isHeartedByUploader() {
         return this.heartedByUploader;
     }
 
-    public boolean getPinned() {
+    public boolean isPinned() {
         return pinned;
     }
 

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
@@ -47,10 +47,10 @@ public interface CommentsInfoItemExtractor extends InfoItemExtractor {
     /**
      * Whether the comment has been hearted by the uploader
      */
-    boolean getHeartedByUploader() throws ParsingException;
+    boolean isHeartedByUploader() throws ParsingException;
 
     /**
      * Whether the comment is pinned
      */
-    boolean getPinned() throws ParsingException;
+    boolean isPinned() throws ParsingException;
 }
diff --git a/...actor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemsCollector.java b/...actor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemsCollector.java
@@ -71,13 +71,13 @@ public CommentsInfoItem extract(CommentsInfoItemExtractor extractor) throws Pars
         }
 
         try {
-            resultItem.setHeartedByUploader(extractor.getHeartedByUploader());
+            resultItem.setHeartedByUploader(extractor.isHeartedByUploader());
         } catch (Exception e) {
             addError(e);
         }
 
         try {
-            resultItem.setPinned(extractor.getPinned());
+            resultItem.setPinned(extractor.isPinned());
         } catch (Exception e) {
             addError(e);
         }

diff --git a/...abi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java b/...abi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java
@@ -89,12 +89,12 @@ public String getUploaderAvatarUrl() {
     }
 
     @Override
-    public boolean getHeartedByUploader() throws ParsingException {
+    public boolean isHeartedByUploader() throws ParsingException {
         return false;
     }
 
     @Override
-    public boolean getPinned() throws ParsingException {
+    public boolean isPinned() throws ParsingException {
         return false;
     }
 

diff --git a/...newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java b/...newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java
@@ -40,12 +40,12 @@ public String getUploaderAvatarUrl() {
     }
 
     @Override
-    public boolean getHeartedByUploader() throws ParsingException {
+    public boolean isHeartedByUploader() throws ParsingException {
         return false;
     }
 
     @Override
-    public boolean getPinned() throws ParsingException {
+    public boolean isPinned() throws ParsingException {
         return false;
     }
 

diff --git a/...chabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java b/...chabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java
@@ -116,12 +116,12 @@ public String getUploaderAvatarUrl() throws ParsingException {
     }
 
     @Override
-    public boolean getHeartedByUploader() throws ParsingException {
+    public boolean isHeartedByUploader() throws ParsingException {
         return json.has("creatorHeart");
     }
 
     @Override
-    public boolean getPinned() {
+    public boolean isPinned() {
         return json.has("pinnedCommentBadge");
     }
 

diff --git a/...test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeCommentsExtractorTest.java b/...test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeCommentsExtractorTest.java
@@ -181,7 +181,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {
                 assertFalse(Utils.isBlank(c.getUrl()));
                 assertFalse(c.getLikeCount() < 0);
                 assertFalse(Utils.isBlank(c.getCommentText()));
-                if (c.getHeartedByUploader()) {
+                if (c.isHeartedByUploader()) {
                     heartedByUploader = true;
                 }
             }
@@ -222,7 +222,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {
                 assertFalse(Utils.isBlank(c.getCommentText()));
             }
 
-            assertTrue("First comment isn't pinned", comments.getItems().get(0).getPinned());
+            assertTrue("First comment isn't pinned", comments.getItems().get(0).isPinned());
         }
     }
 }