tweaks from testing in auth classes

Change-Id: Idb1346ca645ffcc55808e25c8957e01d27a48a75
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Issue-ID: POLICY-1043

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/AuthorizationFilter.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/AuthorizationFilter.java
index cb58371..d884b86 100644 (file)
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/AuthorizationFilter.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/AuthorizationFilter.java
@@ -54,7 +54,7 @@ public abstract class AuthorizationFilter implements Filter {
         boolean authorized = request.isUserInRole(role);
 
         logger.info("user {} in role {} is {}authorized to {}",
-            request.getUserPrincipal().getName(), role, ((authorized) ? "" : "NOT "), request.getMethod());
+            request.getUserPrincipal(), role, ((authorized) ? "" : "NOT "), request.getMethod());
 
         if (!authorized) {
             response.setStatus(HttpServletResponse.SC_FORBIDDEN);

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/aaf/AafGranularAuthFilter.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/aaf/AafGranularAuthFilter.java
index 42df248..27b15a9 100644 (file)
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/aaf/AafGranularAuthFilter.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/aaf/AafGranularAuthFilter.java
@@ -36,8 +36,7 @@ public abstract class AafGranularAuthFilter extends AafAuthFilter {
 
     @Override
     protected String getPermissionType(HttpServletRequest request) {
-        return getPermissionTypeRoot() + "." +
-                request.getRequestURI().replace('/', '.');
+        return getPermissionTypeRoot() + request.getRequestURI().replace('/', '.');
     }
 
     @Override

diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/TestAafGranularAuthFilter.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/TestAafGranularAuthFilter.java
index cad6fb5..183e5ae 100644 (file)
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/TestAafGranularAuthFilter.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/TestAafGranularAuthFilter.java
@@ -28,7 +28,7 @@ public class TestAafGranularAuthFilter extends AafGranularAuthFilter {
 
     @Override
     protected String getRole(HttpServletRequest request) {
-        String expectedPerm = this.getPermissionTypeRoot() + "."
+        String expectedPerm = this.getPermissionTypeRoot()
             + request.getRequestURI().replace('/', '.') + "|"
             + NetworkUtil.getHostname() + "|"
             + request.getMethod().toLowerCase();