RoleValidatorFactory respects owning-entity feature flag

Add FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY flag to response with correct type of RoleValidator

Issue-ID: VID-758
Change-Id: I464fc1a155e72fedbe3f15d9745c80817db22391
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>

2 files changed, 91 insertions, 3 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorFactory.java b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorFactory.java
index 12865401d..f4334b1be 100644
--- a/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorFactory.java
+++ b/vid-app-common/src/main/java/org/onap/vid/roles/RoleValidatorFactory.java
@@ -25,6 +25,7 @@ package org.onap.vid.roles;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.vid.properties.Features;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.togglz.core.manager.FeatureManager;
@@ -46,8 +47,18 @@ public class RoleValidatorFactory {
     }
 
     public RoleValidator by(List<Role> roles, boolean disableRoles) {
-        return disableRoles
-            ? new AlwaysValidRoleValidator()
-            : new RoleValidatorBySubscriberAndServiceType(roles);
+
+        if(disableRoles) {
+            return new AlwaysValidRoleValidator();
+        }
+        else if (featureManager.isActive(Features.FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY)){
+            return new RoleValidatorsComposer(
+                new RoleValidatorBySubscriberAndServiceType(roles),
+                new RoleValidatorByOwningEntity()
+            );
+        }
+        else {
+            return new RoleValidatorBySubscriberAndServiceType(roles);
+        }
     }
 }
diff --git a/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorFactoryTest.java b/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorFactoryTest.java
new file mode 100644
index 000000000..b3c71c547
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorFactoryTest.java
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2020 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.vid.roles;
+
+import static java.util.Collections.emptyList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.List;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.onap.vid.properties.Features;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import org.togglz.core.manager.FeatureManager;
+
+public class RoleValidatorFactoryTest {
+
+    @InjectMocks
+    private RoleValidatorFactory roleValidatorFactory;
+
+    @Mock
+    private FeatureManager featureManager;
+
+    @BeforeClass
+    public void initMocks() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @AfterMethod
+    public void reset() {
+        Mockito.reset(featureManager);
+    }
+
+    @Test (dataProvider = "presetRoleValidatorClass")
+    public void returnRoleValidatorByGivenClass_And_RoleManagementActivated_And_FeatureFlag(Class expectedClass,boolean isDisabledRoles, boolean flagActive ) {
+
+        when(featureManager.isActive(Features.FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY)).thenReturn(flagActive);
+        RoleValidator roleValidator = roleValidatorFactory.by(emptyList(), isDisabledRoles);
+        assertThat(roleValidator, instanceOf(expectedClass));
+    }
+
+    @DataProvider
+    public static Object[][] presetRoleValidatorClass() {
+        return new Object[][] {
+            {RoleValidatorsComposer.class, false, true},
+            {AlwaysValidRoleValidator.class, true, true},
+            {RoleValidatorBySubscriberAndServiceType.class, false, false},
+            {AlwaysValidRoleValidator.class, true, false}
+        };
+    }
+
+}
\ No newline at end of file