Finish transition to use getters on Info classes

- Renamed Collector method

Author: mauriciocolli

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

@@ -31,7 +31,7 @@ public interface Collector<I, E> {
      * Get all items
      * @return the items
      */
-    List<I> getItemList();
+    List<I> getItems();
 
     /**
      * Get all errors

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

@@ -7,16 +7,16 @@
 
 public abstract class Info implements Serializable {
 
-    public final int service_id;
+    private final int serviceId;
     /**
      * Id of this Info object <br>
      * e.g. Youtube:  https://www.youtube.com/watch?v=RER5qCTzZ7     &gt;    RER5qCTzZ7
      */
-    public final String id;
-    public final String url;
-    public final String name;
+    private final String id;
+    private final String url;
+    private final String name;
 
-    public final List<Throwable> errors = new ArrayList<>();
+    private final List<Throwable> errors = new ArrayList<>();
 
     public void addError(Throwable throwable) {
         this.errors.add(throwable);
@@ -27,20 +27,19 @@ public void addAllErrors(Collection<Throwable> errors) {
     }
 
     public Info(int serviceId, String id, String url, String name) {
-        this.service_id = serviceId;
+        this.serviceId = serviceId;
         this.id = id;
         this.url = url;
         this.name = name;
     }
 
-
     @Override
     public String toString() {
         return getClass().getSimpleName() + "[url=\"" + url + "\", name=\"" + name + "\"]";
     }
 
     public int getServiceId() {
-        return service_id;
+        return serviceId;
     }
 
     public String getId() {

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

@@ -23,25 +23,25 @@
 import java.io.Serializable;
 
 public abstract class InfoItem implements Serializable {
-    public final InfoType info_type;
-    public final int service_id;
-    public final String url;
-    public final String name;
-    public String thumbnail_url;
+    private final InfoType infoType;
+    private final int serviceId;
+    private final String url;
+    private final String name;
+    private String thumbnailUrl;
 
     public InfoItem(InfoType infoType, int serviceId, String url, String name) {
-        this.info_type = infoType;
-        this.service_id = serviceId;
+        this.infoType = infoType;
+        this.serviceId = serviceId;
         this.url = url;
         this.name = name;
     }
 
     public InfoType getInfoType() {
-        return info_type;
+        return infoType;
     }
 
     public int getServiceId() {
-        return service_id;
+        return serviceId;
     }
 
     public String getUrl() {
@@ -53,11 +53,11 @@ public String getName() {
     }
 
     public void setThumbnailUrl(String thumbnailUrl) {
-        this.thumbnail_url = thumbnailUrl;
+        this.thumbnailUrl = thumbnailUrl;
     }
 
     public String getThumbnailUrl() {
-        return thumbnail_url;
+        return thumbnailUrl;
     }
 
     @Override

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

@@ -42,7 +42,7 @@ public InfoItemsCollector(int serviceId) {
     }
 
     @Override
-    public List<I> getItemList() {
+    public List<I> getItems() {
         return Collections.unmodifiableList(itemList);
     }
 

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

@@ -46,7 +46,7 @@ public static class InfoItemPage<T extends InfoItem> {
         private final List<Throwable> errors;
 
         public InfoItemPage(InfoItemsCollector<T, ?> collector, String nextPageUrl) {
-            this(collector.getItemList(), nextPageUrl, collector.getErrors());
+            this(collector.getItems(), nextPageUrl, collector.getErrors());
         }
 
         public InfoItemPage(List<T> itemsList, String nextPageUrl, List<Throwable> errors) {

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

@@ -2,20 +2,20 @@
 
 import java.util.List;
 
-public abstract class ListInfo extends Info {
-    public List<InfoItem> related_streams;
-    public String nextPageUrl = null;
+public abstract class ListInfo<T extends InfoItem> extends Info {
+    private List<T> relatedItems;
+    private String nextPageUrl = null;
 
     public ListInfo(int serviceId, String id, String url, String name) {
         super(serviceId, id, url, name);
     }
 
-    public List<InfoItem> getRelatedStreams() {
-        return related_streams;
+    public List<T> getRelatedItems() {
+        return relatedItems;
     }
 
-    public void setRelatedStreams(List<InfoItem> related_streams) {
-        this.related_streams = related_streams;
+    public void setRelatedItems(List<T> relatedItems) {
+        this.relatedItems = relatedItems;
     }
 
     public boolean hasNextPage() {

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

@@ -79,7 +79,7 @@ public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException
             info.addError(e);
         }
 
-        info.setRelatedStreams(ExtractorHelper.getInfoItemsOrLogError(info, extractor));
+        info.setRelatedItems(ExtractorHelper.getInfoItemsOrLogError(info, extractor));
 
         try {
             info.setSubscriberCount(extractor.getSubscriberCount());
@@ -96,42 +96,42 @@ public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException
         return info;
     }
 
-    public String avatar_url;
-    public String banner_url;
-    public String feed_url;
-    public long subscriber_count = -1;
-    public String description;
+    private String avatarUrl;
+    private String bannerUrl;
+    private String feedUrl;
+    private long subscriberCount = -1;
+    private String description;
 
     public String getAvatarUrl() {
-        return avatar_url;
+        return avatarUrl;
     }
 
     public void setAvatarUrl(String avatarUrl) {
-        this.avatar_url = avatarUrl;
+        this.avatarUrl = avatarUrl;
     }
 
     public String getBannerUrl() {
-        return banner_url;
+        return bannerUrl;
     }
 
     public void setBannerUrl(String bannerUrl) {
-        this.banner_url = bannerUrl;
+        this.bannerUrl = bannerUrl;
     }
 
     public String getFeedUrl() {
-        return feed_url;
+        return feedUrl;
     }
 
     public void setFeedUrl(String feedUrl) {
-        this.feed_url = feedUrl;
+        this.feedUrl = feedUrl;
     }
 
     public long getSubscriberCount() {
-        return subscriber_count;
+        return subscriberCount;
     }
 
     public void setSubscriberCount(long subscriberCount) {
-        this.subscriber_count = subscriberCount;
+        this.subscriberCount = subscriberCount;
     }
 
     public String getDescription() {

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

@@ -24,9 +24,9 @@
 
 public class ChannelInfoItem extends InfoItem {
 
-    public String description;
-    public long subscriber_count = -1;
-    public long stream_count = -1;
+    private String description;
+    private long subscriberCount = -1;
+    private long streamCount = -1;
 
 
     public ChannelInfoItem(int serviceId, String url, String name) {
@@ -42,18 +42,18 @@ public void setDescription(String description) {
     }
 
     public long getSubscriberCount() {
-        return subscriber_count;
+        return subscriberCount;
     }
 
     public void setSubscriberCount(long subscriber_count) {
-        this.subscriber_count = subscriber_count;
+        this.subscriberCount = subscriber_count;
     }
 
     public long getStreamCount() {
-        return stream_count;
+        return streamCount;
     }
 
     public void setStreamCount(long stream_count) {
-        this.stream_count = stream_count;
+        this.streamCount = stream_count;
     }
 }

src/main/java/org/schabi/newpipe/extractor/kiosk/KioskInfo.java

@@ -75,7 +75,7 @@ public static KioskInfo getInfo(KioskExtractor extractor) throws ExtractionExcep
 
         KioskInfo info = new KioskInfo(serviceId, id, name, url);
 
-        info.related_streams = ExtractorHelper.getInfoItemsOrLogError(info, extractor);
+        info.setRelatedItems(ExtractorHelper.getInfoItemsOrLogError(info, extractor));
 
         return info;
     }

src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java

@@ -75,63 +75,63 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws IOExcepti
             info.addError(e);
         }
 
-        info.setRelatedStreams(getInfoItemsOrLogError(info, extractor));
+        info.setRelatedItems(getInfoItemsOrLogError(info, extractor));
         info.setNextPageUrl(extractor.getNextPageUrl());
         return info;
     }
 
-    public String thumbnail_url;
-    public String banner_url;
-    public String uploader_url;
-    public String uploader_name;
-    public String uploader_avatar_url;
-    public long stream_count = 0;
+    private String thumbnailUrl;
+    private String bannerUrl;
+    private String uploaderUrl;
+    private String uploaderName;
+    private String uploaderAvatarUrl;
+    private long streamCount = 0;
 
     public String getThumbnailUrl() {
-        return thumbnail_url;
+        return thumbnailUrl;
     }
 
-    public String getBannerUrl() {
-        return banner_url;
+    public void setThumbnailUrl(String thumbnailUrl) {
+        this.thumbnailUrl = thumbnailUrl;
     }
 
-    public String getUploaderUrl() {
-        return uploader_url;
+    public String getBannerUrl() {
+        return bannerUrl;
     }
 
-    public String getUploaderName() {
-        return uploader_name;
+    public void setBannerUrl(String bannerUrl) {
+        this.bannerUrl = bannerUrl;
     }
 
-    public String getUploaderAvatarUrl() {
-        return uploader_avatar_url;
+    public String getUploaderUrl() {
+        return uploaderUrl;
     }
 
-    public long getStreamCount() {
-        return stream_count;
+    public void setUploaderUrl(String uploaderUrl) {
+        this.uploaderUrl = uploaderUrl;
     }
 
-    public void setThumbnailUrl(String thumbnailUrl) {
-        this.thumbnail_url = thumbnailUrl;
+    public String getUploaderName() {
+        return uploaderName;
     }
 
-    public void setBannerUrl(String bannerUrl) {
-        this.banner_url = bannerUrl;
+    public void setUploaderName(String uploaderName) {
+        this.uploaderName = uploaderName;
     }
 
-    public void setUploaderUrl(String uploaderUrl) {
-        this.uploader_url = uploaderUrl;
+    public String getUploaderAvatarUrl() {
+        return uploaderAvatarUrl;
     }
 
-    public void setUploaderName(String uploaderName) {
-        this.uploader_name = uploaderName;
+    public void setUploaderAvatarUrl(String uploaderAvatarUrl) {
+        this.uploaderAvatarUrl = uploaderAvatarUrl;
     }
 
-    public void setUploaderAvatarUrl(String uploaderAvatarUrl) {
-        this.uploader_avatar_url = uploaderAvatarUrl;
+    public long getStreamCount() {
+        return streamCount;
     }
 
     public void setStreamCount(long streamCount) {
-        this.stream_count = streamCount;
+        this.streamCount = streamCount;
     }
 }