You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/06/18 19:21:24 UTC
git commit: Fix replaceAll regex to handle spaces correctly
Repository: jclouds
Updated Branches:
refs/heads/master 235092e51 -> 1982626cd
Fix replaceAll regex to handle spaces correctly
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/1982626c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/1982626c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/1982626c
Branch: refs/heads/master
Commit: 1982626cd60e7819b3dfa47a8533e38bced0e55d
Parents: 235092e
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Mon Jun 16 09:02:22 2014 -0700
Committer: Jeremy Daggett <jd...@apache.org>
Committed: Wed Jun 18 10:21:01 2014 -0700
----------------------------------------------------------------------
.../openstack/v2_0/internal/BaseOpenStackMockTest.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/1982626c/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
index 3366b27..c865922 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
@@ -28,6 +28,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.regex.Pattern;
import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule;
@@ -58,6 +59,11 @@ public class BaseOpenStackMockTest<A extends Closeable> {
private final Set<Module> modules = ImmutableSet.<Module> of(
new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor()));
+ /**
+ * Pattern for replacing the URL token with the correct local address.
+ */
+ private static final Pattern urlTokenPattern = Pattern.compile(":\\s*\"\\s*URL");
+
@SuppressWarnings("serial")
public A api(String uri, String provider, Properties overrides) {
if (!overrides.containsKey(PROPERTY_MAX_RETRIES)) {
@@ -98,10 +104,11 @@ public class BaseOpenStackMockTest<A extends Closeable> {
if (response.getBody() != null) {
/*
* "URL" must be used in the service catalog sample (such as
- * access.json or accessRackspace) for the declared service
+ * access.json or accessRackspace.json) for the declared service
* endpoints.
*/
- String newBody = new String(response.getBody()).replace(":\"URL", ":\"" + url.toString());
+ String newBody = urlTokenPattern.matcher(new String(response.getBody())).replaceAll(": \"" + url.toString());
+
response = response.setBody(newBody);
}
return response;