Adapted new SpanWithinQueryBuilder/Parser and SpanContainingQueryBuilder/Parser merged in from master to query refactoring base clases.

Author: Christoph Büscher

src/main/java/org/elasticsearch/index/query/QueryParseContext.java

@@ -252,13 +252,12 @@ public QueryBuilder parseInnerQueryBuilder() throws IOException {
     }
 
     /**
-     * @deprecated replaced by calls to parseInnerQueryBuilder() and checkCachable() for the resulting queries
+     * @deprecated replaced by calls to parseInnerQueryBuilder() for the resulting queries
      */
     @Nullable
     @Deprecated
     public Query parseInnerQuery() throws IOException, QueryParsingException {
         QueryBuilder builder = parseInnerQueryBuilder();
-
         Query result = builder.toQuery(this);
         return result;
     }

src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java

@@ -33,15 +33,15 @@ public class SpanContainingQueryBuilder extends BaseQueryBuilder implements Span
     private float boost = -1;
     private String queryName;
 
-    /** 
+    /**
      * Sets the little clause, it must be contained within {@code big} for a match.
      */
     public SpanContainingQueryBuilder little(SpanQueryBuilder clause) {
         this.little = clause;
         return this;
     }
 
-    /** 
+    /**
      * Sets the big clause, it must enclose {@code little} for a match.
      */
     public SpanContainingQueryBuilder big(SpanQueryBuilder clause) {
@@ -89,4 +89,9 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
 
         builder.endObject();
     }
+
+    @Override
+    protected String parserName() {
+        return SpanContainingQueryParser.NAME;
+    }
 }

src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java

@@ -31,7 +31,7 @@
 /**
  * Parser for {@link SpanContainingQuery}
  */
-public class SpanContainingQueryParser implements QueryParser {
+public class SpanContainingQueryParser extends BaseQueryParserTemp {
 
     public static final String NAME = "span_containing";
 
@@ -81,8 +81,8 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
             } else {
                 throw new QueryParsingException(parseContext, "[span_containing] query does not support [" + currentFieldName + "]");
             }
-        }        
-        
+        }
+
         if (big == null) {
             throw new QueryParsingException(parseContext, "span_containing must include [big]");
         }

src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java

@@ -33,15 +33,15 @@ public class SpanWithinQueryBuilder extends BaseQueryBuilder implements SpanQuer
     private float boost = -1;
     private String queryName;
 
-    /** 
+    /**
      * Sets the little clause, it must be contained within {@code big} for a match.
      */
     public SpanWithinQueryBuilder little(SpanQueryBuilder clause) {
         this.little = clause;
         return this;
     }
 
-    /** 
+    /**
      * Sets the big clause, it must enclose {@code little} for a match.
      */
     public SpanWithinQueryBuilder big(SpanQueryBuilder clause) {
@@ -89,4 +89,9 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
 
         builder.endObject();
     }
+
+    @Override
+    protected String parserName() {
+        return SpanWithinQueryParser.NAME;
+    }
 }

src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java

@@ -31,7 +31,7 @@
 /**
  * Parser for {@link SpanWithinQuery}
  */
-public class SpanWithinQueryParser implements QueryParser {
+public class SpanWithinQueryParser extends BaseQueryParserTemp {
 
     public static final String NAME = "span_within";
 
@@ -81,8 +81,8 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
             } else {
                 throw new QueryParsingException(parseContext, "[span_within] query does not support [" + currentFieldName + "]");
             }
-        }        
-        
+        }
+
         if (big == null) {
             throw new QueryParsingException(parseContext, "span_within must include [big]");
         }