JCLOUDS-40 Replaced incorrect use of @ConfiguresRestClient and delete…

…d old rest client modules.
arr-ee · Oct 5, 2014 · 1b2cee0 · 1b2cee0
1 parent d190040
commit 1b2cee0
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 214 deletions.
diff --git a/...elasticstack/src/main/java/org/jclouds/elasticstack/config/ElasticStackHttpApiModule.java b/...elasticstack/src/main/java/org/jclouds/elasticstack/config/ElasticStackHttpApiModule.java
@@ -40,7 +40,7 @@
 import org.jclouds.http.annotation.ClientError;
 import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
-import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.rest.ConfiguresHttpApi;
 import org.jclouds.rest.config.HttpApiModule;
 
 import com.google.common.base.Function;
@@ -49,7 +49,7 @@
 /**
  * Configures the elasticstack connection.
  */
-@ConfiguresRestClient
+@ConfiguresHttpApi
 public class ElasticStackHttpApiModule extends HttpApiModule<ElasticStackApi> {
 
    @Override

diff --git a/...penstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaHttpApiModule.java b/...penstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/config/NovaHttpApiModule.java
@@ -32,7 +32,7 @@
 import org.jclouds.openstack.nova.v2_0.handlers.NovaErrorHandler;
 import org.jclouds.openstack.v2_0.domain.Extension;
 import org.jclouds.openstack.v2_0.functions.PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet;
-import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.rest.ConfiguresHttpApi;
 import org.jclouds.rest.config.HttpApiModule;
 import org.jclouds.rest.functions.ImplicitOptionalConverter;
 
@@ -47,7 +47,7 @@
  * Configures the Nova connection.
  *
  */
-@ConfiguresRestClient
+@ConfiguresHttpApi
 public class NovaHttpApiModule extends HttpApiModule<NovaApi> {
 
    public NovaHttpApiModule() {

diff --git a/apis/sts/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java b/apis/sts/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java
diff --git a/apis/sts/src/main/java/org/jclouds/aws/config/FormSigningRestClientModule.java b/apis/sts/src/main/java/org/jclouds/aws/config/FormSigningRestClientModule.java
diff --git a/apis/sts/src/main/java/org/jclouds/aws/config/WithZonesFormSigningRestClientModule.java b/apis/sts/src/main/java/org/jclouds/aws/config/WithZonesFormSigningRestClientModule.java
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSHttpApiModule.java b/providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSHttpApiModule.java
@@ -26,15 +26,15 @@
 import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
 import org.jclouds.location.suppliers.ImplicitLocationSupplier;
 import org.jclouds.location.suppliers.implicit.OnlyLocationOrFirstZone;
-import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.rest.ConfiguresHttpApi;
 import org.jclouds.rest.config.HttpApiModule;
 
 import com.google.inject.Scopes;
 
 /**
  * Configures the GleSYS connection.
  */
-@ConfiguresRestClient
+@ConfiguresHttpApi
 public class GleSYSHttpApiModule extends HttpApiModule<GleSYSApi> {
 
    @Override

diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/config/GoGridHttpApiModule.java
@@ -31,7 +31,7 @@
 import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
 import org.jclouds.location.suppliers.ImplicitLocationSupplier;
-import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.rest.ConfiguresHttpApi;
 import org.jclouds.rest.config.HttpApiModule;
 
 import com.google.common.base.Supplier;
@@ -42,7 +42,7 @@
 /**
  * Configures the GoGrid connection.
  */
-@ConfiguresRestClient
+@ConfiguresHttpApi
 public class GoGridHttpApiModule extends HttpApiModule<GoGridApi> {
 
    @Provides

diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridApiTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridApiTest.java
@@ -24,7 +24,7 @@
 import org.jclouds.gogrid.filters.SharedKeyLiteAuthentication;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.rest.ConfiguresHttpApi;
 import org.jclouds.rest.internal.BaseAsyncClientTest;
 import org.testng.annotations.Test;
 
@@ -39,7 +39,7 @@ protected void checkFilters(HttpRequest request) {
       assertEquals(request.getFilters().get(0).getClass(), SharedKeyLiteAuthentication.class);
    }
 
-      @ConfiguresRestClient
+      @ConfiguresHttpApi
    protected static final class TestGoGridHttpApiModule extends GoGridHttpApiModule {
       @Override
       protected void configure() {

diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridHttpApiExpectTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/BaseGoGridHttpApiExpectTest.java
@@ -19,7 +19,7 @@
 import org.jclouds.date.TimeStamp;
 import org.jclouds.gogrid.GoGridApi;
 import org.jclouds.gogrid.config.GoGridHttpApiModule;
-import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.rest.ConfiguresHttpApi;
 import org.jclouds.rest.internal.BaseRestClientExpectTest;
 
 import com.google.common.base.Supplier;
@@ -31,7 +31,7 @@ public BaseGoGridHttpApiExpectTest() {
       provider = "gogrid";
    }
 
-      @ConfiguresRestClient
+      @ConfiguresHttpApi
    protected static final class TestGoGridHttpApiModule extends GoGridHttpApiModule {
 
       @Override