fixing bug in registry related to getAllGateways
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ddda60c7 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ddda60c7 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ddda60c7 Branch: refs/heads/master Commit: ddda60c7085a58264017b074ce65c7d6ce426055 Parents: 2c6d1d5 Author: scnakandala <[email protected]> Authored: Wed Jul 13 13:26:38 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Jul 13 13:26:38 2016 -0400 ---------------------------------------------------------------------- .../registry/core/experiment/catalog/resources/Utils.java | 10 ++++++++++ .../catalog/utils/ThriftDataModelConversion.java | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/ddda60c7/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java index afddef8..7d877c1 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java @@ -346,6 +346,16 @@ public class Utils { gatewayResource.setGatewayId(o.getGatewayId()); gatewayResource.setDomain(o.getDomain()); gatewayResource.setEmailAddress(o.getEmailAddress()); + gatewayResource.setGatewayApprovalStatus(o.getGatewayApprovalStatus()); + gatewayResource.setGatewayAcronym(o.getGatewayAcronym()); + gatewayResource.setGatewayUrl(o.getGatewayUrl()); + gatewayResource.setGatewayPublicAbstract(o.getGatewayPublicAbstract()); + gatewayResource.setReviewProposalDescription(o.getReviewProposalDescription()); + gatewayResource.setGatewayAdminFirstName(o.getGatewayAdminFirstName()); + gatewayResource.setGetGatewayAdminLastName(o.getGetGatewayAdminLastName()); + gatewayResource.setGatewayAdminEmail(o.getGatewayAdminEmail()); + gatewayResource.setIdentityServerUserName(o.getIdentityServerUserName()); + gatewayResource.setIdentityServerPasswordToken(o.getIdentityServerPasswordToken()); return gatewayResource; } http://git-wip-us.apache.org/repos/asf/airavata/blob/ddda60c7/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java index 378daba..6d5caca 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java @@ -35,10 +35,7 @@ import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel import org.apache.airavata.model.status.*; import org.apache.airavata.model.task.TaskModel; import org.apache.airavata.model.task.TaskTypes; -import org.apache.airavata.model.workspace.Gateway; -import org.apache.airavata.model.workspace.Notification; -import org.apache.airavata.model.workspace.NotificationPriority; -import org.apache.airavata.model.workspace.Project; +import org.apache.airavata.model.workspace.*; import org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource; import org.apache.airavata.registry.core.experiment.catalog.resources.*; import org.apache.airavata.registry.cpi.RegistryException; @@ -79,6 +76,7 @@ public class ThriftDataModelConversion { public static Gateway getGateway (GatewayResource resource){ Gateway gateway = new Gateway(); gateway.setGatewayId(resource.getGatewayId()); + gateway.setGatewayApprovalStatus(GatewayApprovalStatus.valueOf(resource.getGatewayApprovalStatus())); gateway.setGatewayName(resource.getGatewayName()); gateway.setDomain(resource.getDomain()); gateway.setEmailAddress(resource.getEmailAddress());
