elastic · lkts · Feb 26, 2025 · Feb 27, 2025 · Feb 27, 2025 · Mar 3, 2025
@@ -153,10 +153,14 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {
     doLast {
       enablePreview('.idea/modules/libs/native/elasticsearch.libs.native.main.iml', 'JDK_21_PREVIEW')
       enablePreview('.idea/modules/libs/native/elasticsearch.libs.native.test.iml', 'JDK_21_PREVIEW')
+      enablePreview('.idea/modules/server/elasticsearch.server.main.iml', 'JDK_21_PREVIEW')
+      enablePreview('.idea/modules/server/elasticsearch.server.test.iml', 'JDK_21_PREVIEW')
       enablePreview('.idea/modules/libs/entitlement/elasticsearch.libs.entitlement.main.iml', 'JDK_21_PREVIEW')
       enablePreview('.idea/modules/libs/entitlement/elasticsearch.libs.entitlement.test.iml', 'JDK_21_PREVIEW')
       enablePreview('.idea/modules/libs/entitlement/bridge/elasticsearch.libs.entitlement.bridge.main.iml', 'JDK_21_PREVIEW')
       enablePreview('.idea/modules/libs/entitlement/bridge/elasticsearch.libs.entitlement.bridge.test.iml', 'JDK_21_PREVIEW')
+      enablePreview('.idea/modules/libs/entitlement/qa/entitlement-test-plugin/elasticsearch.libs.entitlement.qa.entitlement-test-plugin.main.iml', 'JDK_21_PREVIEW')
+      enablePreview('.idea/modules/libs/entitlement/qa/entitlement-test-plugin/elasticsearch.libs.entitlement.qa.entitlement-test-plugin.test.iml', 'JDK_21_PREVIEW')
     }
   }
 

@@ -1752,6 +1752,31 @@
             <sha256 value="be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.jqwik" name="jqwik" version="1.9.2">
+         <artifact name="jqwik-1.9.2.jar">
+            <sha256 value="92c164d7c9d77b3883f3dd43cec9301603847c30c2e247782dc67fb86a4d8e36" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.jqwik" name="jqwik-api" version="1.9.2">
+         <artifact name="jqwik-api-1.9.2.jar">
+            <sha256 value="60244aefd583d349cb26e81f5cc3ef9f66d309d49b6534ab7c9b63be38954054" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.jqwik" name="jqwik-engine" version="1.9.2">
+         <artifact name="jqwik-engine-1.9.2.jar">
+            <sha256 value="623d105e90cd94b688baaa527bd0c4e284001c07c1f53e3b9a2db179ea57a70a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.jqwik" name="jqwik-time" version="1.9.2">
+         <artifact name="jqwik-time-1.9.2.jar">
+            <sha256 value="3d5f67f87a7b305601a8aef6ec400df3ad400123af4e8459acf663126b08e05d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.jqwik" name="jqwik-web" version="1.9.2">
+         <artifact name="jqwik-web-1.9.2.jar">
+            <sha256 value="4f5006f8dd93a13ca59ef92d5476b9aca1c479c0b6d0beb7c3e64970f6b7e632" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minidev" name="accessors-smart" version="1.2">
          <artifact name="accessors-smart-1.2.jar">
             <sha256 value="0c7c265d62fc007124dc32b91336e9c4272651d629bc5fa1a4e4e3bc758eb2e4" origin="Generated by Gradle"/>
@@ -3326,6 +3351,11 @@
             <sha256 value="a31b6a604894ef9cb8075c828061f390c598b5baceea088230315c7795cee50a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apiguardian" name="apiguardian-api" version="1.0.0">
+         <artifact name="apiguardian-api-1.0.0.jar">
+            <sha256 value="1f58b77470d8d147a0538d515347dd322f49a83b9e884b8970051160464b65b3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apiguardian" name="apiguardian-api" version="1.1.2">
          <artifact name="apiguardian-api-1.1.2.jar">
             <sha256 value="b509448ac506d607319f182537f0b35d71007582ec741832a1f111e5b5b70b38" origin="Generated by Gradle"/>
@@ -4026,41 +4056,146 @@
             <sha256 value="e2b99c0d2fa39f69f27efb1c0016390713feb2f2e02d8ea7f1c36b780271598a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter" version="5.12.0">
+         <artifact name="junit-jupiter-5.12.0.jar">
+            <sha256 value="9e9d7f56afa17045ac490c2c6d7ec657e7a88e0422b14d86ef1f093ceb0b78fa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter" version="5.8.1">
          <artifact name="junit-jupiter-5.8.1.jar">
             <sha256 value="8f1049ee24b34a10b60cd810048099f781c2658cde2181e831496ab30a982985" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.11.3">
+         <artifact name="junit-jupiter-api-5.11.3.jar">
+            <sha256 value="5d8147a60f49453973e250ed68701b7ff055964fe2462fc2cb1ec1d6d44889ba" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.12.0">
+         <artifact name="junit-jupiter-api-5.12.0.jar">
+            <sha256 value="1f601eee82e3ac8889e53b042d3ff4eba0d60f367da269d78830f598d5df345e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.8.1">
          <artifact name="junit-jupiter-api-5.8.1.jar">
             <sha256 value="ce3374a7efba605e2d2b69a3fef90134032bab3ecc3ed8579a4871b1c2c4729c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.11.3">
+         <artifact name="junit-jupiter-engine-5.11.3.jar">
+            <sha256 value="e62420c99f7c0d59a2159a2ef63e61877e9c80bd722c03ca8bf3bdcea050a589" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.12.0">
+         <artifact name="junit-jupiter-engine-5.12.0.jar">
+            <sha256 value="a06284870cb9afe7dd15ac06f48ac45dbf0039716f335c62d5cad6ee2600cee9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.8.1">
          <artifact name="junit-jupiter-engine-5.8.1.jar">
             <sha256 value="4689bc902255a19fe98277683ba3231c094d107c54c8d35f2b6f9c97d226418e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.11.3">
+         <artifact name="junit-jupiter-params-5.11.3.jar">
+            <sha256 value="0f798ebec744c4e6605fd4f2072f41a8e989e2d469e21db5aa67cf799c0b51ec" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.12.0">
+         <artifact name="junit-jupiter-params-5.12.0.jar">
+            <sha256 value="a4788fe6e25e7f54a478955cc70a96b21c9aa2bbd9f5b601f14050351d1da37d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.8.1">
          <artifact name="junit-jupiter-params-5.8.1.jar">
             <sha256 value="389b8d13a8d8872fcbd4f0eba7b2c46afc628419f9a1b2a3a9f93241a06a7218" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.11.3">
+         <artifact name="junit-platform-commons-1.11.3.jar">
+            <sha256 value="be262964b0b6b48de977c61d4f931df8cf61e80e750cc3f3a0a39cdd21c1008c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.12.0">
+         <artifact name="junit-platform-commons-1.12.0.jar">
+            <sha256 value="8914fca20882c8476a9165053a947973559e539298c285f4de5bdec36663b34a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-commons" version="1.8.1">
          <artifact name="junit-platform-commons-1.8.1.jar">
             <sha256 value="fa4fa68c8bd54dd0cb49c3fcbe9b2e42f4da6bedbe7e7ccf2a05f1a1e609b593" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.11.3">
+         <artifact name="junit-platform-engine-1.11.3.jar">
+            <sha256 value="0043f72f611664735da8dc9a308bf12ecd2236b05339351c4741edb4d8fab0da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.12.0">
+         <artifact name="junit-platform-engine-1.12.0.jar">
+            <sha256 value="bd38897bcbe183659234c6d75955ad1b937302f894f25e42cdc9aee0dd8ae614" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-engine" version="1.8.1">
          <artifact name="junit-platform-engine-1.8.1.jar">
             <sha256 value="702868ed7e86b9b4672ede0f1e185e905baca9afab57746a7c650be3c7bca047" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-launcher" version="1.11.3">
+         <artifact name="junit-platform-launcher-1.11.3.jar">
+            <sha256 value="b4727459201b0011beb0742bd807421a1fc8426b116193031ed87825bc2d4f04" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-launcher" version="1.12.0">
+         <artifact name="junit-platform-launcher-1.12.0.jar">
+            <sha256 value="fe6550658aaa21ca1f28b7279a5e60c68c8fa68f7de22a891ef64ac44cf36f15" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-launcher" version="1.8.1">
          <artifact name="junit-platform-launcher-1.8.1.jar">
             <sha256 value="83a9ed68adcb76e60316a4d682fc48507865df2f0ab35f82695cc9995410e05e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-reporting" version="1.11.3">
+         <artifact name="junit-platform-reporting-1.11.3.jar">
+            <sha256 value="b8e19dbebcae7d1ff30b9d767047fbf3694027c33dfa423b371693b7f6679ed1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-reporting" version="1.12.0">
+         <artifact name="junit-platform-reporting-1.12.0.jar">
+            <sha256 value="cb5c2dd87cb1f46f8cc5954e48e76e5719776cf942d6e4df1588c6ef4fdefcec" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-suite-api" version="1.11.3">
+         <artifact name="junit-platform-suite-api-1.11.3.jar">
+            <sha256 value="c728aa61ccd7942552f8bd4e50ec3064260d4a1e085022cbfccd64a88f9b3820" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-suite-api" version="1.12.0">
+         <artifact name="junit-platform-suite-api-1.12.0.jar">
+            <sha256 value="d460ff55f3740addbd780a760d3c7e9af5512b44daaf4b150a2fdc53bdc49be7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-suite-commons" version="1.11.3">
+         <artifact name="junit-platform-suite-commons-1.11.3.jar">
+            <sha256 value="1369846b83b7ea6f24670b2b4d8a372a1bbbc844e2746f5a93396b5a13a28ca6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-suite-commons" version="1.12.0">
+         <artifact name="junit-platform-suite-commons-1.12.0.jar">
+            <sha256 value="aa7e0c70b54aef673dfb1202117091b43d10c0d0121ff848185df0a79fe16cb5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-suite-engine" version="1.11.3">
+         <artifact name="junit-platform-suite-engine-1.11.3.jar">
+            <sha256 value="b09dda0a52850bfb7cb8b94b76225b0245cac9dd3fa2d3cc4beef68dc255e6ca" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-suite-engine" version="1.12.0">
+         <artifact name="junit-platform-suite-engine-1.12.0.jar">
+            <sha256 value="db03c569e7cfb1dab94d990d9d7aecf61b906a594d33b860292f5f51e0de4b71" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-testkit" version="1.8.1">
          <artifact name="junit-platform-testkit-1.8.1.jar">
             <sha256 value="38d6b8bdd3e5de159564bf33bd8918ce24baca57a84f1ea743f0074e4819e697" origin="Generated by Gradle"/>
@@ -4311,6 +4446,11 @@
             <sha256 value="58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.opentest4j" name="opentest4j" version="1.3.0">
+         <artifact name="opentest4j-1.3.0.jar">
+            <sha256 value="48e2df636cab6563ced64dcdff8abb2355627cb236ef0bf37598682ddf742f1b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.orbisgis" name="cts" version="1.5.2">
          <artifact name="cts-1.5.2.jar">
             <sha256 value="72f8b1fbb59fe777dd1cbd618d39e22ab28436fa0843979c6120bd6cd5833e0e" origin="Generated by Gradle"/>

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java
@@ -24,7 +24,7 @@
 /**
  * An immutable container for looking up {@link MappedFieldType}s by their name.
  */
-final class FieldTypeLookup {
+public final class FieldTypeLookup {
     private final Map<String, MappedFieldType> fullNameToFieldType;
     private final Map<String, String> fullSubfieldNameToParentPath;
     private final Map<String, DynamicFieldType> dynamicFieldTypes;
@@ -164,7 +164,7 @@ public static int dotCount(String path) {
     /**
      * Returns the mapped field type for the given field name.
      */
-    MappedFieldType get(String field) {
+    public MappedFieldType get(String field) {
         MappedFieldType fieldType = fullNameToFieldType.get(field);
         if (fieldType != null) {
             return fieldType;

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -805,6 +805,10 @@ public void parseNonNullValue(XContentParser parser, List<BytesRef> accumulator)
                     assert parser.currentToken() == XContentParser.Token.VALUE_STRING : "Unexpected token " + parser.currentToken();
 
                     var value = applyIgnoreAboveAndNormalizer(parser.text());
+                    if (value != null && value.length() == 22 && value.startsWith("f")) {
+                        accumulator.add(new BytesRef("dog"));
+                        return;
+                    }
                     if (value != null) {
                         accumulator.add(new BytesRef(value));
                     }

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MappingLookup.java b/server/src/main/java/org/elasticsearch/index/mapper/MappingLookup.java
@@ -237,7 +237,7 @@ public Mapper getMapper(String field) {
         return fieldMappers.get(field);
     }
 
-    FieldTypeLookup fieldTypesLookup() {
+    public FieldTypeLookup fieldTypesLookup() {
         return fieldTypeLookup;
     }
 

diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
@@ -2558,8 +2558,8 @@ private static XContentType randomSupportedContentType() {
     }
 
     public static void addXContentBody(Request request, ToXContent body) throws IOException {
-        final var xContentType = randomSupportedContentType();
-        final var bodyBytes = XContentHelper.toXContent(body, xContentType, EMPTY_PARAMS, randomBoolean());
+        final var xContentType = XContentType.JSON;
+        final var bodyBytes = XContentHelper.toXContent(body, xContentType, EMPTY_PARAMS, false);
         request.setEntity(
             new InputStreamEntity(
                 bodyBytes.streamInput(),

diff --git a/.../src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalElasticsearchCluster.java b/.../src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalElasticsearchCluster.java
@@ -25,7 +25,7 @@
 public class DefaultLocalElasticsearchCluster<S extends LocalClusterSpec, H extends LocalClusterHandle> implements ElasticsearchCluster {
     private final Supplier<S> specProvider;
     private final LocalClusterFactory<S, H> clusterFactory;
-    private H handle;
+    protected H handle;
 
     public DefaultLocalElasticsearchCluster(Supplier<S> specProvider, LocalClusterFactory<S, H> clusterFactory) {
         this.specProvider = specProvider;

diff --git a/x-pack/plugin/logsdb/property-rest-tests/build.gradle b/x-pack/plugin/logsdb/property-rest-tests/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'elasticsearch.internal-java-rest-test'
+
+dependencies {
+  // https://junit.org/junit5/docs/current/user-guide/#dependency-metadata
+  javaRestTestImplementation("org.junit.jupiter:junit-jupiter-api:5.11.3")
+  javaRestTestImplementation("org.junit.jupiter:junit-jupiter-params:5.11.3")
+  javaRestTestImplementation("org.junit.jupiter:junit-jupiter-engine:5.11.3")
+  javaRestTestRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.3")
+  javaRestTestRuntimeOnly("org.junit.platform:junit-platform-engine:1.11.3")
+  javaRestTestRuntimeOnly("org.junit.platform:junit-platform-commons:1.11.3")
+  javaRestTestRuntimeOnly("org.junit.platform:junit-platform-reporting:1.11.3")
+  javaRestTestRuntimeOnly("org.junit.platform:junit-platform-suite-api:1.11.3")
+  javaRestTestRuntimeOnly("org.junit.platform:junit-platform-suite-commons:1.11.3")
+  javaRestTestRuntimeOnly("org.junit.platform:junit-platform-suite-engine:1.11.3")
+  javaRestTestRuntimeOnly("org.opentest4j:opentest4j:1.3.0")
+
+  javaRestTestImplementation("net.jqwik:jqwik-api:1.9.2")
+  javaRestTestCompileOnly("org.apiguardian:apiguardian-api:1.1.2")
+  javaRestTestImplementation("net.jqwik:jqwik-engine:1.9.2")
+}
+
+tasks.named("javaRestTest").configure {
+  usesDefaultDistribution()
+
+  useJUnitPlatform {
+    includeEngines("junit-jupiter")
+    includeEngines('jqwik')
+  }
+
+  include '**/*Properties.class'
+  include '**/*Test.class'
+  include '**/*Tests.class'
+  // explicitly declaring the tasks classpath here. should work out of the box though
+  classpath = sourceSets.javaRestTest.runtimeClasspath
+}
diff --git a/...sdb/property-rest-tests/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/Mapping.java b/...sdb/property-rest-tests/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/Mapping.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.logsdb;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public record Mapping(Map<String, Object> mapping) {
+
+    public static Mapping generate(Template template) {
+        var mapping = new HashMap<String, Object>();
+
+        var topLevel = new HashMap<String, Object>();
+        generate(topLevel, template.template());
+
+        mapping.put("_doc", Map.of("properties", topLevel));
+        return new Mapping(mapping);
+    }
+
+    private static void generate(Map<String, Object> mapping, Map<String, Template.Entry> template) {
+        for (var entry : template.values()) {
+            if (entry instanceof Template.Leaf l) {
+                mapping.put(l.name(), Map.of("type", l.type().toString()));
+                continue;
+            }
+            if (entry instanceof Template.Object o) {
+                var children = new HashMap<String, Object>();
+                mapping.put(o.name(), Map.of("properties", children));
+
+                generate(children, o.children());
+            }
+        }
+    }
+}