From 7239330fc0fc4a09a363e0ad765fcb1798292fe5 Mon Sep 17 00:00:00 2001 From: Einat Vinouze Date: Sun, 26 Jan 2020 14:56:22 +0200 Subject: [PATCH] Rename RoleValidatorByRoles to RoleValidatorBySubscriberAndServiceType Issue-ID: VID-758 Signed-off-by: Einat Vinouze Change-Id: I61fbfc902afee62e1099e491494065abae523b2e --- .../java/org/onap/vid/roles/RoleValidator.java | 2 +- ...> RoleValidatorBySubscriberAndServiceType.java} | 4 +-- .../org/onap/vid/controller/AaiControllerTest.java | 6 ++--- ...leValidatorBySubscriberAndServiceTypeTest.java} | 29 ++++++++++++---------- 4 files changed, 22 insertions(+), 19 deletions(-) rename vid-app-common/src/main/java/org/onap/vid/roles/{RoleValidatorByRoles.java => RoleValidatorBySubscriberAndServiceType.java} (95%) rename vid-app-common/src/test/java/org/onap/vid/roles/{RoleValidatorByRolesTest.java => RoleValidatorBySubscriberAndServiceTypeTest.java} (70%) diff --git a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidator.java b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidator.java index 830c0f50c..f0ee26b0b 100644 --- a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidator.java +++ b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidator.java @@ -35,7 +35,7 @@ public interface RoleValidator { static RoleValidator by(List roles, boolean disableRoles) { return disableRoles ? new AlwaysValidRoleValidator() - : new RoleValidatorByRoles(roles); + : new RoleValidatorBySubscriberAndServiceType(roles); } boolean isSubscriberPermitted(String subscriberName); diff --git a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorByRoles.java b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorBySubscriberAndServiceType.java similarity index 95% rename from vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorByRoles.java rename to vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorBySubscriberAndServiceType.java index ad5b519c4..244610c89 100644 --- a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorByRoles.java +++ b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorBySubscriberAndServiceType.java @@ -24,11 +24,11 @@ import java.util.List; import java.util.Map; import org.onap.vid.mso.rest.RequestDetails; -public class RoleValidatorByRoles implements RoleValidator { +public class RoleValidatorBySubscriberAndServiceType implements RoleValidator { private final List userRoles; - RoleValidatorByRoles(List roles) { + RoleValidatorBySubscriberAndServiceType(List roles) { this.userRoles = roles; } diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java index 521102383..400926fbd 100644 --- a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java @@ -69,7 +69,7 @@ import org.onap.vid.aai.util.AAIRestInterface; import org.onap.vid.model.VersionByInvariantIdsRequest; import org.onap.vid.properties.Features; import org.onap.vid.roles.RoleProvider; -import org.onap.vid.roles.RoleValidatorByRoles; +import org.onap.vid.roles.RoleValidatorBySubscriberAndServiceType; import org.onap.vid.services.AaiService; import org.onap.vid.utils.SystemPropertiesWrapper; import org.onap.vid.utils.Unchecked; @@ -408,7 +408,7 @@ public class AaiControllerTest { String okResponseBody = "OK_RESPONSE"; AaiResponse aaiResponse = new AaiResponse<>(okResponseBody, "", HttpStatus.OK.value()); given(featureManager.isActive(Features.FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH)).willReturn(isFeatureActive); - given(aaiService.getSubscriberData(eq(subscriberId), isA(RoleValidatorByRoles.class), + given(aaiService.getSubscriberData(eq(subscriberId), isA(RoleValidatorBySubscriberAndServiceType.class), eq(isFeatureActive && omitServiceInstances))) .willReturn(aaiResponse); @@ -479,7 +479,7 @@ public class AaiControllerTest { String okResponseBody = "OK_RESPONSE"; AaiResponse aaiResponse = new AaiResponse<>(okResponseBody, "", HttpStatus.OK.value()); given(featureManager.isActive(Features.FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH)).willReturn(isFeatureActive); - given(aaiService.getSubscriberData(eq(subscriberId), isA(RoleValidatorByRoles.class), + given(aaiService.getSubscriberData(eq(subscriberId), isA(RoleValidatorBySubscriberAndServiceType.class), eq(isFeatureActive && omitServiceInstances))) .willReturn(aaiResponse); diff --git a/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorByRolesTest.java b/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorBySubscriberAndServiceTypeTest.java similarity index 70% rename from vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorByRolesTest.java rename to vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorBySubscriberAndServiceTypeTest.java index 9362ec9d7..77e5088e5 100644 --- a/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorByRolesTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorBySubscriberAndServiceTypeTest.java @@ -31,7 +31,7 @@ import org.onap.vid.mso.rest.RequestDetails; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -public class RoleValidatorByRolesTest { +public class RoleValidatorBySubscriberAndServiceTypeTest { private static final String SAMPLE_SUBSCRIBER = "sampleSubscriber"; private static final String NOT_MATCHING_SUBSCRIBER = "notMatchingSubscriber"; @@ -46,61 +46,64 @@ public class RoleValidatorByRolesTest { private Map requestParameters = ImmutableMap.of("subscriptionServiceType", SAMPLE_SERVICE_TYPE); private Map requestDetailsProperties = ImmutableMap.of("subscriberInfo", subscriberInfo, "requestParameters", requestParameters); private RequestDetails requestDetails; - private RoleValidatorByRoles roleValidator; + private RoleValidatorBySubscriberAndServiceType roleValidatorBySubscriberAndServiceType; @BeforeMethod public void setUp() { - roleValidator = new RoleValidatorByRoles(roles); + roleValidatorBySubscriberAndServiceType = new RoleValidatorBySubscriberAndServiceType(roles); requestDetails = new RequestDetails(); } @Test public void shouldPermitSubscriberWhenNameMatchesAndRolesAreEnabled() { - assertThat(roleValidator.isSubscriberPermitted(SAMPLE_SUBSCRIBER)).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType.isSubscriberPermitted(SAMPLE_SUBSCRIBER)).isTrue(); } @Test public void shouldNotPermitSubscriberWhenNameNotMatches() { - assertThat(roleValidator.isSubscriberPermitted(NOT_MATCHING_SUBSCRIBER)).isFalse(); + assertThat(roleValidatorBySubscriberAndServiceType.isSubscriberPermitted(NOT_MATCHING_SUBSCRIBER)).isFalse(); } @Test public void shouldPermitServiceWhenNamesMatches() { - assertThat(roleValidator.isServicePermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE)).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType.isServicePermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE)).isTrue(); } @Test public void shouldNotPermitServiceWhenSubscriberNameNotMatches() { - assertThat(roleValidator.isServicePermitted(NOT_MATCHING_SUBSCRIBER, SAMPLE_SERVICE_TYPE)).isFalse(); + assertThat( + roleValidatorBySubscriberAndServiceType.isServicePermitted(NOT_MATCHING_SUBSCRIBER, SAMPLE_SERVICE_TYPE)).isFalse(); } @Test public void shouldNotPermitServiceWhenServiceTypeNotMatches() { - assertThat(roleValidator.isServicePermitted(SAMPLE_SUBSCRIBER, NOT_MATCHING_SUBSCRIBER)).isFalse(); + assertThat(roleValidatorBySubscriberAndServiceType.isServicePermitted(SAMPLE_SUBSCRIBER, NOT_MATCHING_SUBSCRIBER)).isFalse(); } @Test public void shouldPermitTenantWhenNameMatches() { - assertThat(roleValidator.isTenantPermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE, SAMPLE_TENANT)).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType + .isTenantPermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE, SAMPLE_TENANT)).isTrue(); } @Test public void shouldNotPermitTenantWhenNameNotMatches() { - assertThat(roleValidator.isTenantPermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE, NOT_MATCHING_TENANT)).isFalse(); + assertThat(roleValidatorBySubscriberAndServiceType + .isTenantPermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE, NOT_MATCHING_TENANT)).isFalse(); } @Test public void shouldValidateProperlySORequest() { requestDetails.setAdditionalProperty("requestDetails", requestDetailsProperties); - assertThat(roleValidator.isMsoRequestValid(requestDetails)).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType.isMsoRequestValid(requestDetails)).isTrue(); } @Test public void shouldValidateUnknownSORequest() { - assertThat(roleValidator.isMsoRequestValid(new RequestDetails())).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType.isMsoRequestValid(new RequestDetails())).isTrue(); } @Test @@ -109,6 +112,6 @@ public class RoleValidatorByRolesTest { Map requestDetailsProperties = ImmutableMap.of("subscriberInfo", subscriberInfo, "requestParameters", requestParameters); requestDetails.setAdditionalProperty("requestDetails", requestDetailsProperties); - assertThat(roleValidator.isMsoRequestValid(requestDetails)).isFalse(); + assertThat(roleValidatorBySubscriberAndServiceType.isMsoRequestValid(requestDetails)).isFalse(); } } -- 2.16.6