Problem in building AAF permission - fix

Change-Id: If3c16d950ebe21d4f922b2e8f074e29ded26e9ce
Issue-ID: DMAAP-1200
Signed-off-by: piotr.karas <piotr.karas@nokia.com>

diff --git a/pom.xml b/pom.xml
index 244a9c0..a555393 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -387,7 +387,7 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <jettyVersion>9.4.12.RC2</jettyVersion> 
                <eelf.version>1.0.0</eelf.version>
-               <artifact.version>1.0.27-SNAPSHOT</artifact.version>
+               <artifact.version>1.0.28-SNAPSHOT</artifact.version>
                <!-- SONAR -->
                <jacoco.version>0.7.7.201606060606</jacoco.version>
                <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>

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 (file)
--- 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 (file)
--- 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));
 

diff --git a/version.properties b/version.properties
index 018a4e7..67b4ad2 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=0
-patch=27
+patch=28
 base_version=${major}.${minor}.${patch}
 
 # Release must be completed with git revision # in Jenkins