From e253f539d6776cca028f2b1cef81ef4c7f211277 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Mon, 30 Jul 2012 11:51:24 -0700 Subject: [PATCH] Prefer string replacement over regular expression Previously this method threw an PatternSyntaxException due to a missing level of escaping. Also remove bogus test. --- .../strategy/internal/FilesystemStorageStrategyImpl.java | 4 ++-- .../internal/FilesystemStorageStrategyImplTest.java | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index 2158c3dce4..43fb4c1fea 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -349,10 +349,10 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy { * @param pathToBeNormalized * @return */ - private String normalize(String pathToBeNormalized) { + private static String normalize(String pathToBeNormalized) { if (null != pathToBeNormalized && pathToBeNormalized.contains(BACK_SLASH)) { if (!BACK_SLASH.equals(File.separator)) { - return pathToBeNormalized.replaceAll(BACK_SLASH, File.separator); + return pathToBeNormalized.replace(BACK_SLASH, File.separator); } } return pathToBeNormalized; diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java index 203cce78f5..f3e05d7394 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java @@ -123,15 +123,6 @@ public class FilesystemStorageStrategyImplTest { storageStrategy.createDirectory(CONTAINER_NAME, null); } - @Test(dataProvider = "ignoreOnWindows", description = "see http://code.google.com/p/jclouds/issues/detail?id=737") - public void testCreateDirectory_WrongDirectoryName() { - try { - storageStrategy.createDirectory(CONTAINER_NAME, "$%&!'`\\/"); - fail("No exception thrown"); - } catch (Exception e) { - } - } - public void testCreateContainer() { boolean result;