Temporarily remove bwc check

Author: Kubik42

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

@@ -245,7 +245,7 @@ public static class Builder extends FieldMapper.Builder {
         private final IndexMode indexMode;
 
         private final Parameter<Boolean> index = Parameter.indexParam(m -> ((TextFieldMapper) m).index, true);
-        private Parameter<Boolean> store = Parameter.storeParam(m -> ((TextFieldMapper) m).store, false);
+        private final Parameter<Boolean> store = Parameter.storeParam(m -> ((TextFieldMapper) m).store, false);
 
         final Parameter<SimilarityProvider> similarity = TextParams.similarity(m -> ((TextFieldMapper) m).similarity);
 
@@ -317,8 +317,8 @@ public Builder(
 
             // don't enable norms by default if the index is LOGSDB or TSDB based
             this.norms = Parameter.normsParam(
-                    m -> ((TextFieldMapper) m).norms,
-                    () -> indexMode != IndexMode.LOGSDB && indexMode != IndexMode.TIME_SERIES
+                m -> ((TextFieldMapper) m).norms,
+                () -> indexMode != IndexMode.LOGSDB && indexMode != IndexMode.TIME_SERIES
             );
         }
 
@@ -471,18 +471,18 @@ private SubFieldInfo buildPhraseInfo(FieldType fieldType, TextFieldType parent)
         public TextFieldMapper build(MapperBuilderContext context) {
             this.isSyntheticSourceEnabled = context.isSourceSynthetic();
 
-            // backwards compatibility checks
-            if (keywordMultiFieldsNotStoredWhenIgnored_indexVersionCheck(indexCreatedVersion) == false) {
-                this.store = Parameter.storeParam(m -> ((TextFieldMapper) m).store, () -> {
-                    if (multiFieldsNotStoredByDefault_indexVersionCheck(indexCreatedVersion)) {
-                        return isSyntheticSourceEnabled
-                            && isWithinMultiField == false
-                            && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
-                    } else {
-                        return isSyntheticSourceEnabled && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
-                    }
-                });
-            }
+            // // backwards compatibility checks
+            // if (this.store.isSet() == false && keywordMultiFieldsNotStoredWhenIgnored_indexVersionCheck(indexCreatedVersion) == false) {
+            // this.store = Parameter.storeParam(m -> ((TextFieldMapper) m).store, () -> {
+            // if (multiFieldsNotStoredByDefault_indexVersionCheck(indexCreatedVersion)) {
+            // return isSyntheticSourceEnabled
+            // && isWithinMultiField == false
+            // && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
+            // } else {
+            // return isSyntheticSourceEnabled && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
+            // }
+            // });
+            // }
 
             FieldType fieldType = TextParams.buildFieldType(
                 index,
@@ -506,13 +506,7 @@ public TextFieldMapper build(MapperBuilderContext context) {
     }
 
     public static final TypeParser PARSER = createTypeParserWithLegacySupport(
-        (n, c) -> new Builder(
-            n,
-            c.indexVersionCreated(),
-            c.getIndexSettings().getMode(),
-            c.getIndexAnalyzers(),
-            c.isWithinMultiField()
-        )
+        (n, c) -> new Builder(n, c.indexVersionCreated(), c.getIndexSettings().getMode(), c.getIndexAnalyzers(), c.isWithinMultiField())
     );
 
     private static class PhraseWrappedAnalyzer extends AnalyzerWrapper {
@@ -1305,7 +1299,6 @@ public Query existsQuery(SearchExecutionContext context) {
 
     }
 
-    private final IndexVersion indexCreatedVersion;
     private final IndexMode indexMode;
     private final boolean index;
     private final boolean store;

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

@@ -739,7 +739,7 @@ public void testNestedObjectWithMultiFieldsgetTotalFieldsCount() {
                     new KeywordFieldMapper.Builder("multi_field_size_4", IndexVersion.current(), true)
                 )
                     .addMultiField(
-                        new TextFieldMapper.Builder("grand_child_size_5", IndexVersion.current(), createDefaultIndexAnalyzers(), true)
+                        new TextFieldMapper.Builder("grand_child_size_5", IndexVersion.current(), null, createDefaultIndexAnalyzers(), true)
                             .addMultiField(
                                 new KeywordFieldMapper.Builder("multi_field_of_multi_field_size_6", IndexVersion.current(), true)
                             )

test/framework/src/main/java/org/elasticsearch/index/mapper/KeywordFieldSyntheticSourceSupport.java

@@ -80,8 +80,8 @@ public MapperTestCase.SyntheticSourceExample example(int maxValues, boolean load
             // this is an ugly little hack that flips the order of ignored values, which is important for the text-family fields where the
             // ordering of produced synthetic source values can be different from what was supplied
             var syntheticSourceOutputList = flipOrder
-                    ? Stream.concat(ignoredValues.stream(), validValuesInCorrectOrder.stream()).toList()
-                    : Stream.concat(validValuesInCorrectOrder.stream(), ignoredValues.stream()).toList();
+                ? Stream.concat(ignoredValues.stream(), validValuesInCorrectOrder.stream()).toList()
+                : Stream.concat(validValuesInCorrectOrder.stream(), ignoredValues.stream()).toList();
             out = syntheticSourceOutputList.size() == 1 ? syntheticSourceOutputList.get(0) : syntheticSourceOutputList;
         }
 

test/framework/src/main/java/org/elasticsearch/index/mapper/TextFieldFamilySyntheticSourceTestSetup.java

@@ -81,7 +81,11 @@ public MapperTestCase.SyntheticSourceExample example(int maxValues) {
             // Block loader will not use keyword multi-field if it has ignore_above configured.
             // And in this case it will use values from source.
             boolean loadingFromSource = ignoreAbove != null;
-            MapperTestCase.SyntheticSourceExample delegate = keywordMultiFieldSyntheticSourceSupport.example(maxValues, loadingFromSource, true);
+            MapperTestCase.SyntheticSourceExample delegate = keywordMultiFieldSyntheticSourceSupport.example(
+                maxValues,
+                loadingFromSource,
+                true
+            );
 
             return new MapperTestCase.SyntheticSourceExample(delegate.inputValue(), delegate.expectedForSyntheticSource(), b -> {
                 b.field("type", fieldType);