You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2014/11/23 23:01:21 UTC
[40/50] [abbrv] jclouds git commit: Fix drift due to unasyncing
Fix drift due to unasyncing
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/df5a674f
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/df5a674f
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/df5a674f
Branch: refs/heads/1.8.x
Commit: df5a674f48a9852fdf7e7066e6c1ea63025272d4
Parents: c230f2c
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Oct 5 20:12:46 2014 -0700
Committer: Adrian Cole <ad...@gmail.com>
Committed: Sun Oct 5 20:24:18 2014 -0700
----------------------------------------------------------------------
.../chef/test/config/TransientChefApiModule.java | 2 --
.../test/java/org/jclouds/chef/ChefApiExpectTest.java | 8 ++++----
.../src/test/java/org/jclouds/chef/ChefApiTest.java | 12 ++++++------
3 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/df5a674f/apis/chef/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java b/apis/chef/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java
index d9eab4d..bab35d0 100644
--- a/apis/chef/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java
+++ b/apis/chef/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java
@@ -40,7 +40,6 @@ import org.jclouds.crypto.Crypto;
import org.jclouds.domain.JsonBall;
import org.jclouds.rest.ConfiguresHttpApi;
import org.jclouds.rest.config.RestModule;
-import org.jclouds.rest.config.SyncToAsyncHttpInvocationModule;
import com.google.common.base.Optional;
import com.google.common.base.Supplier;
@@ -58,7 +57,6 @@ public class TransientChefApiModule extends AbstractModule {
@Override
protected void configure() {
install(new RestModule());
- install(new SyncToAsyncHttpInvocationModule());
bind(ChefApi.class).to(TransientChefApi.class);
bind(LocalBlobStore.class).annotatedWith(Names.named("databags"))
.toInstance(
http://git-wip-us.apache.org/repos/asf/jclouds/blob/df5a674f/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java b/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java
index ea4070d..478959b 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java
@@ -31,7 +31,7 @@ import org.jclouds.chef.options.SearchOptions;
import org.jclouds.date.TimeStamp;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.rest.ConfiguresHttpApi;
import org.testng.annotations.Test;
import com.google.common.base.Supplier;
@@ -260,11 +260,11 @@ public class ChefApiExpectTest extends BaseChefApiExpectTest<ChefApi> {
@Override
protected Module createModule() {
- return new TestChefRestClientModule();
+ return new TestChefHttpApiModule();
}
- @ConfiguresRestClient
- static class TestChefRestClientModule extends ChefHttpApiModule {
+ @ConfiguresHttpApi
+ static class TestChefHttpApiModule extends ChefHttpApiModule {
@Override
protected String provideTimeStamp(@TimeStamp Supplier<String> cache) {
return "timestamp";
http://git-wip-us.apache.org/repos/asf/jclouds/blob/df5a674f/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java b/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java
index 434c22c..f998a95 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java
@@ -56,8 +56,8 @@ import org.jclouds.http.functions.ReturnInputStream;
import org.jclouds.io.Payload;
import org.jclouds.io.payloads.StringPayload;
import org.jclouds.reflect.Invocation;
-import org.jclouds.rest.ConfiguresRestClient;
-import org.jclouds.rest.internal.BaseAsyncApiTest;
+import org.jclouds.rest.ConfiguresHttpApi;
+import org.jclouds.rest.internal.BaseRestAnnotationProcessingTest;
import org.jclouds.rest.internal.GeneratedHttpRequest;
import org.testng.annotations.Test;
@@ -71,7 +71,7 @@ import com.google.inject.Module;
* Tests annotation parsing of {@code ChefApi}.
*/
@Test(groups = { "unit" })
-public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
+public class ChefApiTest extends BaseRestAnnotationProcessingTest<ChefApi> {
public void testCommitSandbox() throws SecurityException, NoSuchMethodException, IOException {
@@ -713,7 +713,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
@Override
protected Module createModule() {
- return new TestChefRestClientModule();
+ return new TestChefHttpApiModule();
}
@Override
@@ -723,8 +723,8 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
return props;
}
- @ConfiguresRestClient
- static class TestChefRestClientModule extends ChefHttpApiModule {
+ @ConfiguresHttpApi
+ static class TestChefHttpApiModule extends ChefHttpApiModule {
@Override
protected String provideTimeStamp(@TimeStamp Supplier<String> cache) {
return "timestamp";