Merge branch 'elastic:main' into bugfix/highlighting-for-constant_keyword-field-type

Author: piergm

.ci/bwcVersions

@@ -60,6 +60,7 @@ BWC_VERSION:
   - "7.17.9"
   - "7.17.10"
   - "7.17.11"
+  - "7.17.12"
   - "8.0.0"
   - "8.0.1"
   - "8.1.0"
@@ -90,5 +91,6 @@ BWC_VERSION:
   - "8.8.0"
   - "8.8.1"
   - "8.8.2"
+  - "8.8.3"
   - "8.9.0"
   - "8.10.0"

.ci/snapshotBwcVersions

@@ -1,5 +1,5 @@
 BWC_VERSION:
-  - "7.17.11"
-  - "8.8.2"
+  - "7.17.12"
+  - "8.8.3"
   - "8.9.0"
   - "8.10.0"

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/LicenseHeadersTask.java

@@ -50,15 +50,11 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
 import java.io.Serializable;
 
-import javax.inject.Inject;
-
 /**
  * Checks files for license headers..
  */
@@ -193,9 +189,8 @@ public void runRat() {
         boolean unApprovedLicenses = stats.getNumUnApproved() > 0;
         if (unknownLicenses || unApprovedLicenses) {
             getLogger().error("The following files contain unapproved license headers:");
-            unapprovedFiles(repFile).stream().forEachOrdered(unapprovedFile -> getLogger().error(unapprovedFile));
-            throw new GradleException("Check failed. License header problems were found. Full details: " +
-                    repFile.getAbsolutePath());
+            unapprovedFiles(repFile).forEach(getLogger()::error);
+            throw new GradleException("Check failed. License header problems were found. Full details: " + repFile.getAbsolutePath());
         }
     }
 

build-tools-internal/build.gradle

@@ -240,7 +240,7 @@ dependencies {
     // ensuring brought asm version brought in by spock is up-to-date
     testImplementation buildLibs.asm
     integTestImplementation buildLibs.asm
-    integTestImplementation('org.ow2.asm:asm:9.4')
+    integTestImplementation('org.ow2.asm:asm:9.5')
     api("org.yaml:snakeyaml") {
       version { strictly(versions.snakeyaml) }
     }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportService.java

@@ -34,6 +34,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
@@ -287,7 +288,7 @@ static Map<String, String> parseOsRelease(final List<String> osReleaseLines) {
      */
     private Optional<String> getDockerPath() {
         // Check if the Docker binary exists
-        return List.of(DOCKER_BINARIES).stream().filter(path -> new File(path).exists()).findFirst();
+        return Stream.of(DOCKER_BINARIES).filter(path -> new File(path).exists()).findFirst();
     }
 
     /**
@@ -298,7 +299,7 @@ private Optional<String> getDockerPath() {
      */
     private Optional<String> getDockerComposePath() {
         // Check if the Docker binary exists
-        return List.of(DOCKER_COMPOSE_BINARIES).stream().filter(path -> new File(path).exists()).findFirst();
+        return Stream.of(DOCKER_COMPOSE_BINARIES).filter(path -> new File(path).exists()).findFirst();
     }
 
     private void throwDockerRequiredException(final String message) {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTask.java

@@ -114,24 +114,19 @@ public void checkInvalidPatterns() throws IOException {
             } catch (UncheckedIOException e) {
                 throw new IllegalArgumentException("Failed to read " + f + " as UTF_8", e);
             }
-            List<Integer> invalidLines = IntStream.range(0, lines.size())
-                .filter(i -> allPatterns.matcher(lines.get(i)).find())
-                .boxed()
-                .collect(Collectors.toList());
 
             URI baseUri = getRootDir().orElse(projectLayout.getProjectDirectory().getAsFile()).get().toURI();
             String path = baseUri.relativize(f.toURI()).toString();
-            failures.addAll(
-                invalidLines.stream()
-                    .map(l -> new AbstractMap.SimpleEntry<>(l + 1, lines.get(l)))
-                    .flatMap(
-                        kv -> patterns.entrySet()
-                            .stream()
-                            .filter(p -> Pattern.compile(p.getValue()).matcher(kv.getValue()).find())
-                            .map(p -> "- " + p.getKey() + " on line " + kv.getKey() + " of " + path)
-                    )
-                    .collect(Collectors.toList())
-            );
+            IntStream.range(0, lines.size())
+                .filter(i -> allPatterns.matcher(lines.get(i)).find())
+                .mapToObj(l -> new AbstractMap.SimpleEntry<>(l + 1, lines.get(l)))
+                .flatMap(
+                    kv -> patterns.entrySet()
+                        .stream()
+                        .filter(p -> Pattern.compile(p.getValue()).matcher(kv.getValue()).find())
+                        .map(p -> "- " + p.getKey() + " on line " + kv.getKey() + " of " + path)
+                )
+                .forEach(failures::add);
         }
         if (failures.isEmpty() == false) {
             throw new GradleException("Found invalid patterns:\n" + String.join("\n", failures));

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/JavaModulePrecommitTask.java

@@ -159,8 +159,7 @@ private static ModuleReference esModuleFor(File filePath) {
         return ModuleFinder.of(filePath.toPath())
             .findAll()
             .stream()
-            .sorted(Comparator.comparing(ModuleReference::descriptor))
-            .findFirst()
+            .min(Comparator.comparing(ModuleReference::descriptor))
             .orElseThrow(() -> new GradleException("module not found in " + filePath));
     }
 }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/SplitPackagesAuditTask.java

@@ -48,7 +48,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -234,7 +233,7 @@ private void filterSplitPackages(Map<String, Set<String>> splitPackages) {
             String lastPackageName = null;
             Set<String> currentClasses = null;
             boolean filterErrorsFound = false;
-            for (String fqcn : getParameters().getIgnoreClasses().get().stream().sorted().collect(Collectors.toList())) {
+            for (String fqcn : getParameters().getIgnoreClasses().get().stream().sorted().toList()) {
                 int lastDot = fqcn.lastIndexOf('.');
                 if (lastDot == -1) {
                     LOGGER.error("Missing package in classname in split package ignores: " + fqcn);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/TestingConventionsCheckTask.java

@@ -38,6 +38,7 @@
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
@@ -128,7 +129,7 @@ private void assertNoMissmatchingTest(List<? extends Class<?>> testClassesCandid
             var mismatchingBaseClasses = testClassesCandidate.stream()
                 .filter(testClassDefaultPredicate)
                 .filter(TestingConventionsCheckWorkAction::seemsLikeATest)
-                .collect(Collectors.toList());
+                .toList();
             if (mismatchingBaseClasses.isEmpty() == false) {
                 throw new GradleException(
                     "Following test classes do not extend any supported base class:\n\t"
@@ -141,7 +142,7 @@ private void assertMatchesSuffix(List<String> suffixes, List<Class> matchingBase
             // ensure base class matching do match suffix
             var matchingBaseClassNotMatchingSuffix = matchingBaseClass.stream()
                 .filter(c -> suffixes.stream().allMatch(s -> c.getName().endsWith(s) == false))
-                .collect(Collectors.toList());
+                .toList();
             if (matchingBaseClassNotMatchingSuffix.isEmpty() == false) {
                 throw new GradleException(
                     "Following test classes do not match naming convention to use suffix "
@@ -202,8 +203,7 @@ private static boolean matchesTestMethodNamingConvention(Method method) {
         }
 
         private static boolean isAnnotated(Method method, Class<?> annotation) {
-            return List.of(method.getAnnotations())
-                .stream()
+            return Stream.of(method.getAnnotations())
                 .anyMatch(presentAnnotation -> annotation.isAssignableFrom(presentAnnotation.getClass()));
         }
 

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

@@ -389,12 +389,11 @@ private List<ElasticsearchDistribution> configureDistributions(Project project)
         List<ElasticsearchDistribution> currentDistros = new ArrayList<>();
 
         for (Architecture architecture : Architecture.values()) {
-            ALL_INTERNAL.stream()
-                .forEach(
-                    type -> currentDistros.add(
-                        createDistro(distributions, architecture, type, null, true, VersionProperties.getElasticsearch())
-                    )
-                );
+            ALL_INTERNAL.forEach(
+                type -> currentDistros.add(
+                    createDistro(distributions, architecture, type, null, true, VersionProperties.getElasticsearch())
+                )
+            );
         }
 
         for (Architecture architecture : Architecture.values()) {