Merge branch 'dev'

Author: TobiGr

build.gradle

@@ -8,7 +8,7 @@ allprojects {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
-    version 'v0.21.13'
+    version 'v0.21.14'
     group 'com.github.TeamNewPipe'
 
     repositories {
@@ -28,8 +28,8 @@ allprojects {
 
     ext {
         nanojsonVersion = "1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
-        spotbugsVersion = "4.5.0"
-        junitVersion = "4.13.2"
+        spotbugsVersion = "4.5.3"
+        junitVersion = "5.8.2"
     }
 }
 

extractor/build.gradle

@@ -3,6 +3,7 @@ test {
     if (System.properties.containsKey('downloader')) {
         systemProperty('downloader', System.getProperty('downloader'))
     }
+    useJUnitPlatform()
 }
 
 dependencies {
@@ -14,7 +15,11 @@ dependencies {
     implementation "com.github.spotbugs:spotbugs-annotations:$spotbugsVersion"
     implementation 'org.nibor.autolink:autolink:0.10.0'
 
-    testImplementation "junit:junit:$junitVersion"
+    testImplementation platform("org.junit:junit-bom:$junitVersion")
+    testImplementation 'org.junit.jupiter:junit-jupiter-api'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params'
+
     testImplementation "com.squareup.okhttp3:okhttp:3.12.13"
     testImplementation 'com.google.code.gson:gson:2.8.9'
 }

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java

@@ -149,27 +149,24 @@ public List<StreamSegment> getStreamSegments() throws ParsingException {
     @Nonnull
     @Override
     public String getLicence() {
+        // Contrary to other Bandcamp streams, radio streams don't have a license
         return "";
     }
 
     @Nonnull
     @Override
     public String getCategory() {
+        // Contrary to other Bandcamp streams, radio streams don't have categories
         return "";
     }
 
     @Nonnull
     @Override
     public List<String> getTags() {
+        // Contrary to other Bandcamp streams, radio streams don't have tags
         return Collections.emptyList();
     }
 
-    @Nonnull
-    @Override
-    public Privacy getPrivacy() {
-        return Privacy.PUBLIC;
-    }
-
     @Override
     public PlaylistInfoItemsCollector getRelatedItems() {
         // Contrary to other Bandcamp streams, radio streams don't have related items

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampStreamExtractor.java

@@ -98,11 +98,6 @@ public String getUploaderName() {
         return albumJson.getString("artist");
     }
 
-    @Override
-    public boolean isUploaderVerified() throws ParsingException {
-        return false;
-    }
-
     @Nullable
     @Override
     public String getTextualUploadDate() {
@@ -132,24 +127,6 @@ public String getUploaderAvatarUrl() {
         }
     }
 
-    @Nonnull
-    @Override
-    public String getSubChannelUrl() {
-        return "";
-    }
-
-    @Nonnull
-    @Override
-    public String getSubChannelName() {
-        return "";
-    }
-
-    @Nonnull
-    @Override
-    public String getSubChannelAvatarUrl() {
-        return "";
-    }
-
     @Nonnull
     @Override
     public Description getDescription() {
@@ -164,48 +141,6 @@ public Description getDescription() {
         return new Description(s, Description.PLAIN_TEXT);
     }
 
-    @Override
-    public int getAgeLimit() {
-        return NO_AGE_LIMIT;
-    }
-
-    @Override
-    public long getLength() {
-        return 0;
-    }
-
-    @Override
-    public long getTimeStamp() {
-        return 0;
-    }
-
-    @Override
-    public long getViewCount() {
-        return -1;
-    }
-
-    @Override
-    public long getLikeCount() {
-        return -1;
-    }
-
-    @Override
-    public long getDislikeCount() {
-        return -1;
-    }
-
-    @Nonnull
-    @Override
-    public String getDashMpdUrl() {
-        return "";
-    }
-
-    @Nonnull
-    @Override
-    public String getHlsUrl() {
-        return "";
-    }
-
     @Override
     public List<AudioStream> getAudioStreams() {
         final List<AudioStream> audioStreams = new ArrayList<>();
@@ -228,18 +163,6 @@ public List<VideoStream> getVideoOnlyStreams() {
         return Collections.emptyList();
     }
 
-    @Nonnull
-    @Override
-    public List<SubtitlesStream> getSubtitlesDefault() {
-        return Collections.emptyList();
-    }
-
-    @Nonnull
-    @Override
-    public List<SubtitlesStream> getSubtitles(MediaFormat format) {
-        return Collections.emptyList();
-    }
-
     @Override
     public StreamType getStreamType() {
         return StreamType.AUDIO_STREAM;
@@ -259,23 +182,6 @@ public PlaylistInfoItemsCollector getRelatedItems() {
         return collector;
     }
 
-    @Override
-    public String getErrorMessage() {
-        return null;
-    }
-
-    @Nonnull
-    @Override
-    public String getHost() {
-        return "";
-    }
-
-    @Nonnull
-    @Override
-    public Privacy getPrivacy() {
-        return Privacy.PUBLIC;
-    }
-
     @Nonnull
     @Override
     public String getCategory() {
@@ -315,12 +221,6 @@ public String getLicence() {
         }
     }
 
-    @Nullable
-    @Override
-    public Locale getLanguageInfo() {
-        return null;
-    }
-
     @Nonnull
     @Override
     public List<String> getTags() {
@@ -334,22 +234,4 @@ public List<String> getTags() {
 
         return tags;
     }
-
-    @Nonnull
-    @Override
-    public String getSupportInfo() {
-        return "";
-    }
-
-    @Nonnull
-    @Override
-    public List<StreamSegment> getStreamSegments() throws ParsingException {
-        return Collections.emptyList();
-    }
-
-    @Nonnull
-    @Override
-    public List<MetaInfo> getMetaInfo() throws ParsingException {
-        return Collections.emptyList();
-    }
 }