From ef8f21a65d5cd0ae25eac3576c99165be8e5a912 Mon Sep 17 00:00:00 2001
From: Everett Toews <everett.toews@rackspace.com>
Date: Mon, 18 Feb 2013 16:24:13 -0600
Subject: [PATCH] Fixed inheritance hierarchy for Swift and Cloud Files to
 avoid problems when using BlobStore.

---
 .../java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java  | 4 ++--
 .../main/java/org/jclouds/cloudfiles/CloudFilesClient.java  | 6 ++----
 .../jclouds/openstack/swift/SwiftKeystoneAsyncClient.java   | 2 +-
 .../org/jclouds/openstack/swift/SwiftKeystoneClient.java    | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java
index 7a9169b167..e9c9619dce 100644
--- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java
+++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java
@@ -42,8 +42,8 @@ import org.jclouds.cloudfiles.functions.ParseContainerCDNMetadataFromHeaders;
 import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
 import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
 import org.jclouds.openstack.filters.AuthenticateRequest;
-import org.jclouds.openstack.swift.CommonSwiftAsyncClient;
 import org.jclouds.openstack.swift.Storage;
+import org.jclouds.openstack.swift.SwiftAsyncClient;
 import org.jclouds.rest.annotations.BinderParam;
 import org.jclouds.rest.annotations.Endpoint;
 import org.jclouds.rest.annotations.ExceptionParser;
@@ -67,7 +67,7 @@ import com.google.common.util.concurrent.ListenableFuture;
  */
 @RequestFilters(AuthenticateRequest.class)
 @Endpoint(Storage.class)
-public interface CloudFilesAsyncClient extends CommonSwiftAsyncClient {
+public interface CloudFilesAsyncClient extends SwiftAsyncClient {
 
    /**
     * @see CloudFilesClient#listCDNContainers
diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java
index 5400d78c33..16904e3377 100644
--- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java
+++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java
@@ -20,14 +20,12 @@ package org.jclouds.cloudfiles;
 
 import java.net.URI;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
 import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
 import org.jclouds.concurrent.Timeout;
-import org.jclouds.openstack.swift.CommonSwiftClient;
+import org.jclouds.openstack.swift.SwiftClient;
 
 /**
  * Provides access to Cloud Files via their REST API.
@@ -36,7 +34,7 @@ import org.jclouds.openstack.swift.CommonSwiftClient;
  * @see <a href="http://docs.rackspace.com/files/api/v1/cf-devguide/content/index.html">Cloud Files</a>
  */
 @Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
-public interface CloudFilesClient extends CommonSwiftClient {
+public interface CloudFilesClient extends SwiftClient {
 
    /**
     * Retrieve a list of existing CDN-enabled containers.
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneAsyncClient.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneAsyncClient.java
index 65304a5615..cd89cc4bb2 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneAsyncClient.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneAsyncClient.java
@@ -29,6 +29,6 @@ import org.jclouds.rest.annotations.RequestFilters;
  */
 @RequestFilters(AuthenticateRequest.class)
 @Endpoint(Storage.class)
-public interface SwiftKeystoneAsyncClient extends CommonSwiftAsyncClient {
+public interface SwiftKeystoneAsyncClient extends SwiftAsyncClient {
 
 }
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneClient.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneClient.java
index 4aa5edacbd..b3d1e3ddb4 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneClient.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneClient.java
@@ -28,6 +28,6 @@ import org.jclouds.concurrent.Timeout;
  * @author Adrian Cole
  */
 @Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
-public interface SwiftKeystoneClient extends CommonSwiftClient {
+public interface SwiftKeystoneClient extends SwiftClient {
 
 }