update to cql2 (#705)

Author: Rachael-E

ogc/query-with-cql-filters/build.gradle

@@ -6,7 +6,7 @@ plugins {
 group = 'com.esri.samples'
 
 ext {
-    arcgisVersion = '100.14.1'
+    arcgisVersion = '100.15.0-3593'
 }
 
 javafx {

ogc/query-with-cql-filters/src/main/java/com/esri/samples/query_with_cql_filters/QueryWithCqlFiltersController.java

@@ -281,15 +281,13 @@ private void populateUiWithCqlQueriesAndDateValues() {
     ObservableList<String> cqlQueryList = FXCollections.observableArrayList();
 
     // sample query 1: query for features with an F_CODE attribute property of "AP010".
-    cqlQueryList.add("F_CODE = 'AP010'"); // cql-text query
-    cqlQueryList.add("{ \"eq\" : [ { \"property\" : \"F_CODE\" }, \"AP010\" ] }"); // cql-json query
+    cqlQueryList.add("{ \"op\": \"=\", \"args\": [ { \"property\": \"F_CODE\" }, \"AP010\" ] }"); // cql2-json query
 
     // sample query 2: cql-text query for features with an F_CODE attribute property similar to "AQ".
     cqlQueryList.add("F_CODE LIKE 'AQ%'");
 
-    // sample query 3: use cql-json to combine "before" and "eq" operators with the logical "and" operator
-    cqlQueryList.add("{\"and\":[{\"eq\":[{ \"property\" : \"F_CODE\" }, \"AP010\"]},{ \"before\":" +
-      "[{ \"property\" : \"ZI001_SDV\"},\"2013-01-01\"]}]}");
+    // sample query 3: use cql2-json to combine "before" and "eq" operators with the logical "and" operator
+    cqlQueryList.add("{\"op\": \"and\", \"args\":[{ \"op\": \"=\", \"args\":[{ \"property\" : \"F_CODE\" }, \"AP010\"]}, { \"op\": \"t_before\", \"args\":[{ \"property\" : \"ZI001_SDV\"},\"2013-01-01\"]}]}");
 
     // add sample CQL queries to the UI combobox
     comboBox.getItems().addAll(cqlQueryList);