[airavata] branch develop updated: Always create gateway groups, even if no members for a group

[machristie]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1ca7c57  Always create gateway groups, even if no members for a group
1ca7c57 is described below

commit 1ca7c57ad1615551b03ebbe2eef629720b9ce050
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Thu Jul 19 14:15:44 2018 -0400

    Always create gateway groups, even if no members for a group
---
 .../migrator/airavata/AiravataDataMigrator.java    | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git 
a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
 
b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
index ed9d6ae..ab36c9e 100644
--- 
a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
+++ 
b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
@@ -349,24 +349,24 @@ public class AiravataDataMigrator {
                 .collect(Collectors.toList());
         Map<String, List<String>> roleMap = loadRolesForUsers(domain.domainId, 
usernames);
 
-        if (roleMap.containsKey("gateway-user")) {
-            UserGroup gatewayUsersGroup = 
createGroup(sharingRegistryServerHandler, domain, ownerId,
-                    "Gateway Users",
-                    "Default group for users of the gateway.", 
roleMap.get("gateway-user"));
-            
gatewayGroups.setDefaultGatewayUsersGroupId(gatewayUsersGroup.groupId);
-        }
-        if (roleMap.containsKey("admin")) {
-            UserGroup adminUsersGroup = 
createGroup(sharingRegistryServerHandler, domain, ownerId,
-                    "Admin Users",
-                    "Admin users group.", roleMap.get("admin"));
-            gatewayGroups.setAdminsGroupId(adminUsersGroup.groupId);
-        }
-        if (roleMap.containsKey("admin-read-only")) {
-            UserGroup readOnlyAdminsGroup = 
createGroup(sharingRegistryServerHandler, domain, ownerId,
-                    "Read Only Admin Users",
-                    "Group of admin users with read-only access.", 
roleMap.get("admin-read-only"));
-            
gatewayGroups.setReadOnlyAdminsGroupId(readOnlyAdminsGroup.groupId);
-        }
+        UserGroup gatewayUsersGroup = 
createGroup(sharingRegistryServerHandler, domain, ownerId,
+                "Gateway Users",
+                "Default group for users of the gateway.",
+                roleMap.containsKey("gateway-user") ? 
roleMap.get("gateway-user") : Collections.emptyList());
+        gatewayGroups.setDefaultGatewayUsersGroupId(gatewayUsersGroup.groupId);
+
+        UserGroup adminUsersGroup = createGroup(sharingRegistryServerHandler, 
domain, ownerId,
+                "Admin Users",
+                "Admin users group.",
+                roleMap.containsKey("admin") ? roleMap.get("admin") : 
Collections.emptyList());
+        gatewayGroups.setAdminsGroupId(adminUsersGroup.groupId);
+
+        UserGroup readOnlyAdminsGroup = 
createGroup(sharingRegistryServerHandler, domain, ownerId,
+                "Read Only Admin Users",
+                "Group of admin users with read-only access.",
+                roleMap.containsKey("admin-read-only") ? 
roleMap.get("admin-read-only") : Collections.emptyList());
+        gatewayGroups.setReadOnlyAdminsGroupId(readOnlyAdminsGroup.groupId);
+
         registryServiceClient.createGatewayGroups(gatewayGroups);
         return gatewayGroups;
     }