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

[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 756abe2  Bug fix in Resource property
     new a22d48b  Merge pull request #127 from isururanawaka/mysql_conversion
756abe2 is described below

commit 756abe2a8e11d169cc99be68c11d60c5745625d0
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Thu Aug 11 16:42:38 2022 -0400

    Bug fix in Resource property
---
 .../org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java   | 2 +-
 .../airavata/drms/api/persistance/repository/ResourceRepository.java    | 2 +-
 2 files 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 f649a03..67f08a8 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
@@ -172,7 +172,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                         resources = 
resourceRepository.findAllByParentResourceIdAndTenantIdAndTypeWithPagination(resourceId
                                 , callUser.getTenantId(), type, limit, offset);
                     } else {
-                        resources = 
resourceRepository.findAllByParentResourceIdAndTenantIdAAndType(resourceId,
+                        resources = 
resourceRepository.findAllByParentResourceIdAndTenantIdAndType(resourceId,
                                 callUser.getTenantId(), type);
                     }
 
diff --git 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourceRepository.java
 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourceRepository.java
index a849e24..e908ae2 100644
--- 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourceRepository.java
+++ 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourceRepository.java
@@ -16,5 +16,5 @@ public interface ResourceRepository extends 
JpaRepository<Resource, String> {
                                                                              
int limit, int offset);
 
 
-    List<Resource> findAllByParentResourceIdAndTenantIdAAndType(String 
parentResourdeId, String tenantId, String type);
+    List<Resource> findAllByParentResourceIdAndTenantIdAndType(String 
parentResourdeId, String tenantId, String type);
 }