Merge pull request #8 from evanwong/feature/delete-update-rooms-api

Feature/delete update rooms api

Author: Evan Wong

README.md

@@ -53,7 +53,7 @@ NoContent noContent = future.get();
 - [x] Create room
 - [x] Get room
 - [ ] Update room
-- [ ] Delete room
+- [x] Delete room
 - [ ] View room history
 - [ ] Get room message
 - [ ] View recent room history

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

@@ -2,10 +2,7 @@
 
 import io.evanwong.oss.hipchat.v2.emoticons.GetAllEmoticonsRequestBuilder;
 import io.evanwong.oss.hipchat.v2.emoticons.GetEmoticonRequestBuilder;
-import io.evanwong.oss.hipchat.v2.rooms.CreateRoomRequestBuilder;
-import io.evanwong.oss.hipchat.v2.rooms.GetAllRoomsRequestBuilder;
-import io.evanwong.oss.hipchat.v2.rooms.GetRoomRequestBuilder;
-import io.evanwong.oss.hipchat.v2.rooms.SendRoomNotificationRequestBuilder;
+import io.evanwong.oss.hipchat.v2.rooms.*;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
@@ -102,6 +99,14 @@ public GetAllEmoticonsRequestBuilder prepareGetAllEmoticonsRequestBuilder(String
         return new GetAllEmoticonsRequestBuilder(accessToken, httpClient, executorService);
     }
 
+    public DeleteRoomRequestBuilder prepareDeleteRoomRequestBuilder(String roomIdOrName) {
+        return prepareDeleteRoomRequestBuilder(roomIdOrName, defaultAccessToken);
+    }
+
+    public DeleteRoomRequestBuilder prepareDeleteRoomRequestBuilder(String roomIdOrName, String accessToken) {
+        return new DeleteRoomRequestBuilder(roomIdOrName, accessToken, httpClient, executorService);
+    }
+
     public void close() {
         log.info("Shutting down...");
         try {

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

@@ -12,4 +12,12 @@ public Long getId() {
     public void setId(Long id) {
         this.id = id;
     }
+
+    public Links getLinks() {
+        return links;
+    }
+
+    public void setLinks(Links links) {
+        this.links = links;
+    }
 }

src/main/java/io/evanwong/oss/hipchat/v2/commons/DeleteRequest.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.HttpDelete;
+import org.apache.http.client.methods.HttpPost;
+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 DeleteRequest<T> extends Request<T> {
+
+    private static final Logger log = LoggerFactory.getLogger(DeleteRequest.class);
+
+    protected DeleteRequest(String accessToken, HttpClient httpClient, ExecutorService executorService) {
+        super(accessToken, httpClient, executorService);
+    }
+
+    @Override
+    protected HttpResponse request() throws IOException {
+        Map<String, Object> params = toQueryMap();
+        log.info("POST - path: {}, params: {}", getPath(), params);
+
+        HttpDelete httpDelete = new HttpDelete(BASE_URL + getPath());
+        httpDelete.addHeader(new BasicHeader("Authorization", "Bearer " + accessToken));
+        httpDelete.addHeader(new BasicHeader("Content-Type", "application/json"));
+        return httpClient.execute(httpDelete, HttpClientContext.create());
+    }
+}

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

@@ -32,8 +32,10 @@ protected HttpResponse request() throws IOException {
         }
         log.info("GET - path: {}, params: {}", getPath(), params);
         String query = params != null && params.size() > 0 ? "?" : "";
-        for (String key : params.keySet()) {
-            query += key + "=" + params.get(key) + "&";
+        if (params != null) {
+            for (String key : params.keySet()) {
+                query += key + "=" + params.get(key) + "&";
+            }
         }
 
         HttpGet httpGet = new HttpGet(BASE_URL + getPath() + query);

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

@@ -1,5 +1,8 @@
 package io.evanwong.oss.hipchat.v2.commons;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Links {
 
     private String self;

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

@@ -0,0 +1,32 @@
+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 DeleteRoomRequest extends DeleteRequest<NoContent> {
+
+    private final String roomIdOrName;
+
+    public DeleteRoomRequest(String roomIdOrName, String accessToken, HttpClient httpClient, ExecutorService executorService) {
+        super(accessToken, httpClient, executorService);
+        this.roomIdOrName = roomIdOrName;
+    }
+
+    public String getRoomIdOrName() {
+        return roomIdOrName;
+    }
+
+    @Override
+    protected Map<String, Object> toQueryMap() {
+        return null;
+    }
+
+    @Override
+    protected String getPath() {
+        return "/room/" + roomIdOrName;
+    }
+}

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

@@ -0,0 +1,21 @@
+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 DeleteRoomRequestBuilder extends RequestBuilder<DeleteRoomRequest> {
+
+    private final String roomIdOrName;
+
+    public DeleteRoomRequestBuilder(String roomIdOrName, String accessToken, HttpClient httpClient, ExecutorService executorService) {
+        super(accessToken, httpClient, executorService);
+        this.roomIdOrName = roomIdOrName;
+    }
+
+    @Override
+    public DeleteRoomRequest build() {
+        return new DeleteRoomRequest(roomIdOrName, accessToken, httpClient, executorService);
+    }
+}

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

@@ -22,6 +22,6 @@ protected Map<String, Object> toQueryMap() {
 
     @Override
     protected String getPath() {
-        return "/" + roomIdOrName;
+        return "/room/" + roomIdOrName;
     }
 }

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

@@ -1,9 +1,12 @@
 package io.evanwong.oss.hipchat.v2.rooms;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSetter;
 import io.evanwong.oss.hipchat.v2.commons.Links;
 
 import java.util.Date;
 
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Room {
     private String xmppJid;
     private Links statistics;
@@ -73,6 +76,13 @@ public void setPrivacy(Privacy privacy) {
         this.privacy = privacy;
     }
 
+    @JsonSetter("privacy")
+    public void setPrivacyStr(String privacyStr) {
+        if (privacyStr != null) {
+            this.privacy = Privacy.valueOf(privacyStr.toUpperCase());
+        }
+    }
+
     public Boolean getIsGuestAccessible() {
         return isGuestAccessible;
     }