From 6a728f8cb348f7548aedf650df837eeb8a90eef8 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Tue, 8 Jan 2013 20:37:13 -0800 Subject: [PATCH] refactored tests and internal code due to removing custom guava code --- .../org/jclouds/chef/test/config/TransientChefApiModule.java | 4 ++-- .../chef/src/test/java/org/jclouds/chef/ChefAsyncApiTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 f514d205a5..c72aff7006 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 @@ -18,7 +18,7 @@ */ package org.jclouds.chef.test.config; -import static org.jclouds.rest.config.BinderUtils.bindClient; +import static org.jclouds.rest.config.BinderUtils.bindBlockingApi; import java.io.IOException; import java.security.PrivateKey; @@ -71,7 +71,7 @@ public class TransientChefApiModule extends AbstractModule { bind(ChefAsyncApi.class).to(TransientChefAsyncApi.class).asEagerSingleton(); // forward all requests from TransientChefApi to ChefAsyncApi. needs above // binding as cannot proxy a class - bindClient(binder(), TransientChefApi.class, ChefAsyncApi.class); + bindBlockingApi(binder(), TransientChefApi.class, ChefAsyncApi.class); bind(ChefApi.class).to(TransientChefApi.class); bind(LocalAsyncBlobStore.class).annotatedWith(Names.named("databags")).toInstance( diff --git a/apis/chef/src/test/java/org/jclouds/chef/ChefAsyncApiTest.java b/apis/chef/src/test/java/org/jclouds/chef/ChefAsyncApiTest.java index 4f44b168d9..73e18e67b4 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/ChefAsyncApiTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/ChefAsyncApiTest.java @@ -67,7 +67,7 @@ import org.testng.annotations.Test; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import org.jclouds.reflect.Invokable; +import com.google.common.reflect.Invokable; import com.google.inject.Module; /**