Re-added the logic to move to the last where - except put it only on the first where so it clears out the excess bool -> must -> bool -> must, but doesn't cause problems later.

calebott · calebott · commit 13a2fce15849 · 2015-10-16T07:55:54.000-05:00
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/FilterMaker.java b/src/main/java/org/nlpcn/es4sql/query/maker/FilterMaker.java
@@ -19,6 +19,9 @@ public class FilterMaker extends Maker {
 	 */
 	public static BoolFilterBuilder explan(Where where) throws SqlParseException {
 		BoolFilterBuilder boolFilter = FilterBuilders.boolFilter();
+		while (where.getWheres().size() == 1) {
+			where = where.getWheres().getFirst();
+		}
 		new FilterMaker().explanWhere(boolFilter, where);
 		return boolFilter;
 	}
diff --git a/src/test/resources/expectedOutput/search_spatial_explain.json b/src/test/resources/expectedOutput/search_spatial_explain.json
@@ -6,19 +6,15 @@
       "filter" : {
         "bool" : {
           "must" : {
-            "bool" : {
-              "must" : {
-                "geo_shape" : {
-                  "place" : {
-                    "shape" : {
-                      "type" : "polygon",
-                      "coordinates" : [ [ [ 102.0, 2.0 ], [ 103.0, 2.0 ], [ 103.0, 3.0 ], [ 102.0, 3.0 ], [ 102.0, 2.0 ] ] ]
-                    },
-                    "relation" : "intersects"
-                  },
-                  "_name" : null
-                }
-              }
+            "geo_shape" : {
+              "place" : {
+                "shape" : {
+                  "type" : "polygon",
+                  "coordinates" : [ [ [ 102.0, 2.0 ], [ 103.0, 2.0 ], [ 103.0, 3.0 ], [ 102.0, 3.0 ], [ 102.0, 2.0 ] ] ]
+                },
+                "relation" : "intersects"
+              },
+              "_name" : null
             }
           }
         }
