Use proper beans (HaarigerHarald#39)

Author: meoyawn

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip

gradlew

@@ -123,4 +123,51 @@ public int getHeight() {
         return height;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Format format = (Format) o;
+
+        if (itag != format.itag) return false;
+        if (height != format.height) return false;
+        if (fps != format.fps) return false;
+        if (audioBitrate != format.audioBitrate) return false;
+        if (isDashContainer != format.isDashContainer) return false;
+        if (isHlsContent != format.isHlsContent) return false;
+        if (ext != null ? !ext.equals(format.ext) : format.ext != null) return false;
+        if (vCodec != format.vCodec) return false;
+        return aCodec == format.aCodec;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = itag;
+        result = 31 * result + (ext != null ? ext.hashCode() : 0);
+        result = 31 * result + height;
+        result = 31 * result + fps;
+        result = 31 * result + (vCodec != null ? vCodec.hashCode() : 0);
+        result = 31 * result + (aCodec != null ? aCodec.hashCode() : 0);
+        result = 31 * result + audioBitrate;
+        result = 31 * result + (isDashContainer ? 1 : 0);
+        result = 31 * result + (isHlsContent ? 1 : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Format{" +
+                "itag=" + itag +
+                ", ext='" + ext + '\'' +
+                ", height=" + height +
+                ", fps=" + fps +
+                ", vCodec=" + vCodec +
+                ", aCodec=" + aCodec +
+                ", audioBitrate=" + audioBitrate +
+                ", isDashContainer=" + isDashContainer +
+                ", isHlsContent=" + isHlsContent +
+                '}';
+    }
 }

youtubeExtractor/src/main/java/at/huber/youtubeExtractor/Format.java

@@ -26,7 +26,6 @@ protected VideoMeta(String videoId, String title, String author, String channelI
     }
 
 
-
     // 120 x 90
     public String getThumbUrl() {
         return IMAGE_BASE_URL + videoId + "/default.jpg";
@@ -83,4 +82,47 @@ public long getViewCount() {
         return viewCount;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        VideoMeta videoMeta = (VideoMeta) o;
+
+        if (videoLength != videoMeta.videoLength) return false;
+        if (viewCount != videoMeta.viewCount) return false;
+        if (isLiveStream != videoMeta.isLiveStream) return false;
+        if (videoId != null ? !videoId.equals(videoMeta.videoId) : videoMeta.videoId != null)
+            return false;
+        if (title != null ? !title.equals(videoMeta.title) : videoMeta.title != null) return false;
+        if (author != null ? !author.equals(videoMeta.author) : videoMeta.author != null)
+            return false;
+        return channelId != null ? channelId.equals(videoMeta.channelId) : videoMeta.channelId == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = videoId != null ? videoId.hashCode() : 0;
+        result = 31 * result + (title != null ? title.hashCode() : 0);
+        result = 31 * result + (author != null ? author.hashCode() : 0);
+        result = 31 * result + (channelId != null ? channelId.hashCode() : 0);
+        result = 31 * result + (int) (videoLength ^ (videoLength >>> 32));
+        result = 31 * result + (int) (viewCount ^ (viewCount >>> 32));
+        result = 31 * result + (isLiveStream ? 1 : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "VideoMeta{" +
+                "videoId='" + videoId + '\'' +
+                ", title='" + title + '\'' +
+                ", author='" + author + '\'' +
+                ", channelId='" + channelId + '\'' +
+                ", videoLength=" + videoLength +
+                ", viewCount=" + viewCount +
+                ", isLiveStream=" + isLiveStream +
+                '}';
+    }
 }

youtubeExtractor/src/main/java/at/huber/youtubeExtractor/VideoMeta.java

@@ -28,7 +28,33 @@ public Format getFormat() {
      * Format data for the specific file.
      */
     @Deprecated
-    public Format getMeta(){
+    public Format getMeta() {
         return format;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        YtFile ytFile = (YtFile) o;
+
+        if (format != null ? !format.equals(ytFile.format) : ytFile.format != null) return false;
+        return url != null ? url.equals(ytFile.url) : ytFile.url == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = format != null ? format.hashCode() : 0;
+        result = 31 * result + (url != null ? url.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "YtFile{" +
+                "format=" + format +
+                ", url='" + url + '\'' +
+                '}';
+    }
 }