Add the token field to the User and cleanup unneeded constructs

Author: rubengees

library/src/androidTest/java/com/proxerme/library/connection/user/request/LoginRequestTest.java

@@ -81,6 +81,9 @@ public void testPasswordParameter() throws Exception {
     }
 
     private User generateTestUser() {
-        return new User("121658", "121658_VHuZqz.jpg");
+        return new User("121658", "121658_VHuZqz.jpg", "OmSjyOzMeyICUnErDD04lsDta7REW2fIn6ZWUxG96" +
+                "mIXHmplYymjYZK94BNXA1wloFSVcw3fTKdA6CT49ek7b4dfCYcdWQ0Xv2TFvTUoD8XGHOHP11Uc46rF4" +
+                "BSXrZUU1LxwEqSgxNWdAC3ACWMF2di3N0Xe9S88BEBe3tuAfoNP1NpAIadJlwK9DHlLxqS83rl6VPD9b" +
+                "qXabkKTsYBOslW61fOwFFDI7WLZLo8UM35XnPRPLsBdLwgJL5dpJQ6");
     }
 }

library/src/main/java/com/proxerme/library/connection/user/entitiy/User.java

@@ -14,11 +14,14 @@
  * @author Ruben Gees
  */
 public class User implements Parcelable, IdItem, ImageItem {
+
     public static final Creator<User> CREATOR = new Creator<User>() {
+        @Override
         public User createFromParcel(Parcel source) {
             return new User(source);
         }
 
+        @Override
         public User[] newArray(int size) {
             return new User[size];
         }
@@ -28,60 +31,64 @@ public User[] newArray(int size) {
     private String id;
     @Json(name = "avatar")
     private String imageId;
+    @Json(name = "token")
+    private String loginToken;
 
     private User() {
 
     }
 
     /**
-     * Constructor for a user after the login.
+     * The Constructor.
      *
-     * @param id    The id of the user.
-     * @param image The profile picture of the user.
+     * @param id         The id of the user.
+     * @param image      The profile picture of the user.
+     * @param loginToken The login token, usable for further authentication.
      */
-    public User(@NonNull String id,
-                @NonNull String image) {
+    public User(@NonNull String id, @NonNull String image, @NonNull String loginToken) {
         this.id = id;
         this.imageId = image;
+        this.loginToken = loginToken;
     }
 
     protected User(Parcel in) {
         this.id = in.readString();
         this.imageId = in.readString();
+        this.loginToken = in.readString();
     }
 
     /**
      * Returns the id of the user.
      *
      * @return The id.
-     * @throws RuntimeException If the user has no id yet, meaning he is not logged in yet.
      */
     @NonNull
     @Override
-    public String getId() throws UserInitializationException {
-        if (id == null) {
-            throw new UserInitializationException("User has no id yet.");
-        }
-
+    public String getId() {
         return id;
     }
 
     /**
      * Returns the profile picture of the user.
      *
      * @return The image.
-     * @throws RuntimeException If the user has not image yet, meaning he is not logged in yet.
      */
     @NonNull
     @Override
-    public String getImageId() throws UserInitializationException {
-        if (imageId == null) {
-            throw new UserInitializationException("User has no image yet.");
-        }
-
+    public String getImageId() {
         return imageId;
     }
 
+    /**
+     * Returns the login token of the user for further authentification.
+     *
+     * @return The token.
+     */
+    @NonNull
+    public String getLoginToken() {
+        return loginToken;
+    }
+
     @SuppressWarnings("SimplifiableIfStatement")
     @Override
     public boolean equals(Object o) {
@@ -91,13 +98,15 @@ public boolean equals(Object o) {
         User user = (User) o;
 
         if (!id.equals(user.id)) return false;
-        return imageId.equals(user.imageId);
+        if (!imageId.equals(user.imageId)) return false;
+        return loginToken.equals(user.loginToken);
     }
 
     @Override
     public int hashCode() {
         int result = id.hashCode();
         result = 31 * result + imageId.hashCode();
+        result = 31 * result + loginToken.hashCode();
         return result;
     }
 
@@ -110,12 +119,6 @@ public int describeContents() {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.id);
         dest.writeString(this.imageId);
-    }
-
-    public static class UserInitializationException extends RuntimeException {
-
-        public UserInitializationException(String message) {
-            super(message);
-        }
+        dest.writeString(this.loginToken);
     }
 }