Audited and updated all user related data models (#349, #350)

* Updated user related data models and tests to match latest GitLab API specs.

Author: gmessner

src/main/java/org/gitlab4j/api/models/AbstractUser.java

@@ -1,4 +1,36 @@
 package org.gitlab4j.api.models;
 
+/**
+ * This class models the object for a repository contributor.
+ * See <a href="https://docs.gitlab.com/ee/api/repositories.html#contributors">Contributors at GitLab</a>.
+ */
 public class Contributor extends AbstractUser<Contributor> {
+
+    private Integer commits;
+    private Integer additions;
+    private Integer deletions;
+
+    public Integer getCommits() {
+        return commits;
+    }
+
+    public void setCommits(Integer commits) {
+        this.commits = commits;
+    }
+
+    public Integer getAdditions() {
+        return additions;
+    }
+
+    public void setAdditions(Integer additions) {
+        this.additions = additions;
+    }
+
+    public Integer getDeletions() {
+        return deletions;
+    }
+
+    public void setDeletions(Integer deletions) {
+        this.deletions = deletions;
+    }
 }

src/main/java/org/gitlab4j/api/models/Contributor.java

@@ -5,14 +5,10 @@
 
 import org.gitlab4j.api.utils.JacksonJson;
 
-public class Member {
+public class Member extends AbstractUser<Member> {
 
     private AccessLevel accessLevel;
-    private Date createdAt;
-    private Integer id;
-    private String name;
-    private String state;
-    private String username;
+    private Date expiresAt;
 
     public AccessLevel getAccessLevel() {
         return this.accessLevel;
@@ -22,68 +18,21 @@ public void setAccessLevel(AccessLevel accessLevel) {
         this.accessLevel = accessLevel;
     }
 
-    public Date getCreatedAt() {
-        return this.createdAt;
+    public Date getExpiresAt() {
+        return this.expiresAt;
     }
 
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Integer getId() {
-        return this.id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getState() {
-        return this.state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getUsername() {
-        return this.username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
+    public void setExpiresAt(Date expiresAt) {
+        this.expiresAt = expiresAt;
     }
 
     public Member withAccessLevel(AccessLevel accessLevel) {
         this.accessLevel = accessLevel;
         return this;
     }
 
-    public Member withCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-        return this;
-    }
-
-    public Member withId(Integer id) {
-        this.id = id;
-        return this;
-    }
-
-    public Member withState(String state) {
-        this.state = state;
-        return this;
-    }
-
-    public Member withUsername(String username) {
-        this.username = username;
+    public Member withExpiresAt(Date expiresAt) {
+        this.expiresAt = expiresAt;
         return this;
     }
 

src/main/java/org/gitlab4j/api/models/Member.java

@@ -1,41 +1,4 @@
 package org.gitlab4j.api.models;
 
-import java.util.Date;
-
-import org.gitlab4j.api.utils.JacksonJson;
-
-public class Owner {
-
-    private Date createdAt;
-    private Integer id;
-    private String name;
-
-    public Date getCreatedAt() {
-        return this.createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Integer getId() {
-        return this.id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return (JacksonJson.toJsonString(this));
-    }
+public class Owner extends AbstractUser<Owner> {
 }

src/main/java/org/gitlab4j/api/models/Owner.java

@@ -1,66 +1,4 @@
 package org.gitlab4j.api.models;
 
-import org.gitlab4j.api.utils.JacksonJson;
-
-public class ProjectUser {
-
-    private Integer id;
-    private String username;
-    private String name;
-    private String state;
-    private String avatarUrl;
-    private String webUrl;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getAvatarUrl() {
-        return avatarUrl;
-    }
-
-    public void setAvatarUrl(String avatarUrl) {
-        this.avatarUrl = avatarUrl;
-    }
-
-    public String getWebUrl() {
-        return webUrl;
-    }
-
-    public void setWebUrl(String webUrl) {
-        this.webUrl = webUrl;
-    }
-
-    @Override
-    public String toString() {
-        return (JacksonJson.toJsonString(this));
-    }
+public class ProjectUser extends AbstractUser<ProjectUser> {
 }