Fixed annotations.

Author: Desnoo

…ion/messenger/entity/ConferenceInfo.java …nger/entity/ConferenceInfoContainer.javalibrary/src/main/java/com/proxerme/library/connection/messenger/entity/ConferenceInfo.java renamed to library/src/main/java/com/proxerme/library/connection/messenger/entity/ConferenceInfoContainer.java library/src/main/java/com/proxerme/library/connection/messenger/entity/ConferenceInfo.java renamed to library/src/main/java/com/proxerme/library/connection/messenger/entity/ConferenceInfoContainer.java

@@ -2,9 +2,10 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.NonNull;
 
 import com.afollestad.bridge.annotations.Body;
-import com.proxerme.library.connection.messenger.entity.conferenceInfo.User;
+import com.proxerme.library.connection.messenger.entity.conferenceInfo.ConferenceInfoUser;
 
 import java.util.Arrays;
 
@@ -13,50 +14,50 @@
  *
  * @author Desnoo
  */
-public class ConferenceInfo implements Parcelable {
+public class ConferenceInfoContainer implements Parcelable {
 
-    public static final Creator<ConferenceInfo> CREATOR = new Creator<ConferenceInfo>() {
+    public static final Creator<ConferenceInfoContainer> CREATOR = new Creator<ConferenceInfoContainer>() {
         @Override
-        public ConferenceInfo createFromParcel(Parcel in) {
-            return new ConferenceInfo(in);
+        public ConferenceInfoContainer createFromParcel(Parcel in) {
+            return new ConferenceInfoContainer(in);
         }
 
         @Override
-        public ConferenceInfo[] newArray(int size) {
-            return new ConferenceInfo[size];
+        public ConferenceInfoContainer[] newArray(int size) {
+            return new ConferenceInfoContainer[size];
         }
     };
 
     @Body(name = "conference")
     Conference conference;
     @Body(name = "users")
-    User[] user;
+    ConferenceInfoUser[] conferenceInfoUser;
 
     /**
      * Private Constructor.
      */
-    ConferenceInfo() {
+    ConferenceInfoContainer() {
     }
 
     /**
      * The Constructor.
      *
      * @param conference The conference object.
-     * @param user       The user object.
+     * @param conferenceInfoUser       The user object.
      */
-    public ConferenceInfo(Conference conference, User[] user) {
+    public ConferenceInfoContainer(@NonNull Conference conference, @NonNull ConferenceInfoUser[] conferenceInfoUser) {
         this.conference = conference;
-        this.user = user;
+        this.conferenceInfoUser = conferenceInfoUser;
     }
 
     /**
      * The Constructor to parse a parcel.
      *
      * @param in The parcel to parse.
      */
-    protected ConferenceInfo(Parcel in) {
+    protected ConferenceInfoContainer(Parcel in) {
         conference = in.readParcelable(Conference.class.getClassLoader());
-        user = in.createTypedArray(User.CREATOR);
+        conferenceInfoUser = in.createTypedArray(ConferenceInfoUser.CREATOR);
     }
 
     @Override
@@ -67,14 +68,15 @@ public int describeContents() {
     @Override
     public void writeToParcel(Parcel parcel, int i) {
         parcel.writeParcelable(conference, i);
-        parcel.writeTypedArray(user, i);
+        parcel.writeTypedArray(conferenceInfoUser, i);
     }
 
     /**
-     * Returns the Conference.
+     * Returns the ConferenceInfo.
      *
-     * @return The Conference.‚
+     * @return The ConferenceInfo.‚
      **/
+    @NonNull
     public Conference getConference() {
         return conference;
     }
@@ -84,27 +86,28 @@ public Conference getConference() {
      *
      * @return The User.
      **/
-    public User[] getUser() {
-        return user;
+    @NonNull
+    public ConferenceInfoUser[] getConferenceInfoUser() {
+        return conferenceInfoUser;
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        ConferenceInfo that = (ConferenceInfo) o;
+        ConferenceInfoContainer that = (ConferenceInfoContainer) o;
 
         if (!conference.equals(that.conference)) return false;
         // Probably incorrect - comparing Object[] arrays with Arrays.equals
-        return Arrays.equals(user, that.user);
+        return Arrays.equals(conferenceInfoUser, that.conferenceInfoUser);
 
     }
 
     @Override
     public int hashCode() {
         int result = conference.hashCode();
-        result = 31 * result + Arrays.hashCode(user);
+        result = 31 * result + Arrays.hashCode(conferenceInfoUser);
         return result;
     }
 }

…er/entity/conferenceInfo/Conference.java …ntity/conferenceInfo/ConferenceInfo.javalibrary/src/main/java/com/proxerme/library/connection/messenger/entity/conferenceInfo/Conference.java renamed to library/src/main/java/com/proxerme/library/connection/messenger/entity/conferenceInfo/ConferenceInfo.java library/src/main/java/com/proxerme/library/connection/messenger/entity/conferenceInfo/Conference.java renamed to library/src/main/java/com/proxerme/library/connection/messenger/entity/conferenceInfo/ConferenceInfo.java

@@ -8,22 +8,22 @@
 import com.afollestad.bridge.annotations.Body;
 
 /**
- * The class that represents the ConferenceInfo Conference entity.
+ * The class that represents the ConferenceInfo ConferenceInfo entity.
  * This class is different to the {@link com.proxerme.library.connection.messenger.entity.Conference}
  *
  * @author Desnoo
  */
-public class Conference implements Parcelable {
+public class ConferenceInfo implements Parcelable {
 
-    public static final Creator<Conference> CREATOR = new Creator<Conference>() {
+    public static final Creator<ConferenceInfo> CREATOR = new Creator<ConferenceInfo>() {
         @Override
-        public Conference createFromParcel(Parcel in) {
-            return new Conference(in);
+        public ConferenceInfo createFromParcel(Parcel in) {
+            return new ConferenceInfo(in);
         }
 
         @Override
-        public Conference[] newArray(int size) {
-            return new Conference[size];
+        public ConferenceInfo[] newArray(int size) {
+            return new ConferenceInfo[size];
         }
     };
 
@@ -41,7 +41,7 @@ public Conference[] newArray(int size) {
     /**
      * Private Constructor.
      */
-    Conference() {
+    ConferenceInfo() {
     }
 
     /**
@@ -53,9 +53,9 @@ public Conference[] newArray(int size) {
      * @param timestampEnd   The timestamp when the last message of the conference was sent.
      * @param leaderId       The user id of the conference leader.
      */
-    public Conference(@NonNull String topic, @IntRange(from = 1) int participants,
-                      @IntRange(from = 0) long timestampStart, @IntRange(from = 0) long timestampEnd,
-                      @NonNull String leaderId) {
+    public ConferenceInfo(@NonNull String topic, @IntRange(from = 2) int participants,
+                          @IntRange(from = 0) long timestampStart, @IntRange(from = 0) long timestampEnd,
+                          @NonNull String leaderId) {
         this.topic = topic;
         this.participants = participants;
         this.timestampStart = timestampStart;
@@ -68,7 +68,7 @@ public Conference(@NonNull String topic, @IntRange(from = 1) int participants,
      *
      * @param in The parcel to parse.
      */
-    protected Conference(Parcel in) {
+    protected ConferenceInfo(Parcel in) {
         topic = in.readString();
         participants = in.readInt();
         timestampStart = in.readLong();
@@ -107,7 +107,7 @@ public String getTopic() {
      *
      * @return The Count.
      **/
-    @IntRange(from = 1)
+    @IntRange(from = 2)
     public int getParticipants() {
         return participants;
     }
@@ -148,7 +148,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        Conference that = (Conference) o;
+        ConferenceInfo that = (ConferenceInfo) o;
 
         if (participants != that.participants) return false;
         if (timestampStart != that.timestampStart) return false;

…essenger/entity/conferenceInfo/User.java …y/conferenceInfo/ConferenceInfoUser.javalibrary/src/main/java/com/proxerme/library/connection/messenger/entity/conferenceInfo/User.java renamed to library/src/main/java/com/proxerme/library/connection/messenger/entity/conferenceInfo/ConferenceInfoUser.java library/src/main/java/com/proxerme/library/connection/messenger/entity/conferenceInfo/User.java renamed to library/src/main/java/com/proxerme/library/connection/messenger/entity/conferenceInfo/ConferenceInfoUser.java

@@ -5,30 +5,32 @@
 import android.support.annotation.NonNull;
 
 import com.afollestad.bridge.annotations.Body;
+import com.proxerme.library.interfaces.IdItem;
+import com.proxerme.library.interfaces.ImageItem;
 
 /**
  * The class that represents a user.
  *
  * @author Desnoo
  */
-public class User implements Parcelable {
+public class ConferenceInfoUser implements Parcelable, IdItem, ImageItem {
 
-    public static final Creator<User> CREATOR = new Creator<User>() {
+    public static final Creator<ConferenceInfoUser> CREATOR = new Creator<ConferenceInfoUser>() {
         @Override
-        public User createFromParcel(Parcel in) {
-            return new User(in);
+        public ConferenceInfoUser createFromParcel(Parcel in) {
+            return new ConferenceInfoUser(in);
         }
 
         @Override
-        public User[] newArray(int size) {
-            return new User[size];
+        public ConferenceInfoUser[] newArray(int size) {
+            return new ConferenceInfoUser[size];
         }
     };
 
     @Body(name = "uid")
-    String uid;
+    String id;
     @Body(name = "avatar")
-    String avatarId;
+    String imageId;
     @Body(name = "username")
     String username;
     @Body(name = "status")
@@ -37,20 +39,20 @@ public User[] newArray(int size) {
     /**
      * Private Constructor.
      */
-    User() {
+    ConferenceInfoUser() {
     }
 
     /**
      * The Constructor.
      *
-     * @param uid      The user id.
+     * @param id      The user id.
      * @param avatar   The avatar id.
      * @param username The user's name.
      * @param status   The current status message.
      */
-    public User(@NonNull String uid, @NonNull String avatar, @NonNull String username, @NonNull String status) {
-        this.uid = uid;
-        this.avatarId = avatar;
+    public ConferenceInfoUser(@NonNull String id, @NonNull String avatar, @NonNull String username, @NonNull String status) {
+        this.id = id;
+        this.imageId = avatar;
         this.username = username;
         this.status = status;
     }
@@ -60,33 +62,13 @@ public User(@NonNull String uid, @NonNull String avatar, @NonNull String usernam
      *
      * @param in The parcel to parse.
      */
-    protected User(Parcel in) {
-        uid = in.readString();
-        avatarId = in.readString();
+    protected ConferenceInfoUser(Parcel in) {
+        id = in.readString();
+        imageId = in.readString();
         username = in.readString();
         status = in.readString();
     }
 
-    /**
-     * Returns the Uid.
-     *
-     * @return The Uid.
-     **/
-    @NonNull
-    public String getUid() {
-        return uid;
-    }
-
-    /**
-     * Returns the Avatar.
-     *
-     * @return The Avatar.
-     **/
-    @NonNull
-    public String getAvatar() {
-        return avatarId;
-    }
-
     /**
      * Returns the Username.
      *
@@ -107,15 +89,28 @@ public String getStatus() {
         return status;
     }
 
+
+    @NonNull
+    @Override
+    public String getId() {
+        return this.id;
+    }
+
+    @NonNull
+    @Override
+    public String getImageId() {
+        return imageId;
+    }
+
     @Override
     public int describeContents() {
         return 0;
     }
 
     @Override
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeString(uid);
-        parcel.writeString(avatarId);
+        parcel.writeString(id);
+        parcel.writeString(imageId);
         parcel.writeString(username);
         parcel.writeString(status);
     }
@@ -126,21 +121,23 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        User user = (User) o;
+        ConferenceInfoUser conferenceInfoUser = (ConferenceInfoUser) o;
 
-        if (!uid.equals(user.uid)) return false;
-        if (!avatarId.equals(user.avatarId)) return false;
-        if (!username.equals(user.username)) return false;
-        return status.equals(user.status);
+        if (!id.equals(conferenceInfoUser.id)) return false;
+        if (!imageId.equals(conferenceInfoUser.imageId)) return false;
+        if (!username.equals(conferenceInfoUser.username)) return false;
+        return status.equals(conferenceInfoUser.status);
 
     }
 
     @Override
     public int hashCode() {
-        int result = uid.hashCode();
-        result = 31 * result + avatarId.hashCode();
+        int result = id.hashCode();
+        result = 31 * result + imageId.hashCode();
         result = 31 * result + username.hashCode();
         result = 31 * result + status.hashCode();
         return result;
     }
+
+
 }

library/src/main/java/com/proxerme/library/connection/messenger/request/ConferenceInfoRequest.java

@@ -28,7 +28,7 @@ public class ConferenceInfoRequest extends ProxerRequest<ConferenceInfoResult> {
      *
      * @param conferenceId The id of the conference to request.
      */
-    public ConferenceInfoRequest(String conferenceId) {
+    public ConferenceInfoRequest(@NonNull String conferenceId) {
         this.conferenceId = conferenceId;
     }