Skip to content

Commit e5fe444

Browse files
gmarouligmarouli
committed
Use default lifecycle instance instead of default constructor
1 parent ceaa01a commit e5fe444

File tree

14 files changed

+51
-40
lines changed

14 files changed

+51
-40
lines changed

‎modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/GetDataStreamsResponseTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void testResponseIlmAndDataStreamLifecycleRepresentation() throws Excepti
5353
.setGeneration(3)
5454
.setAllowCustomRouting(true)
5555
.setIndexMode(IndexMode.STANDARD)
56-
.setLifecycle(new DataStreamLifecycle())
56+
.setLifecycle(DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE)
5757
.setDataStreamOptions(DataStreamOptions.FAILURE_STORE_ENABLED)
5858
.setFailureIndices(DataStream.DataStreamIndices.failureIndicesBuilder(failureStores).build())
5959
.build();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public void testRetentionNotConfigured() {
247247
dataStreamName,
248248
numBackingIndices,
249249
settings(IndexVersion.current()),
250-
new DataStreamLifecycle(),
250+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE,
251251
now
252252
);
253253
builder.put(dataStream);
@@ -496,7 +496,7 @@ public void testDeletedIndicesAreRemovedFromTheErrorStore() throws IOException {
496496
dataStreamName,
497497
numBackingIndices,
498498
Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current()),
499-
new DataStreamLifecycle(),
499+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE,
500500
now
501501
);
502502
builder.put(dataStream);
@@ -1482,7 +1482,7 @@ public void testTargetIndices() {
14821482
numBackingIndices,
14831483
numFailureIndices,
14841484
settings(IndexVersion.current()),
1485-
new DataStreamLifecycle(),
1485+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE,
14861486
now
14871487
).copy().setDataStreamOptions(dataStreamOptions).build(); // failure store is managed even when disabled
14881488
builder.put(dataStream);

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static boolean isDataStreamsLifecycleOnlyMode(final Settings settings) {
8686
Setting.Property.NodeScope
8787
);
8888

89-
public static final DataStreamLifecycle DEFAULT = new DataStreamLifecycle();
89+
public static final DataStreamLifecycle DEFAULT_DATA_LIFECYCLE = new DataStreamLifecycle(null, null, null);
9090

9191
public static final String DATA_STREAM_LIFECYCLE_ORIGIN = "data_stream_lifecycle";
9292

@@ -132,10 +132,6 @@ public static boolean isDataStreamsLifecycleOnlyMode(final Settings settings) {
132132
@Nullable
133133
private final List<DownsamplingRound> downsampling;
134134

135-
public DataStreamLifecycle() {
136-
this(null, null, null);
137-
}
138-
139135
public DataStreamLifecycle(
140136
@Nullable Boolean enabled,
141137
@Nullable TimeValue dataRetention,

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ static ClusterState createDataStream(
339339
System::currentTimeMillis,
340340
template.getDataStreamTemplate().isAllowCustomRouting(),
341341
indexMode,
342-
lifecycle == null && isDslOnlyMode ? DataStreamLifecycle.DEFAULT : lifecycle,
342+
lifecycle == null && isDslOnlyMode ? DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE : lifecycle,
343343
dataStreamOptions,
344344
new DataStream.DataStreamIndices(DataStream.BACKING_INDEX_PREFIX, dsBackingIndices, false, null),
345345
// If the failure store shouldn't be initialized on data stream creation, we're marking it for "lazy rollover", which will

‎server/src/test/java/org/elasticsearch/action/datastreams/lifecycle/ExplainDataStreamLifecycleResponseTests.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected NamedWriteableRegistry getNamedWriteableRegistry() {
6363
@SuppressWarnings("unchecked")
6464
public void testToXContent() throws IOException {
6565
long now = System.currentTimeMillis();
66-
DataStreamLifecycle lifecycle = new DataStreamLifecycle();
66+
DataStreamLifecycle lifecycle = DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE;
6767
ExplainIndexDataStreamLifecycle explainIndex = createRandomIndexDataStreamLifecycleExplanation(now, lifecycle);
6868
explainIndex.setNowSupplier(() -> now);
6969
{
@@ -241,7 +241,7 @@ public void testToXContent() throws IOException {
241241

242242
public void testChunkCount() {
243243
long now = System.currentTimeMillis();
244-
DataStreamLifecycle lifecycle = new DataStreamLifecycle();
244+
DataStreamLifecycle lifecycle = DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE;
245245
Response response = new Response(
246246
List.of(
247247
createRandomIndexDataStreamLifecycleExplanation(now, lifecycle),
@@ -298,7 +298,12 @@ protected Response mutateInstance(Response instance) {
298298

299299
private Response randomResponse() {
300300
return new Response(
301-
List.of(createRandomIndexDataStreamLifecycleExplanation(System.nanoTime(), randomBoolean() ? new DataStreamLifecycle() : null)),
301+
List.of(
302+
createRandomIndexDataStreamLifecycleExplanation(
303+
System.nanoTime(),
304+
randomBoolean() ? DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE : null
305+
)
306+
),
302307
randomBoolean()
303308
? new RolloverConfiguration(
304309
new RolloverConditions(

‎server/src/test/java/org/elasticsearch/action/datastreams/lifecycle/ExplainIndexDataStreamLifecycleTests.java‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void testGetGenerationTime() {
4141
now,
4242
randomBoolean() ? now + TimeValue.timeValueDays(1).getMillis() : null,
4343
null,
44-
new DataStreamLifecycle(),
44+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE,
4545
randomBoolean()
4646
? new ErrorEntry(
4747
System.currentTimeMillis(),
@@ -59,7 +59,7 @@ public void testGetGenerationTime() {
5959
now,
6060
randomBoolean() ? now + TimeValue.timeValueDays(1).getMillis() : null,
6161
TimeValue.timeValueMillis(now + 100),
62-
new DataStreamLifecycle(),
62+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE,
6363
randomBoolean()
6464
? new ErrorEntry(
6565
System.currentTimeMillis(),
@@ -95,7 +95,7 @@ public void testGetGenerationTime() {
9595
now,
9696
now + 80L, // rolled over in the future (clocks are funny that way)
9797
TimeValue.timeValueMillis(now + 100L),
98-
new DataStreamLifecycle(),
98+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE,
9999
null
100100
);
101101
assertThat(indexDataStreamLifecycle.getGenerationTime(() -> now), is(TimeValue.ZERO));
@@ -107,7 +107,7 @@ public void testGetTimeSinceIndexCreation() {
107107
{
108108
ExplainIndexDataStreamLifecycle randomIndexDataStreamLifecycleExplanation = createManagedIndexDataStreamLifecycleExplanation(
109109
now,
110-
new DataStreamLifecycle()
110+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE
111111
);
112112
assertThat(
113113
randomIndexDataStreamLifecycleExplanation.getTimeSinceIndexCreation(() -> now + 75L),
@@ -138,7 +138,7 @@ public void testGetTimeSinceIndexCreation() {
138138
now + 80L, // created in the future (clocks are funny that way)
139139
null,
140140
null,
141-
new DataStreamLifecycle(),
141+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE,
142142
null
143143
);
144144
assertThat(indexDataStreamLifecycle.getTimeSinceIndexCreation(() -> now), is(TimeValue.ZERO));
@@ -150,7 +150,7 @@ public void testGetTimeSinceRollover() {
150150
{
151151
ExplainIndexDataStreamLifecycle randomIndexDataStreamLifecycleExplanation = createManagedIndexDataStreamLifecycleExplanation(
152152
now,
153-
new DataStreamLifecycle()
153+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE
154154
);
155155
if (randomIndexDataStreamLifecycleExplanation.getRolloverDate() == null) {
156156
// age calculated since creation date
@@ -188,7 +188,7 @@ public void testGetTimeSinceRollover() {
188188
now - 50L,
189189
now + 100L, // rolled over in the future
190190
TimeValue.timeValueMillis(now),
191-
new DataStreamLifecycle(),
191+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE,
192192
null
193193
);
194194
assertThat(indexDataStreamLifecycle.getTimeSinceRollover(() -> now), is(TimeValue.ZERO));
@@ -254,12 +254,18 @@ protected Writeable.Reader<ExplainIndexDataStreamLifecycle> instanceReader() {
254254

255255
@Override
256256
protected ExplainIndexDataStreamLifecycle createTestInstance() {
257-
return createManagedIndexDataStreamLifecycleExplanation(System.nanoTime(), randomBoolean() ? new DataStreamLifecycle() : null);
257+
return createManagedIndexDataStreamLifecycleExplanation(
258+
System.nanoTime(),
259+
randomBoolean() ? DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE : null
260+
);
258261
}
259262

260263
@Override
261264
protected ExplainIndexDataStreamLifecycle mutateInstance(ExplainIndexDataStreamLifecycle instance) throws IOException {
262-
return createManagedIndexDataStreamLifecycleExplanation(System.nanoTime(), randomBoolean() ? new DataStreamLifecycle() : null);
265+
return createManagedIndexDataStreamLifecycleExplanation(
266+
System.nanoTime(),
267+
randomBoolean() ? DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE : null
268+
);
263269
}
264270

265271
private static ExplainIndexDataStreamLifecycle createManagedIndexDataStreamLifecycleExplanation(

‎server/src/test/java/org/elasticsearch/action/datastreams/lifecycle/GetDataStreamLifecycleActionTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class GetDataStreamLifecycleActionTests extends ESTestCase {
3535
public void testDefaultLifecycleResponseToXContent() throws Exception {
3636
boolean isInternalDataStream = randomBoolean();
3737
GetDataStreamLifecycleAction.Response.DataStreamLifecycle dataStreamLifecycle = createDataStreamLifecycle(
38-
DataStreamLifecycle.DEFAULT,
38+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE,
3939
isInternalDataStream
4040
);
4141
GetDataStreamLifecycleAction.Response response = new GetDataStreamLifecycleAction.Response(List.of(dataStreamLifecycle));

‎server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamLifecycleTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void testXContentDeSerializationWithNullValues() throws IOException {
135135
var parsed = DataStreamLifecycle.fromXContent(parser);
136136
assertEquals(XContentParser.Token.END_OBJECT, parser.currentToken());
137137
assertNull(parser.nextToken());
138-
assertThat(parsed, equalTo(DataStreamLifecycle.DEFAULT));
138+
assertThat(parsed, equalTo(DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE));
139139
}
140140
}
141141

‎server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamLifecycleWithRetentionWarningsTests.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,14 @@ public void testUpdatingLifecycleOnADataStream() {
145145
DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings(settingsWithDefaultRetention))
146146
);
147147

148-
ProjectMetadata after = metadataDataStreamsService.updateDataLifecycle(before, List.of(dataStream), DataStreamLifecycle.DEFAULT);
148+
ProjectMetadata after = metadataDataStreamsService.updateDataLifecycle(
149+
before,
150+
List.of(dataStream),
151+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE
152+
);
149153
DataStream updatedDataStream = after.dataStreams().get(dataStream);
150154
assertNotNull(updatedDataStream);
151-
assertThat(updatedDataStream.getDataLifecycle(), equalTo(DataStreamLifecycle.DEFAULT));
155+
assertThat(updatedDataStream.getDataLifecycle(), equalTo(DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE));
152156
Map<String, List<String>> responseHeaders = threadContext.getResponseHeaders();
153157
assertThat(responseHeaders.size(), is(1));
154158
assertThat(

‎server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ public void testGetBackingIndicesPastRetention() {
13881388
dataStreamName,
13891389
creationAndRolloverTimes,
13901390
settings(IndexVersion.current()),
1391-
new DataStreamLifecycle() {
1391+
new DataStreamLifecycle(null, null, null) {
13921392
public TimeValue dataRetention() {
13931393
return retention.get();
13941394
}
@@ -1538,7 +1538,7 @@ public void testGetFailureIndicesPastRetention() {
15381538
dataStreamName,
15391539
creationAndRolloverTimes,
15401540
settings(IndexVersion.current()),
1541-
new DataStreamLifecycle() {
1541+
new DataStreamLifecycle(null, null, null) {
15421542
public TimeValue dataRetention() {
15431543
return retention.get();
15441544
}
@@ -1649,7 +1649,7 @@ public void testBackingIndicesPastRetentionWithOriginationDate() {
16491649
dataStreamName,
16501650
creationAndRolloverTimes,
16511651
settings(IndexVersion.current()),
1652-
new DataStreamLifecycle() {
1652+
new DataStreamLifecycle(null, null, null) {
16531653
public TimeValue dataRetention() {
16541654
return testRetentionReference.get();
16551655
}
@@ -1700,7 +1700,7 @@ public void testFailureIndicesPastRetentionWithOriginationDate() {
17001700
dataStreamName,
17011701
creationAndRolloverTimes,
17021702
settings(IndexVersion.current()),
1703-
new DataStreamLifecycle() {
1703+
new DataStreamLifecycle(null, null, null) {
17041704
public TimeValue dataRetention() {
17051705
return testRetentionReference.get();
17061706
}
@@ -1956,7 +1956,7 @@ public void testIsIndexManagedByDataStreamLifecycle() {
19561956
Settings.builder()
19571957
.put(IndexMetadata.LIFECYCLE_NAME, "ILM_policy")
19581958
.put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current()),
1959-
new DataStreamLifecycle()
1959+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE
19601960
);
19611961
Metadata metadataIlm = builderWithIlm.build();
19621962
for (Index index : ds.getIndices()) {
@@ -1977,7 +1977,7 @@ public void testIsIndexManagedByDataStreamLifecycle() {
19771977
.put(IndexMetadata.LIFECYCLE_NAME, "ILM_policy")
19781978
.put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
19791979
.put(IndexSettings.PREFER_ILM, false),
1980-
new DataStreamLifecycle()
1980+
DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE
19811981
);
19821982
Metadata metadataIlm = builderWithIlm.build();
19831983
for (Index index : ds.getIndices()) {
@@ -2077,7 +2077,7 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws
20772077
failureIndices = randomNonEmptyIndexInstances();
20782078
}
20792079

2080-
DataStreamLifecycle lifecycle = new DataStreamLifecycle();
2080+
DataStreamLifecycle lifecycle = DataStreamLifecycle.DEFAULT_DATA_LIFECYCLE;
20812081
boolean isSystem = randomBoolean();
20822082
DataStream dataStream = new DataStream(
20832083
dataStreamName,

0 commit comments

Comments
 (0)