WIP
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4ddfa10d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4ddfa10d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4ddfa10d Branch: refs/heads/airavata-gov-registry Commit: 4ddfa10de79c708b726d8983bf0a7f2004926b02 Parents: 986f00f Author: scnakandala <[email protected]> Authored: Wed Oct 5 16:27:13 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Oct 5 16:27:13 2016 -0400 ---------------------------------------------------------------------- .../sharing/registry/ConnectionFactory.java | 2 +- .../registry/db/entities/SharingEntity.java | 21 ++++++++++---------- .../registry/db/entities/SharingEntityPK.java | 3 +-- .../server/SharingRegistryServerHandler.java | 6 +----- 4 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/4ddfa10d/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/ConnectionFactory.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/ConnectionFactory.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/ConnectionFactory.java index d501b96..40c0e18 100644 --- a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/ConnectionFactory.java +++ b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/ConnectionFactory.java @@ -38,7 +38,7 @@ public class ConnectionFactory { public static final String EXPCAT_PASSWORD = ""; public static final String DRIVER_CLASS = "com.mysql.jdbc.Driver"; - private static Connection expCatConnection, sharingCatConnection; + private static Connection expCatConnection; //private constructor private ConnectionFactory() throws ClassNotFoundException, SQLException { http://git-wip-us.apache.org/repos/asf/airavata/blob/4ddfa10d/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java index bbb9614..b4b74b0 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java +++ b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java @@ -68,17 +68,8 @@ public class SharingEntity { this.groupId = groupId; } - @Basic - @Column(name = "SHARING_TYPE") - public String getSharingType() { - return sharingType; - } - public void setSharingType(String sharingType) { - this.sharingType = sharingType; - } - - @Basic + @Id @Column(name = "INHERITED_PARENT_ID") public String getInheritedParentId() { return inheritedParentId; @@ -89,6 +80,16 @@ public class SharingEntity { } @Basic + @Column(name = "SHARING_TYPE") + public String getSharingType() { + return sharingType; + } + + public void setSharingType(String sharingType) { + this.sharingType = sharingType; + } + + @Basic @Column(name = "CREATED_TIME") public Long getCreatedTime() { return createdTime; http://git-wip-us.apache.org/repos/asf/airavata/blob/4ddfa10d/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntityPK.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntityPK.java b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntityPK.java index 59de199..da77a87 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntityPK.java +++ b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntityPK.java @@ -23,7 +23,6 @@ package org.apache.airavata.sharing.registry.db.entities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Id; import java.io.Serializable; @@ -65,8 +64,8 @@ public class SharingEntityPK implements Serializable { this.groupId = groupId; } - @Basic @Column(name = "INHERITED_PARENT_ID") + @Id public String getInheritedParentId() { return inheritedParentId; } http://git-wip-us.apache.org/repos/asf/airavata/blob/4ddfa10d/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java index b99a6df..247cbfe 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java +++ b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java @@ -386,11 +386,7 @@ public class SharingRegistryServerHandler implements GovRegistryService.Iface{ newSharing.setPermissionTypeId(sharing.permissionTypeId); newSharing.setEntityId(entity.entityId); newSharing.setGroupId(sharing.groupId); - if(sharing.sharingType.equals(SharingType.DIRECT_CASCADING)) - newSharing.setInheritedParentId(sharing.entityId); - - else - newSharing.setInheritedParentId(sharing.inheritedParentId); + newSharing.setInheritedParentId(sharing.inheritedParentId); newSharing.setSharingType(SharingType.INDIRECT_CASCADING); newSharing.setCreatedTime(System.currentTimeMillis()); newSharing.setUpdatedTime(System.currentTimeMillis());
