Reverted MapperBuilderContext changes to make PR smaller

Author: Kubik42

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

@@ -24,15 +24,11 @@ public class MapperBuilderContext {
      * The root context, to be used when building a tree of mappers
      */
     public static MapperBuilderContext root(boolean isSourceSynthetic, boolean isDataStream) {
-        return MapperBuilderContext.builder().isSourceSynthetic(isSourceSynthetic).isDataStream(isDataStream).build();
+        return root(isSourceSynthetic, isDataStream, MergeReason.MAPPING_UPDATE);
     }
 
     public static MapperBuilderContext root(boolean isSourceSynthetic, boolean isDataStream, MergeReason mergeReason) {
-        return MapperBuilderContext.builder()
-            .isSourceSynthetic(isSourceSynthetic)
-            .isDataStream(isDataStream)
-            .mergeReason(mergeReason)
-            .build();
+        return new MapperBuilderContext(null, isSourceSynthetic, isDataStream, false, ObjectMapper.Defaults.DYNAMIC, mergeReason, false);
     }
 
     private final String path;
@@ -150,66 +146,4 @@ public MergeReason getMergeReason() {
     public boolean isInNestedContext() {
         return inNestedContext;
     }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static final class Builder {
-
-        private String path = null;
-        private boolean isSourceSynthetic;
-        private boolean isDataStream;
-        private boolean parentObjectContainsDimensions = false;
-        private ObjectMapper.Dynamic dynamic = ObjectMapper.Defaults.DYNAMIC;
-        private MergeReason mergeReason = MergeReason.MAPPING_UPDATE;
-        private boolean inNestedContext = false;
-
-        public Builder path(String path) {
-            this.path = path;
-            return this;
-        }
-
-        public Builder isSourceSynthetic(boolean isSourceSynthetic) {
-            this.isSourceSynthetic = isSourceSynthetic;
-            return this;
-        }
-
-        public Builder isDataStream(boolean isDataStream) {
-            this.isDataStream = isDataStream;
-            return this;
-        }
-
-        public Builder parentObjectContainsDimensions(boolean parentObjectContainsDimensions) {
-            this.parentObjectContainsDimensions = parentObjectContainsDimensions;
-            return this;
-        }
-
-        public Builder dynamic(ObjectMapper.Dynamic dynamic) {
-            this.dynamic = dynamic;
-            return this;
-        }
-
-        public Builder mergeReason(MergeReason mergeReason) {
-            this.mergeReason = mergeReason;
-            return this;
-        }
-
-        public Builder inNestedContext(boolean inNestedContext) {
-            this.inNestedContext = inNestedContext;
-            return this;
-        }
-
-        public MapperBuilderContext build() {
-            return new MapperBuilderContext(
-                path,
-                isSourceSynthetic,
-                isDataStream,
-                parentObjectContainsDimensions,
-                dynamic,
-                mergeReason,
-                inNestedContext
-            );
-        }
-    }
 }

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

@@ -161,7 +161,15 @@ public void testFieldAliasWithDifferentNestedScopes() {
 
     private static FieldMapper createFieldMapper(String parent, String name) {
         return new BooleanFieldMapper.Builder(name, ScriptCompiler.NONE, false, IndexVersion.current(), null).build(
-            MapperBuilderContext.builder().path(parent).isSourceSynthetic(false).build()
+            new MapperBuilderContext(
+                parent,
+                false,
+                false,
+                false,
+                ObjectMapper.Defaults.DYNAMIC,
+                MapperService.MergeReason.MAPPING_UPDATE,
+                false
+            )
         );
     }
 

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

@@ -365,7 +365,15 @@ private static RootObjectMapper createRootSubobjectFalseLeafWithDots() {
     private static ObjectMapper.Builder createObjectSubobjectsFalseLeafWithDots() {
         KeywordFieldMapper.Builder fieldBuilder = new KeywordFieldMapper.Builder("host.name", IndexVersion.current());
         KeywordFieldMapper fieldMapper = fieldBuilder.build(
-            MapperBuilderContext.builder().path("foo.metrics").isSourceSynthetic(false).isDataStream(false).build()
+            new MapperBuilderContext(
+                "foo.metrics",
+                false,
+                false,
+                false,
+                ObjectMapper.Defaults.DYNAMIC,
+                MapperService.MergeReason.MAPPING_UPDATE,
+                false
+            )
         );
         assertEquals("host.name", fieldMapper.leafName());
         assertEquals("foo.metrics.host.name", fieldMapper.fullPath());
@@ -377,7 +385,15 @@ private static ObjectMapper.Builder createObjectSubobjectsFalseLeafWithDots() {
     private ObjectMapper.Builder createObjectSubobjectsFalseLeafWithMultiField() {
         TextFieldMapper.Builder fieldBuilder = createTextKeywordMultiField("host.name");
         TextFieldMapper textKeywordMultiField = fieldBuilder.build(
-            MapperBuilderContext.builder().path("foo.metrics").isSourceSynthetic(false).isDataStream(false).build()
+            new MapperBuilderContext(
+                "foo.metrics",
+                false,
+                false,
+                false,
+                ObjectMapper.Defaults.DYNAMIC,
+                MapperService.MergeReason.MAPPING_UPDATE,
+                false
+            )
         );
         assertEquals("host.name", textKeywordMultiField.leafName());
         assertEquals("foo.metrics.host.name", textKeywordMultiField.fullPath());