Merge pull request #23 from SlicingDice/feature/correct-data-extraction-validators

	Correct data extraction validator

Author: joaosimbiose

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [2.0.2]
+### Updated
+- Correct data extraction validator to accept columns: all
+
 ## [2.0.1]
 ### Updated
 - Improve exception throwing in case of JSON parsing error.

src/main/java/com/slicingdice/jslicer/utils/validators/QueryDataExtractionValidator.java

@@ -17,6 +17,7 @@
 
 import com.slicingdice.jslicer.exceptions.client.InvalidQueryException;
 import com.slicingdice.jslicer.exceptions.client.MaxLimitException;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.Iterator;
@@ -48,9 +49,20 @@ private boolean validKeys() {
                     throw new InvalidQueryException("The key 'limit' in query has a invalid value.");
                 }
             } else if (key.equals("columns")) {
-                if (this.data.getJSONArray("columns").length() > 10) {
-                    throw new MaxLimitException("The key 'columns' in data extraction result must" +
-                            " have up to 10 columns.");
+                final Object columns = this.data.get("columns");
+                if (columns instanceof JSONArray) {
+                    if (((JSONArray) columns).length() > 10) {
+                        throw new MaxLimitException("The key 'columns' in data extraction result" +
+                                " must have up to 10 columns.");
+                    }
+                } else if (columns instanceof String) {
+                    if (!columns.equals("all")) {
+                        throw new InvalidQueryException("The key 'columns' should be a list of" +
+                                " columns or the keyword 'all'");
+                    }
+                } else {
+                    throw new InvalidQueryException("The key 'columns' should be a list of" +
+                            " columns or the keyword 'all'");
                 }
             }
         }