Skip to content

Commit 3b5f7a6

Browse files
committed
Move project-related tests from MetadataTests to ProjectMetadataTests
The main goal was to get rid of loads of usages of deprecated methods in `Metadata` and its builder, but I figured it made more sense to move these tests to a more appropriate test class. These changes mainly consist of a copy-paste from one test class to another, and using `ProjectMetadata` objects (and its builders) instead of `Metadata` objects.
1 parent 5e2f154 commit 3b5f7a6

File tree

4 files changed

+2381
-2341
lines changed

4 files changed

+2381
-2341
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,12 +1499,6 @@ public Builder put(String name, ComponentTemplate componentTemplate) {
14991499
return this;
15001500
}
15011501

1502-
@Deprecated(forRemoval = true)
1503-
public Builder removeComponentTemplate(String name) {
1504-
getSingleProject().removeComponentTemplate(name);
1505-
return this;
1506-
}
1507-
15081502
@Deprecated(forRemoval = true)
15091503
public Builder componentTemplates(Map<String, ComponentTemplate> componentTemplates) {
15101504
getSingleProject().componentTemplates(componentTemplates);
@@ -1523,12 +1517,6 @@ public Builder put(String name, ComposableIndexTemplate indexTemplate) {
15231517
return this;
15241518
}
15251519

1526-
@Deprecated(forRemoval = true)
1527-
public Builder removeIndexTemplate(String name) {
1528-
getSingleProject().removeIndexTemplate(name);
1529-
return this;
1530-
}
1531-
15321520
@Deprecated(forRemoval = true)
15331521
public DataStream dataStream(String dataStreamName) {
15341522
return getSingleProject().dataStream(dataStreamName);
@@ -1562,11 +1550,6 @@ public Builder removeDataStream(String name) {
15621550
return this;
15631551
}
15641552

1565-
@Deprecated(forRemoval = true)
1566-
public boolean removeDataStreamAlias(String aliasName, String dataStreamName, boolean mustExist) {
1567-
return getSingleProject().removeDataStreamAlias(aliasName, dataStreamName, mustExist);
1568-
}
1569-
15701553
public Builder putCustom(String type, ClusterCustom custom) {
15711554
customs.put(type, Objects.requireNonNull(custom, type));
15721555
return this;

0 commit comments

Comments
 (0)