Parcourir la source

Remove FieldMapper.Builder.indexName. #18219

The ability to configure index names that are different from the full name was
removed in 2.0.
Adrien Grand il y a 9 ans
Parent
commit
f481492af3

+ 0 - 6
core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java

@@ -58,7 +58,6 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
         protected final MappedFieldType defaultFieldType;
         private final IndexOptions defaultOptions;
         protected boolean omitNormsSet = false;
-        protected String indexName;
         protected Boolean includeInAll;
         protected boolean indexOptionsSet = false;
         protected boolean docValuesSet = false;
@@ -169,11 +168,6 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
             return builder;
         }
 
-        public T indexName(String indexName) {
-            this.indexName = indexName;
-            return builder;
-        }
-
         public T indexAnalyzer(NamedAnalyzer indexAnalyzer) {
             this.fieldType.setIndexAnalyzer(indexAnalyzer);
             return builder;

+ 0 - 1
core/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java

@@ -102,7 +102,6 @@ public class AllFieldMapper extends MetadataFieldMapper {
         public Builder(MappedFieldType existing) {
             super(Defaults.NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE);
             builder = this;
-            indexName = Defaults.INDEX_NAME;
         }
 
         public Builder enabled(EnabledAttributeMapper enabled) {

+ 0 - 1
core/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java

@@ -78,7 +78,6 @@ public class FieldNamesFieldMapper extends MetadataFieldMapper {
 
         public Builder(MappedFieldType existing) {
             super(Defaults.NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE);
-            indexName = Defaults.NAME;
         }
 
         @Override

+ 0 - 1
core/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java

@@ -81,7 +81,6 @@ public class IdFieldMapper extends MetadataFieldMapper {
 
         public Builder(MappedFieldType existing) {
             super(Defaults.NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE);
-            indexName = Defaults.NAME;
         }
 
         @Override

+ 0 - 1
core/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java

@@ -73,7 +73,6 @@ public class IndexFieldMapper extends MetadataFieldMapper {
 
         public Builder(MappedFieldType existing) {
             super(Defaults.NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE);
-            indexName = Defaults.NAME;
         }
 
         @Override

+ 0 - 1
core/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java

@@ -77,7 +77,6 @@ public class TypeFieldMapper extends MetadataFieldMapper {
 
         public Builder(MappedFieldType existing) {
             super(Defaults.NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE);
-            indexName = Defaults.NAME;
         }
 
         @Override

+ 0 - 1
core/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java

@@ -75,7 +75,6 @@ public class UidFieldMapper extends MetadataFieldMapper {
 
         public Builder(MappedFieldType existing) {
             super(Defaults.NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE);
-            indexName = Defaults.NAME;
         }
 
         @Override

+ 0 - 1
plugins/mapper-attachments/src/main/java/org/elasticsearch/mapper/attachments/AttachmentMapper.java

@@ -206,7 +206,6 @@ public class AttachmentMapper extends FieldMapper {
                 if (contentBuilder instanceof FieldMapper.Builder == false) {
                     throw new IllegalStateException("content field for attachment must be a field mapper");
                 }
-                ((FieldMapper.Builder<?, ?>)contentBuilder).indexName(name);
                 contentBuilder.name = name + "." + FieldNames.CONTENT;
                 contentMapper = (FieldMapper) contentBuilder.build(context);
                 context.path().add(name);