fix

Author: lkts

server/src/test/java/org/elasticsearch/index/mapper/blockloader/BooleanFieldBlockLoaderTests.java

@@ -18,7 +18,7 @@
 
 public class BooleanFieldBlockLoaderTests extends BlockLoaderTestCase {
     public BooleanFieldBlockLoaderTests(Params params) {
-        super(FieldType.BOOLEAN, params);
+        super(FieldType.BOOLEAN.toString(), params);
     }
 
     @Override

server/src/test/java/org/elasticsearch/index/mapper/blockloader/DateFieldBlockLoaderTests.java

@@ -24,7 +24,7 @@
 
 public class DateFieldBlockLoaderTests extends BlockLoaderTestCase {
     public DateFieldBlockLoaderTests(Params params) {
-        super(FieldType.DATE, params);
+        super(FieldType.DATE.toString(), params);
     }
 
     @Override

server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java

@@ -22,7 +22,7 @@
 
 public class KeywordFieldBlockLoaderTests extends BlockLoaderTestCase {
     public KeywordFieldBlockLoaderTests(Params params) {
-        super(FieldType.KEYWORD, params);
+        super(FieldType.KEYWORD.toString(), params);
     }
 
     @SuppressWarnings("unchecked")

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/MappingTransforms.java

@@ -26,7 +26,7 @@ record FieldMapping(Map<String, Object> mappingParameters, List<Map<String, Obje
 
     /**
      * Normalize mapping to have the same structure as normalized source and enable field mapping lookup.
-     * Similar to {@link SourceTransforms#normalize(Map)} but needs to get rid of intermediate nodes
+     * Similar to {@link SourceTransforms#normalize(Map, Map)} but needs to get rid of intermediate nodes
      * and collect results into a different data structure.
      *
      * @param map raw mapping document converted to map

test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationSnapshotTests.java

@@ -220,11 +220,11 @@ public DataSourceResponse.FieldTypeGenerator handle(DataSourceRequest.FieldTypeG
             return new DataSourceResponse.FieldTypeGenerator(() -> {
                 if (fieldType == FieldType.KEYWORD) {
                     fieldType = FieldType.LONG;
-                    return new DataSourceResponse.FieldTypeGenerator.FieldTypeInfo(FieldType.KEYWORD);
+                    return new DataSourceResponse.FieldTypeGenerator.FieldTypeInfo(FieldType.KEYWORD.toString());
                 }
 
                 fieldType = FieldType.KEYWORD;
-                return new DataSourceResponse.FieldTypeGenerator.FieldTypeInfo(FieldType.LONG);
+                return new DataSourceResponse.FieldTypeGenerator.FieldTypeInfo(FieldType.LONG.toString());
             });
         }
 
@@ -235,11 +235,11 @@ public DataSourceResponse.DynamicMappingGenerator handle(DataSourceRequest.Dynam
 
         @Override
         public DataSourceResponse.LeafMappingParametersGenerator handle(DataSourceRequest.LeafMappingParametersGenerator request) {
-            if (request.fieldType() == FieldType.KEYWORD) {
+            if (request.fieldType().equals(FieldType.KEYWORD.toString())) {
                 return new DataSourceResponse.LeafMappingParametersGenerator(() -> Map.of("store", "true"));
             }
 
-            if (request.fieldType() == FieldType.LONG) {
+            if (request.fieldType().equals(FieldType.LONG.toString())) {
                 return new DataSourceResponse.LeafMappingParametersGenerator(() -> Map.of("index", "false"));
             }
 

test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationTests.java

@@ -91,7 +91,7 @@ public DataSourceResponse.ChildFieldGenerator handle(DataSourceRequest.ChildFiel
             public DataSourceResponse.FieldTypeGenerator handle(DataSourceRequest.FieldTypeGenerator request) {
                 return new DataSourceResponse.FieldTypeGenerator(
                     () -> new DataSourceResponse.FieldTypeGenerator.FieldTypeInfo(
-                        FieldType.values()[generatedFields++ % FieldType.values().length]
+                        FieldType.values()[generatedFields++ % FieldType.values().length].toString()
                     )
                 );
 
@@ -166,7 +166,7 @@ public DataSourceResponse.ObjectArrayGenerator handle(DataSourceRequest.ObjectAr
             @Override
             public DataSourceResponse.FieldTypeGenerator handle(DataSourceRequest.FieldTypeGenerator request) {
                 return new DataSourceResponse.FieldTypeGenerator(
-                    () -> new DataSourceResponse.FieldTypeGenerator.FieldTypeInfo(FieldType.LONG)
+                    () -> new DataSourceResponse.FieldTypeGenerator.FieldTypeInfo(FieldType.LONG.toString())
                 );
             }
         };

test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/SourceMatcherTests.java

@@ -27,6 +27,7 @@ public void testDynamicMatch() throws IOException {
         );
 
         var sut = new SourceMatcher(
+            Map.of(),
             XContentBuilder.builder(XContentType.JSON.xContent()).startObject().endObject(),
             Settings.builder(),
             XContentBuilder.builder(XContentType.JSON.xContent()).startObject().endObject(),
@@ -49,6 +50,7 @@ public void testDynamicMismatch() throws IOException {
         );
 
         var sut = new SourceMatcher(
+            Map.of(),
             XContentBuilder.builder(XContentType.JSON.xContent()).startObject().endObject(),
             Settings.builder(),
             XContentBuilder.builder(XContentType.JSON.xContent()).startObject().endObject(),
@@ -77,7 +79,7 @@ public void testMappedMatch() throws IOException {
         mapping.endObject();
         mapping.endObject();
 
-        var sut = new SourceMatcher(mapping, Settings.builder(), mapping, Settings.builder(), values, values, false);
+        var sut = new SourceMatcher(Map.of(), mapping, Settings.builder(), mapping, Settings.builder(), values, values, false);
         assertTrue(sut.match().isMatch());
     }
 
@@ -102,7 +104,7 @@ public void testMappedMismatch() throws IOException {
         mapping.endObject();
         mapping.endObject();
 
-        var sut = new SourceMatcher(mapping, Settings.builder(), mapping, Settings.builder(), actual, expected, false);
+        var sut = new SourceMatcher(Map.of(), mapping, Settings.builder(), mapping, Settings.builder(), actual, expected, false);
         assertFalse(sut.match().isMatch());
     }
 
@@ -119,7 +121,7 @@ public void testCountedKeywordMatch() throws IOException {
         mapping.endObject();
         mapping.endObject();
 
-        var sut = new SourceMatcher(mapping, Settings.builder(), mapping, Settings.builder(), actual, expected, false);
+        var sut = new SourceMatcher(Map.of(), mapping, Settings.builder(), mapping, Settings.builder(), actual, expected, false);
         assertTrue(sut.match().isMatch());
     }
 
@@ -136,7 +138,7 @@ public void testCountedKeywordMismatch() throws IOException {
         mapping.endObject();
         mapping.endObject();
 
-        var sut = new SourceMatcher(mapping, Settings.builder(), mapping, Settings.builder(), actual, expected, false);
+        var sut = new SourceMatcher(Map.of(), mapping, Settings.builder(), mapping, Settings.builder(), actual, expected, false);
         assertFalse(sut.match().isMatch());
     }
 }