[airavata-data-lake] branch master updated: Bug fix in Generic Resource Deserializer

[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 d29ea00  Bug fix in Generic Resource Deserializer
     new b5e3735  Merge pull request #17 from isururanawaka/workflow_merge
d29ea00 is described below

commit d29ea00645e6ae03319eb977ab986a0f9861b2d4
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Wed Jul 7 14:06:58 2021 -0400

    Bug fix in Generic Resource Deserializer
---
 .../airavata/drms/core/deserializer/GenericResourceDeserializer.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/GenericResourceDeserializer.java
 
b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/GenericResourceDeserializer.java
index 00b588c..c8d8e05 100644
--- 
a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/GenericResourceDeserializer.java
+++ 
b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/GenericResourceDeserializer.java
@@ -66,6 +66,9 @@ public class GenericResourceDeserializer {
                 if (field.equals("entityId")) {
                     
genericResourceBuilder.setResourceId(String.valueOf(node.asMap().get(field)));
                 }
+                if (field.equals("resourceName") || field.equals("name")) {
+                    
genericResourceBuilder.setResourceName(String.valueOf(node.asMap().get(field)));
+                }
             }
             return genericResourceBuilder.build();
         }).collect(Collectors.toList());