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 3dd3046 Bug fix in create storage
new 3db3d3e Merge pull request #132 from isururanawaka/mysql_conversion
3dd3046 is described below
commit 3dd30463a334b86895216700f4ca33fa720aef51
Author: Isuru Ranawaka <[email protected]>
AuthorDate: Tue Aug 16 14:43:24 2022 -0400
Bug fix in create storage
---
.../drms/api/handlers/StoragePreferenceServiceHandler.java | 7 +++----
.../airavata/drms/api/persistance/mapper/StorageMapper.java | 6 +++---
.../drms/api/persistance/mapper/StoragePreferenceMapper.java | 2 +-
.../apache/airavata/drms/api/persistance/model/Resource.java | 10 +++++-----
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
index e5c972e..bc8ca0a 100644
---
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
+++
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
@@ -28,7 +28,6 @@ import
org.apache.airavata.drms.api.persistance.model.ResourceProperty;
import
org.apache.airavata.drms.api.persistance.repository.ResourcePropertyRepository;
import org.apache.airavata.drms.api.persistance.repository.ResourceRepository;
import org.apache.airavata.drms.api.utils.CustosUtils;
-import org.apache.airavata.drms.core.Neo4JConnector;
import org.apache.airavata.drms.core.constants.SharingConstants;
import org.apache.airavata.drms.core.constants.StoragePreferenceConstants;
import org.apache.airavata.drms.core.serializer.AnyStoragePreferenceSerializer;
@@ -120,7 +119,7 @@ public class StoragePreferenceServiceHandler extends
StoragePreferenceServiceGrp
serializedMap.put(StoragePreferenceConstants.STORAGE_PREFERENCE_TYPE_LABEL,
StoragePreferenceConstants.S3_STORAGE_PREFERENCE_TYPE_LABEL);
resource.setParentResourceId(storageId);
-
resource.setType(StoragePreferenceConstants.S3_STORAGE_PREFERENCE_TYPE_LABEL);
+
resource.setResourceType(StoragePreferenceConstants.S3_STORAGE_PREFERENCE_TYPE_LABEL);
} else if (storage.getStorageCase()
.equals(AnyStoragePreference.StorageCase.SSH_STORAGE_PREFERENCE)) {
@@ -133,7 +132,7 @@ public class StoragePreferenceServiceHandler extends
StoragePreferenceServiceGrp
serializedMap.put(StoragePreferenceConstants.STORAGE_PREFERENCE_TYPE_LABEL,
StoragePreferenceConstants.SSH_STORAGE_PREFERENCE_TYPE_LABEL);
resource.setParentResourceId(storageId);
-
resource.setType(StoragePreferenceConstants.SSH_STORAGE_PREFERENCE_TYPE_LABEL);
+
resource.setResourceType(StoragePreferenceConstants.SSH_STORAGE_PREFERENCE_TYPE_LABEL);
} else if (storage.getStorageCase()
.equals(AnyStoragePreference.StorageCase.SDA_STORAGE_PREFERENCE)) {
@@ -141,7 +140,7 @@ public class StoragePreferenceServiceHandler extends
StoragePreferenceServiceGrp
serializedMap.put(StoragePreferenceConstants.STORAGE_PREFERENCE_TYPE_LABEL,
StoragePreferenceConstants.SDA_STORAGE_PREFERENCE_TYPE_LABEL);
resource.setParentResourceId(storageId);
-
resource.setType(StoragePreferenceConstants.SDA_STORAGE_PREFERENCE_TYPE_LABEL);
+
resource.setResourceType(StoragePreferenceConstants.SDA_STORAGE_PREFERENCE_TYPE_LABEL);
}
diff --git
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StorageMapper.java
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StorageMapper.java
index 53d4402..955c9d9 100644
---
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StorageMapper.java
+++
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StorageMapper.java
@@ -26,7 +26,7 @@ public class StorageMapper {
AnyStorage.Builder anyStorageBuilder = AnyStorage.newBuilder();
- String type = resource.getType();
+ String type = resource.getResourceType();
switch (type) {
case StorageConstants.SSH_STORAGE_TYPE_LABEL:
SSHStorage.Builder builder = SSHStorage.newBuilder();
@@ -61,7 +61,7 @@ public class StorageMapper {
allFields = sshStorage.getAllFields();
resourcePropertySet.add(new
ResourceProperty(StorageConstants.STORAGE_TYPE_LABEL,
StorageConstants.SSH_STORAGE_TYPE_LABEL, prResource));
- prResource.setType(StorageConstants.SSH_STORAGE_TYPE_LABEL);
+
prResource.setResourceType(StorageConstants.SSH_STORAGE_TYPE_LABEL);
prResource.setId(sshStorage.getStorageId());
break;
case S3_STORAGE:
@@ -69,7 +69,7 @@ public class StorageMapper {
allFields = s3Storage.getAllFields();
resourcePropertySet.add(new
ResourceProperty(StorageConstants.STORAGE_TYPE_LABEL,
StorageConstants.S3_STORAGE_TYPE_LABEL, prResource));
- prResource.setType(StorageConstants.S3_STORAGE_TYPE_LABEL);
+
prResource.setResourceType(StorageConstants.S3_STORAGE_TYPE_LABEL);
prResource.setId(s3Storage.getStorageId());
break;
case STORAGE_NOT_SET:
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 cfc3453..785af95 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
@@ -19,7 +19,7 @@ public class StoragePreferenceMapper {
public static AnyStoragePreference map(Resource resource, AnyStorage
anyStorage) throws Exception {
- String type = resource.getType();
+ String type = resource.getResourceType();
AnyStoragePreference.Builder anyStoragePrefBuilder =
AnyStoragePreference.newBuilder();
switch (type) {
diff --git
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/Resource.java
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/Resource.java
index fc3efb3..6975ad9 100644
---
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/Resource.java
+++
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/Resource.java
@@ -20,7 +20,7 @@ public class Resource {
private String parentResourceId;
@Column
- private String type;
+ private String resourceType;
@OneToMany(fetch = FetchType.EAGER, mappedBy = "resource", orphanRemoval =
true, cascade = CascadeType.ALL)
private Set<ResourceProperty> resourceProperty;
@@ -56,12 +56,12 @@ public class Resource {
this.tenantId = tenantId;
}
- public String getType() {
- return type;
+ public String getResourceType() {
+ return resourceType;
}
- public void setType(String type) {
- this.type = type;
+ public void setResourceType(String type) {
+ this.resourceType = type;
}
public Set<ResourceProperty> getResourceProperty() {
