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

Issue 925: fixed cyclic dependency on GAE

This commit is contained in:
Adrian Cole 2012-05-15 19:16:41 -07:00
parent 251754b20a
commit fed9c22a23
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gae/src/main/java/org/jclouds/gae/config/AsyncGoogleAppEngineConfigurationModule.java
View File

@ -24,8 +24,6 @@ import org.jclouds.gae.AsyncGaeHttpCommandExecutorService;
import org.jclouds.http.HttpCommandExecutorService; import org.jclouds.http.HttpCommandExecutorService;
import org.jclouds.http.config.ConfiguresHttpCommandExecutorService; import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
import com.google.inject.Injector;
/** /**
* Configures {@link AsyncGaeHttpCommandExecutorService}. * Configures {@link AsyncGaeHttpCommandExecutorService}.
* *
@ -35,13 +33,9 @@ import com.google.inject.Injector;
@ConfiguresExecutorService @ConfiguresExecutorService
@SingleThreaded @SingleThreaded
public class AsyncGoogleAppEngineConfigurationModule extends GoogleAppEngineConfigurationModule { public class AsyncGoogleAppEngineConfigurationModule extends GoogleAppEngineConfigurationModule {
public AsyncGoogleAppEngineConfigurationModule() { protected void bindHttpCommandExecutorService() {
super(); bind(HttpCommandExecutorService.class).to(AsyncGaeHttpCommandExecutorService.class);
}
protected HttpCommandExecutorService providerHttpCommandExecutorService(Injector injector) {
return injector.getInstance(AsyncGaeHttpCommandExecutorService.class);
} }
} }

10
drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java
View File

@ -18,8 +18,6 @@
*/ */
package org.jclouds.gae.config; package org.jclouds.gae.config;
import javax.inject.Singleton;
import org.jclouds.concurrent.MoreExecutors; import org.jclouds.concurrent.MoreExecutors;
import org.jclouds.concurrent.SingleThreaded; import org.jclouds.concurrent.SingleThreaded;
import org.jclouds.concurrent.config.ConfiguresExecutorService; import org.jclouds.concurrent.config.ConfiguresExecutorService;
@ -32,7 +30,6 @@ import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
import com.google.appengine.api.urlfetch.URLFetchService; import com.google.appengine.api.urlfetch.URLFetchService;
import com.google.appengine.api.urlfetch.URLFetchServiceFactory; import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
import com.google.inject.Injector;
import com.google.inject.Provides; import com.google.inject.Provides;
/** /**
@ -53,12 +50,11 @@ public class GoogleAppEngineConfigurationModule extends ExecutorServiceModule {
protected void configure() { protected void configure() {
super.configure(); super.configure();
bind(TransformingHttpCommandExecutorService.class).to(TransformingHttpCommandExecutorServiceImpl.class); bind(TransformingHttpCommandExecutorService.class).to(TransformingHttpCommandExecutorServiceImpl.class);
bindHttpCommandExecutorService();
} }
@Singleton protected void bindHttpCommandExecutorService() {
@Provides bind(HttpCommandExecutorService.class).to(GaeHttpCommandExecutorService.class);
protected HttpCommandExecutorService providerHttpCommandExecutorService(Injector injector) {
return injector.getInstance(GaeHttpCommandExecutorService.class);
} }
@Provides @Provides

8
drivers/gae/src/test/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorServiceIntegrationTest.java
View File

@ -22,7 +22,6 @@ import static org.jclouds.concurrent.FutureIterables.awaitCompletion;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.UndeclaredThrowableException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
@ -232,9 +231,9 @@ public class AsyncGaeHttpCommandExecutorServiceIntegrationTest extends BaseHttpC
super.testGetStringSynch(path); super.testGetStringSynch(path);
} }
// local env does not support snakeoil certs // TODO: determine how to get redirects to operate
@Override @Override
@Test(enabled = true, expectedExceptions = UndeclaredThrowableException.class) @Test(enabled = false)
public void testGetStringRedirect() throws MalformedURLException, ExecutionException, InterruptedException, public void testGetStringRedirect() throws MalformedURLException, ExecutionException, InterruptedException,
TimeoutException { TimeoutException {
setupApiProxy(); setupApiProxy();
@ -284,8 +283,9 @@ public class AsyncGaeHttpCommandExecutorServiceIntegrationTest extends BaseHttpC
super.testGetStringViaRequest(); super.testGetStringViaRequest();
} }
// TODO: determine how to get redirects to operate
@Override @Override
@Test(enabled = true, expectedExceptions = UndeclaredThrowableException.class) @Test(enabled = false)
public void testPutRedirect() throws MalformedURLException, ExecutionException, InterruptedException, public void testPutRedirect() throws MalformedURLException, ExecutionException, InterruptedException,
TimeoutException { TimeoutException {
setupApiProxy(); setupApiProxy();