From 06391a16da77d8da8493a2a4ae3a11da3b7a974e Mon Sep 17 00:00:00 2001
From: remillet <remillet@yahoo.com>
Date: Thu, 4 Feb 2016 21:49:27 -0800
Subject: [PATCH] CSPACE-6895: Trimmed leading '/' character from resource
 names.

---
 .../services/client/test/AbstractServiceTestImpl.java          | 2 +-
 .../services/common/security/SecurityUtils.java                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
index 8f1d058ab..cbce4fa92 100644
--- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
@@ -656,7 +656,7 @@ public abstract class AbstractServiceTestImpl<CLT, CPT, REQUEST_TYPE, RESPONSE_T
             final int OBJECTS_TO_CREATE = 3;
             final String KEYWORD = NON_EXISTENT_KEYWORD + createIdentifier();
             for (int i = 0; i < OBJECTS_TO_CREATE; i++) {
-                this.createWorkflowTarget(testName, KEYWORD);
+                this.createWorkflowTarget(testName, KEYWORD + " " + i);
             }
 
             //
diff --git a/services/common/src/main/java/org/collectionspace/services/common/security/SecurityUtils.java b/services/common/src/main/java/org/collectionspace/services/common/security/SecurityUtils.java
index 801662340..64ad4e5f5 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/security/SecurityUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/security/SecurityUtils.java
@@ -164,7 +164,8 @@ public class SecurityUtils {
 			uriPath = uriPath.replace(hjidValue, "*");
 		}
 		
-		uriPath = uriPath.replace("//", "/");
+		uriPath = uriPath.replace("//", "/"); // replace duplicate '/' characters
+		uriPath = uriPath.startsWith("/") ? uriPath.substring(1) : uriPath; // if present, strip the leading '/' character
 		return uriPath;
 	}
     
-- 
2.47.3