merge upstream with master

.gitignore

 .DS_Store
 .idea/*
 *.iml
+build/
 target/*

build.gradle

+apply plugin: 'java'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'org.codehaus.jackson:jackson-core-asl:1.9.9'
+    compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.9'
+    compile 'commons-io:commons-io:1.4'
+    testCompile 'org.hamcrest:hamcrest-all:1.3'
+    testCompile 'junit:junit:4.11'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}
\ No newline at end of file

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.gitlab</groupId>
     <artifactId>java-gitlab-api</artifactId>
-    <version>1.1.4-SNAPSHOT</version>
+    <version>1.1.5-SNAPSHOT</version>
 
     <name>Gitlab Java API Wrapper</name>
     <description>A Java wrapper for the Gitlab Git Hosting Server API</description>
@@ -22,6 +22,13 @@
             <email>tim.olshansky@gmail.com</email>
         </developer>
     </developers>
+    <contributors>
+        <contributor>
+            <name>Adam Retter</name>
+            <email>adam.retter@googlemail.com</email>
+            <organization>Evolved Binary Ltd</organization>
+        </contributor>
+    </contributors>
 
     <licenses>
         <license>
@@ -81,6 +88,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.5.1</version>
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>

src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java

@@ -291,7 +291,7 @@ public class GitlabHTTPRequestor {
                 return null;
             }
         } catch (SSLHandshakeException e) {
-            throw new SSLHandshakeException("You can disable certificate checking by setting ignoreCertificateErrors on GitlabHTTPRequestor");
+            throw new SSLHandshakeException("You can disable certificate checking by setting ignoreCertificateErrors on GitlabHTTPRequestor. SSL Error: " + e.getMessage());
         } finally {
             IOUtils.closeQuietly(reader);
         }

src/main/java/org/gitlab/api/http/Query.java

+package org.gitlab.api.http;
+
+import org.gitlab.api.models.GitlabAccessLevel;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Models the Query
+ * aspect of a URL
+ */
+public class Query {
+
+    private class Tuple<T1, T2> {
+        T1 _1;
+        T2 _2;
+        public Tuple(T1 _1, T2 _2) {
+            this._1 = _1;
+            this._2 = _2;
+        }
+    }
+
+    /**
+     * The type of params is:
+     *  Tuple<name, Tuple<value, URLEncoder.encode(value, "UTF-8")>>
+     */
+    private final List<Tuple<String, Tuple<String, String>>> params = new ArrayList<Tuple<String, Tuple<String, String>>>();
+
+    /**
+     * Appends a parameter to the query
+     *
+     * @param name Parameter name
+     * @param value Parameter value
+     *
+     * @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
+     */
+    public Query append(final String name, final String value) throws UnsupportedEncodingException {
+        params.add(new Tuple(name, new Tuple(value, URLEncoder.encode(value, "UTF-8"))));
+        return this;
+    }
+
+    /**
+     * Conditionally append a parameter to the query
+     * if the value of the parameter is not null
+     *
+     * @param name Parameter name
+     * @param value Parameter value
+     *
+     * @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
+     */
+    public Query appendIf(final String name, final String value) throws UnsupportedEncodingException {
+        if(value != null) {
+            append(name, value);
+        }
+        return this;
+    }
+
+    /**
+     * Conditionally append a parameter to the query
+     * if the value of the parameter is not null
+     *
+     * @param name Parameter name
+     * @param value Parameter value
+     *
+     * @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
+     */
+    public Query appendIf(final String name, final Integer value) throws UnsupportedEncodingException {
+        if(value != null) {
+            append(name, value.toString());
+        }
+        return this;
+    }
+
+    /**
+     * Conditionally append a parameter to the query
+     * if the value of the parameter is not null
+     *
+     * @param name Parameter name
+     * @param value Parameter value
+     *
+     * @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
+     */
+    public Query appendIf(final String name, final Boolean value) throws UnsupportedEncodingException {
+        if(value != null) {
+            append(name, value.toString());
+        }
+        return this;
+    }
+
+    /**
+     * Conditionally append a parameter to the query
+     * if the value of the parameter is not null
+     *
+     * @param name Parameter name
+     * @param value Parameter value
+     *
+     * @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
+     */
+    public Query appendIf(final String name, final GitlabAccessLevel value) throws UnsupportedEncodingException {
+        if(value != null) {
+            append(name, Integer.toString(value.accessValue));
+        }
+        return this;
+    }
+
+    /**
+     * Returns a Query suitable for appending
+     * to a URI
+     */
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+
+        for(final Tuple<String, Tuple<String, String>> param : params) {
+            if(builder.length() == 0) {
+                builder.append('?');
+            } else {
+                builder.append('&');
+            }
+            builder.append(param._1);
+            builder.append('=');
+            builder.append(param._2._2);
+        }
+
+        return builder.toString();
+    }
+}

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

+package org.gitlab.api.models;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public abstract class GitlabAbstractMember extends GitlabUser {
+
+	public static final String URL = "/members";
+
+    @JsonProperty("access_level")
+	private int _accessLevel;
+
+	public GitlabAccessLevel getAccessLevel() {
+		return GitlabAccessLevel.fromAccessValue(_accessLevel);
+	}
+
+	public void setAccessLevel(GitlabAccessLevel accessLevel) {
+		_accessLevel = accessLevel.accessValue;
+	}
+
+}

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

+package org.gitlab.api.models;
+
+
+public enum GitlabAccessLevel {
+    Guest(10),
+    Reporter(20),
+    Developer(30),
+    Master(40),
+    Owner(50);
+
+    public final int accessValue;
+    GitlabAccessLevel(int accessValue) {
+        this.accessValue = accessValue;
+    }
+
+    public static GitlabAccessLevel fromAccessValue(final int accessValue) throws IllegalArgumentException {
+        for(final GitlabAccessLevel gitlabAccessLevel : GitlabAccessLevel.values()) {
+            if(gitlabAccessLevel.accessValue == accessValue) {
+                return gitlabAccessLevel;
+            }
+        }
+        throw new IllegalArgumentException("No GitLab Access Level enum constant with access value: " + accessValue);
+    }
+}
\ No newline at end of file

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

+package org.gitlab.api.models;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class GitlabGroup {
+
+    public static final String URL = "/groups";
+
+    private Integer _id;
+    private String _name;
+    private String _path;
+
+    @JsonProperty("ldap_cn")
+    private String _ldapCn;
+
+    @JsonProperty("ldap_access")
+    private Integer _ldapAccess;
+
+    public Integer getId() {
+        return _id;
+    }
+
+    public void setId(Integer id) {
+        _id = id;
+    }
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    public String getPath() {
+        return _path;
+    }
+
+    public void setPath(String path) {
+        _path = path;
+    }
+
+    public String getLdapCn() {
+        return _ldapCn;
+    }
+
+    public void setLdapCn(String ldapCn) {
+        this._ldapCn = ldapCn;
+    }
+
+    public GitlabAccessLevel getLdapAccess() {
+        return GitlabAccessLevel.fromAccessValue(_ldapAccess);
+    }
+
+    public void setLdapAccess(GitlabAccessLevel ldapGitlabAccessLevel) {
+        this._ldapAccess = ldapGitlabAccessLevel.accessValue;
+    }
+}

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

+package org.gitlab.api.models;
+
+public class GitlabGroupMember extends GitlabAbstractMember {
+}

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

@@ -9,6 +9,7 @@ public class GitlabMergeRequest {
     private Integer _iid;
     private String _title;
     private String _state;
+    private String _description;
     private boolean _closed;
     private boolean _merged;
     private GitlabUser _author;
@@ -26,6 +27,10 @@ public class GitlabMergeRequest {
     @JsonProperty("source_project_id")
     private Integer _sourceProjectId;
 
+    @JsonProperty("milestone_id")
+    private Integer _milestone_id;
+
+
     public Integer getId() {
         return _id;
     }
@@ -34,6 +39,9 @@ public class GitlabMergeRequest {
         _id = id;
     }
 
+    public Integer getMilestoneId(){ return _milestone_id; }
+    public void setMilestoneId(Integer id) { _milestone_id = id; }
+
     public Integer getIid() {
         return _iid;
     }
@@ -82,6 +90,10 @@ public class GitlabMergeRequest {
         _title = title;
     }
 
+    public String getDescription() { return _description; }
+
+    public void setDescription(String d) { _description = d; }
+
     public boolean isClosed() {
         return _closed;
     }

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

@@ -9,6 +9,10 @@ public class GitlabProject {
 
     private Integer _id;
     private String _name;
+
+    @JsonProperty("name_with_namespace")
+    private String _nameWithNamespace;
+
     private String _description;
 
     @JsonProperty("default_branch")
@@ -18,6 +22,9 @@ public class GitlabProject {
     private boolean _public;
     private String _path;
 
+    @JsonProperty("visibility_level")
+    private Integer _visibilityLevel;
+
     @JsonProperty("path_with_namespace")
     private String _pathWithNamespace;
 
@@ -27,6 +34,9 @@ public class GitlabProject {
     @JsonProperty("merge_requests_enabled")
     private boolean _mergeRequestsEnabled;
 
+    @JsonProperty("snippets_enabled")
+    private boolean _snippetsEnabled;
+
     @JsonProperty("wall_enabled")
     private boolean _wallEnabled;
 
@@ -60,6 +70,14 @@ public class GitlabProject {
         _name = name;
     }
 
+    public String getNameWithNamespace() {
+        return _nameWithNamespace;
+    }
+
+    public void setNameWithNamespace(String nameWithNamespace) {
+        this._nameWithNamespace = nameWithNamespace;
+    }
+
     public String getDescription() {
         return _description;
     }
@@ -76,6 +94,14 @@ public class GitlabProject {
         _defaultBranch = defaultBranch;
     }
 
+    public Integer getVisibilityLevel() {
+        return _visibilityLevel;
+    }
+
+    public void setVisibilityLevel(Integer visibilityLevel) {
+        this._visibilityLevel = visibilityLevel;
+    }
+
     public GitlabUser getOwner() {
         return _owner;
     }
@@ -116,6 +142,14 @@ public class GitlabProject {
         _mergeRequestsEnabled = mergeRequestsEnabled;
     }
 
+    public boolean isSnippetsEnabled() {
+        return _snippetsEnabled;
+    }
+
+    public void setSnippetsEnabled(boolean snippetsEnabled) {
+        this._snippetsEnabled = snippetsEnabled;
+    }
+
     public boolean isWallEnabled() {
         return _wallEnabled;
     }

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

 package org.gitlab.api.models;
 
-public class GitlabProjectMember extends GitlabUser {
-
-	public static final String URL = "/members";
-	
-	private int _accessLevel;
-
-	public int getAccessLevel() {
-		return _accessLevel;
-	}
-
-	public void setAccessLevel(int accessLevel) {
-		_accessLevel = accessLevel;
-	}
-	
+public class GitlabProjectMember extends GitlabAbstractMember {
 }

src/test/java/org/gitlab/api/http/QueryTest.java

+package org.gitlab.api.http;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+import java.io.UnsupportedEncodingException;
+
+public class QueryTest {
+
+    @Test
+    public void mutableStyle_append() throws UnsupportedEncodingException {
+        Query query = new Query();
+
+        query.append("p1", "v1");
+        query.append("p2", "v2");
+
+        assertEquals("?p1=v1&p2=v2", query.toString());
+    }
+
+    @Test
+    public void fluentStyle_append() throws UnsupportedEncodingException {
+        Query query = new Query()
+            .append("p1", "v1")
+            .append("p2", "v2");
+
+        assertEquals("?p1=v1&p2=v2", query.toString());
+    }
+
+    @Test
+    public void mixedStyle_append() throws UnsupportedEncodingException {
+        Query query = new Query()
+                .append("p1", "v1");
+
+
+        query.append("p2", "v2");
+
+        query = query.append("p3", "v3");
+
+        assertEquals("?p1=v1&p2=v2&p3=v3", query.toString());
+    }
+
+    @Test
+    public void conditionalAppend_notNull() throws UnsupportedEncodingException {
+        Query query = new Query()
+          .appendIf("p1", "v1")
+          .appendIf("p2", "v2");
+
+        assertEquals("?p1=v1&p2=v2", query.toString());
+    }
+
+    @Test
+    public void conditionalAppend_null() throws UnsupportedEncodingException {
+        Query query = new Query()
+            .appendIf("p1", (String) null);
+
+        assertEquals("", query.toString());
+    }
+
+    @Test
+    public void conditionalAppend_null_notNull() throws UnsupportedEncodingException {
+        Query query = new Query()
+                .appendIf("p1", (String)null)
+                .appendIf("p2", "v2");
+
+        assertEquals("?p2=v2", query.toString());
+    }
+
+    @Test
+    public void append_encodes_values() throws UnsupportedEncodingException {
+        Query query = new Query()
+            .append("p1", "v 1")
+            .append("p2", "v 2");
+
+        assertEquals("?p1=v+1&p2=v+2", query.toString());
+    }
+}