Repository: airavata Updated Branches: refs/heads/develop 82e57526c -> 2c81c1ed5
adding getAllAccessible Users method Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2c81c1ed Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2c81c1ed Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2c81c1ed Branch: refs/heads/develop Commit: 2c81c1ed5364eba8a431a98f9f596acee37c4c1f Parents: 82e5752 Author: scnakandala <[email protected]> Authored: Mon Oct 10 01:17:16 2016 -0400 Committer: scnakandala <[email protected]> Committed: Mon Oct 10 01:17:16 2016 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 6 +- .../sharing-data-migrator/pom.xml | 1 + .../sharing-registry-core/pom.xml | 6 + .../db/repositories/SharingRepository.java | 2 +- .../db/repositories/UserGroupRepository.java | 17 +++ .../db/repositories/UserRepository.java | 16 +++ .../server/SharingRegistryServerHandler.java | 114 +++++++++---------- .../SharingRegistryServerHandlerTest.java | 67 +++++------ .../sharing-registry-stubs/pom.xml | 1 + 9 files changed, 138 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/2c81c1ed/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 98211c0..7ae3888 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -3705,7 +3705,11 @@ public class AiravataServerHandler implements Airavata.Iface { try { List<String> accessibleUsers = new ArrayList<>(); if(permissionType.equals(ResourcePermissionType.WRITE)) - sharingRegistryServerHandler.getListOfSharedUsers(resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID) + ":WRITE").stream().forEach(u->accessibleUsers.add(u.userId)); + sharingRegistryServerHandler.getListOfSharedUsers(resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID) + + ":WRITE").stream().forEach(u->accessibleUsers.add(u.userId)); + else if(permissionType.equals(ResourcePermissionType.READ)) + sharingRegistryServerHandler.getListOfSharedUsers(resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID) + + ":READ").stream().forEach(u->accessibleUsers.add(u.userId)); return accessibleUsers; } catch (Exception e) { String msg = "Error in getting all accessible users for resource. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ; http://git-wip-us.apache.org/repos/asf/airavata/blob/2c81c1ed/modules/sharing-registry/sharing-data-migrator/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml index 472b0a2..7a6de21 100644 --- a/modules/sharing-registry/sharing-data-migrator/pom.xml +++ b/modules/sharing-registry/sharing-data-migrator/pom.xml @@ -10,6 +10,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>airavata-sharing-data-migrator</artifactId> + <packaging>jar</packaging> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/2c81c1ed/modules/sharing-registry/sharing-registry-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/pom.xml b/modules/sharing-registry/sharing-registry-core/pom.xml index 3ed4de5..d529744 100644 --- a/modules/sharing-registry/sharing-registry-core/pom.xml +++ b/modules/sharing-registry/sharing-registry-core/pom.xml @@ -11,6 +11,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>airavata-sharing-registry-core</artifactId> + <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.slf4j</groupId> @@ -52,6 +53,11 @@ <artifactId>mysql-connector-java</artifactId> <version>5.1.34</version> </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>0.9.3</version> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/airavata/blob/2c81c1ed/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java index e706f24..9c30fa4 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java +++ b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java @@ -23,8 +23,8 @@ package org.apache.airavata.sharing.registry.db.repositories; import org.apache.airavata.sharing.registry.db.entities.SharingEntity; import org.apache.airavata.sharing.registry.db.entities.SharingEntityPK; import org.apache.airavata.sharing.registry.db.utils.DBConstants; -import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.Sharing; +import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.SharingType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/2c81c1ed/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java index 170b1fd..ed49c94 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java +++ b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java @@ -20,15 +20,32 @@ */ package org.apache.airavata.sharing.registry.db.repositories; +import org.apache.airavata.sharing.registry.db.entities.SharingEntity; import org.apache.airavata.sharing.registry.db.entities.UserGroupEntity; +import org.apache.airavata.sharing.registry.db.utils.DBConstants; +import org.apache.airavata.sharing.registry.models.GroupType; +import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.UserGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; + public class UserGroupRepository extends AbstractRepository<UserGroup, UserGroupEntity, String> { private final static Logger logger = LoggerFactory.getLogger(UserGroupRepository.class); public UserGroupRepository() { super(UserGroup.class, UserGroupEntity.class); } + + public List<UserGroup> getAccessibleGroups(String entityId, String permissionTypeId) throws SharingRegistryException { + String query = "SELECT g from " + UserGroupEntity.class.getSimpleName() + " g, " + SharingEntity.class.getSimpleName() + " s"; + query += " WHERE "; + query += "g." + DBConstants.UserGroupTable.GROUP_ID + " = s." + DBConstants.SharingTable.GROUP_ID + " AND "; + query += "s." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND "; + query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " = '" + permissionTypeId + "' AND "; + query += "g." + DBConstants.UserGroupTable.GROUP_TYPE + " = '" + GroupType.MULTI_USER.toString() + "'"; + query += " ORDER BY s.createdTime DESC"; + return select(query, 0, -1); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/2c81c1ed/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java index 6a17f46..845c0b9 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java +++ b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java @@ -21,15 +21,31 @@ package org.apache.airavata.sharing.registry.db.repositories; +import org.apache.airavata.sharing.registry.db.entities.SharingEntity; import org.apache.airavata.sharing.registry.db.entities.SharingUserEntity; +import org.apache.airavata.sharing.registry.db.utils.DBConstants; +import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; + public class UserRepository extends AbstractRepository<User, SharingUserEntity, String> { private final static Logger logger = LoggerFactory.getLogger(UserRepository.class); public UserRepository() { super(User.class, SharingUserEntity.class); } + + + public List<User> getAccessibleUsers(String entityId, String permissionTypeId) throws SharingRegistryException { + String query = "SELECT u from " + SharingUserEntity.class.getSimpleName() + " u, " + SharingEntity.class.getSimpleName() + " s"; + query += " WHERE "; + query += "u." + DBConstants.UserTable.USER_ID + " = s." + DBConstants.SharingTable.GROUP_ID + " AND "; + query += "s." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND "; + query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " = '" + permissionTypeId + "'"; + query += " ORDER BY s.createdTime DESC"; + return select(query, 0, -1); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/2c81c1ed/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java index b260018..7909d07 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java +++ b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java @@ -21,12 +21,10 @@ package org.apache.airavata.sharing.registry.server; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.sharing.registry.db.entities.GroupMembershipEntityPK; import org.apache.airavata.sharing.registry.db.entities.SharingEntityPK; import org.apache.airavata.sharing.registry.db.repositories.*; import org.apache.airavata.sharing.registry.db.utils.DBConstants; -import org.apache.airavata.sharing.registry.db.utils.JPAUtils; import org.apache.airavata.sharing.registry.models.*; import org.apache.airavata.sharing.registry.service.cpi.GovRegistryService; import org.apache.thrift.TException; @@ -51,8 +49,8 @@ public class SharingRegistryServerHandler implements GovRegistryService.Iface{ private SharingRepository sharingRepository; public SharingRegistryServerHandler() throws ApplicationSettingsException, TException { - JPAUtils.initializeDB(); - +// JPAUtils.initializeDB(); +// this.domainRepository = new DomainRepository(); this.userRepository = new UserRepository(); this.userGroupRepository = new UserGroupRepository(); @@ -61,58 +59,58 @@ public class SharingRegistryServerHandler implements GovRegistryService.Iface{ this.permissionTypeRepository = new PermissionTypeRepository(); this.entityRepository = new EntityRepository(); this.sharingRepository = new SharingRepository(); - - if(!domainRepository.isExists(ServerSettings.getDefaultUserGateway())){ - Domain domain = new Domain(); - domain.setDomainId(ServerSettings.getDefaultUserGateway()); - domain.setName(ServerSettings.getDefaultUserGateway()); - domain.setDescription("Domain entry for " + domain.name); - createDomain(domain); - - User user = new User(); - user.setDomainId(domain.domainId); - user.setUserId(ServerSettings.getDefaultUser()+"@"+ServerSettings.getDefaultUserGateway()); - user.setUserName(ServerSettings.getDefaultUser()); - createUser(user); - - //Creating Entity Types for each domain - EntityType entityType = new EntityType(); - entityType.setEntityTypeId(domain.domainId+":PROJECT"); - entityType.setDomainId(domain.domainId); - entityType.setName("PROJECT"); - entityType.setDescription("Project entity type"); - createEntityType(entityType); - - entityType = new EntityType(); - entityType.setEntityTypeId(domain.domainId+":EXPERIMENT"); - entityType.setDomainId(domain.domainId); - entityType.setName("EXPERIMENT"); - entityType.setDescription("Experiment entity type"); - createEntityType(entityType); - - entityType = new EntityType(); - entityType.setEntityTypeId(domain.domainId+":FILE"); - entityType.setDomainId(domain.domainId); - entityType.setName("FILE"); - entityType.setDescription("File entity type"); - createEntityType(entityType); - - //Creating Permission Types for each domain - PermissionType permissionType = new PermissionType(); - permissionType.setPermissionTypeId(domain.domainId+":READ"); - permissionType.setDomainId(domain.domainId); - permissionType.setName("READ"); - permissionType.setDescription("Read permission type"); - createPermissionType(permissionType); - - permissionType = new PermissionType(); - permissionType.setPermissionTypeId(domain.domainId+":WRITE"); - permissionType.setDomainId(domain.domainId); - permissionType.setName("WRITE"); - permissionType.setDescription("Write permission type"); - createPermissionType(permissionType); - - } +// +// if(!domainRepository.isExists(ServerSettings.getDefaultUserGateway())){ +// Domain domain = new Domain(); +// domain.setDomainId(ServerSettings.getDefaultUserGateway()); +// domain.setName(ServerSettings.getDefaultUserGateway()); +// domain.setDescription("Domain entry for " + domain.name); +// createDomain(domain); +// +// User user = new User(); +// user.setDomainId(domain.domainId); +// user.setUserId(ServerSettings.getDefaultUser()+"@"+ServerSettings.getDefaultUserGateway()); +// user.setUserName(ServerSettings.getDefaultUser()); +// createUser(user); +// +// //Creating Entity Types for each domain +// EntityType entityType = new EntityType(); +// entityType.setEntityTypeId(domain.domainId+":PROJECT"); +// entityType.setDomainId(domain.domainId); +// entityType.setName("PROJECT"); +// entityType.setDescription("Project entity type"); +// createEntityType(entityType); +// +// entityType = new EntityType(); +// entityType.setEntityTypeId(domain.domainId+":EXPERIMENT"); +// entityType.setDomainId(domain.domainId); +// entityType.setName("EXPERIMENT"); +// entityType.setDescription("Experiment entity type"); +// createEntityType(entityType); +// +// entityType = new EntityType(); +// entityType.setEntityTypeId(domain.domainId+":FILE"); +// entityType.setDomainId(domain.domainId); +// entityType.setName("FILE"); +// entityType.setDescription("File entity type"); +// createEntityType(entityType); +// +// //Creating Permission Types for each domain +// PermissionType permissionType = new PermissionType(); +// permissionType.setPermissionTypeId(domain.domainId+":READ"); +// permissionType.setDomainId(domain.domainId); +// permissionType.setName("READ"); +// permissionType.setDescription("Read permission type"); +// createPermissionType(permissionType); +// +// permissionType = new PermissionType(); +// permissionType.setPermissionTypeId(domain.domainId+":WRITE"); +// permissionType.setDomainId(domain.domainId); +// permissionType.setName("WRITE"); +// permissionType.setDescription("Write permission type"); +// createPermissionType(permissionType); +// +// } } /** @@ -508,12 +506,12 @@ public class SharingRegistryServerHandler implements GovRegistryService.Iface{ @Override public List<User> getListOfSharedUsers(String entityId, String permissionTypeId) throws SharingRegistryException, TException { - return null; + return userRepository.getAccessibleUsers(entityId, permissionTypeId); } @Override public List<UserGroup> getListOfSharedGroups(String entityId, String permissionTypeId) throws SharingRegistryException, TException { - return null; + return userGroupRepository.getAccessibleGroups(entityId, permissionTypeId); } /** http://git-wip-us.apache.org/repos/asf/airavata/blob/2c81c1ed/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java b/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java index b35bfef..09e98ca 100644 --- a/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java +++ b/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java @@ -47,7 +47,7 @@ public class SharingRegistryServerHandlerTest { @Test public void test() throws TException, ApplicationSettingsException { - SharingRegistryServerHandler govRegistryServerHandler = new SharingRegistryServerHandler(); + SharingRegistryServerHandler sharingRegistryServerHandler = new SharingRegistryServerHandler(); //Creating domain Domain domain = new Domain(); @@ -58,8 +58,8 @@ public class SharingRegistryServerHandlerTest { domain.setCreatedTime(System.currentTimeMillis()); domain.setUpdatedTime(System.currentTimeMillis()); - Assert.assertNotNull(govRegistryServerHandler.createDomain(domain)); - Assert.assertTrue(govRegistryServerHandler.getDomains(0, 10).size() > 0); + Assert.assertNotNull(sharingRegistryServerHandler.createDomain(domain)); + Assert.assertTrue(sharingRegistryServerHandler.getDomains(0, 10).size() > 0); //Creating users @@ -72,7 +72,7 @@ public class SharingRegistryServerHandlerTest { user1.setCreatedTime(System.currentTimeMillis()); user1.setUpdatedTime(System.currentTimeMillis()); - Assert.assertNotNull(govRegistryServerHandler.createUser(user1)); + Assert.assertNotNull(sharingRegistryServerHandler.createUser(user1)); User user2 = new User(); String userName2 = "test-user-2." + System.currentTimeMillis(); @@ -83,7 +83,7 @@ public class SharingRegistryServerHandlerTest { user2.setCreatedTime(System.currentTimeMillis()); user2.setUpdatedTime(System.currentTimeMillis()); - Assert.assertNotNull(govRegistryServerHandler.createUser(user2)); + Assert.assertNotNull(sharingRegistryServerHandler.createUser(user2)); User user3 = new User(); String userName3 = "test-user-3." + System.currentTimeMillis(); @@ -94,9 +94,9 @@ public class SharingRegistryServerHandlerTest { user3.setCreatedTime(System.currentTimeMillis()); user3.setUpdatedTime(System.currentTimeMillis()); - Assert.assertNotNull(govRegistryServerHandler.createUser(user3)); + Assert.assertNotNull(sharingRegistryServerHandler.createUser(user3)); - Assert.assertTrue(govRegistryServerHandler.getUsers(domainId, 0, 10).size() > 0); + Assert.assertTrue(sharingRegistryServerHandler.getUsers(domainId, 0, 10).size() > 0); // Creating user groups UserGroup userGroup1 = new UserGroup(); @@ -111,7 +111,7 @@ public class SharingRegistryServerHandlerTest { userGroup1.setCreatedTime(System.currentTimeMillis()); userGroup1.setUpdatedTime(System.currentTimeMillis()); - Assert.assertNotNull(govRegistryServerHandler.createGroup(userGroup1)); + Assert.assertNotNull(sharingRegistryServerHandler.createGroup(userGroup1)); UserGroup userGroup2 = new UserGroup(); String groupName2 = "test-group-2." + System.currentTimeMillis(); @@ -125,14 +125,14 @@ public class SharingRegistryServerHandlerTest { userGroup2.setCreatedTime(System.currentTimeMillis()); userGroup2.setUpdatedTime(System.currentTimeMillis()); - Assert.assertNotNull(govRegistryServerHandler.createGroup(userGroup2)); + Assert.assertNotNull(sharingRegistryServerHandler.createGroup(userGroup2)); - govRegistryServerHandler.addUsersToGroup(Arrays.asList(userId1), groupId1); - govRegistryServerHandler.addUsersToGroup(Arrays.asList(userId2, userId3), groupId2); - govRegistryServerHandler.addChildGroupToParentGroup(groupId2, groupId1); + sharingRegistryServerHandler.addUsersToGroup(Arrays.asList(userId1), groupId1); + sharingRegistryServerHandler.addUsersToGroup(Arrays.asList(userId2, userId3), groupId2); + sharingRegistryServerHandler.addChildGroupToParentGroup(groupId2, groupId1); - Assert.assertTrue(govRegistryServerHandler.getGroupMembers(groupId1, 0, 10).size() == 2); - Assert.assertTrue(govRegistryServerHandler.getGroupMembers(groupId2, 0, 10).size() == 2); + Assert.assertTrue(sharingRegistryServerHandler.getGroupMembers(groupId1, 0, 10).size() == 2); + Assert.assertTrue(sharingRegistryServerHandler.getGroupMembers(groupId2, 0, 10).size() == 2); //Creating permission types @@ -144,7 +144,7 @@ public class SharingRegistryServerHandlerTest { permissionType1.setDescription("READ description"); permissionType1.setCreatedTime(System.currentTimeMillis()); permissionType1.setUpdatedTime(System.currentTimeMillis()); - String permissionTypeId1 = govRegistryServerHandler.createPermissionType(permissionType1); + String permissionTypeId1 = sharingRegistryServerHandler.createPermissionType(permissionType1); Assert.assertNotNull(permissionTypeId1); PermissionType permissionType2 = new PermissionType(); @@ -155,7 +155,7 @@ public class SharingRegistryServerHandlerTest { permissionType2.setDescription("WRITE description"); permissionType2.setCreatedTime(System.currentTimeMillis()); permissionType2.setUpdatedTime(System.currentTimeMillis()); - String permissionTypeId2 = govRegistryServerHandler.createPermissionType(permissionType2); + String permissionTypeId2 = sharingRegistryServerHandler.createPermissionType(permissionType2); Assert.assertNotNull(permissionTypeId2); //Creating entity types @@ -167,7 +167,7 @@ public class SharingRegistryServerHandlerTest { entityType1.setDescription("test entity type"); entityType1.setCreatedTime(System.currentTimeMillis()); entityType1.setUpdatedTime(System.currentTimeMillis()); - String entityTypeId1 = govRegistryServerHandler.createEntityType(entityType1); + String entityTypeId1 = sharingRegistryServerHandler.createEntityType(entityType1); Assert.assertNotNull(entityTypeId1); EntityType entityType2 = new EntityType(); @@ -178,7 +178,7 @@ public class SharingRegistryServerHandlerTest { entityType2.setDescription("test entity type"); entityType2.setCreatedTime(System.currentTimeMillis()); entityType2.setUpdatedTime(System.currentTimeMillis()); - String entityTypeId2 = govRegistryServerHandler.createEntityType(entityType2); + String entityTypeId2 = sharingRegistryServerHandler.createEntityType(entityType2); Assert.assertNotNull(entityTypeId2); EntityType entityType3 = new EntityType(); @@ -189,7 +189,7 @@ public class SharingRegistryServerHandlerTest { entityType3.setDescription("file input type"); entityType3.setCreatedTime(System.currentTimeMillis()); entityType3.setUpdatedTime(System.currentTimeMillis()); - String entityTypeId3 = govRegistryServerHandler.createEntityType(entityType3); + String entityTypeId3 = sharingRegistryServerHandler.createEntityType(entityType3); Assert.assertNotNull(entityTypeId3); //Creating Entities @@ -207,7 +207,7 @@ public class SharingRegistryServerHandlerTest { entity1.setCreatedTime(System.currentTimeMillis()); entity1.setUpdatedTime(System.currentTimeMillis()); - String entityId1 = govRegistryServerHandler.createEntity(entity1); + String entityId1 = sharingRegistryServerHandler.createEntity(entity1); Assert.assertNotNull(entityId1); Entity entity2 = new Entity(); @@ -225,7 +225,7 @@ public class SharingRegistryServerHandlerTest { entity2.setCreatedTime(System.currentTimeMillis()); entity2.setUpdatedTime(System.currentTimeMillis()); - String entityId2 = govRegistryServerHandler.createEntity(entity2); + String entityId2 = sharingRegistryServerHandler.createEntity(entity2); Assert.assertNotNull(entityId2); Entity entity3 = new Entity(); @@ -243,11 +243,11 @@ public class SharingRegistryServerHandlerTest { entity3.setCreatedTime(System.currentTimeMillis()); entity3.setUpdatedTime(System.currentTimeMillis()); - String entityId3 = govRegistryServerHandler.createEntity(entity3); + String entityId3 = sharingRegistryServerHandler.createEntity(entity3); Assert.assertNotNull(entityId3); - govRegistryServerHandler.shareEntityWithUsers(entityId1, Arrays.asList(userId2), permissionTypeId1, true); - govRegistryServerHandler.shareEntityWithGroups(entityId3, Arrays.asList(groupId2), permissionTypeId1, true); + sharingRegistryServerHandler.shareEntityWithUsers(entityId1, Arrays.asList(userId2), permissionTypeId1, true); + sharingRegistryServerHandler.shareEntityWithGroups(entityId3, Arrays.asList(groupId2), permissionTypeId1, true); Entity entity4 = new Entity(); entity4.setEntityId(domainId+":Entity4"); @@ -264,19 +264,22 @@ public class SharingRegistryServerHandlerTest { entity4.setCreatedTime(System.currentTimeMillis()); entity4.setUpdatedTime(System.currentTimeMillis()); - String entityId4 = govRegistryServerHandler.createEntity(entity4); + String entityId4 = sharingRegistryServerHandler.createEntity(entity4); Assert.assertNotNull(entityId4); - Assert.assertTrue(govRegistryServerHandler.userHasAccess(domainId, userId3, entityId4, permissionTypeId1)); - Assert.assertTrue(govRegistryServerHandler.userHasAccess(domainId, userId2, entityId4, permissionTypeId1)); - Assert.assertTrue(govRegistryServerHandler.userHasAccess(domainId, userId1, entityId4, permissionTypeId1)); - Assert.assertFalse(govRegistryServerHandler.userHasAccess(domainId, userId3, entityId1, permissionTypeId1)); + Assert.assertTrue(sharingRegistryServerHandler.userHasAccess(domainId, userId3, entityId4, permissionTypeId1)); + Assert.assertTrue(sharingRegistryServerHandler.userHasAccess(domainId, userId2, entityId4, permissionTypeId1)); + Assert.assertTrue(sharingRegistryServerHandler.userHasAccess(domainId, userId1, entityId4, permissionTypeId1)); + Assert.assertFalse(sharingRegistryServerHandler.userHasAccess(domainId, userId3, entityId1, permissionTypeId1)); HashMap<EntitySearchFields, String> filters = new HashMap<>(); filters.put(EntitySearchFields.NAME, "Input"); - Assert.assertTrue(govRegistryServerHandler.searchEntities(userId1, entityTypeId3, filters, 0, -1).size() > 0); + Assert.assertTrue(sharingRegistryServerHandler.searchEntities(userId1, entityTypeId3, filters, 0, -1).size() > 0); -// govRegistryServerHandler.revokeEntitySharingFromUsers(entityId1, Arrays.asList(userId2), permissionTypeId1); -// govRegistryServerHandler.revokeEntitySharingFromGroups(entityId3, Arrays.asList(groupId2), permissionTypeId1); + Assert.assertNotNull(sharingRegistryServerHandler.getListOfSharedUsers(entityId1, permissionTypeId1)); + Assert.assertNotNull(sharingRegistryServerHandler.getListOfSharedGroups(entityId1, permissionTypeId1)); + +// sharingRegistryServerHandler.revokeEntitySharingFromUsers(entityId1, Arrays.asList(userId2), permissionTypeId1); +// sharingRegistryServerHandler.revokeEntitySharingFromGroups(entityId3, Arrays.asList(groupId2), permissionTypeId1); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/2c81c1ed/modules/sharing-registry/sharing-registry-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/pom.xml b/modules/sharing-registry/sharing-registry-stubs/pom.xml index ff0334c..f0a46ef 100644 --- a/modules/sharing-registry/sharing-registry-stubs/pom.xml +++ b/modules/sharing-registry/sharing-registry-stubs/pom.xml @@ -11,6 +11,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>airavata-sharing-registry-stubs</artifactId> + <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.apache.thrift</groupId>
