Fix PR review

Royosef · wb9688 · commit a4086617719e · 2020-05-07T20:20:12.000+02:00
Rename "ParentChannel" to "SubChannel"
Add Tests for sub-channel info fetching
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java
@@ -37,7 +37,7 @@ public ChannelExtractor(StreamingService service, ListLinkHandler linkHandler) {
     public abstract String getFeedUrl() throws ParsingException;
     public abstract long getSubscriberCount() throws ParsingException;
     public abstract String getDescription() throws ParsingException;
-    public abstract String getParentChannelName() throws ParsingException;
-    public abstract String getParentChannelUrl() throws ParsingException;
-    public abstract String getParentChannelAvatarUrl() throws ParsingException;
+    public abstract String getSubChannelName() throws ParsingException;
+    public abstract String getSubChannelUrl() throws ParsingException;
+    public abstract String getSubChannelAvatarUrl() throws ParsingException;
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java
@@ -95,19 +95,19 @@ public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException
         }
 
         try {
-            info.setParentChannelName(extractor.getParentChannelName());
+            info.setSubChannelName(extractor.getSubChannelName());
         } catch (Exception e) {
             info.addError(e);
         }
 
         try {
-            info.setParentChannelUrl(extractor.getParentChannelUrl());
+            info.setSubChannelUrl(extractor.getSubChannelUrl());
         } catch (Exception e) {
             info.addError(e);
         }
 
         try {
-            info.setParentChannelAvatarUrl(extractor.getParentChannelAvatarUrl());
+            info.setSubChannelAvatarUrl(extractor.getSubChannelAvatarUrl());
         } catch (Exception e) {
             info.addError(e);
         }
@@ -116,37 +116,37 @@ public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException
     }
 
     private String avatarUrl;
-    private String parentChannelName;
-    private String parentChannelUrl;
-    private String parentChannelAvatarUrl;
+    private String subChannelName;
+    private String subChannelUrl;
+    private String subChannelAvatarUrl;
     private String bannerUrl;
     private String feedUrl;
     private long subscriberCount = -1;
     private String description;
     private String[] donationLinks;
 
-    public String getParentChannelName() {
-        return parentChannelName;
+    public String getSubChannelName() {
+        return subChannelName;
     }
 
-    public void setParentChannelName(String parentChannelName) {
-        this.parentChannelName = parentChannelName;
+    public void setSubChannelName(String subChannelName) {
+        this.subChannelName = subChannelName;
     }
 
-    public String getParentChannelUrl() {
-        return parentChannelUrl;
+    public String getSubChannelUrl() {
+        return subChannelUrl;
     }
 
-    public void setParentChannelUrl(String parentChannelUrl) {
-        this.parentChannelUrl = parentChannelUrl;
+    public void setSubChannelUrl(String subChannelUrl) {
+        this.subChannelUrl = subChannelUrl;
     }
 
-    public String getParentChannelAvatarUrl() {
-        return parentChannelAvatarUrl;
+    public String getSubChannelAvatarUrl() {
+        return subChannelAvatarUrl;
     }
 
-    public void setParentChannelAvatarUrl(String parentChannelAvatarUrl) {
-        this.parentChannelAvatarUrl = parentChannelAvatarUrl;
+    public void setSubChannelAvatarUrl(String subChannelAvatarUrl) {
+        this.subChannelAvatarUrl = subChannelAvatarUrl;
     }
 
     public String getAvatarUrl() {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java
@@ -53,17 +53,17 @@ public String getDescription() {
     }
 
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getSubChannelName() throws ParsingException {
         return "";
     }
 
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getSubChannelUrl() throws ParsingException {
         return "";
     }
 
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getSubChannelAvatarUrl() throws ParsingException {
         return "";
     }
 
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
@@ -112,19 +112,19 @@ public String getUploaderAvatarUrl() {
 
     @Nonnull
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getSubChannelUrl() throws ParsingException {
         return "";
     }
 
     @Nonnull
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getSubChannelName() throws ParsingException {
         return "";
     }
 
     @Nonnull
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getSubChannelAvatarUrl() throws ParsingException {
         return "";
     }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java
@@ -76,17 +76,17 @@ public String getDescription() throws ParsingException {
     }
 
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getSubChannelName() throws ParsingException {
         return "";
     }
 
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getSubChannelUrl() throws ParsingException {
         return "";
     }
 
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getSubChannelAvatarUrl() throws ParsingException {
         return "";
     }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java
@@ -76,17 +76,17 @@ public String getDescription() throws ParsingException {
     }
 
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getSubChannelName() throws ParsingException {
         return JsonUtils.getString(json, "ownerAccount.name");
     }
 
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getSubChannelUrl() throws ParsingException {
         return JsonUtils.getString(json, "ownerAccount.url");
     }
 
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getSubChannelAvatarUrl() throws ParsingException {
         String value;
         try {
             value = JsonUtils.getString(json, "ownerAccount.avatar.path");
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
@@ -148,19 +148,19 @@ public String getUploaderAvatarUrl() throws ParsingException {
     }
 
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getSubChannelUrl() throws ParsingException {
         return JsonUtils.getString(json, "channel.url");
     }
 
     @Nonnull
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getSubChannelName() throws ParsingException {
         return JsonUtils.getString(json, "channel.displayName");
     }
 
     @Nonnull
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getSubChannelAvatarUrl() throws ParsingException {
         String value;
         try {
             value = JsonUtils.getString(json, "channel.avatar.path");
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java
@@ -84,17 +84,17 @@ public String getDescription() {
     }
 
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getSubChannelName() throws ParsingException {
         return "";
     }
 
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getSubChannelUrl() throws ParsingException {
         return "";
     }
 
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getSubChannelAvatarUrl() throws ParsingException {
         return "";
     }
 
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
@@ -144,19 +144,19 @@ public String getUploaderAvatarUrl() {
 
     @Nonnull
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getSubChannelUrl() throws ParsingException {
         return "";
     }
 
     @Nonnull
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getSubChannelName() throws ParsingException {
         return "";
     }
 
     @Nonnull
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getSubChannelAvatarUrl() throws ParsingException {
         return "";
     }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java
@@ -213,17 +213,17 @@ public String getDescription() throws ParsingException {
     }
 
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getSubChannelName() throws ParsingException {
         return "";
     }
 
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getSubChannelUrl() throws ParsingException {
         return "";
     }
 
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getSubChannelAvatarUrl() throws ParsingException {
         return "";
     }
 
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
@@ -354,19 +354,19 @@ public String getUploaderAvatarUrl() throws ParsingException {
 
     @Nonnull
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getSubChannelUrl() throws ParsingException {
         return "";
     }
 
     @Nonnull
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getSubChannelName() throws ParsingException {
         return "";
     }
 
     @Nonnull
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getSubChannelAvatarUrl() throws ParsingException {
         return "";
     }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java
@@ -23,6 +23,7 @@
 import org.schabi.newpipe.extractor.Extractor;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
@@ -148,7 +149,7 @@ public StreamExtractor(StreamingService service, LinkHandler linkHandler) {
     /**
      * The Url to the page of the creator/uploader of the stream. This must not be a homepage,
      * but the page offered by the service the extractor handles. This url will be handled by the
-     * <a href="https://teamnewpipe.github.io/documentation/03_Implement_a_service/#channel">ChannelExtractor</a>,
+     * {@link ChannelExtractor},
      * so be sure to implement that one before you return a value here, otherwise NewPipe will crash if one selects
      * this url.
      *
@@ -179,37 +180,37 @@ public StreamExtractor(StreamingService service, LinkHandler linkHandler) {
     public abstract String getUploaderAvatarUrl() throws ParsingException;
 
     /**
-     * The Url to the page of the parent chanel of the stream. This must not be a homepage,
+     * The Url to the page of the sub-channel of the stream. This must not be a homepage,
      * but the page offered by the service the extractor handles. This url will be handled by the
-     * <a href="https://teamnewpipe.github.io/documentation/03_Implement_a_service/#channel">ChannelExtractor</a>,
+     * {@link ChannelExtractor},
      * so be sure to implement that one before you return a value here, otherwise NewPipe will crash if one selects
      * this url.
      *
-     * @return the url to the page of the parent chanel of the stream or an empty String
+     * @return the url to the page of the sub-channel of the stream or an empty String
      * @throws ParsingException
      */
     @Nonnull
-    public abstract String getParentChannelUrl() throws ParsingException;
+    public abstract String getSubChannelUrl() throws ParsingException;
 
     /**
-     * The name of the parent chanel of the stream.
+     * The name of the sub-channel of the stream.
      * If the name is not available you can simply return an empty string.
      *
-     * @return the name of the parent chanel of the stream or an empty String
+     * @return the name of the sub-channel of the stream or an empty String
      * @throws ParsingException
      */
     @Nonnull
-    public abstract String getParentChannelName() throws ParsingException;
+    public abstract String getSubChannelName() throws ParsingException;
 
     /**
-     * The url to the image file/profile picture/avatar of the parent chanel of the stream.
+     * The url to the image file/profile picture/avatar of the sub-channel of the stream.
      * If the url is not available you can return an empty String.
      *
-     * @return The url of the image file of the parent chanel or an empty String
+     * @return The url of the image file of the sub-channel or an empty String
      * @throws ParsingException
      */
     @Nonnull
-    public abstract String getParentChannelAvatarUrl() throws ParsingException;
+    public abstract String getSubChannelAvatarUrl() throws ParsingException;
 
     /**
      * Get the dash mpd url. If you don't know what a dash MPD is you can read about it
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorDefaultTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorDefaultTest.java

Original file line number	Diff line number	Diff line change
`@@ -53,17 +53,17 @@ public String getDescription() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public String getParentChannelName() throws ParsingException {`
	`56`	`+ public String getSubChannelName() throws ParsingException {`
`57`	`57`	`return "";`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- public String getParentChannelUrl() throws ParsingException {`
	`61`	`+ public String getSubChannelUrl() throws ParsingException {`
`62`	`62`	`return "";`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public String getParentChannelAvatarUrl() throws ParsingException {`
	`66`	`+ public String getSubChannelAvatarUrl() throws ParsingException {`
`67`	`67`	`return "";`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -112,19 +112,19 @@ public String getUploaderAvatarUrl() {`
`112`	`112`
`113`	`113`	`@Nonnull`
`114`	`114`	`@Override`
`115`		`- public String getParentChannelUrl() throws ParsingException {`
	`115`	`+ public String getSubChannelUrl() throws ParsingException {`
`116`	`116`	`return "";`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`@Nonnull`
`120`	`120`	`@Override`
`121`		`- public String getParentChannelName() throws ParsingException {`
	`121`	`+ public String getSubChannelName() throws ParsingException {`
`122`	`122`	`return "";`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Nonnull`
`126`	`126`	`@Override`
`127`		`- public String getParentChannelAvatarUrl() throws ParsingException {`
	`127`	`+ public String getSubChannelAvatarUrl() throws ParsingException {`
`128`	`128`	`return "";`
`129`	`129`	`}`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -76,17 +76,17 @@ public String getDescription() throws ParsingException {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Override`
`79`		`- public String getParentChannelName() throws ParsingException {`
	`79`	`+ public String getSubChannelName() throws ParsingException {`
`80`	`80`	`return "";`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Override`
`84`		`- public String getParentChannelUrl() throws ParsingException {`
	`84`	`+ public String getSubChannelUrl() throws ParsingException {`
`85`	`85`	`return "";`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`
`89`		`- public String getParentChannelAvatarUrl() throws ParsingException {`
	`89`	`+ public String getSubChannelAvatarUrl() throws ParsingException {`
`90`	`90`	`return "";`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -84,17 +84,17 @@ public String getDescription() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Override`
`87`		`- public String getParentChannelName() throws ParsingException {`
	`87`	`+ public String getSubChannelName() throws ParsingException {`
`88`	`88`	`return "";`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Override`
`92`		`- public String getParentChannelUrl() throws ParsingException {`
	`92`	`+ public String getSubChannelUrl() throws ParsingException {`
`93`	`93`	`return "";`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`@Override`
`97`		`- public String getParentChannelAvatarUrl() throws ParsingException {`
	`97`	`+ public String getSubChannelAvatarUrl() throws ParsingException {`
`98`	`98`	`return "";`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -144,19 +144,19 @@ public String getUploaderAvatarUrl() {`
`144`	`144`
`145`	`145`	`@Nonnull`
`146`	`146`	`@Override`
`147`		`- public String getParentChannelUrl() throws ParsingException {`
	`147`	`+ public String getSubChannelUrl() throws ParsingException {`
`148`	`148`	`return "";`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`@Nonnull`
`152`	`152`	`@Override`
`153`		`- public String getParentChannelName() throws ParsingException {`
	`153`	`+ public String getSubChannelName() throws ParsingException {`
`154`	`154`	`return "";`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`@Nonnull`
`158`	`158`	`@Override`
`159`		`- public String getParentChannelAvatarUrl() throws ParsingException {`
	`159`	`+ public String getSubChannelAvatarUrl() throws ParsingException {`
`160`	`160`	`return "";`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -213,17 +213,17 @@ public String getDescription() throws ParsingException {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`@Override`
`216`		`- public String getParentChannelName() throws ParsingException {`
	`216`	`+ public String getSubChannelName() throws ParsingException {`
`217`	`217`	`return "";`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`@Override`
`221`		`- public String getParentChannelUrl() throws ParsingException {`
	`221`	`+ public String getSubChannelUrl() throws ParsingException {`
`222`	`222`	`return "";`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`@Override`
`226`		`- public String getParentChannelAvatarUrl() throws ParsingException {`
	`226`	`+ public String getSubChannelAvatarUrl() throws ParsingException {`
`227`	`227`	`return "";`
`228`	`228`	`}`
`229`	`229`