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

Disable binding for RetryOnRenewAndLogoutOnClose. I think it creates a Guice cycle

This commit is contained in:
Andrei Savu 2012-02-01 16:37:08 +02:00
parent ec104454b1
commit 4a071a7d26
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java
View File

@ -18,15 +18,17 @@
*/ */
package org.jclouds.cloudstack.config; package org.jclouds.cloudstack.config;
import static com.google.common.base.Throwables.propagate; import com.google.common.base.Function;
import com.google.common.base.Supplier;
import java.net.URI; import com.google.common.cache.CacheBuilder;
import java.util.Map; import com.google.common.cache.CacheLoader;
import java.util.concurrent.ExecutionException; import com.google.common.cache.LoadingCache;
import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
import javax.ws.rs.core.UriBuilder; import com.google.inject.Provides;
import com.google.inject.Singleton;
import com.google.inject.TypeLiteral;
import com.google.inject.name.Named;
import org.jclouds.Constants; import org.jclouds.Constants;
import org.jclouds.cloudstack.CloudStackAsyncClient; import org.jclouds.cloudstack.CloudStackAsyncClient;
import org.jclouds.cloudstack.CloudStackClient; import org.jclouds.cloudstack.CloudStackClient;
@ -121,11 +123,9 @@ import org.jclouds.cloudstack.filters.AuthenticationFilter;
import org.jclouds.cloudstack.filters.QuerySigner; import org.jclouds.cloudstack.filters.QuerySigner;
import org.jclouds.cloudstack.functions.LoginWithPasswordCredentials; import org.jclouds.cloudstack.functions.LoginWithPasswordCredentials;
import org.jclouds.cloudstack.handlers.CloudStackErrorHandler; import org.jclouds.cloudstack.handlers.CloudStackErrorHandler;
import org.jclouds.cloudstack.handlers.RetryOnRenewAndLogoutOnClose;
import org.jclouds.concurrent.RetryOnTimeOutExceptionFunction; import org.jclouds.concurrent.RetryOnTimeOutExceptionFunction;
import org.jclouds.domain.Credentials; import org.jclouds.domain.Credentials;
import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.HttpErrorHandler;
import org.jclouds.http.HttpRetryHandler;
import org.jclouds.http.RequiresHttp; import org.jclouds.http.RequiresHttp;
import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.ClientError;
import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.Redirection;
@ -138,17 +138,13 @@ import org.jclouds.rest.config.BinderUtils;
import org.jclouds.rest.config.RestClientModule; import org.jclouds.rest.config.RestClientModule;
import org.jclouds.rest.internal.RestContextImpl; import org.jclouds.rest.internal.RestContextImpl;
import com.google.common.base.Function; import javax.ws.rs.core.UriBuilder;
import com.google.common.base.Supplier; import java.net.URI;
import com.google.common.cache.CacheBuilder; import java.util.Map;
import com.google.common.cache.CacheLoader; import java.util.concurrent.ExecutionException;
import com.google.common.cache.LoadingCache; import java.util.concurrent.TimeUnit;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject; import static com.google.common.base.Throwables.propagate;
import com.google.inject.Provides;
import com.google.inject.Singleton;
import com.google.inject.TypeLiteral;
import com.google.inject.name.Named;
/** /**
* Configures the cloudstack connection. * Configures the cloudstack connection.
@ -237,7 +233,7 @@ public class CloudStackRestClientModule extends RestClientModule<CloudStackClien
}); });
install(new CloudStackParserModule()); install(new CloudStackParserModule());
bind(CredentialType.class).toProvider(CredentialTypeFromPropertyOrDefault.class); bind(CredentialType.class).toProvider(CredentialTypeFromPropertyOrDefault.class);
bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(RetryOnRenewAndLogoutOnClose.class); // bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(RetryOnRenewAndLogoutOnClose.class);
super.configure(); super.configure();
} }