readding some methods that use the slug version of the project id

readding the json properties

fixing up code style to match master

trying to fix up whitespace issues to match original changes

white space fixes for gitlab branch and project hook

clean up gitlab api file

fixing compile issues with gitlab api

fixing compile issues with gitlab api

pom.xml

@@ -77,7 +77,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>1.4</version> 
+            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>

src/main/java/org/gitlab/api/models/GitlabBranch.java

 package org.gitlab.api.models;
 
-import org.gitlab.api.models.GitlabBranchCommit;
-
 import org.codehaus.jackson.annotate.JsonProperty;
 
 public class GitlabBranch {
-    public static String URL = "/repository/branches/";
-
+	public final static String URL = "/repository/branches/";
+	
+	@JsonProperty("name")
     private String _name;
-    private GitlabBranchCommit _commit;
-    private boolean _protected;
 
-    public String getName() {
-        return _name;
-    }
+    	@JsonProperty("commit")
+    	private GitlabBranchCommit _commit;
+	
+	@JsonProperty("protected")
+	private boolean _protected;
+
+	public String getName() {
+		return _name;
+	}
 
-    public void setName(String name) {
-        _name = name;
-    }
+	public void setName(String name) {
+		this._name = name;
+	}
 
-    public GitlabBranchCommit getCommit() {
-        return _commit;
-    }
+	public GitlabBranchCommit getCommit() {
+		return _commit;
+	}
 
-    public void setCommit(GitlabBranchCommit commit) {
-        _commit = commit;
-    }
+	public void setCommit(GitlabBranchCommit commit) {
+		this._commit = commit;
+	}
 
-    public boolean getProtected() {
-        return _protected;
-    }
+	public boolean isProtected() {
+		return _protected;
+	}
 
-    public void setProtected(boolean isProtected) {
-        _protected = isProtected;
-    }
+	public void setProtected(boolean isProtected) {
+		this._protected = isProtected;
+	}
 }
\ No newline at end of file

src/main/java/org/gitlab/api/models/GitlabProjectHook.java

 package org.gitlab.api.models;
 
 import java.util.Date;
+
 import org.codehaus.jackson.annotate.JsonProperty;
 
 public class GitlabProjectHook {
 
-    public static final String URL = "/hooks";
-
-    private Integer _id;
-    private String _url;
-
-    @JsonProperty("project_id")
-    private Integer _projectId;
+	public final static String URL = "/hooks";
+	
+	private String _id;
+	private String _url;
+	
+	private Integer _projectId;
 
-    @JsonProperty("push_events")
-    private boolean _pushEvents;
+    	@JsonProperty("push_events")
+    	private boolean _pushEvents;
 
-    @JsonProperty("issues_events")
-    private boolean _issueEvents;
+    	@JsonProperty("issues_events")
+    	private boolean _issueEvents;
 
-    @JsonProperty("merge_requests_events")
-    private boolean _mergeRequestsEvents;
+    	@JsonProperty("merge_requests_events")
+    	private boolean _mergeRequestsEvents;
 
-    @JsonProperty("created_at")
+	@JsonProperty("created_at")
     private Date _createdAt;
-
-    public Integer getId() {
+	
+	
+	public String getId() {
         return _id;
     }
 
-    public void setId(Integer id) {
+    public void setId(String id) {
         _id = id;
     }
 
-    public String getUrl() {
-        return _url;
-    }
+	public String getUrl() {
+		return _url;
+	}
 
-    public void setUrl(String url) {
-        _url = url;
-    }
+	public void setUrl(String url) {
+		this._url = url;
+	}
+    
+	public Integer getProjectId() {
+        	return _projectId;
+    	}
 
-    public Integer getProjectId() {
-        return _projectId;
-    }
+    	public void setProjectId(Integer projectId) {
+        	_projectId = projectId;
+    	}
 
-    public void setProjectId(Integer projectId) {
-        _projectId = projectId;
-    }
+    	public boolean getPushEvents() {
+        	return _pushEvents;
+    	}
 
-    public boolean getPushEvents() {
-        return _pushEvents;
-    }
+    	public void setPushEvents(boolean pushEvents) {
+        	_pushEvents = pushEvents;
+    	}
 
-    public void setPushEvents(boolean pushEvents) {
-        _pushEvents = pushEvents;
-    }
+    	public boolean getIssueEvents() {
+        	return _issueEvents;
+    	}
 
-    public Date getCreatedAt() {
-        return _createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        _createdAt = createdAt;
-    }
+    	public void setIssueEvents(boolean issueEvents) {
+        	_issueEvents = issueEvents;
+    	}
 
-    public boolean getIssueEvents() {
-        return _issueEvents;
-    }
+    	public boolean isMergeRequestsEvents() {
+        	return _mergeRequestsEvents;
+    	}
 
-    public void setIssueEvents(boolean issueEvents) {
-        _issueEvents = issueEvents;
-    }
+    	public void setMergeRequestsEvents(boolean mergeRequestsEvents) {
+        	_mergeRequestsEvents = mergeRequestsEvents;
+    	}
 
-    public boolean isMergeRequestsEvents() {
-        return _mergeRequestsEvents;
+	public Date getCreatedAt() {
+        return _createdAt;
     }
 
-    public void setMergeRequestsEvents(boolean mergeRequestsEvents) {
-        _mergeRequestsEvents = mergeRequestsEvents;
+    public void setCreatedAt(Date createdAt) {
+        _createdAt = createdAt;
     }
 }
\ No newline at end of file