From 1d8caedf11c4ae23d2b905745253ae2d7cb1708d Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 4 May 2010 07:03:16 +0000
Subject: [PATCH] LMS-1445 Query API modified
SVN: 15734
---
.../plugin/query/client/api/v1/IQueryApiFacade.java | 6 +++---
.../plugin/query/client/api/v1/QueryApiFacade.java | 13 +++----------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/IQueryApiFacade.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/IQueryApiFacade.java
index 0bc92a07599..5ac27c07f93 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/IQueryApiFacade.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/IQueryApiFacade.java
@@ -17,6 +17,7 @@
package ch.systemsx.cisd.openbis.plugin.query.client.api.v1;
import java.util.List;
+import java.util.Map;
import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto.QueryDescription;
import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto.QueryTableModel;
@@ -34,10 +35,9 @@ public interface IQueryApiFacade
public List<QueryDescription> listQueries();
/**
- * Executes specified query by using specified parameter values.
+ * Executes specified query by using specified parameter bindings.
*/
- public QueryTableModel executeQuery(QueryDescription queryDescription,
- List<String> parameterValues);
+ public QueryTableModel executeQuery(long queryID, Map<String, String> parameterBindings);
/**
* Logs current user out.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiFacade.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiFacade.java
index 2845114c62c..6a6c2937f31 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiFacade.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiFacade.java
@@ -16,8 +16,8 @@
package ch.systemsx.cisd.openbis.plugin.query.client.api.v1;
-import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.IQueryApiServer;
import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto.QueryDescription;
@@ -49,15 +49,8 @@ class QueryApiFacade implements IQueryApiFacade
return service.listQueries(sessionToken);
}
- public QueryTableModel executeQuery(QueryDescription queryDescription, List<String> parameterValues)
+ public QueryTableModel executeQuery(long queryID, Map<String, String> parameterBindings)
{
- long id = queryDescription.getId();
- HashMap<String, String> parameterBindings = new HashMap<String, String>();
- List<String> parameters = queryDescription.getParameters();
- for (int i = 0, n = parameters.size(); i < n; i++)
- {
- parameterBindings.put(parameters.get(i), parameterValues.get(i));
- }
- return service.executeQuery(sessionToken, id, parameterBindings);
+ return service.executeQuery(sessionToken, queryID, parameterBindings);
}
}
--
GitLab