checkstyle

Author: Kubik42

server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java

@@ -341,7 +341,6 @@ public boolean newDynamicStringField(DocumentParserContext context, String name)
                         indexSettings.getIndexVersionCreated(),
                         indexSettings.getMode(),
                         context.indexAnalyzers(),
-                        SourceFieldMapper.isSynthetic(indexSettings),
                         false
                     ).addMultiField(
                         new KeywordFieldMapper.Builder("keyword", context.indexSettings().getIndexVersionCreated()).ignoreAbove(256)

server/src/test/java/org/elasticsearch/index/mapper/CompositeSyntheticFieldLoaderTests.java

@@ -239,19 +239,19 @@ public void testFieldName() {
     public void testMergeTwoFieldLoaders() throws IOException {
         // given
         var fieldLoader1 = new CompositeSyntheticFieldLoader(
-                "foo",
-                "bar.baz.foo",
-                List.of(new CompositeSyntheticFieldLoader.StoredFieldLayer("foo.one") {
-                    @Override
-                    protected void writeValue(Object value, XContentBuilder b) throws IOException {
-                        b.value((long) value);
-                    }
-                }, new CompositeSyntheticFieldLoader.StoredFieldLayer("foo.two") {
-                    @Override
-                    protected void writeValue(Object value, XContentBuilder b) throws IOException {
-                        b.value((long) value);
-                    }
-                })
+            "foo",
+            "bar.baz.foo",
+            List.of(new CompositeSyntheticFieldLoader.StoredFieldLayer("foo.one") {
+                @Override
+                protected void writeValue(Object value, XContentBuilder b) throws IOException {
+                    b.value((long) value);
+                }
+            }, new CompositeSyntheticFieldLoader.StoredFieldLayer("foo.two") {
+                @Override
+                protected void writeValue(Object value, XContentBuilder b) throws IOException {
+                    b.value((long) value);
+                }
+            })
         );
 
         var fieldLoader2 = new CompositeSyntheticFieldLoader(
@@ -267,8 +267,7 @@ protected void writeValue(Object value, XContentBuilder b) throws IOException {
 
         var mergedFieldLoader = fieldLoader1.mergedWith(fieldLoader2);
 
-        var storedFieldLoaders = mergedFieldLoader.storedFieldLoaders()
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        var storedFieldLoaders = mergedFieldLoader.storedFieldLoaders().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         storedFieldLoaders.get("foo.one").load(List.of(45L, 46L));
         storedFieldLoaders.get("foo.two").load(List.of(1L));
         storedFieldLoaders.get("foo.three").load(List.of(98L, 99L));
@@ -281,6 +280,6 @@ protected void writeValue(Object value, XContentBuilder b) throws IOException {
 
         // then
         assertEquals("""
-                             {"foo":[45,46,1,98,99]}""", Strings.toString(result));
+            {"foo":[45,46,1,98,99]}""", Strings.toString(result));
     }
 }

server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java

@@ -1006,7 +1006,10 @@ public void test_value_is_not_ignored_when_it_exceeds_ignore_above_and_field_is_
         KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("potato");
 
         // then
-        assertFalse(mapper.fieldType().isIgnored("this value will trip ignore_above, but bc keyword is not a multi field this value will not be ignored"));
+        assertFalse(
+            mapper.fieldType()
+                .isIgnored("this value will trip ignore_above, but bc keyword is not a multi field this value will not be ignored")
+        );
     }
 
     public void test_value_is_ignored_when_it_exceeds_ignore_above_and_field_is_a_multi_field() throws IOException {
@@ -1054,7 +1057,7 @@ public void test_value_is_not_ignored_when_it_does_not_exceed_ignore_above_and_f
         // then
         assertFalse(mapper.fieldType().isIgnored("this value is too short to be ignored"));
     }
-    
+
     public void test_value_exceeds_ignore_above_and_field_is_not_a_multi_field() throws IOException {
         // given
         MapperService mapperService = createSytheticSourceMapperService(mapping(b -> {
@@ -1063,12 +1066,10 @@ public void test_value_exceeds_ignore_above_and_field_is_not_a_multi_field() thr
             b.field("ignore_above", 1);
             b.endObject();
         }));
-        
+
         // when
         KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("potato");
-        ParsedDocument doc = mapperService.documentMapper().parse(source(b -> {
-            b.field("potato", "this value is too long");
-        }));
+        ParsedDocument doc = mapperService.documentMapper().parse(source(b -> { b.field("potato", "this value is too long"); }));
 
         // then
 
@@ -1094,9 +1095,7 @@ public void test_value_exceeds_ignore_above_and_field_is_a_multi_field() throws
 
         // when
         KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("potato.tomato");
-        ParsedDocument doc = mapperService.documentMapper().parse(source(b -> {
-            b.field("potato", "this value is too long");
-        }));
+        ParsedDocument doc = mapperService.documentMapper().parse(source(b -> { b.field("potato", "this value is too long"); }));
 
         // then
 
@@ -1123,9 +1122,7 @@ public void test_value_does_not_exceed_ignore_above_and_field_is_a_multi_field()
 
         // when
         KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("potato.tomato");
-        ParsedDocument doc = mapperService.documentMapper().parse(source(b -> {
-            b.field("potato", "this value is too long");
-        }));
+        ParsedDocument doc = mapperService.documentMapper().parse(source(b -> { b.field("potato", "this value is too long"); }));
 
         // then
 
@@ -1145,9 +1142,7 @@ public void test_value_exceeds_ignore_above_when_synthetic_source_disabled() thr
 
         // when
         KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("potato");
-        ParsedDocument doc = mapperService.documentMapper().parse(source(b -> {
-            b.field("potato", "this value is too long");
-        }));
+        ParsedDocument doc = mapperService.documentMapper().parse(source(b -> { b.field("potato", "this value is too long"); }));
 
         // then