You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/02/23 19:16:26 UTC
airavata git commit: enabling caching in the sharing entity manager
Repository: airavata
Updated Branches:
refs/heads/develop f07a1ddd6 -> 6931cd3c6
enabling caching in the sharing entity manager
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6931cd3c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6931cd3c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6931cd3c
Branch: refs/heads/develop
Commit: 6931cd3c6ddf39280b4bb7db393502334f3fb8d2
Parents: f07a1dd
Author: scnakandala <su...@gmail.com>
Authored: Thu Feb 23 14:16:22 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Feb 23 14:16:22 2017 -0500
----------------------------------------------------------------------
.../registry/db/entities/DomainEntity.java | 24 +++++-----
.../registry/db/entities/EntityEntity.java | 47 +++++++++++---------
.../sharing/registry/db/entities/EntityPK.java | 9 ++--
.../registry/db/entities/EntityTypeEntity.java | 27 ++++++-----
.../registry/db/entities/EntityTypePK.java | 9 ++--
.../db/entities/GroupMembershipEntity.java | 20 +++++----
.../registry/db/entities/GroupMembershipPK.java | 13 +++---
.../db/entities/PermissionTypeEntity.java | 21 +++++----
.../registry/db/entities/PermissionTypePK.java | 9 ++--
.../registry/db/entities/SharingEntity.java | 19 ++++----
.../sharing/registry/db/entities/SharingPK.java | 23 +++++-----
.../registry/db/entities/UserEntity.java | 22 +++++----
.../registry/db/entities/UserGroupEntity.java | 33 ++++++++------
.../registry/db/entities/UserGroupPK.java | 9 ++--
.../sharing/registry/db/entities/UserPK.java | 9 ++--
.../db/repositories/AbstractRepository.java | 2 +
.../sharing/registry/db/utils/JPAUtils.java | 9 ++--
.../server/SharingRegistryServerHandler.java | 7 ++-
.../main/resources/sharing-registry-derby.sql | 2 +-
.../registry/SharingRegistryServiceTest.java | 3 +-
20 files changed, 185 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/DomainEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/DomainEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/DomainEntity.java
index 48b5314..3c2a49a 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/DomainEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/DomainEntity.java
@@ -92,22 +92,26 @@ public class DomainEntity {
DomainEntity that = (DomainEntity) o;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
- if (name != null ? !name.equals(that.name) : that.name != null) return false;
- if (description != null ? !description.equals(that.description) : that.description != null) return false;
- if (createdTime != null ? !createdTime.equals(that.createdTime) : that.createdTime != null) return false;
- if (updatedTime != null ? !updatedTime.equals(that.updatedTime) : that.updatedTime != null) return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
+ return false;
+ if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) return false;
+ if (getDescription() != null ? !getDescription().equals(that.getDescription()) : that.getDescription() != null)
+ return false;
+ if (getCreatedTime() != null ? !getCreatedTime().equals(that.getCreatedTime()) : that.getCreatedTime() != null)
+ return false;
+ if (getUpdatedTime() != null ? !getUpdatedTime().equals(that.getUpdatedTime()) : that.getUpdatedTime() != null)
+ return false;
return true;
}
@Override
public int hashCode() {
- int result = domainId != null ? domainId.hashCode() : 0;
- result = 31 * result + (name != null ? name.hashCode() : 0);
- result = 31 * result + (description != null ? description.hashCode() : 0);
- result = 31 * result + (createdTime != null ? createdTime.hashCode() : 0);
- result = 31 * result + (updatedTime != null ? updatedTime.hashCode() : 0);
+ int result = getDomainId() != null ? getDomainId().hashCode() : 0;
+ result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+ result = 31 * result + (getDescription() != null ? getDescription().hashCode() : 0);
+ result = 31 * result + (getCreatedTime() != null ? getCreatedTime().hashCode() : 0);
+ result = 31 * result + (getUpdatedTime() != null ? getUpdatedTime().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
index 0827439..a6090e4 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
@@ -171,32 +171,39 @@ public class EntityEntity {
EntityEntity that = (EntityEntity) o;
- if (entityId != null ? !entityId.equals(that.entityId) : that.entityId != null) return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
- if (parentEntityId != null ? !parentEntityId.equals(that.parentEntityId) : that.parentEntityId != null) return false;
- if (name != null ? !name.equals(that.name) : that.name != null) return false;
- if (description != null ? !description.equals(that.description) : that.description != null) return false;
- if (binaryData.equals(that.binaryData)) return false;
- if (fullText != null ? !fullText.equals(that.fullText) : that.fullText != null) return false;
- if (originalEntityCreationTime != null ? !originalEntityCreationTime.equals(that.originalEntityCreationTime)
- : that.originalEntityCreationTime != null) return false;
- if (createdTime != null ? !createdTime.equals(that.createdTime) : that.createdTime != null) return false;
- if (updatedTime != null ? !updatedTime.equals(that.updatedTime) : that.updatedTime != null) return false;
- if (ownerId != null ? !ownerId.equals(that.ownerId) : that.ownerId != null) return false;
+ if (getEntityId() != null ? !getEntityId().equals(that.getEntityId()) : that.getEntityId() != null)
+ return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
+ return false;
+ if (getParentEntityId() != null ? !getParentEntityId().equals(that.getParentEntityId()) : that.getParentEntityId() != null)
+ return false;
+ if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) return false;
+ if (getDescription() != null ? !getDescription().equals(that.getDescription()) : that.getDescription() != null)
+ return false;
+ if (getBinaryData().equals(that.getBinaryData())) return false;
+ if (getFullText() != null ? !getFullText().equals(that.getFullText()) : that.getFullText() != null)
+ return false;
+ if (getOriginalEntityCreationTime() != null ? !getOriginalEntityCreationTime().equals(that.getOriginalEntityCreationTime())
+ : that.getOriginalEntityCreationTime() != null) return false;
+ if (getCreatedTime() != null ? !getCreatedTime().equals(that.getCreatedTime()) : that.getCreatedTime() != null)
+ return false;
+ if (getUpdatedTime() != null ? !getUpdatedTime().equals(that.getUpdatedTime()) : that.getUpdatedTime() != null)
+ return false;
+ if (getOwnerId() != null ? !getOwnerId().equals(that.getOwnerId()) : that.getOwnerId() != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = entityId != null ? entityId.hashCode() : 0;
- result = 31 * result + (name != null ? name.hashCode() : 0);
- result = 31 * result + (description != null ? description.hashCode() : 0);
- result = 31 * result + (binaryData != null ? binaryData.hashCode() : 0);
- result = 31 * result + (fullText != null ? fullText.hashCode() : 0);
- result = 31 * result + (originalEntityCreationTime != null ? originalEntityCreationTime.hashCode() : 0);
- result = 31 * result + (createdTime != null ? createdTime.hashCode() : 0);
- result = 31 * result + (updatedTime != null ? updatedTime.hashCode() : 0);
+ int result = getEntityId() != null ? getEntityId().hashCode() : 0;
+ result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+ result = 31 * result + (getDescription() != null ? getDescription().hashCode() : 0);
+ result = 31 * result + (getBinaryData() != null ? getBinaryData().hashCode() : 0);
+ result = 31 * result + (getFullText() != null ? getFullText().hashCode() : 0);
+ result = 31 * result + (getOriginalEntityCreationTime() != null ? getOriginalEntityCreationTime().hashCode() : 0);
+ result = 31 * result + (getCreatedTime() != null ? getCreatedTime().hashCode() : 0);
+ result = 31 * result + (getUpdatedTime() != null ? getUpdatedTime().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityPK.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityPK.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityPK.java
index 44bd33c..5474668 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityPK.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityPK.java
@@ -60,17 +60,18 @@ public class EntityPK implements Serializable {
EntityPK that = (EntityPK) o;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null)
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
+ return false;
+ if (getEntityId() != null ? !getEntityId().equals(that.getEntityId()) : that.getEntityId() != null)
return false;
- if (entityId != null ? !entityId.equals(that.entityId) : that.entityId != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = domainId != null ? domainId.hashCode() : 0;
- result = 31 * result + (entityId != null ? entityId.hashCode() : 0);
+ int result = getDomainId() != null ? getDomainId().hashCode() : 0;
+ result = 31 * result + (getEntityId() != null ? getEntityId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypeEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypeEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypeEntity.java
index 1b531cc..b25ccce 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypeEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypeEntity.java
@@ -104,23 +104,28 @@ public class EntityTypeEntity {
EntityTypeEntity that = (EntityTypeEntity) o;
- if (entityTypeId != null ? !entityTypeId.equals(that.entityTypeId) : that.entityTypeId != null) return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
- if (name != null ? !name.equals(that.name) : that.name != null) return false;
- if (description != null ? !description.equals(that.description) : that.description != null) return false;
- if (createdTime != null ? !createdTime.equals(that.createdTime) : that.createdTime != null) return false;
- if (updatedTime != null ? !updatedTime.equals(that.updatedTime) : that.updatedTime != null) return false;
+ if (getEntityTypeId() != null ? !getEntityTypeId().equals(that.getEntityTypeId()) : that.getEntityTypeId() != null)
+ return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
+ return false;
+ if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) return false;
+ if (getDescription() != null ? !getDescription().equals(that.getDescription()) : that.getDescription() != null)
+ return false;
+ if (getCreatedTime() != null ? !getCreatedTime().equals(that.getCreatedTime()) : that.getCreatedTime() != null)
+ return false;
+ if (getUpdatedTime() != null ? !getUpdatedTime().equals(that.getUpdatedTime()) : that.getUpdatedTime() != null)
+ return false;
return true;
}
@Override
public int hashCode() {
- int result = entityTypeId != null ? entityTypeId.hashCode() : 0;
- result = 31 * result + (name != null ? name.hashCode() : 0);
- result = 31 * result + (description != null ? description.hashCode() : 0);
- result = 31 * result + (createdTime != null ? createdTime.hashCode() : 0);
- result = 31 * result + (updatedTime != null ? updatedTime.hashCode() : 0);
+ int result = getEntityTypeId() != null ? getEntityTypeId().hashCode() : 0;
+ result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+ result = 31 * result + (getDescription() != null ? getDescription().hashCode() : 0);
+ result = 31 * result + (getCreatedTime() != null ? getCreatedTime().hashCode() : 0);
+ result = 31 * result + (getUpdatedTime() != null ? getUpdatedTime().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypePK.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypePK.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypePK.java
index 03f5ba2..af2cde3 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypePK.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypePK.java
@@ -60,17 +60,18 @@ public class EntityTypePK implements Serializable {
EntityTypePK that = (EntityTypePK) o;
- if (entityTypeId != null ? !entityTypeId.equals(that.entityTypeId) : that.entityTypeId != null)
+ if (getEntityTypeId() != null ? !getEntityTypeId().equals(that.getEntityTypeId()) : that.getEntityTypeId() != null)
+ return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = entityTypeId != null ? entityTypeId.hashCode() : 0;
- result = 31 * result + (domainId != null ? domainId.hashCode() : 0);
+ int result = getEntityTypeId() != null ? getEntityTypeId().hashCode() : 0;
+ result = 31 * result + (getDomainId() != null ? getDomainId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipEntity.java
index 1e7710b..da36c76 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipEntity.java
@@ -104,20 +104,24 @@ public class GroupMembershipEntity {
GroupMembershipEntity that = (GroupMembershipEntity) o;
- if (parentId != null ? !parentId.equals(that.parentId) : that.parentId != null) return false;
- if (childId != null ? !childId.equals(that.childId) : that.childId != null) return false;
- if (childType != null ? !childType.equals(that.childType) : that.childType != null) return false;
- if (createdTime != null ? !createdTime.equals(that.createdTime) : that.createdTime != null) return false;
- if (updatedTime != null ? !updatedTime.equals(that.updatedTime) : that.updatedTime != null) return false;
+ if (getParentId() != null ? !getParentId().equals(that.getParentId()) : that.getParentId() != null)
+ return false;
+ if (getChildId() != null ? !getChildId().equals(that.getChildId()) : that.getChildId() != null) return false;
+ if (getChildType() != null ? !getChildType().equals(that.getChildType()) : that.getChildType() != null)
+ return false;
+ if (getCreatedTime() != null ? !getCreatedTime().equals(that.getCreatedTime()) : that.getCreatedTime() != null)
+ return false;
+ if (getUpdatedTime() != null ? !getUpdatedTime().equals(that.getUpdatedTime()) : that.getUpdatedTime() != null)
+ return false;
return true;
}
@Override
public int hashCode() {
- int result = parentId != null ? parentId.hashCode() : 0;
- result = 31 * result + (childId != null ? childId.hashCode() : 0);
- result = 31 * result + (childType != null ? childType.hashCode() : 0);
+ int result = getParentId() != null ? getParentId().hashCode() : 0;
+ result = 31 * result + (getChildId() != null ? getChildId().hashCode() : 0);
+ result = 31 * result + (getChildType() != null ? getChildType().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipPK.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipPK.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipPK.java
index d123021..ea194ca 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipPK.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipPK.java
@@ -70,19 +70,20 @@ public class GroupMembershipPK implements Serializable {
GroupMembershipPK that = (GroupMembershipPK) o;
- if (parentId != null ? !parentId.equals(that.parentId) : that.parentId != null)
+ if (getParentId() != null ? !getParentId().equals(that.getParentId()) : that.getParentId() != null)
+ return false;
+ if (getChildId() != null ? !getChildId().equals(that.getChildId()) : that.getChildId() != null) return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
return false;
- if (childId != null ? !childId.equals(that.childId) : that.childId != null) return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = parentId != null ? parentId.hashCode() : 0;
- result = 31 * result + (childId != null ? childId.hashCode() : 0);
- result = 31 * result + (domainId != null ? domainId.hashCode() : 0);
+ int result = getParentId() != null ? getParentId().hashCode() : 0;
+ result = 31 * result + (getChildId() != null ? getChildId().hashCode() : 0);
+ result = 31 * result + (getDomainId() != null ? getDomainId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypeEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypeEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypeEntity.java
index a5eddae..42348ba 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypeEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypeEntity.java
@@ -105,22 +105,25 @@ public class PermissionTypeEntity {
PermissionTypeEntity that = (PermissionTypeEntity) o;
- if (permissionTypeId != null ? !permissionTypeId.equals(that.permissionTypeId) : that.permissionTypeId != null)
+ if (getPermissionTypeId() != null ? !getPermissionTypeId().equals(that.getPermissionTypeId()) : that.getPermissionTypeId() != null)
+ return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
+ return false;
+ if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) return false;
+ if (getCreatedTime() != null ? !getCreatedTime().equals(that.getCreatedTime()) : that.getCreatedTime() != null)
+ return false;
+ if (getUpdatedTime() != null ? !getUpdatedTime().equals(that.getUpdatedTime()) : that.getUpdatedTime() != null)
return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
- if (name != null ? !name.equals(that.name) : that.name != null) return false;
- if (createdTime != null ? !createdTime.equals(that.createdTime) : that.createdTime != null) return false;
- if (updatedTime != null ? !updatedTime.equals(that.updatedTime) : that.updatedTime != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = permissionTypeId != null ? permissionTypeId.hashCode() : 0;
- result = 31 * result + (name != null ? name.hashCode() : 0);
- result = 31 * result + (createdTime != null ? createdTime.hashCode() : 0);
- result = 31 * result + (updatedTime != null ? updatedTime.hashCode() : 0);
+ int result = getPermissionTypeId() != null ? getPermissionTypeId().hashCode() : 0;
+ result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+ result = 31 * result + (getCreatedTime() != null ? getCreatedTime().hashCode() : 0);
+ result = 31 * result + (getUpdatedTime() != null ? getUpdatedTime().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypePK.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypePK.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypePK.java
index 4a5bec2..60078fe 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypePK.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypePK.java
@@ -60,17 +60,18 @@ public class PermissionTypePK implements Serializable {
PermissionTypePK that = (PermissionTypePK) o;
- if (permissionTypeId != null ? !permissionTypeId.equals(that.permissionTypeId) : that.permissionTypeId != null)
+ if (getPermissionTypeId() != null ? !getPermissionTypeId().equals(that.getPermissionTypeId()) : that.getPermissionTypeId() != null)
+ return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = permissionTypeId != null ? permissionTypeId.hashCode() : 0;
- result = 31 * result + (domainId != null ? domainId.hashCode() : 0);
+ int result = getPermissionTypeId() != null ? getPermissionTypeId().hashCode() : 0;
+ result = 31 * result + (getDomainId() != null ? getDomainId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java
index 50dadab..375b8b5 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java
@@ -127,21 +127,24 @@ public class SharingEntity {
SharingEntity that = (SharingEntity) o;
- if (permissionTypeId != null ? !permissionTypeId.equals(that.permissionTypeId) : that.permissionTypeId != null)
+ if (getPermissionTypeId() != null ? !getPermissionTypeId().equals(that.getPermissionTypeId()) : that.getPermissionTypeId() != null)
+ return false;
+ if (getEntityId() != null ? !getEntityId().equals(that.getEntityId()) : that.getEntityId() != null)
+ return false;
+ if (getGroupId() != null ? !getGroupId().equals(that.getGroupId()) : that.getGroupId() != null) return false;
+ if (getCreatedTime() != null ? !getCreatedTime().equals(that.getCreatedTime()) : that.getCreatedTime() != null)
+ return false;
+ if (getUpdatedTime() != null ? !getUpdatedTime().equals(that.getUpdatedTime()) : that.getUpdatedTime() != null)
return false;
- if (entityId != null ? !entityId.equals(that.entityId) : that.entityId != null) return false;
- if (groupId != null ? !groupId.equals(that.groupId) : that.groupId != null) return false;
- if (createdTime != null ? !createdTime.equals(that.createdTime) : that.createdTime != null) return false;
- if (updatedTime != null ? !updatedTime.equals(that.updatedTime) : that.updatedTime != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = permissionTypeId != null ? permissionTypeId.hashCode() : 0;
- result = 31 * result + (entityId != null ? entityId.hashCode() : 0);
- result = 31 * result + (groupId != null ? groupId.hashCode() : 0);
+ int result = getPermissionTypeId() != null ? getPermissionTypeId().hashCode() : 0;
+ result = 31 * result + (getEntityId() != null ? getEntityId().hashCode() : 0);
+ result = 31 * result + (getGroupId() != null ? getGroupId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingPK.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingPK.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingPK.java
index c046fb1..b6950fa 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingPK.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingPK.java
@@ -92,23 +92,26 @@ public class SharingPK implements Serializable {
SharingPK that = (SharingPK) o;
- if (permissionTypeId != null ? !permissionTypeId.equals(that.permissionTypeId) : that.permissionTypeId != null)
+ if (getPermissionTypeId() != null ? !getPermissionTypeId().equals(that.getPermissionTypeId()) : that.getPermissionTypeId() != null)
+ return false;
+ if (getEntityId() != null ? !getEntityId().equals(that.getEntityId()) : that.getEntityId() != null)
+ return false;
+ if (getGroupId() != null ? !getGroupId().equals(that.getGroupId()) : that.getGroupId() != null) return false;
+ if (getInheritedParentId() != null ? !getInheritedParentId().equals(that.getInheritedParentId()) : that.getInheritedParentId() != null)
+ return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
return false;
- if (entityId != null ? !entityId.equals(that.entityId) : that.entityId != null) return false;
- if (groupId != null ? !groupId.equals(that.groupId) : that.groupId != null) return false;
- if (inheritedParentId != null ? !inheritedParentId.equals(that.inheritedParentId) : that.inheritedParentId != null) return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = permissionTypeId != null ? permissionTypeId.hashCode() : 0;
- result = 31 * result + (entityId != null ? entityId.hashCode() : 0);
- result = 31 * result + (groupId != null ? groupId.hashCode() : 0);
- result = 31 * result + (inheritedParentId != null ? inheritedParentId.hashCode() : 0);
- result = 31 * result + (domainId != null ? domainId.hashCode() : 0);
+ int result = getPermissionTypeId() != null ? getPermissionTypeId().hashCode() : 0;
+ result = 31 * result + (getEntityId() != null ? getEntityId().hashCode() : 0);
+ result = 31 * result + (getGroupId() != null ? getGroupId().hashCode() : 0);
+ result = 31 * result + (getInheritedParentId() != null ? getInheritedParentId().hashCode() : 0);
+ result = 31 * result + (getDomainId() != null ? getDomainId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java
index 05cbd19..7b06c70 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java
@@ -138,21 +138,25 @@ public class UserEntity {
UserEntity that = (UserEntity) o;
- if (userId != null ? !userId.equals(that.userId) : that.userId != null) return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
- if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
- if (createdTime != null ? !createdTime.equals(that.createdTime) : that.createdTime != null) return false;
- if (updatedTime != null ? !updatedTime.equals(that.updatedTime) : that.updatedTime != null) return false;
+ if (getUserId() != null ? !getUserId().equals(that.getUserId()) : that.getUserId() != null) return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
+ return false;
+ if (getUserName() != null ? !getUserName().equals(that.getUserName()) : that.getUserName() != null)
+ return false;
+ if (getCreatedTime() != null ? !getCreatedTime().equals(that.getCreatedTime()) : that.getCreatedTime() != null)
+ return false;
+ if (getUpdatedTime() != null ? !getUpdatedTime().equals(that.getUpdatedTime()) : that.getUpdatedTime() != null)
+ return false;
return true;
}
@Override
public int hashCode() {
- int result = userId != null ? userId.hashCode() : 0;
- result = 31 * result + (userName != null ? userName.hashCode() : 0);
- result = 31 * result + (createdTime != null ? createdTime.hashCode() : 0);
- result = 31 * result + (updatedTime != null ? updatedTime.hashCode() : 0);
+ int result = getUserId() != null ? getUserId().hashCode() : 0;
+ result = 31 * result + (getUserName() != null ? getUserName().hashCode() : 0);
+ result = 31 * result + (getCreatedTime() != null ? getCreatedTime().hashCode() : 0);
+ result = 31 * result + (getUpdatedTime() != null ? getUpdatedTime().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupEntity.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupEntity.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupEntity.java
index d212d8d..9e666b4 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupEntity.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupEntity.java
@@ -137,26 +137,31 @@ public class UserGroupEntity {
UserGroupEntity that = (UserGroupEntity) o;
- if (groupId != null ? !groupId.equals(that.groupId) : that.groupId != null) return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
- if (ownerId != null ? !ownerId.equals(that.ownerId) : that.ownerId != null) return false;
- if (name != null ? !name.equals(that.name) : that.name != null) return false;
- if (description != null ? !description.equals(that.description) : that.description != null) return false;
- if (groupType != null ? !groupType.equals(that.groupType) : that.groupType != null) return false;
- if (createdTime != null ? !createdTime.equals(that.createdTime) : that.createdTime != null) return false;
- if (updatedTime != null ? !updatedTime.equals(that.updatedTime) : that.updatedTime != null) return false;
+ if (getGroupId() != null ? !getGroupId().equals(that.getGroupId()) : that.getGroupId() != null) return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
+ return false;
+ if (getOwnerId() != null ? !getOwnerId().equals(that.getOwnerId()) : that.getOwnerId() != null) return false;
+ if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) return false;
+ if (getDescription() != null ? !getDescription().equals(that.getDescription()) : that.getDescription() != null)
+ return false;
+ if (getGroupType() != null ? !getGroupType().equals(that.getGroupType()) : that.getGroupType() != null)
+ return false;
+ if (getCreatedTime() != null ? !getCreatedTime().equals(that.getCreatedTime()) : that.getCreatedTime() != null)
+ return false;
+ if (getUpdatedTime() != null ? !getUpdatedTime().equals(that.getUpdatedTime()) : that.getUpdatedTime() != null)
+ return false;
return true;
}
@Override
public int hashCode() {
- int result = groupId != null ? groupId.hashCode() : 0;
- result = 31 * result + (name != null ? name.hashCode() : 0);
- result = 31 * result + (description != null ? description.hashCode() : 0);
- result = 31 * result + (groupType != null ? groupType.hashCode() : 0);
- result = 31 * result + (createdTime != null ? createdTime.hashCode() : 0);
- result = 31 * result + (updatedTime != null ? updatedTime.hashCode() : 0);
+ int result = getGroupId() != null ? getGroupId().hashCode() : 0;
+ result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+ result = 31 * result + (getDescription() != null ? getDescription().hashCode() : 0);
+ result = 31 * result + (getGroupType() != null ? getGroupType().hashCode() : 0);
+ result = 31 * result + (getCreatedTime() != null ? getCreatedTime().hashCode() : 0);
+ result = 31 * result + (getUpdatedTime() != null ? getUpdatedTime().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupPK.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupPK.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupPK.java
index 42ae5da..3197027 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupPK.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupPK.java
@@ -59,17 +59,18 @@ public class UserGroupPK implements Serializable {
UserGroupPK that = (UserGroupPK) o;
- if (groupId != null ? !groupId.equals(that.groupId) : that.groupId != null)
+ if (getGroupId() != null ? !getGroupId().equals(that.getGroupId()) : that.getGroupId() != null)
+ return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = groupId != null ? groupId.hashCode() : 0;
- result = 31 * result + (domainId != null ? domainId.hashCode() : 0);
+ int result = getGroupId() != null ? getGroupId().hashCode() : 0;
+ result = 31 * result + (getDomainId() != null ? getDomainId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserPK.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserPK.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserPK.java
index eb39f69..672c63aa 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserPK.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserPK.java
@@ -59,17 +59,18 @@ public class UserPK implements Serializable {
UserPK that = (UserPK) o;
- if (userId != null ? !userId.equals(that.userId) : that.userId != null)
+ if (getUserId() != null ? !getUserId().equals(that.getUserId()) : that.getUserId() != null)
+ return false;
+ if (getDomainId() != null ? !getDomainId().equals(that.getDomainId()) : that.getDomainId() != null)
return false;
- if (domainId != null ? !domainId.equals(that.domainId) : that.domainId != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = userId != null ? userId.hashCode() : 0;
- result = 31 * result + (domainId != null ? domainId.hashCode() : 0);
+ int result = getUserId() != null ? getUserId().hashCode() : 0;
+ result = 31 * result + (getDomainId() != null ? getDomainId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java
index 8f1fcb3..6b65345 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java
@@ -49,6 +49,7 @@ public abstract class AbstractRepository<T, E, Id> {
return update(t);
}
+ //FIXME do a bulk insert
public List<T> create(List<T> tList) throws SharingRegistryException {
return update(tList);
}
@@ -60,6 +61,7 @@ public abstract class AbstractRepository<T, E, Id> {
return mapper.map(persistedCopy, thriftGenericClass);
}
+ //FIXME do a bulk update
public List<T> update(List<T> tList) throws SharingRegistryException {
List<T> returnList = new ArrayList<>();
for(T temp : tList)
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java
index ed495ce..103cc95 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java
@@ -82,9 +82,12 @@ public class JPAUtils {
properties.put("openjpa.ConnectionProperties", connectionProperties);
properties.put("openjpa.DynamicEnhancementAgent", "true");
properties.put("openjpa.RuntimeUnenhancedClasses", "unsupported");
- // For app catalog, we don't need caching
-// properties.put("openjpa.DataCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
-// properties.put("openjpa.QueryCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
+
+ properties.put("openjpa.DataCache", "" + readServerProperties(JPA_CACHE_ENABLED)
+ + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
+ properties.put("openjpa.QueryCache", "" + readServerProperties(JPA_CACHE_ENABLED)
+ + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
+
properties.put("openjpa.RemoteCommitProvider", "sjvm");
properties.put("openjpa.Log", "DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index 34a4a21..de6dd80 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
@@ -755,6 +755,8 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
throw new SharingRegistryException(OWNER_PERMISSION_NAME + " permission cannot be assigned or removed");
}
+ List<Sharing> sharings = new ArrayList<>();
+
//Adding permission for the specified users/groups for the specified entity
LinkedList<Entity> temp = new LinkedList<>();
for(String userId : groupOrUserList){
@@ -772,7 +774,7 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
sharing.setCreatedTime(System.currentTimeMillis());
sharing.setUpdatedTime(System.currentTimeMillis());
- (new SharingRepository()).create(sharing);
+ sharings.add(sharing);
}
if(cascadePermission){
@@ -792,11 +794,12 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
sharing.setDomainId(domainId);
sharing.setCreatedTime(System.currentTimeMillis());
sharing.setUpdatedTime(System.currentTimeMillis());
- (new SharingRepository()).create(sharing);
+ sharings.add(sharing);
(new EntityRepository()).getChildEntities(childEntityId).stream().forEach(e-> temp.addLast(e));
}
}
}
+ (new SharingRepository()).create(sharings);
return true;
}catch (SharingRegistryException ex) {
logger.error(ex.getMessage(), ex);
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
index dca567b..83ef3f3 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
@@ -100,7 +100,7 @@ CREATE TABLE ENTITY (
NAME VARCHAR(255) NOT NULL,
DESCRIPTION VARCHAR(255),
BINARY_DATA BLOB,
- FULL_TEXT VARCHAR(8192),
+ FULL_TEXT VARCHAR(255),
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
http://git-wip-us.apache.org/repos/asf/airavata/blob/6931cd3c/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
index c7f0df1..f678282 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
@@ -28,6 +28,7 @@ import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
+import org.databene.contiperf.PerfTest;
import org.databene.contiperf.junit.ContiPerfRule;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -54,7 +55,7 @@ public class SharingRegistryServiceTest {
@Test
-// @PerfTest(invocations = 50, threads = 10)
+ @PerfTest(invocations = 50, threads = 10)
public void test() throws TException, InterruptedException {
String serverHost = "localhost";
int serverPort = 7878;