Fixed issues exposed by unit tests.

src/main/java/com/messners/gitlab/api/JacksonJson.java

@@ -3,6 +3,7 @@ package com.messners.gitlab.api;
 
 import java.io.IOException;
 import java.io.Reader;
+import java.util.Date;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
@@ -10,15 +11,21 @@ import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;
 
 import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.Version;
 import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
+import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.JsonSerializer;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.ObjectWriter;
 import org.codehaus.jackson.map.PropertyNamingStrategy;
 import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.DeserializationConfig;
+import org.codehaus.jackson.map.SerializerProvider;
 import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import org.codehaus.jackson.map.module.SimpleModule;
 
 /** 
  * Jackson JSON Configuration and utility class.
@@ -40,7 +47,11 @@ public class JacksonJson extends JacksonJaxbJsonProvider implements ContextResol
 		objectMapper.configure(SerializationConfig.Feature.WRITE_DATES_AS_TIMESTAMPS, false);
 		objectMapper.configure(SerializationConfig.Feature.WRITE_ENUMS_USING_TO_STRING, Boolean.TRUE);
 		objectMapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-		objectMapper.configure(DeserializationConfig.Feature.READ_ENUMS_USING_TO_STRING, Boolean.TRUE);		
+		objectMapper.configure(DeserializationConfig.Feature.READ_ENUMS_USING_TO_STRING, Boolean.TRUE);				
+		
+		SimpleModule module = new SimpleModule("GitLabApiJsonModule", new Version(1, 0, 0, null));
+		module.addSerializer(Date.class, new JsonDateSerializer());
+		objectMapper.registerModule(module);
 	}
 	   
     /**
@@ -118,4 +129,15 @@ public class JacksonJson extends JacksonJaxbJsonProvider implements ContextResol
 		
 		return (results);
 	}
+	
+	
+	public static class JsonDateSerializer extends JsonSerializer<Date> {
+
+		@Override
+		public void serialize(java.util.Date date, JsonGenerator gen, SerializerProvider provider)
+	            throws IOException, JsonProcessingException {
+			String iso8601String = ISO8601.toString(date);
+			gen.writeString(iso8601String);
+		}
+	}	
 }
\ No newline at end of file

src/main/java/com/messners/gitlab/api/models/AbstractUser.java

@@ -15,6 +15,7 @@ public class AbstractUser {
 	private String name;
 	private String state;
 	private String username;
+	private Boolean blocked;
 
 	public Date getCreatedAt () {
 		return this.createdAt;
@@ -63,4 +64,12 @@ public class AbstractUser {
 	public void setUsername (String username) {
 		this.username = username;
 	}
+
+	public Boolean getBlocked() {
+		return blocked;
+	}
+
+	public void setBlocked(Boolean blocked) {
+		this.blocked = blocked;
+	}
 }

src/main/java/com/messners/gitlab/api/models/Commit.java

@@ -6,8 +6,6 @@ import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
@@ -22,9 +20,7 @@ public class Commit {
 	private String id;
 	private String message;
 	
-    @XmlElement(name = "id", type = String.class)
-    @XmlElementWrapper(name = "parents")
-	private List<String> parentIds;
+	private List<Parent> parents;
     
 	private String shortId;
 	private Date timestamp;
@@ -85,12 +81,12 @@ public class Commit {
 		this.message = message;
 	}
 
-	public List<String> getParents () {
-		return this.parentIds;
+	public List<Parent> getParents () {
+		return this.parents;
 	}
 
-	public void setParents (List<String> parentIds) {
-		this.parentIds = parentIds;
+	public void setParents (List<Parent> parents) {
+		this.parents = parents;
 	}
 
 	public void setShort_id (String short_id) {

src/main/java/com/messners/gitlab/api/models/Diff.java

@@ -6,45 +6,51 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Diff {
 
+	@JsonSerialize(include=Inclusion.ALWAYS)
 	@JsonProperty("a_mode")
-	private String aMode;
+	private String a_mode;
 	
+	@JsonSerialize(include=Inclusion.ALWAYS)
 	@JsonProperty("b_mode")
-	private String bMode;	
+	private String b_mode;	
 	
-	private boolean deletedFile;
+	private Boolean deletedFile;
 	private String diff;
-	private boolean newFile;
+	private Boolean newFile;
 	private String newPath;
 	private String oldPath;
-	private boolean renamedFile;
+	private Boolean renamedFile;
 
+	@JsonProperty("a_mode")
 	public String getAMode () {
-		return this.aMode;
+		return this.a_mode;
 	}
 
 	public void setAMode (String aMode) {
-		this.aMode = aMode;
+		this.a_mode = aMode;
 	}
 
+	@JsonProperty("b_mode")
 	public String getBMode () {
-		return this.bMode;
+		return this.b_mode;
 	}
 
 	public void setBMode (String bMode) {
-		this.bMode = bMode;
+		this.b_mode = bMode;
 	}
 
-	public boolean getDeletedFile () {
+	public Boolean getDeletedFile () {
 		return this.deletedFile;
 	}
 
-	public void setDeletedFile (boolean deletedFile) {
+	public void setDeletedFile (Boolean deletedFile) {
 		this.deletedFile = deletedFile;
 	}
 
@@ -56,11 +62,11 @@ public class Diff {
 		this.diff = diff;
 	}
 
-	public boolean getNewFile () {
+	public Boolean getNewFile () {
 		return this.newFile;
 	}
 
-	public void setNewFile (boolean newFile) {
+	public void setNewFile (Boolean newFile) {
 		this.newFile = newFile;
 	}
 
@@ -80,11 +86,11 @@ public class Diff {
 		this.oldPath = oldPath;
 	}
 
-	public boolean getRenamedFile () {
+	public Boolean getRenamedFile () {
 		return this.renamedFile;
 	}
 
-	public void setRenamedFile (boolean renamedFile) {
+	public void setRenamedFile (Boolean renamedFile) {
 		this.renamedFile = renamedFile;
 	}
 }

src/main/java/com/messners/gitlab/api/models/Tag.java

@@ -10,7 +10,7 @@ public class Tag {
 
 	private Commit commit;
 	private String name;
-	private boolean isProtected;
+	private Boolean isProtected;
 
 	public Commit getCommit () {
 		return this.commit;
@@ -28,11 +28,11 @@ public class Tag {
 		this.name = name;
 	}
 
-	public boolean getProtected () {
+	public Boolean getProtected () {
 		return this.isProtected;
 	}
 
-	public void setProtected (boolean isProtected) {
+	public void setProtected (Boolean isProtected) {
 		this.isProtected = isProtected;
 	}
 }

src/test/resources/com/messners/gitlab/api/branch.json

@@ -2,11 +2,7 @@
     "name": "master",
     "commit": {
       "id": "7b5c3cc8be40ee161ae89a06bba6229da1032a0c",
-      "parents": [
-        {
-          "id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8"
-        }
-      ],
+      "parents": [{ "id": "4ad91d3c1144c406e50c7b33bae684bd6837faf8" }],
       "tree": "46e82de44b1061621357f24c05515327f2795a95",
       "message": "add projects API",
       "author": {
@@ -17,8 +13,8 @@
         "name": "John Smith",
         "email": "john@example.com"
       },
-      "authored_date": "2012-06-27T05:51:39-07:00",
-      "committed_date": "2012-06-28T03:44:20-07:00"
+      "authored_date": "2012-06-27T12:51:39Z",
+      "committed_date": "2012-06-28T10:44:20Z"
     },
     "protected": true
 }

src/test/resources/com/messners/gitlab/api/commit.json

@@ -4,6 +4,6 @@
     "title": "Replace sanitize with escape once",
     "author_name": "Dmitriy Zaporozhets",
     "author_email": "dzaporozhets@sphereconsultinginc.com",
-    "created_at": "2012-09-20T11:50:22+03:00"
+    "created_at": "2012-09-20T08:50:22Z"
 }
 

src/test/resources/com/messners/gitlab/api/event-object.json

@@ -11,12 +11,8 @@
     "project_id":14,
     "created_at":"2013-12-03T17:15:43Z",
     "updated_at":"2013-12-03T17:15:43Z",
-    "st_commits":null,
-    "st_diffs":null,
     "position":0,
-    "branch_name":null,
     "description":"Create new API for manipulations with repository",
-    "milestone_id":null,
     "state":"opened",
     "iid":23,
     "merge_status":"unchecked",

src/test/resources/com/messners/gitlab/api/event.json

 {
-  "title": null,
   "project_id": 15,
   "action_name": "opened",
-  "target_id": null,
-  "target_type": null,
   "author_id": 1,
   "data": {
     "before": "50d4420237a9de7be1304607147aec22e4a14af7",
@@ -20,7 +17,7 @@
     "commits": [{
       "id": "c5feabde2d8cd023215af4d2ceeb7a64839fc428",
       "message": "Add simple search to projects in public area",
-      "timestamp": "2013-05-13T18:18:08+00:00",
+      "timestamp": "2013-05-13T18:18:08Z",
       "url": "https://dev.gitlab.org/gitlab/gitlabhq/commit/c5feabde2d8cd023215af4d2ceeb7a64839fc428",
       "author": {
         "name": "Dmitriy Zaporozhets",
@@ -28,7 +25,6 @@
       }
     }],
     "total_commits_count": 1
-  },
-  "target_title": null
+  }
 }
 

src/test/resources/com/messners/gitlab/api/issue.json

@@ -11,7 +11,7 @@
       "id": 1,
       "title": "v1.0",
       "description": "",
-      "due_date": "2012-07-20",
+      "due_date": "2012-07-20T00:00:00Z",
       "state": "reopenend",
       "updated_at": "2012-07-04T13:42:48Z",
       "created_at": "2012-07-04T13:42:48Z"

src/test/resources/com/messners/gitlab/api/merge-request-event.json

@@ -10,9 +10,6 @@
     "title":"MS-Viewport",
     "created_at":"2013-12-03T17:23:34Z",
     "updated_at":"2013-12-03T17:23:34Z",
-    "st_commits":null,
-    "st_diffs":null,
-    "milestone_id":null,
     "state":"opened",
     "merge_status":"unchecked",
     "target_project_id":14,

src/test/resources/com/messners/gitlab/api/milestone.json

@@ -4,7 +4,7 @@
     "project_id":16,
     "title":"10.0",
     "description":"Version",
-    "due_date":"2013-11-29",
+    "due_date":"2013-11-29T00:00:00Z",
     "state":"active",
     "updated_at":"2013-10-02T09:24:18Z",
     "created_at":"2013-10-02T09:24:18Z"

src/test/resources/com/messners/gitlab/api/note.json

 {
   "id":52,
   "title":"Snippet",
-  "attachment":null,
   "file_name":"snippet.rb",
   "author":{
     "id":1,
@@ -11,7 +10,6 @@
     "state":"active",
     "created_at":"2013-09-30T13:46:01Z"
   },
-  "expires_at":null,
   "updated_at":"2013-10-02T07:34:20Z",
   "created_at":"2013-10-02T07:34:20Z"
 }

src/test/resources/com/messners/gitlab/api/project-snippet.json

@@ -10,7 +10,6 @@
     "state": "active",
     "created_at": "2012-05-23T08:00:58Z"
   },
-  "expires_at": null,
   "updated_at": "2012-06-28T10:52:04Z",
   "created_at": "2012-06-28T10:52:04Z"
 }

src/test/resources/com/messners/gitlab/api/project.json

 {
     "id": 6,
-    "description": null,
     "default_branch": "master",
     "public": false,
     "visibility_level": 0,

src/test/resources/com/messners/gitlab/api/push-event.json

@@ -15,7 +15,7 @@
     {
       "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
       "message": "Update Catalan translation to e38cb41.",
-      "timestamp": "2011-12-12T14:27:31+02:00",
+      "timestamp": "2011-12-12T12:27:31Z",
       "url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
       "author": {
         "name": "Jordi Mallach",
@@ -25,7 +25,7 @@
     {
       "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
       "message": "fixed readme",
-      "timestamp": "2012-01-03T23:36:29+02:00",
+      "timestamp": "2012-01-03T21:36:29Z",
       "url": "http://localhost/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
       "author": {
         "name": "GitLab dev user",

src/test/resources/com/messners/gitlab/api/session.json

@@ -6,7 +6,6 @@
   "private_token": "dd34asd13as",
   "blocked": false,
   "created_at": "2012-05-23T08:00:58Z",
-  "bio": null,
   "skype": "",
   "linkedin": "",
   "twitter": "",

src/test/resources/com/messners/gitlab/api/tag.json

@@ -15,9 +15,9 @@
         "name": "Jack Smith",
         "email": "jack@example.com"
       },
-      "authored_date": "2012-05-28T04:42:42-07:00",
-      "committed_date": "2012-05-28T04:42:42-07:00"
+      "authored_date": "2012-05-28T11:42:42Z",
+      "committed_date": "2012-05-28T11:42:42Z"
     },
-    "protected": null
+    "protected": false
 }
 

src/test/resources/com/messners/gitlab/api/user.json

@@ -5,7 +5,6 @@
     "name": "John Smith",
     "state": "active",
     "created_at": "2012-05-23T08:00:58Z",
-    "bio": null,
     "skype": "",
     "linkedin": "",
     "twitter": "",