Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix drift due to unasyncing

This commit is contained in:
Adrian Cole 2014-10-05 20:12:46 -07:00
parent c230f2c337
commit df5a674f48
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/chef/src/main/java/org/jclouds/chef/test/config/TransientChefApiModule.java
View File

@ -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(

8
apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java
View File

@ -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";

12
apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java
View File

@ -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";