Throw a parsing exception when boost is set in span_or query (#28390)

server/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java

@@ -27,6 +27,7 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentLocation;
 import org.elasticsearch.common.xcontent.XContentParser;
 
 import java.io.IOException;
@@ -49,7 +50,7 @@ public SpanOrQueryBuilder(SpanQueryBuilder initialClause) {
         if (initialClause == null) {
             throw new IllegalArgumentException("[" + NAME + "] must include at least one clause");
         }
-        clauses.add(initialClause);
+        addClause(initialClause);
     }
 
     /**
@@ -58,7 +59,7 @@ public SpanOrQueryBuilder(SpanQueryBuilder initialClause) {
     public SpanOrQueryBuilder(StreamInput in) throws IOException {
         super(in);
         for (QueryBuilder clause: readQueries(in)) {
-            clauses.add((SpanQueryBuilder) clause);
+            addClause((SpanQueryBuilder) clause);
         }
     }
 
@@ -74,10 +75,23 @@ public SpanOrQueryBuilder addClause(SpanQueryBuilder clause) {
         if (clause == null) {
             throw new IllegalArgumentException("[" + NAME + "] inner clause cannot be null");
         }
+        checkBoostValue(clause);
         clauses.add(clause);
         return this;
     }
 
+    private static void checkBoostValue(SpanQueryBuilder clause) {
+        if (clause.boost() != AbstractQueryBuilder.DEFAULT_BOOST) {
+            throw new IllegalArgumentException("spanOr [clauses] can't have boost value");
+        }
+    }
+
+    private static void checkBoostValue(XContentLocation location, SpanQueryBuilder clause) {
+        if (clause.boost() != AbstractQueryBuilder.DEFAULT_BOOST) {
+            throw new ParsingException(location, "spanOr [clauses] can't have boost value");
+        }
+    }
+
     /**
      * @return the {@link SpanQueryBuilder} clauses that were set for this query
      */
@@ -115,14 +129,16 @@ public static SpanOrQueryBuilder fromXContent(XContentParser parser) throws IOEx
                         if (query instanceof SpanQueryBuilder == false) {
                             throw new ParsingException(parser.getTokenLocation(), "spanOr [clauses] must be of type span query");
                         }
-                        clauses.add((SpanQueryBuilder) query);
+                        final SpanQueryBuilder clause = (SpanQueryBuilder) query;
+                        checkBoostValue(parser.getTokenLocation(), clause);
+                        clauses.add(clause);
                     }
                 } else {
                     throw new ParsingException(parser.getTokenLocation(), "[span_or] query does not support [" + currentFieldName + "]");
                 }
             } else {
                 if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
-                    boost = parser.floatValue();
+                    throw new ParsingException(parser.getTokenLocation(), "spanOr [clauses] can't have boost value");
                 } else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
                     queryName = parser.text();
                 } else {