From 8476082ee39baddff7b1b4cd95706c6c3fd165ad Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 6 Feb 2011 20:25:30 -0800 Subject: [PATCH] Issue 463: updated to guava r08 --- core/pom.xml | 2 +- .../java/org/jclouds/rest/binders/BindAsHostPrefix.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 8952d644ba..460614d921 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -111,7 +111,7 @@ com.google.guava guava - r07 + r08 com.google.code.findbugs diff --git a/core/src/main/java/org/jclouds/rest/binders/BindAsHostPrefix.java b/core/src/main/java/org/jclouds/rest/binders/BindAsHostPrefix.java index ed3d80c1a8..5886a3a929 100644 --- a/core/src/main/java/org/jclouds/rest/binders/BindAsHostPrefix.java +++ b/core/src/main/java/org/jclouds/rest/binders/BindAsHostPrefix.java @@ -21,7 +21,8 @@ package org.jclouds.rest.binders; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.net.InternetDomainName.isValid; +import static com.google.common.net.InternetDomainName.fromLenient; +import static com.google.common.net.InternetDomainName.isValidLenient; import javax.inject.Inject; import javax.inject.Provider; @@ -51,9 +52,9 @@ public class BindAsHostPrefix implements Binder { @SuppressWarnings("unchecked") public R bindToRequest(R request, Object payload) { checkNotNull(payload, "hostprefix"); - checkArgument(isValid(request.getEndpoint().getHost()), "this is only valid for hostnames: " + request); + checkArgument(isValidLenient(request.getEndpoint().getHost()), "this is only valid for hostnames: " + request); UriBuilder builder = uriBuilderProvider.get().uri(request.getEndpoint()); - InternetDomainName name = InternetDomainName.from(request.getEndpoint().getHost()).child(payload.toString()); + InternetDomainName name = fromLenient(request.getEndpoint().getHost()).child(payload.toString()); builder.host(name.name()); return (R) request.toBuilder().endpoint(builder.build()).build(); }