Skip to content

Commit 8aba2b4

Browse files
Stypoxlitetex
Stypox
authored and
litetex
committed
Fix checkstyle issues in subpackages with abstract classes
1 parent e4951a0 commit 8aba2b4

50 files changed

Lines changed: 903 additions & 781 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎extractor/src/main/java/org/schabi/newpipe/extractor/MultiInfoItemsCollector.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class MultiInfoItemsCollector extends InfoItemsCollector<InfoItem, InfoIt
5050
private final ChannelInfoItemsCollector userCollector;
5151
private final PlaylistInfoItemsCollector playlistCollector;
5252

53-
public MultiInfoItemsCollector(int serviceId) {
53+
public MultiInfoItemsCollector(final int serviceId) {
5454
super(serviceId);
5555
streamCollector = new StreamInfoItemsCollector(serviceId);
5656
userCollector = new ChannelInfoItemsCollector(serviceId);
@@ -76,7 +76,7 @@ public void reset() {
7676
}
7777

7878
@Override
79-
public InfoItem extract(InfoItemExtractor extractor) throws ParsingException {
79+
public InfoItem extract(final InfoItemExtractor extractor) throws ParsingException {
8080
// Use the corresponding collector for each item extractor type
8181
if (extractor instanceof StreamInfoItemExtractor) {
8282
return streamCollector.extract((StreamInfoItemExtractor) extractor);

‎extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public abstract class ChannelExtractor extends ListExtractor<StreamInfoItem> {
3030

3131
public static final long UNKNOWN_SUBSCRIBER_COUNT = -1;
3232

33-
public ChannelExtractor(StreamingService service, ListLinkHandler linkHandler) {
33+
public ChannelExtractor(final StreamingService service, final ListLinkHandler linkHandler) {
3434
super(service, linkHandler);
3535
}
3636

‎extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java‎

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,88 +34,99 @@
3434

3535
public class ChannelInfo extends ListInfo<StreamInfoItem> {
3636

37-
public ChannelInfo(int serviceId, String id, String url, String originalUrl, String name, ListLinkHandler listLinkHandler) {
38-
super(serviceId, id, url, originalUrl, name, listLinkHandler.getContentFilters(), listLinkHandler.getSortFilter());
37+
public ChannelInfo(final int serviceId,
38+
final String id,
39+
final String url,
40+
final String originalUrl,
41+
final String name,
42+
final ListLinkHandler listLinkHandler) {
43+
super(serviceId, id, url, originalUrl, name, listLinkHandler.getContentFilters(),
44+
listLinkHandler.getSortFilter());
3945
}
4046

41-
public static ChannelInfo getInfo(String url) throws IOException, ExtractionException {
47+
public static ChannelInfo getInfo(final String url) throws IOException, ExtractionException {
4248
return getInfo(NewPipe.getServiceByUrl(url), url);
4349
}
4450

45-
public static ChannelInfo getInfo(StreamingService service, String url) throws IOException, ExtractionException {
46-
ChannelExtractor extractor = service.getChannelExtractor(url);
51+
public static ChannelInfo getInfo(final StreamingService service, final String url)
52+
throws IOException, ExtractionException {
53+
final ChannelExtractor extractor = service.getChannelExtractor(url);
4754
extractor.fetchPage();
4855
return getInfo(extractor);
4956
}
5057

51-
public static InfoItemsPage<StreamInfoItem> getMoreItems(StreamingService service,
52-
String url,
53-
Page page) throws IOException, ExtractionException {
58+
public static InfoItemsPage<StreamInfoItem> getMoreItems(final StreamingService service,
59+
final String url,
60+
final Page page)
61+
throws IOException, ExtractionException {
5462
return service.getChannelExtractor(url).getPage(page);
5563
}
5664

57-
public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException, ExtractionException {
65+
public static ChannelInfo getInfo(final ChannelExtractor extractor)
66+
throws IOException, ExtractionException {
5867

5968
final int serviceId = extractor.getServiceId();
6069
final String id = extractor.getId();
6170
final String url = extractor.getUrl();
6271
final String originalUrl = extractor.getOriginalUrl();
6372
final String name = extractor.getName();
6473

65-
final ChannelInfo info = new ChannelInfo(serviceId, id, url, originalUrl, name, extractor.getLinkHandler());
74+
final ChannelInfo info =
75+
new ChannelInfo(serviceId, id, url, originalUrl, name, extractor.getLinkHandler());
6676

6777
try {
6878
info.setAvatarUrl(extractor.getAvatarUrl());
69-
} catch (Exception e) {
79+
} catch (final Exception e) {
7080
info.addError(e);
7181
}
7282
try {
7383
info.setBannerUrl(extractor.getBannerUrl());
74-
} catch (Exception e) {
84+
} catch (final Exception e) {
7585
info.addError(e);
7686
}
7787
try {
7888
info.setFeedUrl(extractor.getFeedUrl());
79-
} catch (Exception e) {
89+
} catch (final Exception e) {
8090
info.addError(e);
8191
}
8292

83-
final InfoItemsPage<StreamInfoItem> itemsPage = ExtractorHelper.getItemsPageOrLogError(info, extractor);
93+
final InfoItemsPage<StreamInfoItem> itemsPage =
94+
ExtractorHelper.getItemsPageOrLogError(info, extractor);
8495
info.setRelatedItems(itemsPage.getItems());
8596
info.setNextPage(itemsPage.getNextPage());
8697

8798
try {
8899
info.setSubscriberCount(extractor.getSubscriberCount());
89-
} catch (Exception e) {
100+
} catch (final Exception e) {
90101
info.addError(e);
91102
}
92103
try {
93104
info.setDescription(extractor.getDescription());
94-
} catch (Exception e) {
105+
} catch (final Exception e) {
95106
info.addError(e);
96107
}
97108

98109
try {
99110
info.setParentChannelName(extractor.getParentChannelName());
100-
} catch (Exception e) {
111+
} catch (final Exception e) {
101112
info.addError(e);
102113
}
103114

104115
try {
105116
info.setParentChannelUrl(extractor.getParentChannelUrl());
106-
} catch (Exception e) {
117+
} catch (final Exception e) {
107118
info.addError(e);
108119
}
109120

110121
try {
111122
info.setParentChannelAvatarUrl(extractor.getParentChannelAvatarUrl());
112-
} catch (Exception e) {
123+
} catch (final Exception e) {
113124
info.addError(e);
114125
}
115126

116127
try {
117128
info.setVerified(extractor.isVerified());
118-
} catch (Exception e) {
129+
} catch (final Exception e) {
119130
info.addError(e);
120131
}
121132

@@ -137,79 +148,79 @@ public String getParentChannelName() {
137148
return parentChannelName;
138149
}
139150

140-
public void setParentChannelName(String parentChannelName) {
151+
public void setParentChannelName(final String parentChannelName) {
141152
this.parentChannelName = parentChannelName;
142153
}
143154

144155
public String getParentChannelUrl() {
145156
return parentChannelUrl;
146157
}
147158

148-
public void setParentChannelUrl(String parentChannelUrl) {
159+
public void setParentChannelUrl(final String parentChannelUrl) {
149160
this.parentChannelUrl = parentChannelUrl;
150161
}
151162

152163
public String getParentChannelAvatarUrl() {
153164
return parentChannelAvatarUrl;
154165
}
155166

156-
public void setParentChannelAvatarUrl(String parentChannelAvatarUrl) {
167+
public void setParentChannelAvatarUrl(final String parentChannelAvatarUrl) {
157168
this.parentChannelAvatarUrl = parentChannelAvatarUrl;
158169
}
159170

160171
public String getAvatarUrl() {
161172
return avatarUrl;
162173
}
163174

164-
public void setAvatarUrl(String avatarUrl) {
175+
public void setAvatarUrl(final String avatarUrl) {
165176
this.avatarUrl = avatarUrl;
166177
}
167178

168179
public String getBannerUrl() {
169180
return bannerUrl;
170181
}
171182

172-
public void setBannerUrl(String bannerUrl) {
183+
public void setBannerUrl(final String bannerUrl) {
173184
this.bannerUrl = bannerUrl;
174185
}
175186

176187
public String getFeedUrl() {
177188
return feedUrl;
178189
}
179190

180-
public void setFeedUrl(String feedUrl) {
191+
public void setFeedUrl(final String feedUrl) {
181192
this.feedUrl = feedUrl;
182193
}
183194

184195
public long getSubscriberCount() {
185196
return subscriberCount;
186197
}
187198

188-
public void setSubscriberCount(long subscriberCount) {
199+
public void setSubscriberCount(final long subscriberCount) {
189200
this.subscriberCount = subscriberCount;
190201
}
191202

192203
public String getDescription() {
193204
return description;
194205
}
195206

196-
public void setDescription(String description) {
207+
public void setDescription(final String description) {
197208
this.description = description;
198209
}
199210

200211
public String[] getDonationLinks() {
201212
return donationLinks;
202213
}
203214

204-
public void setDonationLinks(String[] donationLinks) {
215+
public void setDonationLinks(final String[] donationLinks) {
205216
this.donationLinks = donationLinks;
206217
}
207218

208219
public boolean isVerified() {
209220
return verified;
210221
}
211222

212-
public void setVerified(boolean verified) {
223+
public void setVerified(final boolean verified) {
213224
this.verified = verified;
214225
}
215226
}

‎extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItem.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,39 @@ public class ChannelInfoItem extends InfoItem {
2929
private long streamCount = -1;
3030
private boolean verified = false;
3131

32-
public ChannelInfoItem(int serviceId, String url, String name) {
32+
public ChannelInfoItem(final int serviceId, final String url, final String name) {
3333
super(InfoType.CHANNEL, serviceId, url, name);
3434
}
3535

3636
public String getDescription() {
3737
return description;
3838
}
3939

40-
public void setDescription(String description) {
40+
public void setDescription(final String description) {
4141
this.description = description;
4242
}
4343

4444
public long getSubscriberCount() {
4545
return subscriberCount;
4646
}
4747

48-
public void setSubscriberCount(long subscriber_count) {
49-
this.subscriberCount = subscriber_count;
48+
public void setSubscriberCount(final long subscriberCount) {
49+
this.subscriberCount = subscriberCount;
5050
}
5151

5252
public long getStreamCount() {
5353
return streamCount;
5454
}
5555

56-
public void setStreamCount(long stream_count) {
57-
this.streamCount = stream_count;
56+
public void setStreamCount(final long streamCount) {
57+
this.streamCount = streamCount;
5858
}
5959

6060
public boolean isVerified() {
6161
return verified;
6262
}
6363

64-
public void setVerified(boolean verified) {
64+
public void setVerified(final boolean verified) {
6565
this.verified = verified;
6666
}
6767
}

‎extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemsCollector.java‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,45 +23,42 @@
2323
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
2424
*/
2525

26-
public class ChannelInfoItemsCollector extends InfoItemsCollector<ChannelInfoItem, ChannelInfoItemExtractor> {
27-
public ChannelInfoItemsCollector(int serviceId) {
26+
public final class ChannelInfoItemsCollector
27+
extends InfoItemsCollector<ChannelInfoItem, ChannelInfoItemExtractor> {
28+
public ChannelInfoItemsCollector(final int serviceId) {
2829
super(serviceId);
2930
}
3031

3132
@Override
32-
public ChannelInfoItem extract(ChannelInfoItemExtractor extractor) throws ParsingException {
33-
// important information
34-
int serviceId = getServiceId();
35-
String name = extractor.getName();
36-
String url = extractor.getUrl();
37-
38-
ChannelInfoItem resultItem = new ChannelInfoItem(serviceId, url, name);
39-
33+
public ChannelInfoItem extract(final ChannelInfoItemExtractor extractor)
34+
throws ParsingException {
35+
final ChannelInfoItem resultItem = new ChannelInfoItem(
36+
getServiceId(), extractor.getUrl(), extractor.getName());
4037

4138
// optional information
4239
try {
4340
resultItem.setSubscriberCount(extractor.getSubscriberCount());
44-
} catch (Exception e) {
41+
} catch (final Exception e) {
4542
addError(e);
4643
}
4744
try {
4845
resultItem.setStreamCount(extractor.getStreamCount());
49-
} catch (Exception e) {
46+
} catch (final Exception e) {
5047
addError(e);
5148
}
5249
try {
5350
resultItem.setThumbnailUrl(extractor.getThumbnailUrl());
54-
} catch (Exception e) {
51+
} catch (final Exception e) {
5552
addError(e);
5653
}
5754
try {
5855
resultItem.setDescription(extractor.getDescription());
59-
} catch (Exception e) {
56+
} catch (final Exception e) {
6057
addError(e);
6158
}
6259
try {
6360
resultItem.setVerified(extractor.isVerified());
64-
} catch (Exception e) {
61+
} catch (final Exception e) {
6562
addError(e);
6663
}
6764

‎extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfo.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import java.io.IOException;
1313

14-
public class CommentsInfo extends ListInfo<CommentsInfoItem> {
14+
public final class CommentsInfo extends ListInfo<CommentsInfoItem> {
1515

1616
private CommentsInfo(
1717
final int serviceId,
@@ -56,7 +56,8 @@ public static CommentsInfo getInfo(final CommentsExtractor commentsExtractor)
5656
public static InfoItemsPage<CommentsInfoItem> getMoreItems(
5757
final CommentsInfo commentsInfo,
5858
final Page page) throws ExtractionException, IOException {
59-
return getMoreItems(NewPipe.getService(commentsInfo.getServiceId()), commentsInfo.getUrl(), page);
59+
return getMoreItems(NewPipe.getService(commentsInfo.getServiceId()), commentsInfo.getUrl(),
60+
page);
6061
}
6162

6263
public static InfoItemsPage<CommentsInfoItem> getMoreItems(
@@ -86,7 +87,7 @@ public void setCommentsExtractor(final CommentsExtractor commentsExtractor) {
8687

8788
/**
8889
* @apiNote Warning: This method is experimental and may get removed in a future release.
89-
* @return <code>true</code> if the comments are disabled otherwise <code>false</code> (default)
90+
* @return {@code true} if the comments are disabled otherwise {@code false} (default)
9091
* @see CommentsExtractor#isCommentsDisabled()
9192
*/
9293
public boolean isCommentsDisabled() {
@@ -95,7 +96,7 @@ public boolean isCommentsDisabled() {
9596

9697
/**
9798
* @apiNote Warning: This method is experimental and may get removed in a future release.
98-
* @param commentsDisabled <code>true</code> if the comments are disabled otherwise <code>false</code>
99+
* @param commentsDisabled {@code true} if the comments are disabled otherwise {@code false}
99100
*/
100101
public void setCommentsDisabled(final boolean commentsDisabled) {
101102
this.commentsDisabled = commentsDisabled;

0 commit comments

Comments
 (0)