Merge pull request #27 from Gitteroid/feature/remove-channels-api

Remove channels api.
Gitteroid · Sep 30, 2016 · 5891f7e · 5891f7e
2 parents 987f5b1 + a522d82
commit 5891f7e
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 52 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -10,3 +10,7 @@
 - Add `avatarUrl`
 - Add `role`
 - Add `staff`
+
+**Rx,Async,Sync:**
+- Add `delete` room API
+- Remove channels API
diff --git a/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java b/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java
@@ -42,9 +42,6 @@ public interface AsyncGitterApi {
   @GET("/user/{userId}/repos")
   void getUserRepos(@Path("userId") String userId, Callback<List<RepoResponse>> callback);
 
-  @GET("/user/{userId}/channels")
-  void getUserChannels(@Path("userId") String userId, Callback<List<RoomResponse>> callback);
-
   @GET("/user")
   void searchUsers(
       @Query("type") UserAccountType type,
@@ -62,9 +59,6 @@ void searchUsers(
   @GET("/user/{userId}/rooms")
   void getUserRooms(@Path("userId") String userId, Callback<List<RoomResponse>> callback);
 
-  @GET("/rooms/{roomId}/channels")
-  void getRoomChannels(@Path("roomId") String roomId, Callback<List<RoomResponse>> callback);
-
   @POST("/rooms")
   @FormUrlEncoded
   void joinRoom(@Field("uri") String roomUri, Callback<RoomResponse> callback);

diff --git a/...ary/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java b/...ary/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java
@@ -54,10 +54,6 @@ public void getUserRepos(String userId, Callback<List<RepoResponse>> callback) {
     api.getUserRepos(userId, callback);
   }
 
-  public void getUserChannels(String userId, Callback<List<RoomResponse>> callback) {
-    api.getUserChannels(userId, callback);
-  }
-
   public void searchUsers(UserAccountType type, String searchTerm, final Callback<List<UserResponse>> callback) {
     api.searchUsers(type, searchTerm, new Callback<SearchUsersResponse>() {
       @Override
@@ -95,10 +91,6 @@ public void getCurrentUserRooms(Callback<List<RoomResponse>> callback) {
     api.getCurrentUserRooms(callback);
   }
 
-  public void getRoomChannels(String roomId, Callback<List<RoomResponse>> callback) {
-    api.getRoomChannels(roomId, callback);
-  }
-
   public void joinRoom(String roomUri, Callback<RoomResponse> callback) {
     api.joinRoom(roomUri, callback);
   }

diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java
@@ -39,9 +39,6 @@ public interface RxGitterApi {
   @GET("/user/{userId}/repos")
   Observable<List<RepoResponse>> getUserRepos(@Path("userId") String userId);
 
-  @GET("/user/{userId}/channels")
-  Observable<List<RoomResponse>> getUserChannels(@Path("userId") String userId);
-
   @GET("/user")
   Observable<SearchUsersResponse> searchUsers(@Query("type") UserAccountType type, @Query("q") String searchTerm);
 
@@ -58,9 +55,6 @@ public interface RxGitterApi {
   @GET("/rooms/{roomId}/users")
   Observable<List<UserResponse>> getRoomUsers(@Path("roomId") String roomId);
 
-  @GET("/rooms/{roomId}/channels")
-  Observable<List<RoomResponse>> getRoomChannels(@Path("roomId") String roomId);
-
   @POST("/rooms")
   @FormUrlEncoded
   Observable<RoomResponse> joinRoom(@Field("uri") String roomUri);

diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java
@@ -49,10 +49,6 @@ public Observable<List<RepoResponse>> getUserRepos(String userId) {
     return api.getUserRepos(userId);
   }
 
-  public Observable<List<RoomResponse>> getUserChannels(String userId) {
-    return api.getUserChannels(userId);
-  }
-
   public Observable<List<UserResponse>> searchUsers(UserAccountType type, String searchTerm) {
     return api.searchUsers(type, searchTerm).map(new Func1<SearchUsersResponse, List<UserResponse>>() {
       @Override
@@ -84,10 +80,6 @@ public Observable<List<UserResponse>> getRoomUsers(String roomId) {
     return api.getRoomUsers(roomId);
   }
 
-  public Observable<List<RoomResponse>> getRoomChannels(String roomId) {
-    return api.getRoomChannels(roomId);
-  }
-
   public Observable<RoomResponse> joinRoom(String roomUri) {
     return api.joinRoom(roomUri);
   }

diff --git a/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java b/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java
@@ -41,12 +41,6 @@ public interface SyncGitterApi {
   @GET("/user/{userId}/repos")
   List<RepoResponse> getUserRepos(@Path("userId") String userId);
 
-  @GET("/user/{userId}/channels")
-  List<RoomResponse> getUserChannels(@Path("userId") String userId);
-
-  @GET("/rooms/{roomId}/channels")
-  List<RoomResponse> getRoomChannels(@Path("roomId") String roomId);
-
   @GET("/user")
   SearchUsersResponse searchUsers(@Query("type") UserAccountType type,  @Query("q") String searchTerm);
 

diff --git a/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/client/SyncGitterApiClient.java b/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/client/SyncGitterApiClient.java
@@ -47,10 +47,6 @@ public List<RepoResponse> getUserRepos(String userId) {
     return api.getUserRepos(userId);
   }
 
-  public List<RoomResponse> getUserChannels(String userId) {
-    return api.getUserChannels(userId);
-  }
-
   public List<UserResponse> searchUsers(UserAccountType type, String searchTerm) {
     SearchUsersResponse response = api.searchUsers(type, searchTerm);
     return response.results;
@@ -74,10 +70,6 @@ public List<UserResponse> getRoomUsers(String roomId) {
     return api.getRoomUsers(roomId);
   }
 
-  public List<RoomResponse> getRoomChannels(String roomId) {
-    return api.getRoomChannels(roomId);
-  }
-
   public RoomResponse joinRoom(String roomUri) {
     return api.joinRoom(roomUri);
   }

diff --git a/samples/src/main/java/com/amatkivskiy/gitter/sdk/samples/RxSamples.java b/samples/src/main/java/com/amatkivskiy/gitter/sdk/samples/RxSamples.java
@@ -37,16 +37,28 @@ public static void main(String[] args) {
 //    This is required only for authentication.
     GitterDeveloperCredentials.init(new SimpleGitterCredentialsProvider(OAUTH_KEY, OAUTH_SECRET, REDIRECT_URL));
 
-    getAccessTokenSample();
-    getUserSample();
-    getRoomChatMessages();
-    roomMessagesStreamSample();
-    leaveRoomSample();
-    searchRoomsSample();
-    searchUsersSample();
-    markMessagesRead();
-    getSuggestedRooms();
-    roomEventsStreamSample();
+//    getAccessTokenSample();
+//    getUserSample();
+//    getRoomChatMessages();
+//    roomMessagesStreamSample();
+//    leaveRoomSample();
+//    searchRoomsSample();
+//    searchUsersSample();
+//    markMessagesRead();
+//    getSuggestedRooms();
+//    roomEventsStreamSample();
+    testMethod();
+  }
+
+  private static void testMethod() {
+    RxGitterApiClient client = new RxGitterApiClient.Builder()
+        .withAccountToken("c2fc54dc5bc835317b7b29f389383611d8940987")
+        .build();
+
+    BooleanResponse result = client.deleteRooom("57edcee740f3a6eec068229e").toBlocking().first();
+    System.out.println(String.format("success : %s", result.success));
+
+    System.exit(0);
   }
 
   private static void roomEventsStreamSample() {