Merge branch 'main' into enable-cluster-state-role-mapper

Author: n1v0lg

docs/reference/indices/forcemerge.asciidoc

@@ -56,7 +56,7 @@ documents can't be backed up incrementally.
 ===== Blocks during a force merge
 
 Calls to this API block until the merge is complete (unless request contains
-wait_for_completion=false, which is default true). If the client connection
+`wait_for_completion=false`, which is default `true`). If the client connection
 is lost before completion then the force merge process will continue in the
 background. Any new requests to force merge the same indices will also block
 until the ongoing force merge is complete.

muted-tests.yml

@@ -377,6 +377,9 @@ tests:
 - class: org.elasticsearch.xpack.inference.services.cohere.CohereServiceTests
   method: testInfer_StreamRequest
   issue: https://github.com/elastic/elasticsearch/issues/114385
+- class: org.elasticsearch.index.mapper.extras.ScaledFloatFieldMapperTests
+  method: testSyntheticSourceKeepArrays
+  issue: https://github.com/elastic/elasticsearch/issues/114406
 
 # Examples:
 #

test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java

@@ -1570,7 +1570,7 @@ public void testSyntheticSourceKeepArrays() throws IOException {
             b.endObject();
         }));
 
-        int elementCount = randomIntBetween(1, 5);
+        int elementCount = randomIntBetween(2, 5);
         CheckedConsumer<XContentBuilder, IOException> buildInput = (XContentBuilder builder) -> {
             example.buildInputArray(builder, elementCount);
         };
@@ -1581,10 +1581,7 @@ public void testSyntheticSourceKeepArrays() throws IOException {
         builder.endObject();
         String expected = Strings.toString(builder);
         String actual = syntheticSource(mapperAll, buildInput);
-        // Check for single-element array, the array source is not stored in this case.
-        if (expected.replace("[", "").replace("]", "").equals(actual) == false) {
-            assertThat(actual, equalTo(expected));
-        }
+        assertThat(actual, equalTo(expected));
     }
 
     @Override