[airavata-data-lake] branch master updated: validate entity existence

[isjarana]

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 6297690  validate entity existence
     new ef74800  Merge pull request #189 from isururanawaka/mysql_conversion
6297690 is described below

commit 6297690b9b06d9383437f7a81536f922210d7ae1
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Wed Oct 12 16:22:38 2022 -0400

    validate entity existence
---
 .../org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java | 4 ++--
 1 file changed, 2 insertions(+), 2 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 e73b6b4..5f46078 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
@@ -335,7 +335,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
 
             Entities entities = 
sharingManagementClient.searchEntities(callUser.getTenantId(), searchRequest);
             List<GenericResource> metadataList = new ArrayList<>();
-            entities.getEntityArrayList().forEach(shrMetadata -> {
+            
entities.getEntityArrayList().stream().filter(en->en.getType().equals(type)).forEach(shrMetadata
 -> {
 
                 if (!searchMap.isEmpty()) {
                     searchMap.forEach((key, val) -> {
@@ -355,7 +355,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                 }
 
             });
-
+            
             ResourceSearchResponse resourceSearchResponse = 
ResourceSearchResponse
                     .newBuilder()
                     .addAllResources(metadataList)