JCLOUDS-306. removed dead code
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/commit/49029195 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/49029195 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/49029195 Branch: refs/heads/master Commit: 49029195765b9fe9408903e89ce17d524ea35550 Parents: f46c86a Author: Adrian Cole <[email protected]> Authored: Fri Sep 27 21:03:07 2013 -0700 Committer: Adrian Cole <[email protected]> Committed: Sat Sep 28 07:12:01 2013 -0700 ---------------------------------------------------------------------- .../jclouds/openstack/swift/v1/SwiftApi.java | 4 --- .../swift/v1/config/SwiftHttpApiModule.java | 34 -------------------- 2 files changed, 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/49029195/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java index 562566b..547c356 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java @@ -25,7 +25,6 @@ import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.openstack.swift.v1.features.AccountApi; import org.jclouds.openstack.swift.v1.features.ContainerApi; import org.jclouds.openstack.swift.v1.features.ObjectApi; -import org.jclouds.openstack.v2_0.features.ExtensionApi; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; @@ -45,9 +44,6 @@ public interface SwiftApi extends Closeable { Set<String> configuredRegions(); @Delegate - ExtensionApi extensionApiInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); - - @Delegate AccountApi accountApiInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @Delegate http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/49029195/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftHttpApiModule.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftHttpApiModule.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftHttpApiModule.java index 1822ebb..c0c68c7 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftHttpApiModule.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftHttpApiModule.java @@ -15,11 +15,6 @@ * limitations under the License. */ package org.jclouds.openstack.swift.v1.config; -import java.net.URI; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import javax.inject.Provider; -import javax.inject.Singleton; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.Redirection; @@ -28,17 +23,8 @@ import org.jclouds.json.config.GsonModule.DateAdapter; import org.jclouds.json.config.GsonModule.Iso8601DateAdapter; import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.handlers.SwiftErrorHandler; -import org.jclouds.openstack.v2_0.domain.Extension; -import org.jclouds.openstack.v2_0.functions.PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet; import org.jclouds.rest.ConfiguresHttpApi; import org.jclouds.rest.config.HttpApiModule; -import org.jclouds.rest.functions.ImplicitOptionalConverter; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Multimap; -import com.google.inject.Provides; /** * @author Adrian Cole @@ -53,28 +39,8 @@ public class SwiftHttpApiModule extends HttpApiModule<SwiftApi> { @Override protected void configure() { bind(DateAdapter.class).to(Iso8601DateAdapter.class); - bind(ImplicitOptionalConverter.class).to(PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.class); super.configure(); } - - @Provides - @Singleton - public Multimap<URI, URI> aliases() { - return ImmutableMultimap.<URI, URI>builder() - .build(); - } - - @Provides - @Singleton - public LoadingCache<String, Set<? extends Extension>> provideExtensionsByZone(final Provider<SwiftApi> swiftApi) { - return CacheBuilder.newBuilder().expireAfterWrite(23, TimeUnit.HOURS) - .build(new CacheLoader<String, Set<? extends Extension>>() { - @Override - public Set<? extends Extension> load(String key) throws Exception { - return swiftApi.get().extensionApiInRegion(key).list(); - } - }); - } @Override protected void bindErrorHandlers() {
