CLDIDE-2433 Moved subscription API to hosted-infrastructure project

codenvy-legacy · Jun 12, 2015 · b6a515b · b6a515b
1 parent a93e65c
commit b6a515b
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 2,786 deletions.
diff --git a/...wt-account/src/main/java/org/eclipse/che/api/account/gwt/client/AccountServiceClient.java b/...wt-account/src/main/java/org/eclipse/che/api/account/gwt/client/AccountServiceClient.java
@@ -12,7 +12,6 @@
 
 import org.eclipse.che.api.account.shared.dto.AccountDescriptor;
 import org.eclipse.che.api.account.shared.dto.MemberDescriptor;
-import org.eclipse.che.api.account.shared.dto.SubscriptionDescriptor;
 import org.eclipse.che.api.account.shared.dto.UpdateResourcesDescriptor;
 import org.eclipse.che.ide.collections.Array;
 import org.eclipse.che.ide.rest.AsyncRequestCallback;
@@ -44,30 +43,6 @@ public interface AccountServiceClient {
      */
     void getMemberships(AsyncRequestCallback<Array<MemberDescriptor>> callback);
 
-    /**
-     * Get subscriptions of specified account.
-     *
-     * @param accountId
-     *         id of account
-     * @param callback
-     *         the callback to use for the response
-     */
-    void getSubscriptions(@Nonnull String accountId, AsyncRequestCallback<Array<SubscriptionDescriptor>> callback);
-
-    /**
-     * Get subscription with specified id of specified account.
-     *
-     * @param accountId
-     *         id of account
-     * @param serviceId
-     *         id of service
-     * @param callback
-     *         the callback to use for the response
-     */
-    void getSubscriptionByServiceId(@Nonnull String accountId,
-                                    @Nonnull String serviceId,
-                                    AsyncRequestCallback<Array<SubscriptionDescriptor>> callback);
-
     void redistributeResources(@Nonnull String accountId,
                                @Nonnull Array<UpdateResourcesDescriptor> updateResources,
                                AsyncRequestCallback<Void> callback);

diff --git a/...ccount/src/main/java/org/eclipse/che/api/account/gwt/client/AccountServiceClientImpl.java b/...ccount/src/main/java/org/eclipse/che/api/account/gwt/client/AccountServiceClientImpl.java
@@ -10,21 +10,19 @@
  *******************************************************************************/
 package org.eclipse.che.api.account.gwt.client;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
 import org.eclipse.che.api.account.shared.dto.AccountDescriptor;
 import org.eclipse.che.api.account.shared.dto.MemberDescriptor;
-import org.eclipse.che.api.account.shared.dto.SubscriptionDescriptor;
 import org.eclipse.che.api.account.shared.dto.UpdateResourcesDescriptor;
 import org.eclipse.che.ide.MimeType;
 import org.eclipse.che.ide.collections.Array;
 import org.eclipse.che.ide.rest.AsyncRequestCallback;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
 import org.eclipse.che.ide.rest.HTTPHeader;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
 
 import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Implementation of {@link AccountServiceClient} service.
@@ -40,31 +38,13 @@ public AccountServiceClientImpl(AsyncRequestFactory asyncRequestFactory) {
         this.asyncRequestFactory = asyncRequestFactory;
     }
 
-    /** {@inheritDoc} */
     @Override
-    public void getSubscriptions(@Nonnull String accountId, AsyncRequestCallback<Array<SubscriptionDescriptor>> callback) {
-        final String requestUrl = "/api/account/" + accountId + "/subscriptions";
-        asyncRequestFactory.createGetRequest(requestUrl)
-                           .header(HTTPHeader.ACCEPT, MimeType.APPLICATION_JSON)
-                           .send(callback);
-    }
-
-    @Override
-    public void getSubscriptionByServiceId(@Nonnull String accountId,
-                                           @Nonnull String serviceId,
-                                           AsyncRequestCallback<Array<SubscriptionDescriptor>> callback) {
-        final String requestUrl = "/api/account/" + accountId + "/subscriptions?service=" + serviceId;
-        asyncRequestFactory.createGetRequest(requestUrl)
-                           .header(HTTPHeader.ACCEPT, MimeType.APPLICATION_JSON)
-                           .send(callback);
-    }
-
-    @Override
-    public void redistributeResources(@Nonnull String accountId, @Nonnull Array<UpdateResourcesDescriptor> updateResources, AsyncRequestCallback<Void> callback) {
+    public void redistributeResources(@Nonnull String accountId, @Nonnull Array<UpdateResourcesDescriptor> updateResources,
+                                      AsyncRequestCallback<Void> callback) {
         final String requestUrl = "/api/account/" + accountId + "/resources";
         asyncRequestFactory.createPostRequest(requestUrl, updateResources)
-                .header(HTTPHeader.CONTENT_TYPE, MimeType.APPLICATION_JSON)
-                .send(callback);
+                           .header(HTTPHeader.CONTENT_TYPE, MimeType.APPLICATION_JSON)
+                           .send(callback);
     }
 
     /** {@inheritDoc} */