Rename Role's subscriberId field

[vid.git] / vid-app-common / src / main / java / org / onap / vid / roles / RoleValidatorsComposer.kt

diff --git a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorsComposer.kt b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorsComposer.kt
index 8736223..d012cb3 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorsComposer.kt
+++ b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorsComposer.kt
@@ -7,10 +7,10 @@ class RoleValidatorsComposer(private vararg val roleValidators: RoleValidator) :
     override fun isServicePermitted(p: WithPermissionProperties): Boolean =
             roleValidators.any { it.isServicePermitted(p) }
 
-    override fun isSubscriberPermitted(subscriberName: String?): Boolean =
-            roleValidators.any { it.isSubscriberPermitted(subscriberName) }
+    override fun isSubscriberPermitted(subscriberId: String?): Boolean =
+            roleValidators.any { it.isSubscriberPermitted(subscriberId) }
 
-    override fun isTenantPermitted(globalCustomerId: String?, serviceType: String?, tenantName: String?): Boolean =
-            roleValidators.any { it.isTenantPermitted(globalCustomerId, serviceType, tenantName) }
+    override fun isTenantPermitted(subscriberId: String?, serviceType: String?, tenantName: String?): Boolean =
+            roleValidators.any { it.isTenantPermitted(subscriberId, serviceType, tenantName) }
 
 }