Fix issue #217 Table: QueryTablesOptions.Query not fully used.

Azure · Apr 6, 2012 · f338598 · f338598
1 parent 564d8aa
commit f338598
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 28 deletions.
diff --git a/...rc/main/java/com/microsoft/windowsazure/services/table/implementation/TableRestProxy.java b/...rc/main/java/com/microsoft/windowsazure/services/table/implementation/TableRestProxy.java
@@ -380,31 +380,15 @@ public QueryTablesResult queryTables() throws ServiceException {
 
     @Override
     public QueryTablesResult queryTables(QueryTablesOptions options) throws ServiceException {
-
-        Query query = options.getQuery();
+        Query query = new Query();
         String nextTableName = options.getNextTableName();
         String prefix = options.getPrefix();
 
         if (prefix != null) {
             // Append Max char to end '{' is 1 + 'z' in AsciiTable ==> upperBound is prefix + '{'
             Filter prefixFilter = Filter.and(Filter.ge(Filter.litteral("TableName"), Filter.constant(prefix)),
                     Filter.le(Filter.litteral("TableName"), Filter.constant(prefix + "{")));
-
-            // a new query is needed if prefix alone is passed in
-            if (query == null) {
-                query = new Query();
-            }
-
-            // examine the existing filter on the query
-            if (query.getFilter() == null) {
-                // use the prefix filter if the query filter is null
-                query.setFilter(prefixFilter);
-            }
-            else {
-                // combine and use the prefix filter if the query filter exists
-                Filter combinedFilter = Filter.and(query.getFilter(), prefixFilter);
-                query.setFilter(combinedFilter);
-            }
+            query.setFilter(prefixFilter);
         }
 
         WebResource webResource = getResource(options).path("Tables");

diff --git a/...pi/src/main/java/com/microsoft/windowsazure/services/table/models/QueryTablesOptions.java b/...pi/src/main/java/com/microsoft/windowsazure/services/table/models/QueryTablesOptions.java
@@ -16,18 +16,8 @@
 
 public class QueryTablesOptions extends TableServiceOptions {
     private String nextTableName;
-    private Query query;
     private String prefix;
 
-    public Query getQuery() {
-        return query;
-    }
-
-    public QueryTablesOptions setQuery(Query query) {
-        this.query = query;
-        return this;
-    }
-
     public String getNextTableName() {
         return nextTableName;
     }