[airavata-data-lake] branch master updated: override equals method to avoid duplicates

[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 85548bc  override equals method to avoid duplicates
     new 1bd0efc  Merge pull request #179 from isururanawaka/mysql_conversion
85548bc is described below

commit 85548bce2a3c958561ce198d624dcda7fb7108dc
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Sep 20 20:05:40 2022 -0400

    override equals method to avoid duplicates
---
 .../drms/api/persistance/mapper/ResourceMapper.java  |  4 +---
 .../drms/api/persistance/model/Resource.java         |  2 ++
 .../drms/api/persistance/model/ResourceProperty.java | 20 +++++++++++++++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

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 435907f..4046c7d 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
@@ -64,12 +64,10 @@ public class ResourceMapper {
         resourcePropertySet.add(new ResourceProperty("resourceName", 
entity.getName(), prResource));
         resourcePropertySet.add(new ResourceProperty("createdTime", 
String.valueOf(entity.getCreatedAt()), prResource));
         resourcePropertySet.add(new ResourceProperty("tenantId", 
authenticatedUser.getTenantId(), prResource));
-        resourcePropertySet.add(new ResourceProperty("entityId", 
entity.getId(), prResource));
-        resourcePropertySet.add(new ResourceProperty("entityType", 
entity.getType(), prResource));
         resourcePropertySet.add(new ResourceProperty("lastModifiedTime", 
String.valueOf(entity.getCreatedAt()), prResource));
         resourcePropertySet.add(new ResourceProperty("owner", 
entity.getOwnerId(), prResource));
         resourcePropertySet.add(new ResourceProperty("firstName", 
authenticatedUser.getFirstName(), prResource));
-        resourcePropertySet.add(new ResourceProperty("lastName", 
authenticatedUser.getFirstName(), prResource));
+        resourcePropertySet.add(new ResourceProperty("lastName", 
authenticatedUser.getLastName(), prResource));
 
 
         prResource.setId(entity.getId());
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 33179fa..f20db02 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
@@ -88,4 +88,6 @@ public class Resource {
     public void setDestinationTransferMapping(Set<TransferMapping> 
destinationTransferMapping) {
         this.destinationTransferMapping = destinationTransferMapping;
     }
+
+
 }
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 1e35b03..29d66bf 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
@@ -3,6 +3,7 @@ package org.apache.airavata.drms.api.persistance.model;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
+import java.util.Objects;
 
 @Entity
 @Table(name = "RESOURCE_PROPERTY")
@@ -16,14 +17,14 @@ public class ResourceProperty {
     }
 
     @Id
-    @Column(name="ID")
+    @Column(name = "ID")
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
-    @Column(name="PROPERTY_KEY", nullable = false)
+    @Column(name = "PROPERTY_KEY", nullable = false)
     private String propertyKey;
 
-    @Column(name="PROPERTY_VALUE",nullable = false)
+    @Column(name = "PROPERTY_VALUE", nullable = false)
     @Lob
     private String propertyValue;
 
@@ -68,4 +69,17 @@ public class ResourceProperty {
         this.resource = resource;
     }
 
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ResourceProperty that = (ResourceProperty) o;
+        return Objects.equals(propertyKey, that.propertyKey) && 
Objects.equals(resource.getId(), that.resource.getId());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(propertyKey, resource.getId());
+    }
 }