test
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ad6b5257 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ad6b5257 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ad6b5257 Branch: refs/heads/master Commit: ad6b5257ac315e98adfd7df44f7e99d79654dafd Parents: 35d0706 Author: scnakandala <[email protected]> Authored: Mon Jun 27 18:26:29 2016 -0400 Committer: scnakandala <[email protected]> Committed: Mon Jun 27 18:26:29 2016 -0400 ---------------------------------------------------------------------- .../airavata/api/server/handler/AiravataServerHandler.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/ad6b5257/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 94768b4..7310d1a 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -74,6 +74,7 @@ import org.apache.airavata.registry.core.app.catalog.resources.*; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion; import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; +import org.apache.airavata.registry.core.experiment.catalog.model.ExperimentSummary; import org.apache.airavata.registry.cpi.*; import org.apache.airavata.registry.cpi.utils.Constants; import org.apache.thrift.TException; @@ -893,9 +894,13 @@ public class AiravataServerHandler implements Airavata.Iface { } //FIXME - List<ExperimentModel> allUserExperiments = getUserExperiments(authzToken, gatewayId, userName, -1, 0); + Map<String, String> temp = new HashMap(); + temp.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName); + temp.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId); + List<Object> allUserExperiments = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, temp, -1, + 0, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC); List<String> accessibleExpIds = new ArrayList<>(); - allUserExperiments.stream().forEach(e->accessibleExpIds.add(e.getExperimentId())); + allUserExperiments.stream().forEach(e->accessibleExpIds.add(((ExperimentSummary)e).getExperimentId())); List<Object> results = experimentCatalog.searchAllAccessible(ExperimentCatalogModelType.EXPERIMENT, accessibleExpIds, regFilters, limit,
