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 2022/12/20 17:22:21 UTC
[airavata-data-lake] branch master updated: COLLECTION_GROUP support
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 46bb842 COLLECTION_GROUP support
new 5fc8987 Merge pull request #197 from isururanawaka/mysql_conversion
46bb842 is described below
commit 46bb842ddb9820437d539a60465e90377265a725
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Dec 20 12:21:37 2022 -0500
COLLECTION_GROUP support
---
.../drms/api/handlers/ResourceServiceHandler.java | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
index 864ea6e..5b40de8 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
@@ -45,7 +45,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@@ -212,11 +211,11 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
.setCondition(SearchCondition.EQUAL)
.setValue(id))
.build();
- Entities entities = sharingManagementClient.searchEntities(callUser.getTenantId(), searchRequest);
+ Entities entities = sharingManagementClient.searchEntities(callUser.getTenantId(), searchRequest);
if (entities != null && !entities.getEntityArrayList().isEmpty()) {
- genericResources.add(ResourceMapper.map(resource, entities.getEntityArray(0)));
+ genericResources.add(ResourceMapper.map(resource, entities.getEntityArray(0)));
}
@@ -325,7 +324,7 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
Optional<TransferMapping> transferMappingOptional = transferMappingRepository.
findTransferMappingByScope(TransferScope.GLOBAL.name());
- if (transferMappingOptional.isPresent() && searchMap.isEmpty()) {
+ if (transferMappingOptional.isPresent() && searchMap.isEmpty() && !type.equalsIgnoreCase("COLLECTION_GROUP")) {
TransferMapping transferMapping = transferMappingOptional.get();
String sourceId = transferMapping.getSource().getId();
@@ -334,16 +333,14 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
.setCondition(SearchCondition.EQUAL)
.setValue(sourceId).build());
- searchRequestBuilder = searchRequestBuilder.addSearchCriteria(SearchCriteria.newBuilder()
- .setSearchField(EntitySearchField.ENTITY_TYPE_ID)
- .setCondition(SearchCondition.EQUAL)
- .setValue(type).build());
searchRequestBuilder.setSearchPermBottomUp(true);
}
// }
-
- SearchRequest searchRequest = searchRequestBuilder.setOwnerId(callUser
- .getUsername())
+ SearchRequest searchRequest = searchRequestBuilder.addSearchCriteria(SearchCriteria.newBuilder()
+ .setSearchField(EntitySearchField.ENTITY_TYPE_ID)
+ .setCondition(SearchCondition.EQUAL)
+ .setValue(type).build())
+ .setOwnerId(callUser.getUsername())
.setClientId(callUser.getTenantId())
.build();