Abstract (instance) service names into constant

Author: litetex

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

@@ -12,13 +12,13 @@
 
 public class PeertubeInstance extends AbstractInstance {
 
-    public static final String INSTANCE_SERVICE_NAME = "Peertube";
+    public static final String SERVICE_NAME = "Peertube";
 
     public static final PeertubeInstance DEFAULT_INSTANCE =
             new PeertubeInstance("https://framatube.org", "FramaTube");
 
     public PeertubeInstance(final String url) {
-        super(url, INSTANCE_SERVICE_NAME);
+        super(url, SERVICE_NAME);
     }
 
     public PeertubeInstance(final String url, final String name) {

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

@@ -48,7 +48,7 @@ public PeertubeService(final int id) {
     }
 
     public PeertubeService(final int id, final PeertubeInstance instance) {
-        super(id, "PeerTube", asList(VIDEO, COMMENTS));
+        super(id, PeertubeInstance.SERVICE_NAME, asList(VIDEO, COMMENTS));
         this.instance = instance;
     }
 

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

@@ -12,6 +12,8 @@
 
 public class InvidiousInstance extends YoutubeLikeInstance<InvidiousService> {
 
+    public static final String SERVICE_NAME = "Invidious";
+
     public InvidiousInstance(final String url) {
         super(url, tryExtractDomainFromUrl(url, "Invidious instance" + url.hashCode()));
     }
@@ -74,7 +76,7 @@ public InvidiousService getNewStreamingService(final int id) {
 
     @Override
     public String getServiceName() {
-        return "Invidious";
+        return SERVICE_NAME;
     }
 
     @FunctionalInterface

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

@@ -51,12 +51,8 @@
 public class InvidiousService extends YoutubeLikeStreamingService {
     protected InvidiousInstance instance;
 
-    public InvidiousService(final int id) {
-        super(id, "Invidious", asList(AUDIO, VIDEO, LIVE, COMMENTS));
-    }
-
     public InvidiousService(final int id, final InvidiousInstance instance) {
-        super(id, "Invidious", asList(AUDIO, VIDEO, LIVE, COMMENTS));
+        super(id, InvidiousInstance.SERVICE_NAME, asList(AUDIO, VIDEO, LIVE, COMMENTS));
         this.instance = instance;
     }
 

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

@@ -71,7 +71,7 @@
 public class YoutubeDirectService extends YoutubeLikeStreamingService {
 
     public YoutubeDirectService(final int id) {
-        super(id, "YouTube", asList(AUDIO, VIDEO, LIVE, COMMENTS));
+        super(id, YoutubeInstance.SERVICE_NAME, asList(AUDIO, VIDEO, LIVE, COMMENTS));
     }
 
     @Override

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

@@ -4,8 +4,10 @@
 
 public class YoutubeInstance extends YoutubeLikeInstance<YoutubeDirectService> {
 
+    public static final String SERVICE_NAME = "YouTube";
+
     public static final YoutubeInstance YOUTUBE =
-            new YoutubeInstance("https://youtube.com", "YouTube");
+            new YoutubeInstance("https://youtube.com", SERVICE_NAME);
 
     protected YoutubeInstance(final String url, final String name) {
         super(url, name);