From f4993218ce5204a3e8b4527e40f71d5fdc5d1de9 Mon Sep 17 00:00:00 2001 From: Einat Vinouze Date: Tue, 28 Jan 2020 17:29:10 +0200 Subject: 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 Signed-off-by: Ittay Stern --- .../src/main/java/org/onap/vid/services/AaiServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java index 66c0e6c04..696aca5ea 100644 --- a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java @@ -85,7 +85,7 @@ import org.onap.vid.model.aaiTree.NodeType; import org.onap.vid.model.aaiTree.RelatedVnf; import org.onap.vid.model.aaiTree.VpnBinding; import org.onap.vid.model.aaiTree.VpnBindingKt; -import org.onap.vid.roles.PermissionProperties; +import org.onap.vid.roles.PermissionPropertiesSubscriberAndServiceType; import org.onap.vid.roles.RoleValidator; import org.onap.vid.utils.Intersection; import org.onap.vid.utils.Logging; @@ -268,7 +268,7 @@ public class AaiServiceImpl implements AaiService { AaiResponse subscriberResponse = aaiClient.getSubscriberData(subscriberId, omitServiceInstances); for (ServiceSubscription serviceSubscription : subscriberResponse.getT().serviceSubscriptions.serviceSubscription) { serviceSubscription.isPermitted = roleValidator.isServicePermitted( - new PermissionProperties(serviceSubscription, subscriberResponse.getT().globalCustomerId)); + new PermissionPropertiesSubscriberAndServiceType(serviceSubscription, subscriberResponse.getT().globalCustomerId)); } return subscriberResponse; @@ -312,7 +312,7 @@ public class AaiServiceImpl implements AaiService { if (serviceSubscriptions != null) { for (ServiceSubscription serviceSubscription : serviceSubscriptions.serviceSubscription) { - serviceSubscription.isPermitted = roleValidator.isServicePermitted(new PermissionProperties(serviceSubscription, subscriberId)); + serviceSubscription.isPermitted = roleValidator.isServicePermitted(new PermissionPropertiesSubscriberAndServiceType(serviceSubscription, subscriberId)); results.addAll(getSearchResultsForSingleSubscription( serviceSubscription, subscriberId, instanceIdentifier, subscriberName, serviceSubscription.serviceType, roleValidator) -- cgit 1.2.3-korg