You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2022/08/17 15:57:29 UTC
[airavata-data-lake] branch master updated: Transfermapping creation change id type
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 89bc3fc Transfermapping creation change id type
new 28815a0 Merge pull request #139 from isururanawaka/mysql_conversion
89bc3fc is described below
commit 89bc3fc449d684575700507481c47a078e25999f
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Wed Aug 17 11:56:40 2022 -0400
Transfermapping creation change id type
---
.../org/apache/airavata/drms/api/handlers/StorageServiceHandler.java | 4 ++--
.../drms/api/persistance/repository/TransferMappingRepository.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/StorageServiceHandler.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
index 4d0c241..c60d605 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
@@ -299,7 +299,7 @@ public class StorageServiceHandler extends StorageServiceGrpc.StorageServiceImpl
}
Optional<org.apache.airavata.drms.api.persistance.model.TransferMapping> transferMappingOp =
- transferMappingRepository.findTransferMappingBySourceResourceIdAndDestinationResourceId(
+ transferMappingRepository.findTransferMappingBySourceIdAndDestinationId(
optionalSource.get().getId(),optionalDst.get().getId());
if (transferMappingOp.isPresent()){
@@ -349,7 +349,7 @@ public class StorageServiceHandler extends StorageServiceGrpc.StorageServiceImpl
.build();
responseObserver.onNext(createTransferMappingResponse);
responseObserver.onCompleted();
-
+
} catch (Exception e) {
String msg = "Errored while creating transfer mapping; Message:" + e.getMessage();
logger.error("Errored while creating transfer mapping; Message: {}", e.getMessage(), e);
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/TransferMappingRepository.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/TransferMappingRepository.java
index 0a97019..f7e85ba 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/TransferMappingRepository.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/TransferMappingRepository.java
@@ -8,6 +8,6 @@ import java.util.Optional;
public interface TransferMappingRepository extends JpaRepository<TransferMapping, String> {
- Optional<TransferMapping> findTransferMappingBySourceResourceIdAndDestinationResourceId(String sourceId,
+ Optional<TransferMapping> findTransferMappingBySourceIdAndDestinationId(String sourceId,
String destinationId);
}