Backport openstack-swift to the older version of guava used in 1.8.x.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/33804b9f Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/33804b9f Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/33804b9f Branch: refs/heads/1.8.x Commit: 33804b9f03a7379bc77c48889ac1209ddb1dcff8 Parents: 8505539 Author: Adrian Cole <[email protected]> Authored: Wed Oct 8 09:18:43 2014 -0700 Committer: Andrew Phillips <[email protected]> Committed: Wed Oct 8 18:16:39 2014 -0400 ---------------------------------------------------------------------- apis/openstack-swift/pom.xml | 2 +- .../openstack/swift/v1/binders/BindMetadataToHeaders.java | 5 ++--- .../java/org/jclouds/openstack/swift/v1/domain/Account.java | 4 ++-- .../jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java | 4 ++-- .../java/org/jclouds/openstack/swift/v1/domain/Container.java | 4 ++-- .../openstack/swift/v1/domain/ExtractArchiveResponse.java | 4 ++-- .../java/org/jclouds/openstack/swift/v1/domain/Segment.java | 4 ++-- .../java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java | 4 ++-- .../v1/blobstore/RegionScopedBlobStoreContextLiveTest.java | 4 ++-- .../openstack/swift/v1/options/CreateContainerOptionsTest.java | 2 +- .../org/jclouds/openstack/swift/v1/options/PutOptionsTest.java | 2 +- .../openstack/swift/v1/options/UpdateContainerOptionsTest.java | 2 +- 12 files changed, 20 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/pom.xml ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/pom.xml b/apis/openstack-swift/pom.xml index 23333c1..78bffc5 100644 --- a/apis/openstack-swift/pom.xml +++ b/apis/openstack-swift/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.8.1-SNAPSHOT</version> <relativePath>../../project/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/BindMetadataToHeaders.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/BindMetadataToHeaders.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/BindMetadataToHeaders.java index 4dabc68..fc57432 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/BindMetadataToHeaders.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/BindMetadataToHeaders.java @@ -16,13 +16,12 @@ */ package org.jclouds.openstack.swift.v1.binders; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.ACCOUNT_METADATA_PREFIX; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_METADATA_PREFIX; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_METADATA_PREFIX; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Map; import java.util.Map.Entry; http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java index b52907c..34b63bc 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java @@ -16,15 +16,15 @@ */ package org.jclouds.openstack.swift.v1.domain; -import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; +import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Map.Entry; -import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java index 4f79044..9933a1c 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java @@ -16,14 +16,14 @@ */ package org.jclouds.openstack.swift.v1.domain; -import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; +import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; /** * Represents a response from a Bulk Delete request. http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java index 4a31ab7..cc671de 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java @@ -16,16 +16,16 @@ */ package org.jclouds.openstack.swift.v1.domain; -import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; +import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Map; import java.util.Map.Entry; -import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java index 7e06e0e..e569cf4 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java @@ -16,14 +16,14 @@ */ package org.jclouds.openstack.swift.v1.domain; -import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; +import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; /** * Represents a response from an Extract Archive request. http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java index a5f064f..18b394f 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java @@ -16,14 +16,14 @@ */ package org.jclouds.openstack.swift.v1.domain; -import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; +import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Named; -import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; /** * Represents a single segment of a multi-part upload. http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java index 2184ff2..375f89a 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.swift.v1.domain; -import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; +import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; @@ -27,8 +27,8 @@ import java.util.Map.Entry; import org.jclouds.io.Payload; -import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java index 97f5448..39b8822 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java @@ -45,10 +45,10 @@ import org.jclouds.rest.HttpClient; import org.testng.annotations.Test; import com.google.common.collect.Iterables; -import com.google.common.io.ByteSource; import com.google.common.hash.Hashing; -import com.google.common.net.MediaType; +import com.google.common.io.ByteSource; import com.google.common.net.HttpHeaders; +import com.google.common.net.MediaType; @Test(groups = "live") public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrationTest { http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/CreateContainerOptionsTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/CreateContainerOptionsTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/CreateContainerOptionsTest.java index 1da648b..a4599c1 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/CreateContainerOptionsTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/CreateContainerOptionsTest.java @@ -18,9 +18,9 @@ package org.jclouds.openstack.swift.v1.options; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_ACL_ANYBODY_READ; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_METADATA_PREFIX; +import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_QUOTA_BYTES; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_READ; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.VERSIONS_LOCATION; -import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_QUOTA_BYTES; import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/PutOptionsTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/PutOptionsTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/PutOptionsTest.java index fddf4cd..7b09d76 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/PutOptionsTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/PutOptionsTest.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.swift.v1.options; -import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_METADATA_PREFIX; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_DELETE_AT; +import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_METADATA_PREFIX; import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds/blob/33804b9f/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/UpdateContainerOptionsTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/UpdateContainerOptionsTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/UpdateContainerOptionsTest.java index 00f95f7..83e87e5 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/UpdateContainerOptionsTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/UpdateContainerOptionsTest.java @@ -20,12 +20,12 @@ import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_AC import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_METADATA_PREFIX; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_QUOTA_BYTES; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_READ; -import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.VERSIONS_LOCATION; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.STATIC_WEB_DIRECTORY_TYPE; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.STATIC_WEB_ERROR; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.STATIC_WEB_INDEX; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.STATIC_WEB_LISTINGS; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.STATIC_WEB_LISTINGS_CSS; +import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.VERSIONS_LOCATION; import static org.testng.Assert.assertEquals; import org.testng.annotations.Test;
