LMS-1445 Query API modified

SVN: 15734

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.

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);
     }
 }