RoleValidatorByOwningEntity permits by PermissionPropertiesOwningEntity

PermissionPropertiesOwningEntity is sharing a parent interface
with PermissionPropertiesServiceType: WithPermissionProperties.

Issue-ID: VID-758
Change-Id: I90c04cb8d4331d68329f3a12329244f09c6bc184
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java b/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java
index d9f2fdedf..c35f5f704 100644
--- a/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java
+++ b/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java
@@ -42,11 +42,6 @@ import org.onap.vid.services.AaiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-
-/**
- * Created by Oren on 7/1/17.
- */
-
 @Component
 public class RoleProvider {
 
@@ -147,11 +142,13 @@ public class RoleProvider {
 
     public Role createRoleFromStringArr(String[] roleParts, String rolePrefix) throws RoleParsingException {
         String globalCustomerID = replaceSubscriberNameToGlobalCustomerID(roleParts[0], rolePrefix);
+        String owningEntityId = translateOwningEntityNameToOwningEntityId(roleParts[0]);
+
         try {
             if (roleParts.length > 2) {
-                return new Role(EcompRole.READ, globalCustomerID, roleParts[1], roleParts[2]);
+                return new Role(EcompRole.READ, globalCustomerID, roleParts[1], roleParts[2], owningEntityId);
             } else {
-                return new Role(EcompRole.READ, globalCustomerID, roleParts[1], null);
+                return new Role(EcompRole.READ, globalCustomerID, roleParts[1], null, owningEntityId);
             }
         } catch (ArrayIndexOutOfBoundsException e) {
             if (roleParts.length > 0)
@@ -165,6 +162,10 @@ public class RoleProvider {
 
     }
 
+    private String translateOwningEntityNameToOwningEntityId(String owningEntityName) {
+        return owningEntityName; // TODO: translate to id
+    }
+
     public RoleValidator getUserRolesValidator(HttpServletRequest request) {
         return roleValidatorFactory.by(getUserRoles(request));
     }