[airavata-data-lake] branch master updated: bug fix in property merge

[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 5ff8cc5  bug fix in property merge
     new 9054f1f  Merge pull request #173 from isururanawaka/mysql_conversion
5ff8cc5 is described below

commit 5ff8cc5ae3fe4391e9bcb2ee544ae3ba62930be2
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Sep 20 14:21:52 2022 -0400

    bug fix in property merge
---
 .../org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java | 4 ++--
 .../drms/api/persistance/repository/ResourcePropertyRepository.java   | 2 +-
 2 files changed, 3 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 103c3d6..6d98b2f 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
@@ -477,7 +477,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                             findByPropertyKeyAndResourceId("metadata", 
resource.getId());
 
                     if (property.isPresent()) {
-                        resourcePropertyRepository.delete(property.get());
+                        
resourcePropertyRepository.deleteById(property.get().getId());
                     }
 
                     ResourceProperty resourceProperty = new ResourceProperty();
@@ -589,7 +589,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                 String value = String.valueOf(values.get(key));
                 if (!matched.isEmpty()) {
                     matched.forEach(val -> {
-                        resourcePropertyRepository.delete(val);
+                        resourcePropertyRepository.deleteById(val.getId());
                     });
                 }
 
diff --git 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourcePropertyRepository.java
 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourcePropertyRepository.java
index 9452804..897d2b4 100644
--- 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourcePropertyRepository.java
+++ 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourcePropertyRepository.java
@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.List;
 import java.util.Optional;
 
-public interface ResourcePropertyRepository extends 
JpaRepository<ResourceProperty, String> {
+public interface ResourcePropertyRepository extends 
JpaRepository<ResourceProperty, Long> {
 
     Optional<ResourceProperty> findByPropertyKeyAndResourceId(String key, 
String resourceId);