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

Merge pull request #1330 from rackspace/1.5.x 

Fixed inheritance hierarchy for Swift and Cloud Files to avoid problems when using BlobStore.
This commit is contained in:
Everett Toews 2013-02-20 15:58:43 -08:00
parent 2b502b0688 ef8f21a65d
commit 655d5fe20d
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java
View File

@ -42,8 +42,8 @@ import org.jclouds.cloudfiles.functions.ParseContainerCDNMetadataFromHeaders;
import org.jclouds.cloudfiles.options.ListCdnContainerOptions; import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
import org.jclouds.cloudfiles.reference.CloudFilesHeaders; import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
import org.jclouds.openstack.filters.AuthenticateRequest; import org.jclouds.openstack.filters.AuthenticateRequest;
import org.jclouds.openstack.swift.CommonSwiftAsyncClient;
import org.jclouds.openstack.swift.Storage; import org.jclouds.openstack.swift.Storage;
import org.jclouds.openstack.swift.SwiftAsyncClient;
import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.BinderParam;
import org.jclouds.rest.annotations.Endpoint; import org.jclouds.rest.annotations.Endpoint;
import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.ExceptionParser;
@ -67,7 +67,7 @@ import com.google.common.util.concurrent.ListenableFuture;
*/ */
@RequestFilters(AuthenticateRequest.class) @RequestFilters(AuthenticateRequest.class)
@Endpoint(Storage.class) @Endpoint(Storage.class)
public interface CloudFilesAsyncClient extends CommonSwiftAsyncClient { public interface CloudFilesAsyncClient extends SwiftAsyncClient {
/** /**
* @see CloudFilesClient#listCDNContainers * @see CloudFilesClient#listCDNContainers

6
apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java
View File

@ -20,14 +20,12 @@ package org.jclouds.cloudfiles;
import java.net.URI; import java.net.URI;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.jclouds.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
import org.jclouds.cloudfiles.options.ListCdnContainerOptions; import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
import org.jclouds.concurrent.Timeout; 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. * 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> * @see <a href="http://docs.rackspace.com/files/api/v1/cf-devguide/content/index.html">Cloud Files</a>
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS) @Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
public interface CloudFilesClient extends CommonSwiftClient { public interface CloudFilesClient extends SwiftClient {
/** /**
* Retrieve a list of existing CDN-enabled containers. * Retrieve a list of existing CDN-enabled containers.

2
apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneAsyncClient.java
View File

@ -29,6 +29,6 @@ import org.jclouds.rest.annotations.RequestFilters;
*/ */
@RequestFilters(AuthenticateRequest.class) @RequestFilters(AuthenticateRequest.class)
@Endpoint(Storage.class) @Endpoint(Storage.class)
public interface SwiftKeystoneAsyncClient extends CommonSwiftAsyncClient { public interface SwiftKeystoneAsyncClient extends SwiftAsyncClient {
} }

2
apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneClient.java
View File

@ -28,6 +28,6 @@ import org.jclouds.concurrent.Timeout;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS) @Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
public interface SwiftKeystoneClient extends CommonSwiftClient { public interface SwiftKeystoneClient extends SwiftClient {
} }