Skip to content

Commit e90c943

Browse files
committed
Add one more version of the data lifecycle template factory method
1 parent 5be35a6 commit e90c943

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

modules/data-streams/src/test/java/org/elasticsearch/datastreams/MetadataIndexTemplateServiceTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,11 @@ public void testLifecycleComposition() {
144144
}
145145
// One lifecycle results to this lifecycle as the final
146146
{
147-
DataStreamLifecycle.Template lifecycle = new DataStreamLifecycle.Template(true, randomRetention(), randomDownsampling());
147+
DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.createDataLifecycleTemplate(
148+
true,
149+
randomRetention(),
150+
randomDownsampling()
151+
);
148152
List<DataStreamLifecycle.Template> lifecycles = List.of(lifecycle);
149153
DataStreamLifecycle result = composeDataLifecycles(lifecycles).build();
150154
// Defaults to true

modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleFixtures.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static void putComposableIndexTemplate(
129129
}
130130

131131
static DataStreamLifecycle.Template randomLifecycleTemplate() {
132-
return new DataStreamLifecycle.Template(
132+
return DataStreamLifecycle.createDataLifecycleTemplate(
133133
frequently(),
134134
randomResettable(ESTestCase::randomTimeValue),
135135
randomResettable(DataStreamLifecycleFixtures::randomDownsamplingRounds)

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,14 @@ public static Template createDataLifecycleTemplate(
560560
return new Template(enabled, ResettableValue.create(dataRetention), ResettableValue.create(downsampling));
561561
}
562562

563+
public static Template createDataLifecycleTemplate(
564+
boolean enabled,
565+
ResettableValue<TimeValue> dataRetention,
566+
ResettableValue<List<DataStreamLifecycle.DownsamplingRound>> downsampling
567+
) {
568+
return new Template(enabled, dataRetention, downsampling);
569+
}
570+
563571
/**
564572
* Represents the template configuration of a lifecycle. It supports explicitly resettable values
565573
* to allow value reset during template composition.

server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamLifecycleTemplateTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public void testInvalidDownsamplingConfiguration() {
166166
}
167167

168168
public static DataStreamLifecycle.Template randomLifecycleTemplate() {
169-
return new DataStreamLifecycle.Template(randomBoolean(), randomRetention(), randomDownsampling());
169+
return DataStreamLifecycle.createDataLifecycleTemplate(randomBoolean(), randomRetention(), randomDownsampling());
170170
}
171171

172172
private static ResettableValue<TimeValue> randomRetention() {

server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,7 @@ public void testResolveLifecycle() throws Exception {
15101510
String ct45d = "ct_45d";
15111511
project = addComponentTemplate(service, project, ct45d, lifecycle45d);
15121512

1513-
DataStreamLifecycle.Template lifecycleNullRetention = new DataStreamLifecycle.Template(
1513+
DataStreamLifecycle.Template lifecycleNullRetention = DataStreamLifecycle.createDataLifecycleTemplate(
15141514
true,
15151515
ResettableValue.reset(),
15161516
ResettableValue.undefined()

0 commit comments

Comments
 (0)