Skip to content

Commit b602755

Browse files
committed
Cleanup
* Removed unused code * Fixed checkstyle problems * Added some docs
1 parent 4090e87 commit b602755

26 files changed

+65
-51
lines changed

extractor/src/main/java/org/schabi/newpipe/extractor/ServiceList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
/**
3232
* A list of supported services.
3333
*/
34-
// keep unusual names and inner assignments
34+
@SuppressWarnings("ConstantName") // keep unusual names
3535
public final class ServiceList {
3636
private ServiceList() {
3737
//no instance

extractor/src/main/java/org/schabi/newpipe/extractor/instance/AbstractInstance.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
public abstract class AbstractInstance implements Instance {
1111

12-
protected Boolean valid = null;
13-
1412
protected final String url;
1513
protected String name;
1614

extractor/src/main/java/org/schabi/newpipe/extractor/instance/Instance.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,12 @@ public interface Instance {
1717
* The base url of this instance.
1818
* <br/>
1919
* Note that the url is returned without trailing slashes.
20-
* Use {@link #getUrlWithTrailingSlash()} if you want a trailing slash.
2120
*
2221
* @return base url
2322
*/
2423
@Nonnull
2524
String getUrl();
2625

27-
default String getUrlWithTrailingSlash() {
28-
return getUrl() + "/";
29-
}
30-
3126

3227
/**
3328
* Fetch instance metadata.

extractor/src/main/java/org/schabi/newpipe/extractor/instance/InstanceMetaDataFetchException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.schabi.newpipe.extractor.instance;
22

3+
/**
4+
* Thrown when an {@link Instance} couldn't be validated.
5+
*/
36
public class InstanceMetaDataFetchException extends RuntimeException {
47
public InstanceMetaDataFetchException(final String message) {
58
super(message);

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.schabi.newpipe.extractor.StreamingService;
1414
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
1515
import org.schabi.newpipe.extractor.comments.CommentsExtractor;
16-
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
1716
import org.schabi.newpipe.extractor.kiosk.KioskList;
1817
import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
1918
import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.schabi.newpipe.extractor.StreamingService;
88
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
99
import org.schabi.newpipe.extractor.comments.CommentsExtractor;
10-
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
1110
import org.schabi.newpipe.extractor.kiosk.KioskList;
1211
import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
1312
import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeInstance.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void fetchMetadata() {
4242
this.setName(JsonUtils.getString(json, "instance.name"));
4343
} catch (final Exception e) {
4444
throw new InstanceMetaDataFetchException(
45-
"Unable to fetch trending from " + urlToCheck, e);
45+
"Unable to fetch config from " + urlToCheck, e);
4646
}
4747
}
4848
}

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeLikeInstance.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
import org.schabi.newpipe.extractor.instance.AbstractInstance;
44

5+
/**
6+
* A YouTube-like instance (or proxy)
7+
*
8+
* @param <S>
9+
*/
510
public abstract class YoutubeLikeInstance<S extends YoutubeLikeStreamingService>
611
extends AbstractInstance {
712

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeLikeStreamingService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ protected YoutubeLikeStreamingService(
3333
}
3434

3535
@Override
36-
public abstract StreamExtractor getStreamExtractor(final LinkHandler linkHandler);
36+
public abstract StreamExtractor getStreamExtractor(LinkHandler linkHandler);
3737

3838
@Override
39-
public abstract ChannelExtractor getChannelExtractor(final ListLinkHandler linkHandler);
39+
public abstract ChannelExtractor getChannelExtractor(ListLinkHandler linkHandler);
4040

4141
@Override
42-
public abstract PlaylistExtractor getPlaylistExtractor(final ListLinkHandler linkHandler);
42+
public abstract PlaylistExtractor getPlaylistExtractor(ListLinkHandler linkHandler);
4343

4444
@Nonnull
4545
@Override
46-
public abstract FeedExtractor getFeedExtractor(final String url) throws ExtractionException;
46+
public abstract FeedExtractor getFeedExtractor(String url) throws ExtractionException;
4747
}

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/invidious/InvidiousInstance.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private void checkEndpoint(
6565
responseCheck.check(response);
6666
} catch (final Exception e) {
6767
throw new InstanceMetaDataFetchException(
68-
"Unable to fetch trending from " + urlToCheck, e);
68+
"Unable to fetch from " + urlToCheck, e);
6969
}
7070
}
7171

@@ -81,6 +81,6 @@ public String getServiceName() {
8181

8282
@FunctionalInterface
8383
public interface ResponseCheck {
84-
void check(final Response r) throws Exception;
84+
void check(Response r) throws Exception;
8585
}
8686
}

0 commit comments

Comments
 (0)