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/18 22:38:35 UTC
[airavata-data-lake] branch master updated: Bug fix in Storage preference builder
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 22c8f00 Bug fix in Storage preference builder
new 5295cef Merge pull request #155 from isururanawaka/mysql_conversion
22c8f00 is described below
commit 22c8f00e4af44e8aa13694629f6320d0e6ab0e96
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Thu Aug 18 18:38:04 2022 -0400
Bug fix in Storage preference builder
---
.../drms/api/persistance/mapper/StoragePreferenceMapper.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StoragePreferenceMapper.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StoragePreferenceMapper.java
index 5079fe3..e04152a 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StoragePreferenceMapper.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StoragePreferenceMapper.java
@@ -38,21 +38,22 @@ public class StoragePreferenceMapper {
case StoragePreferenceConstants.SSH_STORAGE_PREFERENCE_TYPE_LABEL:
SSHStoragePreference.Builder builder = SSHStoragePreference.newBuilder();
builder.setStorage(anyStorage.getSshStorage());
+ setObjectFieldsUsingMap(builder, resource);
SSHStoragePreference sshStoragePreference = builder.build();
anyStoragePrefBuilder.setSshStoragePreference(sshStoragePreference);
- setObjectFieldsUsingMap(anyStoragePrefBuilder, resource);
break;
case StoragePreferenceConstants.S3_STORAGE_PREFERENCE_TYPE_LABEL:
S3StoragePreference.Builder s3Builder = S3StoragePreference.newBuilder();
s3Builder.setStorage(anyStorage.getS3Storage());
+ setObjectFieldsUsingMap(s3Builder, resource);
anyStoragePrefBuilder.setS3StoragePreference(s3Builder.build());
- setObjectFieldsUsingMap(anyStoragePrefBuilder, resource);
+
break;
case StoragePreferenceConstants.SDA_STORAGE_PREFERENCE_TYPE_LABEL:
SDAStoragePreference.Builder sdaBuilder = SDAStoragePreference.newBuilder();
sdaBuilder.setStorage(anyStorage.getSshStorage());
+ setObjectFieldsUsingMap(sdaBuilder, resource);
anyStoragePrefBuilder.setSdaStoragePreference(sdaBuilder.build());
- setObjectFieldsUsingMap(anyStoragePrefBuilder, resource);
break;
default:
throw new Exception("Unsupported storage type for deserializing : " + type);