Move image to RantContent so comments have imgs too

Author: LucaScorpion

src/main/java/com/scorpiac/javarant/Comment.java

@@ -3,8 +3,8 @@
 import com.google.gson.JsonObject;
 
 public class Comment extends RantContent {
-    public Comment(int id, User user, int upvotes, int downvotes, String content) {
-        super(id, user, upvotes, downvotes, content);
+    private Comment(int id, User user, int upvotes, int downvotes, String content, Image image) {
+        super(id, user, upvotes, downvotes, content, image);
     }
 
     static Comment fromJson(JsonObject json) {
@@ -13,7 +13,8 @@ static Comment fromJson(JsonObject json) {
                 User.fromJson(json),
                 json.get("num_upvotes").getAsInt(),
                 json.get("num_downvotes").getAsInt(),
-                json.get("body").getAsString()
+                json.get("body").getAsString(),
+                Image.fromJson(json.get("attached_image"))
         );
     }
 }

src/main/java/com/scorpiac/javarant/Image.java

@@ -0,0 +1,53 @@
+package com.scorpiac.javarant;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+public class Image {
+    private String url;
+    private int width;
+    private int height;
+
+    private Image(String url, int width, int height) {
+        this.url = url;
+        this.width = width;
+        this.height = height;
+    }
+
+    /**
+     * Get the image from the JSON, or {@code null} if there is no image.
+     *
+     * @param json The JSON element for the image.
+     * @return The image, or {@code null}.
+     */
+    static Image fromJson(JsonElement json) {
+        if (json == null || !json.isJsonObject())
+            return null;
+
+        JsonObject obj = json.getAsJsonObject();
+        return new Image(obj.get("url").getAsString(), obj.get("width").getAsInt(), obj.get("height").getAsInt());
+    }
+
+    /**
+     * Get the image url.
+     *
+     * @return
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * Get the image width.
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * Get the image height.
+     */
+    public int getHeight() {
+        return height;
+    }
+}

src/main/java/com/scorpiac/javarant/Rant.java

@@ -6,14 +6,12 @@
 import com.scorpiac.javarant.exceptions.NoSuchRantException;
 
 public class Rant extends RantContent {
-    private String image;
     private String[] tags;
     private int commentCount;
     private Comment[] comments;
 
-    private Rant(int id, User user, int upvotes, int downvotes, String text, String image, String[] tags, int commentCount) {
-        super(id, user, upvotes, downvotes, text);
-        this.image = image;
+    private Rant(int id, User user, int upvotes, int downvotes, String text, Image image, String[] tags, int commentCount) {
+        super(id, user, upvotes, downvotes, text, image);
         this.tags = tags;
         this.commentCount = commentCount;
     }
@@ -47,7 +45,7 @@ static Rant fromJson(JsonObject json) {
                 json.get("num_upvotes").getAsInt(),
                 json.get("num_downvotes").getAsInt(),
                 json.get("text").getAsString(),
-                getImage(json.get("attached_image")),
+                Image.fromJson(json.get("attached_image")),
                 Util.jsonToList(json.getAsJsonArray("tags"), JsonElement::getAsString).toArray(new String[0]),
                 json.get("num_comments").getAsInt()
         );
@@ -62,10 +60,6 @@ private void commentsFromJson(JsonArray commentArray) {
         comments = Util.jsonToList(commentArray, elem -> Comment.fromJson(elem.getAsJsonObject())).toArray(new Comment[0]);
     }
 
-    private static String getImage(JsonElement image) {
-        return image.isJsonObject() ? image.getAsJsonObject().get("url").getAsString() : "";
-    }
-
     /**
      * Get the comments on this rant. If they are not yet retrieved, this will also fetch them.
      *
@@ -117,13 +111,6 @@ public String rantLink() {
         return DevRant.link(DevRant.RANT_URL + "/" + this.getId());
     }
 
-    /**
-     * Get the link to the image, or null if there is none.
-     */
-    public String imageLink() {
-        return image;
-    }
-
     /**
      * Get the tags from this rant.
      */

src/main/java/com/scorpiac/javarant/RantContent.java

@@ -6,13 +6,15 @@ public abstract class RantContent {
     private int upvotes;
     private int downvotes;
     private String content;
+    private Image image;
 
-    protected RantContent(int id, User user, int upvotes, int downvotes, String content) {
+    protected RantContent(int id, User user, int upvotes, int downvotes, String content, Image image) {
         this.id = id;
         this.user = user;
         this.upvotes = upvotes;
         this.downvotes = downvotes;
         this.content = content;
+        this.image = image;
     }
 
     /**
@@ -57,6 +59,13 @@ public String getContent() {
         return content;
     }
 
+    /**
+     * Get the image, or {@code null} if there is none.
+     */
+    public Image getImage() {
+        return image;
+    }
+
     @Override
     public String toString() {
         return content;

src/main/java/com/scorpiac/javarant/Util.java

@@ -27,10 +27,10 @@ static <T> List<T> jsonToList(JsonArray json, Function<JsonElement, T> converter
     }
 
     /**
-     * Check whether the JSON is not null and the success member is true.
+     * Check whether the JSON is not {@code null} and the success member is true.
      *
      * @param json The JSON to check.
-     * @return True if the JSON is not null and has a success member which is true.
+     * @return True if the JSON is not {@code null} and has a success member which is true.
      */
     static boolean jsonSuccess(JsonObject json) {
         return json != null && json.get("success").getAsBoolean();