Merge "Problem in building AAF permission - fix"

2 files changed, 17 insertions, 6 deletions

diff --git a/src/main/java/org/onap/dmaap/dbcapi/util/PermissionBuilder.java b/src/main/java/org/onap/dmaap/dbcapi/util/PermissionBuilder.java
index 44c94af..d1f6b2b 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/util/PermissionBuilder.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/util/PermissionBuilder.java
@@ -73,11 +73,8 @@ public class PermissionBuilder {
 
     private String getPermissionType(String pathInfo) {
         char pathSeparator = '/';
-        String relativePath = (pathInfo.charAt(pathInfo.length()-1) == pathSeparator) ?
-            pathInfo.substring(0,pathInfo.length()-1) : pathInfo;
-
-        String[] pathSlices = relativePath.split(String.valueOf(pathSeparator));
-        return pathSlices[pathSlices.length-1];
+        String[] pathSlices = pathInfo.split(String.valueOf(pathSeparator));
+        return pathSlices[1];
     }
 
     String getInstance() {
diff --git a/src/test/java/org/onap/dmaap/dbcapi/util/PermissionBuilderTest.java b/src/test/java/org/onap/dmaap/dbcapi/util/PermissionBuilderTest.java
index 61bb4b6..8db9d2e 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/util/PermissionBuilderTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/util/PermissionBuilderTest.java
@@ -116,7 +116,21 @@ public class PermissionBuilderTest {
     @Test
     public void buildPermission_shouldBuildPermissionWithRealInstance() {
         //given
-        String path = "/subpath/topics/";
+        String path = "/dmaap";
+        String method = "GET";
+        initPermissionBuilder(path, method, provideRealInstance(DMAAP_NAME));
+
+        //when
+        String permission = permissionBuilder.buildPermission(request);
+
+        //then
+        assertEquals("org.onap.dmaap-bc.api.dmaap|mr|GET", permission);
+    }
+
+    @Test
+    public void buildPermission_shouldBuildPermissionWhenUrlContainsId() {
+        //given
+        String path = "/topics/topic_id_123";
         String method = "GET";
         initPermissionBuilder(path, method, provideRealInstance(DMAAP_NAME));