1 files changed, 4 insertions, 2 deletions
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 d37477610..830c0f50c 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
@@ -28,9 +28,11 @@ import org.onap.portalsdk.core.util.SystemProperties;
 public interface RoleValidator {
 
     static RoleValidator by(List<Role> roles) {
-        boolean disableRoles =
-            StringUtils.equals(SystemProperties.getProperty("role_management_activated"), "false");
+        final boolean disableRoles = StringUtils.equals(SystemProperties.getProperty("role_management_activated"), "false");
+        return by(roles, disableRoles);
+    }
 
+    static RoleValidator by(List<Role> roles, boolean disableRoles) {
         return disableRoles
             ? new AlwaysValidRoleValidator()
             : new RoleValidatorByRoles(roles);