You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/09/01 01:39:15 UTC
[airavata-data-lake] branch master updated: Big fix in sharing
handler
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
The following commit(s) were added to refs/heads/master by this push:
new 7e8a597 Big fix in sharing handler
new 5fdbbce Merge pull request #45 from isururanawaka/sharing_service_impl
7e8a597 is described below
commit 7e8a597e0e310876375668040a80209aeeeeb02a
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Aug 31 21:34:26 2021 -0400
Big fix in sharing handler
---
.../synchronizer/handlers/SharingHandler.java | 38 ++++++++++++----------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/data-resource-management-service/drms-custos-synchronizer/src/main/java/org/apache/airavata/drms/custos/synchronizer/handlers/SharingHandler.java b/data-resource-management-service/drms-custos-synchronizer/src/main/java/org/apache/airavata/drms/custos/synchronizer/handlers/SharingHandler.java
index b07127c..105f193 100644
--- a/data-resource-management-service/drms-custos-synchronizer/src/main/java/org/apache/airavata/drms/custos/synchronizer/handlers/SharingHandler.java
+++ b/data-resource-management-service/drms-custos-synchronizer/src/main/java/org/apache/airavata/drms/custos/synchronizer/handlers/SharingHandler.java
@@ -93,28 +93,29 @@ public class SharingHandler {
private void mergeEntityParentChildRelationShips(SharingManagementClient sharingManagementClient, Entity entity,
String clientId) {
+ try {
+ if (!entity.getParentId().trim().isEmpty()) {
+ Entity parentEntity = Entity.newBuilder().setId(entity.getParentId()).build();
+ Entity fullParentEntity = sharingManagementClient.getEntity(clientId, parentEntity);
+ String query = "MATCH (a:" + entity.getType() + "), (b:" + fullParentEntity.getType() + ") WHERE a.entityId = $entityId" +
+ " AND a.tenantId = $tenantId AND " + "b.entityId = $parentEntityId AND b.tenantId = $tenantId " +
+ "MERGE (a)-[r:CHILD_OF]->(b) RETURN a, b";
+ Map<String, Object> map = new HashMap<>();
+ map.put("entityId", entity.getId());
+ map.put("parentEntityId", fullParentEntity.getId());
+ map.put("tenantId", clientId);
- if (!entity.getParentId().trim().isEmpty()) {
- Entity parentEntity = Entity.newBuilder().setId(entity.getParentId()).build();
- Entity fullParentEntity = sharingManagementClient.getEntity(clientId, parentEntity);
- String query = "MATCH (a:" + entity.getType() + "), (b:" + fullParentEntity.getType() + ") WHERE a.entityId = $entityId" +
- " AND a.tenantId = $tenantId AND " + "b.entityId = $parentEntityId AND b.tenantId = $tenantId " +
- "MERGE (a)-[r:CHILD_OF]->(b) RETURN a, b";
- Map<String, Object> map = new HashMap<>();
- map.put("entityId", entity.getId());
- map.put("parentEntityId", fullParentEntity.getId());
- map.put("tenantId", clientId);
- try {
Utils.getNeo4JConnector().runTransactionalQuery(map, query);
- } catch (Exception ex) {
- ex.printStackTrace();
- String msg = "Error occurred while merging parent child relationships ";
- LOGGER.error(msg, ex);
}
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ String msg = "Error occurred while merging parent child relationships ";
+ LOGGER.error(msg, ex);
}
}
private void mergeEntitySharings(SharingMetadata metadata, String clientId) {
+ try {
Entity entity = metadata.getEntity();
String sourceId = metadata.getEntity().getId();
String permissionId = metadata.getPermission().getId();
@@ -144,14 +145,15 @@ public class SharingHandler {
props.put("sharedBy", sharedBy);
props.put("permission", permissionId);
map.put("props", props);
- try {
+
Utils.getNeo4JConnector().runTransactionalQuery(map, query);
- } catch (Exception ex) {
+ }
+ }
+ catch (Exception ex) {
ex.printStackTrace();
String msg = "Error occurred while merging sharings, " + ex.getMessage();
LOGGER.error(msg, ex);
}
- }
}