Skip to content

Commit 561efa7

Browse files
PnPiehub-cap
authored andcommitted
Remove "template" field in IndexTemplateMetaData (#42099)
Remove "template" field from XContent parsing in IndexTemplateMetaData
1 parent ec427ff commit 561efa7

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import com.carrotsearch.hppc.cursors.ObjectCursor;
2222
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
23-
import org.apache.logging.log4j.LogManager;
2423
import org.elasticsearch.ElasticsearchParseException;
2524
import org.elasticsearch.cluster.AbstractDiffable;
2625
import org.elasticsearch.cluster.Diff;
@@ -32,7 +31,6 @@
3231
import org.elasticsearch.common.compress.CompressedXContent;
3332
import org.elasticsearch.common.io.stream.StreamInput;
3433
import org.elasticsearch.common.io.stream.StreamOutput;
35-
import org.elasticsearch.common.logging.DeprecationLogger;
3634
import org.elasticsearch.common.settings.Settings;
3735
import org.elasticsearch.common.util.set.Sets;
3836
import org.elasticsearch.common.xcontent.ToXContent;
@@ -52,8 +50,6 @@
5250

5351
public class IndexTemplateMetaData extends AbstractDiffable<IndexTemplateMetaData> {
5452

55-
private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(IndexTemplateMetaData.class));
56-
5753
private final String name;
5854

5955
private final int order;
@@ -97,7 +93,7 @@ public IndexTemplateMetaData(String name, int order, Integer version,
9793
this.name = name;
9894
this.order = order;
9995
this.version = version;
100-
this.patterns= patterns;
96+
this.patterns = patterns;
10197
this.settings = settings;
10298
this.mappings = mappings;
10399
this.aliases = aliases;
@@ -227,7 +223,7 @@ public void writeTo(StreamOutput out) throws IOException {
227223
public static class Builder {
228224

229225
private static final Set<String> VALID_FIELDS = Sets.newHashSet(
230-
"template", "order", "mappings", "settings", "index_patterns", "aliases", "version");
226+
"order", "mappings", "settings", "index_patterns", "aliases", "version");
231227

232228
private String name;
233229

@@ -487,11 +483,7 @@ public static IndexTemplateMetaData fromXContent(XContentParser parser, String t
487483
builder.patterns(index_patterns);
488484
}
489485
} else if (token.isValue()) {
490-
// Prior to 5.1.0, elasticsearch only supported a single index pattern called `template` (#21009)
491-
if("template".equals(currentFieldName)) {
492-
deprecationLogger.deprecated("Deprecated field [template] used, replaced by [index_patterns]");
493-
builder.patterns(Collections.singletonList(parser.text()));
494-
} else if ("order".equals(currentFieldName)) {
486+
if ("order".equals(currentFieldName)) {
495487
builder.order(parser.intValue());
496488
} else if ("version".equals(currentFieldName)) {
497489
builder.version(parser.intValue());

0 commit comments

Comments
 (0)