Repository: jclouds-labs Updated Branches: refs/heads/master 249bb586e -> 4cb6b9ec2
Prefer Guava HttpHeaders over JAX-RS jclouds code contains more instances of the former and Guava has additional constants like CONTENT_MD5. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/4cb6b9ec Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/4cb6b9ec Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/4cb6b9ec Branch: refs/heads/master Commit: 4cb6b9ec2e9b88de20fbee207a6f01d7543f3c76 Parents: 249bb58 Author: Andrew Gaul <[email protected]> Authored: Thu May 15 02:02:29 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu May 15 02:03:27 2014 -0700 ---------------------------------------------------------------------- .../jclouds/abiquo/binders/BindLinkToPathAndAcceptHeader.java | 2 +- .../abiquo/binders/BindLinkToPathAndAcceptHeaderTest.java | 4 ++-- .../abiquo/http/filters/AppendApiVersionToMediaTypeTest.java | 3 +-- .../jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java | 2 +- .../org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java | 2 +- .../savvis/vpdc/functions/ParseLoginResponseFromHeaders.java | 2 +- .../jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java | 3 +-- .../BindUserOrgAndPasswordAsBasicAuthorizationHeader.java | 3 ++- .../v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java | 2 +- .../vcloud/director/v1_5/features/QueryApiExpectTest.java | 4 ++-- .../jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java | 4 ++-- .../director/v1_5/features/admin/AdminQueryApiExpectTest.java | 4 ++-- 12 files changed, 17 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/abiquo/src/main/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeader.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeader.java b/abiquo/src/main/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeader.java index 3f4ec05..6747cde 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeader.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeader.java @@ -19,12 +19,12 @@ package org.jclouds.abiquo.binders; import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Singleton; -import javax.ws.rs.core.HttpHeaders; import org.jclouds.http.HttpRequest; import com.abiquo.model.rest.RESTLink; import com.google.common.annotations.VisibleForTesting; +import com.google.common.net.HttpHeaders; /** * Binds the given link to the uri and the Accept header. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/abiquo/src/test/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeaderTest.java ---------------------------------------------------------------------- diff --git a/abiquo/src/test/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeaderTest.java b/abiquo/src/test/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeaderTest.java index f21f078..96e42d0 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeaderTest.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/binders/BindLinkToPathAndAcceptHeaderTest.java @@ -21,11 +21,11 @@ import static org.testng.Assert.assertNotNull; import java.net.URI; -import javax.ws.rs.core.HttpHeaders; - import org.jclouds.http.HttpRequest; import org.testng.annotations.Test; +import com.google.common.net.HttpHeaders; + /** * Unit tests for the {@link BindLinkToPathAndAcceptHeader} class. * http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/abiquo/src/test/java/org/jclouds/abiquo/http/filters/AppendApiVersionToMediaTypeTest.java ---------------------------------------------------------------------- diff --git a/abiquo/src/test/java/org/jclouds/abiquo/http/filters/AppendApiVersionToMediaTypeTest.java b/abiquo/src/test/java/org/jclouds/abiquo/http/filters/AppendApiVersionToMediaTypeTest.java index 69378f4..0a6d49d 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/http/filters/AppendApiVersionToMediaTypeTest.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/http/filters/AppendApiVersionToMediaTypeTest.java @@ -23,8 +23,6 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import java.util.Collection; -import javax.ws.rs.core.HttpHeaders; - import org.jclouds.abiquo.AbiquoApi; import org.jclouds.abiquo.functions.AppendApiVersionToAbiquoMimeType; import org.jclouds.http.HttpRequest; @@ -34,6 +32,7 @@ import org.testng.annotations.Test; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; +import com.google.common.net.HttpHeaders; /** * Unit tests for the {@link AppendApiVersionToMediaType} filter. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java index 6d1bc20..f833a32 100644 --- a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java +++ b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java @@ -28,7 +28,6 @@ import java.net.URL; import java.util.Properties; import java.util.Set; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import org.jclouds.ContextBuilder; @@ -40,6 +39,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; +import com.google.common.net.HttpHeaders; import com.google.inject.Module; import com.squareup.okhttp.mockwebserver.MockWebServer; import com.squareup.okhttp.mockwebserver.RecordedRequest; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java index d8d77d0..3ccbe65 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java @@ -37,7 +37,6 @@ import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import org.jclouds.Constants; @@ -60,6 +59,7 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.Multimap; +import com.google.common.net.HttpHeaders; /** * Generates and signs the access key id and adds the mandatory http header and http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/functions/ParseLoginResponseFromHeaders.java ---------------------------------------------------------------------- diff --git a/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/functions/ParseLoginResponseFromHeaders.java b/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/functions/ParseLoginResponseFromHeaders.java index 0afaede..11fd780 100644 --- a/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/functions/ParseLoginResponseFromHeaders.java +++ b/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/functions/ParseLoginResponseFromHeaders.java @@ -26,7 +26,6 @@ import java.util.regex.Pattern; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; -import javax.ws.rs.core.HttpHeaders; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponseException; @@ -38,6 +37,7 @@ import org.jclouds.savvis.vpdc.internal.VCloudToken; import org.jclouds.savvis.vpdc.xml.OrgListHandler; import com.google.common.base.Function; +import com.google.common.net.HttpHeaders; /** * This parses {@link VCloudSession} from HTTP headers. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java ---------------------------------------------------------------------- diff --git a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java b/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java index 77261b7..735a8c0 100644 --- a/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java +++ b/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/filters/SetVCloudTokenCookieTest.java @@ -18,13 +18,12 @@ package org.jclouds.savvis.vpdc.filters; import static org.testng.Assert.assertEquals; -import javax.ws.rs.core.HttpHeaders; - import org.jclouds.http.HttpRequest; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; import com.google.common.base.Supplier; +import com.google.common.net.HttpHeaders; /** * @author Adrian Cole http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java index cf62ea6..3e35763 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java @@ -23,11 +23,12 @@ import static java.lang.String.format; import java.util.Map; import javax.inject.Singleton; -import javax.ws.rs.core.HttpHeaders; import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; +import com.google.common.net.HttpHeaders; + /** * Uses Basic Authentication to sign the request. * http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java index bc25f4d..c52b7f2 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java @@ -18,7 +18,6 @@ package org.jclouds.vcloud.director.v1_5.filters; import javax.inject.Inject; import javax.inject.Singleton; -import javax.ws.rs.core.HttpHeaders; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; @@ -27,6 +26,7 @@ import org.jclouds.vcloud.director.v1_5.annotations.Session; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMultimap; +import com.google.common.net.HttpHeaders; /** * http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiExpectTest.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiExpectTest.java index b6bd40a..e3b2b44 100644 --- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiExpectTest.java +++ b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiExpectTest.java @@ -20,8 +20,6 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import javax.ws.rs.core.HttpHeaders; - import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; @@ -34,6 +32,8 @@ import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTes import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi; import org.testng.annotations.Test; +import com.google.common.net.HttpHeaders; + /** * Test the {@link QueryApi} by observing its side effects. * http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java index 10470a3..59ba745 100644 --- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java +++ b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java @@ -23,8 +23,6 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import javax.ws.rs.core.HttpHeaders; - import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.vcloud.director.v1_5.domain.Reference; @@ -34,6 +32,8 @@ import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTes import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi; import org.testng.annotations.Test; +import com.google.common.net.HttpHeaders; + /** * Test the {@link TaskApi} by observing its side effects. * http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4cb6b9ec/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiExpectTest.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiExpectTest.java index 309c081..507e58d 100644 --- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiExpectTest.java +++ b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiExpectTest.java @@ -20,8 +20,6 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import javax.ws.rs.core.HttpHeaders; - import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; @@ -32,6 +30,8 @@ import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRoleRecord; import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest; import org.testng.annotations.Test; +import com.google.common.net.HttpHeaders; + /** * Test the {@link AdminQueryApi} by observing its side effects. *
