Merge branch 'main' into drop-ccs-telemetry-flag

.github/workflows/docs-preview-links.yml

@@ -4,10 +4,11 @@ on:
   pull_request_target:
     types: [opened]
     paths:
-      - '**.asciidoc'
+      - "**.asciidoc"
 
 jobs:
   doc-preview:
+    if: github.repository == 'elastic/elasticsearch'
     permissions:
       pull-requests: write
     runs-on: ubuntu-latest

.github/workflows/gradle-wrapper-validation.yml

@@ -7,6 +7,7 @@ permissions:
 jobs:
   validation:
     name: "Validation"
+    if: github.repository == 'elastic/elasticsearch'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/sync-main-to-jdk-branch.yml

@@ -2,11 +2,12 @@
 name: "Merge main to openjdk23-bundle branch"
 on:
   schedule:
-    - cron: '30 17 * * *'
+    - cron: "30 17 * * *"
   workflow_dispatch: {}
 
 jobs:
   merge-branch:
+    if: github.repository == 'elastic/elasticsearch'
     runs-on: ubuntu-latest
     steps:
       - name: checkout
@@ -15,6 +16,6 @@ jobs:
       - name: merge
         uses: devmasx/[email protected]
         with:
-          type: 'now'
+          type: "now"
           target_branch: openjdk23-bundle
           github_token: ${{ secrets.ELASTICSEARCHMACHINE_TOKEN }}

.github/workflows/updatecli-compose.yml

@@ -4,13 +4,14 @@ name: updatecli-compose
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 6 * * *'
+    - cron: "0 6 * * *"
 
 permissions:
   contents: read
 
 jobs:
   compose:
+    if: github.repository == 'elastic/elasticsearch'
     runs-on: ubuntu-latest
     permissions:
       contents: write

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapperTests.java

@@ -220,7 +220,7 @@ public SyntheticSourceExample example(int maxValues) {
 
                 var textArray = values.stream().map(Value::text).toList();
 
-                var blockExpectedList = values.stream().map(Value::tokenCount).filter(Objects::nonNull).toList();
+                var blockExpectedList = values.stream().map(Value::tokenCount).filter(Objects::nonNull).sorted().toList();
                 var blockExpected = blockExpectedList.size() == 1 ? blockExpectedList.get(0) : blockExpectedList;
 
                 return new SyntheticSourceExample(textArray, textArray, blockExpected, this::mapping);
@@ -230,7 +230,7 @@ private record Value(String text, Integer tokenCount) {}
 
             private Value generateValue() {
                 if (rarely()) {
-                    return new Value(null, null);
+                    return new Value(null, nullValue);
                 }
 
                 var text = randomList(0, 10, () -> randomAlphaOfLengthBetween(0, 10)).stream().collect(Collectors.joining(" "));

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/googleaistudio/GoogleAiStudioServiceTests.java

@@ -179,7 +179,6 @@ public void testParseRequestConfig_ThrowsElasticsearchStatusExceptionWhenChunkin
                     createRandomChunkingSettingsMap(),
                     getSecretSettingsMap(apiKey)
                 ),
-                Set.of(),
                 modelVerificationListener
             );
         }
@@ -210,7 +209,6 @@ public void testParseRequestConfig_CreatesAGoogleAiStudioEmbeddingsModelWhenChun
                     createRandomChunkingSettingsMap(),
                     getSecretSettingsMap(apiKey)
                 ),
-                Set.of(),
                 modelListener
             );
         }
@@ -240,7 +238,6 @@ public void testParseRequestConfig_CreatesAGoogleAiStudioEmbeddingsModelWhenChun
                     new HashMap<>(Map.of()),
                     getSecretSettingsMap(apiKey)
                 ),
-                Set.of(),
                 modelListener
             );
         }

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceServiceTests.java

@@ -131,7 +131,6 @@ public void testParseRequestConfig_ThrowsElasticsearchStatusExceptionWhenChunkin
                 "id",
                 TaskType.TEXT_EMBEDDING,
                 getRequestConfigMap(getServiceSettingsMap("url"), createRandomChunkingSettingsMap(), getSecretSettingsMap("secret")),
-                Set.of(),
                 modelVerificationListener
             );
         }
@@ -153,7 +152,6 @@ public void testParseRequestConfig_CreatesAnEmbeddingsModelWhenChunkingSettingsP
                 "id",
                 TaskType.TEXT_EMBEDDING,
                 getRequestConfigMap(getServiceSettingsMap("url"), createRandomChunkingSettingsMap(), getSecretSettingsMap("secret")),
-                Set.of(),
                 modelVerificationActionListener
             );
         }
@@ -175,7 +173,6 @@ public void testParseRequestConfig_CreatesAnEmbeddingsModelWhenChunkingSettingsN
                 "id",
                 TaskType.TEXT_EMBEDDING,
                 getRequestConfigMap(getServiceSettingsMap("url"), getSecretSettingsMap("secret")),
-                Set.of(),
                 modelVerificationActionListener
             );
         }

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/mistral/MistralServiceTests.java

@@ -142,7 +142,6 @@ public void testParseRequestConfig_ThrowsElasticsearchStatusExceptionWhenChunkin
                     createRandomChunkingSettingsMap(),
                     getSecretSettingsMap("secret")
                 ),
-                Set.of(),
                 modelVerificationListener
             );
         }
@@ -171,7 +170,6 @@ public void testParseRequestConfig_CreatesAMistralEmbeddingsModelWhenChunkingSet
                     createRandomChunkingSettingsMap(),
                     getSecretSettingsMap("secret")
                 ),
-                Set.of(),
                 modelVerificationListener
             );
         }
@@ -199,7 +197,6 @@ public void testParseRequestConfig_CreatesAMistralEmbeddingsModelWhenChunkingSet
                     getEmbeddingsTaskSettingsMap(),
                     getSecretSettingsMap("secret")
                 ),
-                Set.of(),
                 modelVerificationListener
             );
         }