Remove default-value parameters from non-core queries (#87813)

This slims down the representations of all remaining queries not in the core * percolate * function_score * script_score * pinned Relates to #76515
elastic · Jun 20, 2022 · 26019f2 · 26019f2
1 parent 0b37360
commit 26019f2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java
@@ -324,7 +324,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
                 builder.field(INDEXED_DOCUMENT_FIELD_VERSION.getPreferredName(), indexedDocumentVersion);
             }
         }
-        printBoostAndQueryName(builder);
+        boostAndQueryNameToXContent(builder);
         builder.endObject();
     }
 

diff --git a/.../src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java b/.../src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java
@@ -239,15 +239,19 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         }
         builder.endArray();
 
-        builder.field(SCORE_MODE_FIELD.getPreferredName(), scoreMode.name().toLowerCase(Locale.ROOT));
+        if (scoreMode != DEFAULT_SCORE_MODE) {
+            builder.field(SCORE_MODE_FIELD.getPreferredName(), scoreMode.name().toLowerCase(Locale.ROOT));
+        }
         if (boostMode != null) {
             builder.field(BOOST_MODE_FIELD.getPreferredName(), boostMode.name().toLowerCase(Locale.ROOT));
         }
-        builder.field(MAX_BOOST_FIELD.getPreferredName(), maxBoost);
+        if (maxBoost != FunctionScoreQuery.DEFAULT_MAX_BOOST) {
+            builder.field(MAX_BOOST_FIELD.getPreferredName(), maxBoost);
+        }
         if (minScore != null) {
             builder.field(MIN_SCORE_FIELD.getPreferredName(), minScore);
         }
-        printBoostAndQueryName(builder);
+        boostAndQueryNameToXContent(builder);
         builder.endObject();
     }
 

diff --git a/...er/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java b/...er/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java
@@ -125,7 +125,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         if (minScore != null) {
             builder.field(MIN_SCORE_FIELD.getPreferredName(), minScore);
         }
-        printBoostAndQueryName(builder);
+        boostAndQueryNameToXContent(builder);
         builder.endObject();
     }
 

diff --git a/...odules/error-query/src/main/java/org/elasticsearch/test/errorquery/ErrorQueryBuilder.java b/...odules/error-query/src/main/java/org/elasticsearch/test/errorquery/ErrorQueryBuilder.java
@@ -115,7 +115,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
             builder.endObject();
         }
         builder.endArray();
-        printBoostAndQueryName(builder);
+        boostAndQueryNameToXContent(builder);
         builder.endObject();
     }
 

diff --git a/...core/src/test/java/org/elasticsearch/xpack/core/transform/MockDeprecatedQueryBuilder.java b/...core/src/test/java/org/elasticsearch/xpack/core/transform/MockDeprecatedQueryBuilder.java
@@ -66,7 +66,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {}
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject(NAME);
-        printBoostAndQueryName(builder);
+        boostAndQueryNameToXContent(builder);
         builder.endObject();
     }
 

diff --git a/...s-rules/src/main/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilder.java b/...s-rules/src/main/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilder.java
@@ -302,7 +302,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
             }
             builder.endArray();
         }
-        printBoostAndQueryName(builder);
+        boostAndQueryNameToXContent(builder);
         builder.endObject();
     }
 

diff --git a/...es/src/test/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderTests.java b/...es/src/test/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderTests.java
@@ -158,8 +158,7 @@ public void testIdsFromJson() throws IOException {
                     }
                   }
                 },
-                "ids": [ "1", "2" ],
-                "boost": 1.0
+                "ids": [ "1", "2" ]
               }
             }""";
 
@@ -181,8 +180,7 @@ public void testDocsFromJson() throws IOException {
                     }
                   }
                 },
-                "docs": [ { "_index": "test", "_id": "1" }, { "_index": "test", "_id": "2" } ],
-                "boost": 1.0
+                "docs": [ { "_index": "test", "_id": "1" }, { "_index": "test", "_id": "2" } ]
               }
             }""";