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/16 19:47:03 UTC
[airavata-data-lake] branch master updated: Change Table names to upper case
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 ede8d9c Change Table names to upper case
new fe07a46 Merge pull request #134 from isururanawaka/mysql_conversion
ede8d9c is described below
commit ede8d9c9f7b402cd48c0d33e15cb60cacbd24740
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Aug 16 15:46:31 2022 -0400
Change Table names to upper case
---
.../drms/api/handlers/ResourceServiceHandler.java | 20 +++++------
.../api/persistance/mapper/ResourceMapper.java | 6 ++--
.../drms/api/persistance/mapper/StorageMapper.java | 2 +-
.../mapper/StoragePreferenceMapper.java | 2 +-
.../drms/api/persistance/model/Resource.java | 9 ++---
.../api/persistance/model/ResourceProperty.java | 39 ++++++++++------------
.../api/persistance/model/TransferMapping.java | 7 ++--
.../repository/ResourcePropertyRepository.java | 2 +-
.../persistance/repository/ResourceRepository.java | 2 +-
9 files changed, 44 insertions(+), 45 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 8cf1f81..f958e7a 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
@@ -413,15 +413,15 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
Set<ResourceProperty> resourcePropertySet = mergeProperties(resource, map);
Optional<ResourceProperty> property = resourcePropertyRepository.
- findByKeyAndResourceId("metadata", resource.getId());
+ findByPropertyKeyAndResourceId("metadata", resource.getId());
if (property.isPresent()) {
resourcePropertyRepository.delete(property.get());
}
ResourceProperty resourceProperty = new ResourceProperty();
- resourceProperty.setKey("metadata");
- resourceProperty.setValue(message);
+ resourceProperty.setPropertyKey("metadata");
+ resourceProperty.setPropertyValue(message);
resourcePropertySet.add(resourceProperty);
resource.setResourceProperty(resourcePropertySet);
@@ -457,9 +457,9 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
if (resourceOptional.isPresent()) {
Optional<ResourceProperty> resourceProperty = resourcePropertyRepository
- .findByKeyAndResourceId("metadata", resourceOptional.get().getId());
+ .findByPropertyKeyAndResourceId("metadata", resourceOptional.get().getId());
if (resourceProperty.isPresent()) {
- String message = resourceProperty.get().getValue();
+ String message = resourceProperty.get().getPropertyValue();
Struct.Builder structBuilder = Struct.newBuilder();
JsonFormat.parser().merge(message, structBuilder);
builder.addMetadata(structBuilder.build());
@@ -483,7 +483,7 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
for (String key : values.keySet()) {
List<ResourceProperty> matched = exisitingProperties.stream().filter(prop -> {
- if (prop.getKey().equals(key)) {
+ if (prop.getPropertyKey().equals(key)) {
return true;
} else {
return false;
@@ -501,8 +501,8 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
}
arrayList.forEach(val -> {
ResourceProperty resourceProperty = new ResourceProperty();
- resourceProperty.setKey(key);
- resourceProperty.setValue(val.toString());
+ resourceProperty.setPropertyKey(key);
+ resourceProperty.setPropertyValue(val.toString());
resourceProperty.setResource(resource);
resourcePropertySet.add(resourceProperty);
});
@@ -514,8 +514,8 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
});
}
ResourceProperty resourceProperty = new ResourceProperty();
- resourceProperty.setKey(key);
- resourceProperty.setValue(value);
+ resourceProperty.setPropertyKey(key);
+ resourceProperty.setPropertyValue(value);
resourceProperty.setResource(resource);
resourcePropertySet.add(resourceProperty);
}
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
index c5726c2..e9932b9 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
@@ -34,10 +34,10 @@ public class ResourceMapper {
while (iterator.hasNext()) {
ResourceProperty resourceProperty = iterator.next();
- if (resourceProperty.getKey().equals("resourcePath")) {
- genericResourceBuilder.setResourcePath(resourceProperty.getValue());
+ if (resourceProperty.getPropertyKey().equals("resourcePath")) {
+ genericResourceBuilder.setResourcePath(resourceProperty.getPropertyValue());
}
- genericResourceBuilder.putProperties(resourceProperty.getKey(), resourceProperty.getValue());
+ genericResourceBuilder.putProperties(resourceProperty.getPropertyKey(), resourceProperty.getPropertyValue());
}
return genericResourceBuilder.build();
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 955c9d9..2f80cec 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
@@ -94,7 +94,7 @@ public class StorageMapper {
for (ResourceProperty field : values) {
BeanWrapper beanWrapper = PropertyAccessorFactory.forBeanPropertyAccess(target);
try {
- beanWrapper.setPropertyValue(field.getKey(), field.getValue());
+ beanWrapper.setPropertyValue(field.getPropertyKey(), field.getPropertyValue());
} catch (Exception ex) {
LOGGER.error(" Error occurred during field setting ", ex);
continue;
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 785af95..afad5c6 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
@@ -53,7 +53,7 @@ public class StoragePreferenceMapper {
for (ResourceProperty field : resource.getResourceProperty()) {
BeanWrapper beanWrapper = PropertyAccessorFactory.forBeanPropertyAccess(target);
try {
- beanWrapper.setPropertyValue(field.getKey(), field.getValue());
+ beanWrapper.setPropertyValue(field.getPropertyKey(), field.getPropertyValue());
} catch (Exception ex) {
continue;
}
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 6975ad9..af8b5d6 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
@@ -6,20 +6,21 @@ import javax.persistence.*;
import java.util.Set;
@Entity
-@Table(name = "resource")
+@Table(name = "RESOURCE")
@EntityListeners(AuditingEntityListener.class)
public class Resource {
@Id
+ @Column(name="ID")
private String id;
- @Column(nullable = false)
+ @Column(name="TENANT_ID",nullable = false)
private String tenantId;
- @Column
+ @Column(name="PARENT_RESOURCE_ID")
private String parentResourceId;
- @Column
+ @Column(name="RESOURCE_TYPE")
private String resourceType;
@OneToMany(fetch = FetchType.EAGER, mappedBy = "resource", orphanRemoval = true, cascade = CascadeType.ALL)
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/ResourceProperty.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/ResourceProperty.java
index 2fd8c5c..1e35b03 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/ResourceProperty.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/ResourceProperty.java
@@ -5,34 +5,31 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
@Entity
-@Table
-//
-// (name = "resource_property",uniqueConstraints={
-// @UniqueConstraint( name = "idx_key_vaule", columnNames ={"key","vaule","resource_id"})
-//})
+@Table(name = "RESOURCE_PROPERTY")
@EntityListeners(AuditingEntityListener.class)
public class ResourceProperty {
- public ResourceProperty(String key, String value, Resource resource) {
- this.key = key;
- this.value = value;
+ public ResourceProperty(String propertyKey, String propertyValue, Resource resource) {
+ this.propertyKey = propertyKey;
+ this.propertyValue = propertyValue;
this.resource = resource;
}
@Id
+ @Column(name="ID")
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
- @Column(nullable = false)
- private String key;
+ @Column(name="PROPERTY_KEY", nullable = false)
+ private String propertyKey;
- @Column(nullable = false)
+ @Column(name="PROPERTY_VALUE",nullable = false)
@Lob
- private String value;
+ private String propertyValue;
@ManyToOne
- @JoinColumn(name = "resource_id")
+ @JoinColumn(name = "RESOURCE_ID")
private Resource resource;
public ResourceProperty() {
@@ -47,20 +44,20 @@ public class ResourceProperty {
this.id = id;
}
- public String getKey() {
- return key;
+ public String getPropertyKey() {
+ return propertyKey;
}
- public void setKey(String key) {
- this.key = key;
+ public void setPropertyKey(String key) {
+ this.propertyKey = key;
}
- public String getValue() {
- return value;
+ public String getPropertyValue() {
+ return propertyValue;
}
- public void setValue(String value) {
- this.value = value;
+ public void setPropertyValue(String value) {
+ this.propertyValue = value;
}
public Resource getResource() {
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/TransferMapping.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/TransferMapping.java
index 7c729f3..ee82b25 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/TransferMapping.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/model/TransferMapping.java
@@ -6,12 +6,13 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
@Entity
-@Table(name = "transfer_mapping")
+@Table(name = "TRANSFER_MAPPING")
@EntityListeners(AuditingEntityListener.class)
public class TransferMapping {
@Id
+ @Column(name="ID")
private String id;
@ManyToOne
@@ -22,10 +23,10 @@ public class TransferMapping {
@JoinColumn(name = "destination_resource_id")
private Resource destination;
- @Column
+ @Column(name="SCOPE")
private String scope;
- @Column
+ @Column(name="OWNER_ID")
private String ownerId;
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 d6a8871..361ef77 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
@@ -7,5 +7,5 @@ import java.util.Optional;
public interface ResourcePropertyRepository extends JpaRepository<ResourceProperty, String> {
- Optional<ResourceProperty> findByKeyAndResourceId(String key, String resourceId);
+ Optional<ResourceProperty> findByPropertyKeyAndResourceId(String key, String resourceId);
}
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 355a9bd..c0ca768 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
@@ -10,7 +10,7 @@ import java.util.List;
public interface ResourceRepository extends JpaRepository<Resource, String> {
- @Query(value = "select * from RESOURCE t where t.parent_resource_id =?1 and t.tenant_id = ?2 and t.type = ?3 " +
+ @Query(value = "select * from RESOURCE t where t.PARENT_RESOURCE_ID =?1 and t.TENANT_ID = ?2 and t.RESOURCE_TYPE = ?3 " +
"order by t.id limit ?3 offset ?4", nativeQuery = true)
List<Resource> findAllByParentResourceIdAndTenantIdAndResourceTypeWithPagination(String parentResourdeId, String tenantId, String type,
int limit, int offset);