Repository: airavata Updated Branches: refs/heads/thrift-docker 97e1e9cd2 -> 8341d4976 (forced update)
Auto generate and set UUID for internal_gateway_id in GatewayEntity Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/aa153443 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/aa153443 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/aa153443 Branch: refs/heads/thrift-docker Commit: aa15344371da93d8076cfd2cee8bc8b4c6db831a Parents: 504f839 Author: Gourav Shenoy <[email protected]> Authored: Tue Jun 6 14:35:32 2017 -0400 Committer: Gourav Shenoy <[email protected]> Committed: Tue Jun 6 14:35:32 2017 -0400 ---------------------------------------------------------------------- .../commons/tenant/entities/GatewayEntity.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/aa153443/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java ---------------------------------------------------------------------- diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java index a63c0a1..0d6f5a2 100644 --- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java +++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java @@ -244,9 +244,25 @@ public class GatewayEntity { } @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (!(obj instanceof GatewayEntity)) { + return false; + } + GatewayEntity gwy = (GatewayEntity) obj; + return getAiravataInternalGatewayId().equals(gwy.getAiravataInternalGatewayId()); + } + + @Override public String toString() { return "GatewayEntity{" + - "gatewayId='" + gatewayId + '\'' + + "airavataInternalGatewayId='" + airavataInternalGatewayId + '\'' + + ", gatewayId='" + gatewayId + '\'' + ", gatewayName='" + gatewayName + '\'' + ", domain='" + domain + '\'' + ", emailAddress='" + emailAddress + '\'' +
