JCLOUDS-534 Folded overly explicit use of HostAndPort, which is also incompatible with guava 16.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/1832b532 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/1832b532 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/1832b532 Branch: refs/heads/1.8.x Commit: 1832b53242e233ded8441f9a5929d1d8504977a6 Parents: 6b6af28 Author: Adrian Cole <[email protected]> Authored: Mon Oct 27 08:48:27 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Wed Oct 29 17:02:44 2014 -0700 ---------------------------------------------------------------------- .../blobstore/integration/internal/BaseContainerLiveTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/1832b532/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java index b2f7d68..f810527 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java @@ -76,7 +76,7 @@ public class BaseContainerLiveTest extends BaseBlobStoreIntegrationTest { SocketOpen socketOpen = context.utils().injector().getInstance(SocketOpen.class); Predicate<HostAndPort> socketTester = retry(socketOpen, 1200, 10, SECONDS); - assertTrue(socketTester.apply(HostAndPort.fromHost(metadata.getPublicUri().getHost()).withDefaultPort(80)), metadata.getPublicUri().toString()); + assertTrue(socketTester.apply(HostAndPort.fromParts(metadata.getPublicUri().getHost(), 80)), metadata.getPublicUri().toString()); assertEquals(Strings2.toStringAndClose(view.utils().http().get(metadata.getPublicUri())), TEST_STRING);
