Merge branch 'release/0.3.0'

* release/0.3.0:
  Bumped version to 0.3. Updated markdown.
  Checked if the ossrhUsername and ossrhPassword exist before apply sonatype.gradle.
  #16 Moved sfl4j simple logger to testRuntime.
  Added add room member unit test.
  Added client method for add room member.
  Added add room member request and builder.
  Added put request.
  Added a simple test for RemoveRoomMember.
  Added client methods for RemoveRoomMember.
  Added RemoveRoomMember request and request builder.
  Bumped version to 0.2.0.

Conflicts:
	README.md
	build.gradle

Author: Evan Wong

README.md

@@ -16,12 +16,12 @@ To add this client into your project:
 <dependency>
     <groupId>io.evanwong.oss</groupId>
     <artifactId>hipchat-java</artifactId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
 </dependency>
 ```
 * gradle
 ```gradle
-compile 'io.evanwong.oss:hipchat-java:0.2.0'
+compile 'io.evanwong.oss:hipchat-java:0.3.0'
 ```
 
 To send a notification
@@ -58,8 +58,8 @@ NoContent noContent = future.get();
 - [ ] Get room message
 - [ ] View recent room history
 - [ ] Invite user
-- [ ] Add member
-- [ ] Remove member
+- [x] Add member
+- [x] Remove member
 - [ ] Get all members
 - [ ] Send room notification redirect
 - [x] Send room notification

build.gradle

@@ -10,15 +10,15 @@ repositories {
 sourceCompatibility = 1.8
 
 group = 'io.evanwong.oss'
-version = "0.2.0"
+version = "0.3.0"
 
 dependencies {
     compile 'org.apache.httpcomponents:httpclient:4.3.5'
     compile 'org.slf4j:slf4j-api:1.7.7'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.4.2'
     testCompile "org.codehaus.groovy:groovy-all:2.3.7"
     testCompile "org.spockframework:spock-core:1.0-groovy-2.3-SNAPSHOT"
-    runtime 'org.slf4j:slf4j-simple:1.7.7'
+    testRuntime 'org.slf4j:slf4j-simple:1.7.7'
 }
 
 test {
@@ -39,7 +39,9 @@ artifacts {
     archives javadocJar, sourcesJar
 }
 
-apply from: 'sonatype.gradle'
+if (hasProperty('ossrhUsername') && hasProperty('ossrhPassword')) {
+    apply from: 'sonatype.gradle'
+}
 
 task wrapper(type: Wrapper) {
     gradleVersion = '2.2.1'

src/main/java/io/evanwong/oss/hipchat/v2/HipChatClient.java

@@ -107,6 +107,22 @@ public DeleteRoomRequestBuilder prepareDeleteRoomRequestBuilder(String roomIdOrN
         return new DeleteRoomRequestBuilder(roomIdOrName, accessToken, httpClient, executorService);
     }
 
+    public RemoveRoomMemberRequestBuilder prepareRemoveRoomMemberRequestBuilder(String userIdOrEmail, String roomIdOrName) {
+        return prepareRemoveRoomMemberRequestBuilder(userIdOrEmail, roomIdOrName, defaultAccessToken);
+    }
+
+    public RemoveRoomMemberRequestBuilder prepareRemoveRoomMemberRequestBuilder(String userIdOrEmail, String roomIdOrName, String accessToken) {
+        return new RemoveRoomMemberRequestBuilder(userIdOrEmail, roomIdOrName, accessToken, httpClient, executorService);
+    }
+
+    public AddRoomMemberRequestBuilder prepareAddRoomMemberRequestBuilder(String userIdOrEmail, String roomIdOrName) {
+        return prepareAddRoomMemberRequestBuilder(userIdOrEmail, roomIdOrName, defaultAccessToken);
+    }
+
+    public AddRoomMemberRequestBuilder prepareAddRoomMemberRequestBuilder(String userIdOrEmail, String roomIdOrName, String accessToken) {
+        return new AddRoomMemberRequestBuilder(userIdOrEmail, roomIdOrName, accessToken, httpClient, executorService);
+    }
+
     public void close() {
         log.info("Shutting down...");
         try {

src/main/java/io/evanwong/oss/hipchat/v2/commons/PutRequest.java

@@ -0,0 +1,35 @@
+package io.evanwong.oss.hipchat.v2.commons;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.message.BasicHeader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+public abstract class PutRequest<T> extends Request<T> {
+
+    private static final Logger log = LoggerFactory.getLogger(PutRequest.class);
+
+    protected PutRequest(String accessToken, HttpClient httpClient, ExecutorService executorService) {
+        super(accessToken, httpClient, executorService);
+    }
+
+    @Override
+    protected HttpResponse request() throws IOException {
+        Map<String, Object> params = toQueryMap();
+        log.info("PUT - path: {}, params: {}", getPath(), params);
+
+        HttpPut httpPut = new HttpPut(BASE_URL + getPath());
+        httpPut.addHeader(new BasicHeader("Authorization", "Bearer " + accessToken));
+        httpPut.addHeader(new BasicHeader("Content-Type", "application/json"));
+        httpPut.setEntity(new StringEntity(objectWriter.writeValueAsString(params)));
+        return httpClient.execute(httpPut, HttpClientContext.create());
+    }
+}

src/main/java/io/evanwong/oss/hipchat/v2/rooms/AddRoomMemberRequest.java

@@ -0,0 +1,38 @@
+package io.evanwong.oss.hipchat.v2.rooms;
+
+import io.evanwong.oss.hipchat.v2.commons.DeleteRequest;
+import io.evanwong.oss.hipchat.v2.commons.NoContent;
+import org.apache.http.client.HttpClient;
+
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+public class AddRoomMemberRequest extends DeleteRequest<NoContent> {
+
+    private final String roomIdOrName;
+    private final String userIdOrEmail;
+
+    public AddRoomMemberRequest(String userIdOrEmail, String roomIdOrName, String accessToken, HttpClient httpClient, ExecutorService executorService) {
+        super(accessToken, httpClient, executorService);
+        this.roomIdOrName = roomIdOrName;
+        this.userIdOrEmail = userIdOrEmail;
+    }
+
+    public String getRoomIdOrName() {
+        return roomIdOrName;
+    }
+
+    public String getUserIdOrEmail() {
+        return userIdOrEmail;
+    }
+
+    @Override
+    protected Map<String, Object> toQueryMap() {
+        return null;
+    }
+
+    @Override
+    protected String getPath() {
+        return "/room/" + roomIdOrName + "/member/" + userIdOrEmail;
+    }
+}

src/main/java/io/evanwong/oss/hipchat/v2/rooms/AddRoomMemberRequestBuilder.java

@@ -0,0 +1,24 @@
+package io.evanwong.oss.hipchat.v2.rooms;
+
+import io.evanwong.oss.hipchat.v2.commons.RequestBuilder;
+import org.apache.http.client.HttpClient;
+
+import java.util.concurrent.ExecutorService;
+
+public class AddRoomMemberRequestBuilder extends RequestBuilder<AddRoomMemberRequest> {
+
+    private final String roomIdOrName;
+    private final String userIdOrEmail;
+
+    public AddRoomMemberRequestBuilder(String userIdOrEmail, String roomIdOrName, String accessToken, HttpClient httpClient, ExecutorService executorService) {
+        super(accessToken, httpClient, executorService);
+        this.roomIdOrName = roomIdOrName;
+        this.userIdOrEmail = userIdOrEmail;
+    }
+
+    @Override
+    public AddRoomMemberRequest build() {
+        return new AddRoomMemberRequest(userIdOrEmail, roomIdOrName, accessToken, httpClient, executorService);
+    }
+
+}

src/main/java/io/evanwong/oss/hipchat/v2/rooms/RemoveRoomMemberRequest.java

@@ -0,0 +1,38 @@
+package io.evanwong.oss.hipchat.v2.rooms;
+
+import io.evanwong.oss.hipchat.v2.commons.DeleteRequest;
+import io.evanwong.oss.hipchat.v2.commons.NoContent;
+import org.apache.http.client.HttpClient;
+
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+public class RemoveRoomMemberRequest extends DeleteRequest<NoContent> {
+
+    private final String roomIdOrName;
+    private final String userIdOrEmail;
+
+    public RemoveRoomMemberRequest(String userIdOrEmail, String roomIdOrName, String accessToken, HttpClient httpClient, ExecutorService executorService) {
+        super(accessToken, httpClient, executorService);
+        this.roomIdOrName = roomIdOrName;
+        this.userIdOrEmail = userIdOrEmail;
+    }
+
+    public String getRoomIdOrName() {
+        return roomIdOrName;
+    }
+
+    public String getUserIdOrEmail() {
+        return userIdOrEmail;
+    }
+
+    @Override
+    protected Map<String, Object> toQueryMap() {
+        return null;
+    }
+
+    @Override
+    protected String getPath() {
+        return "/room/" + roomIdOrName + "/member/" + userIdOrEmail;
+    }
+}

src/main/java/io/evanwong/oss/hipchat/v2/rooms/RemoveRoomMemberRequestBuilder.java

@@ -0,0 +1,24 @@
+package io.evanwong.oss.hipchat.v2.rooms;
+
+import io.evanwong.oss.hipchat.v2.commons.RequestBuilder;
+import org.apache.http.client.HttpClient;
+
+import java.util.concurrent.ExecutorService;
+
+public class RemoveRoomMemberRequestBuilder extends RequestBuilder<RemoveRoomMemberRequest> {
+
+    private final String roomIdOrName;
+    private final String userIdOrEmail;
+
+    public RemoveRoomMemberRequestBuilder(String userIdOrEmail, String roomIdOrName, String accessToken, HttpClient httpClient, ExecutorService executorService) {
+        super(accessToken, httpClient, executorService);
+        this.roomIdOrName = roomIdOrName;
+        this.userIdOrEmail = userIdOrEmail;
+    }
+
+    @Override
+    public RemoveRoomMemberRequest build() {
+        return new RemoveRoomMemberRequest(userIdOrEmail, roomIdOrName, accessToken, httpClient, executorService);
+    }
+
+}

src/test/groovy/io/evanwong/oss/hipchat/v2/HipChatClientSpec.groovy

@@ -164,4 +164,26 @@ class HipChatClientSpec extends Specification {
         expect:
         builder.build().roomIdOrName == roomIdOrName
     }
+
+    def "prepareRemoveRoomMemberRequestBuilder should create a RemoveRoomMemberRequest properly"() {
+        setup:
+        def roomIdOrName = "testdelete"
+        def userIdOrEmail = "testdeletemail"
+        def builder = client.prepareRemoveRoomMemberRequestBuilder(userIdOrEmail, roomIdOrName)
+
+        expect:
+        builder.build().roomIdOrName == roomIdOrName
+        builder.build().userIdOrEmail == userIdOrEmail
+    }
+
+    def "prepareAddRoomMemberRequestBuilder should create a AddRoomMemberRequest properly"() {
+        setup:
+        def roomIdOrName = "testadd"
+        def userIdOrEmail = "testaddemail"
+        def builder = client.prepareAddRoomMemberRequestBuilder(userIdOrEmail, roomIdOrName)
+
+        expect:
+        builder.build().roomIdOrName == roomIdOrName
+        builder.build().userIdOrEmail == userIdOrEmail
+    }
 }