[airavata-data-lake] branch master updated: impl metadata overwrite

[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 2024956  impl metadata overwrite
     new 44b33d3  Merge pull request #172 from isururanawaka/mysql_conversion
2024956 is described below

commit 202495673b5aadbb3324727e9f1d480a69be4c20
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Sep 20 12:11:09 2022 -0400

    impl metadata overwrite
---
 .../airavata/drms/api/handlers/ResourceServiceHandler.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 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 805bdff..103c3d6 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
@@ -602,9 +602,16 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
 
         }
 
-        List<ResourceProperty> restProperties = 
resourcePropertyRepository.findAllByResourceId(resource.getId());
-        resourcePropertySet.addAll(restProperties);
-        
+        Optional<ResourceProperty> hostOp = 
resourcePropertyRepository.findByPropertyKeyAndResourceId("hostName",resource.getId());
+        Optional<ResourceProperty> resourceOp = 
resourcePropertyRepository.findByPropertyKeyAndResourceId("resourcePath",resource.getId());
+        if(hostOp.isPresent()){
+            resourcePropertySet.add(hostOp.get());
+        }
+        if(resourceOp.isPresent()){
+            resourcePropertySet.add(resourceOp.get());
+        }
+
+
         return resourcePropertySet;
     }