Rename random lifecycle generators too

gmarouli · gmarouli · commit ae5bba5e1000 · 2025-04-09T12:29:18.000+03:00
diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/CrudDataStreamLifecycleIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/CrudDataStreamLifecycleIT.java
@@ -25,7 +25,7 @@
 import java.util.List;
 
 import static org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleFixtures.putComposableIndexTemplate;
-import static org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleFixtures.randomLifecycleTemplate;
+import static org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleFixtures.randomDataLifecycleTemplate;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -39,7 +39,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
     }
 
     public void testGetLifecycle() throws Exception {
-        DataStreamLifecycle.Template lifecycle = randomLifecycleTemplate();
+        DataStreamLifecycle.Template lifecycle = randomDataLifecycleTemplate();
         putComposableIndexTemplate("id1", null, List.of("with-lifecycle*"), null, null, lifecycle);
         putComposableIndexTemplate("id2", null, List.of("without-lifecycle*"), null, null, null);
         {
diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleFixtures.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleFixtures.java
@@ -128,7 +128,7 @@ static void putComposableIndexTemplate(
         assertTrue(client().execute(TransportPutComposableIndexTemplateAction.TYPE, request).actionGet().isAcknowledged());
     }
 
-    static DataStreamLifecycle.Template randomLifecycleTemplate() {
+    static DataStreamLifecycle.Template randomDataLifecycleTemplate() {
         return DataStreamLifecycle.createDataLifecycleTemplate(
             frequently(),
             randomResettable(ESTestCase::randomTimeValue),
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java
@@ -90,7 +90,7 @@ public static ComponentTemplate randomInstance(boolean supportsDataStreams, Bool
             templateBuilder.aliases(randomAliases());
         }
         if (randomBoolean() && supportsDataStreams) {
-            templateBuilder.lifecycle(DataStreamLifecycleTemplateTests.randomLifecycleTemplate());
+            templateBuilder.lifecycle(DataStreamLifecycleTemplateTests.randomDataLifecycleTemplate());
         }
         if (randomBoolean() && supportsDataStreams) {
             templateBuilder.dataStreamOptions(randomDataStreamOptionsTemplate());
@@ -182,7 +182,7 @@ yield switch (randomIntBetween(0, 4)) {
                     );
                     case 3 -> new ComponentTemplate(
                         Template.builder(ot)
-                            .lifecycle(randomValueOtherThan(ot.lifecycle(), DataStreamLifecycleTemplateTests::randomLifecycleTemplate))
+                            .lifecycle(randomValueOtherThan(ot.lifecycle(), DataStreamLifecycleTemplateTests::randomDataLifecycleTemplate))
                             .build(),
                         orig.version(),
                         orig.metadata(),
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java
@@ -74,7 +74,7 @@ public static ComposableIndexTemplate randomInstance() {
                 builder.aliases(randomAliases());
             }
             if (dataStreamTemplate != null && randomBoolean()) {
-                builder.lifecycle(DataStreamLifecycleTemplateTests.randomLifecycleTemplate());
+                builder.lifecycle(DataStreamLifecycleTemplateTests.randomDataLifecycleTemplate());
             }
             template = builder.build();
         }
@@ -174,7 +174,9 @@ public static ComposableIndexTemplate mutateTemplate(ComposableIndexTemplate ori
                                 .mappings(randomMappings(orig.getDataStreamTemplate()))
                                 .aliases(randomAliases())
                                 .lifecycle(
-                                    orig.getDataStreamTemplate() == null ? null : DataStreamLifecycleTemplateTests.randomLifecycleTemplate()
+                                    orig.getDataStreamTemplate() == null
+                                        ? null
+                                        : DataStreamLifecycleTemplateTests.randomDataLifecycleTemplate()
                                 )
                                 .build()
                         )
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamLifecycleTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamLifecycleTemplateTests.java
@@ -31,7 +31,7 @@ protected Writeable.Reader<DataStreamLifecycle.Template> instanceReader() {
 
     @Override
     protected DataStreamLifecycle.Template createTestInstance() {
-        return randomLifecycleTemplate();
+        return randomDataLifecycleTemplate();
     }
 
     @Override
@@ -165,7 +165,7 @@ public void testInvalidDownsamplingConfiguration() {
         }
     }
 
-    public static DataStreamLifecycle.Template randomLifecycleTemplate() {
+    public static DataStreamLifecycle.Template randomDataLifecycleTemplate() {
         return DataStreamLifecycle.createDataLifecycleTemplate(randomBoolean(), randomRetention(), randomDownsampling());
     }
 
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamLifecycleTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamLifecycleTests.java
@@ -53,7 +53,7 @@ protected Writeable.Reader<DataStreamLifecycle> instanceReader() {
 
     @Override
     protected DataStreamLifecycle createTestInstance() {
-        return randomLifecycle();
+        return randomDataLifecycle();
     }
 
     @Override
@@ -400,7 +400,7 @@ public void testEffectiveRetentionParams() {
         }
     }
 
-    public static DataStreamLifecycle randomLifecycle() {
+    public static DataStreamLifecycle randomDataLifecycle() {
         return DataStreamLifecycle.dataLifecycleBuilder()
             .dataRetention(randomBoolean() ? null : randomTimeValue(1, 365, TimeUnit.DAYS))
             .downsampling(randomBoolean() ? null : randomDownsampling())
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java
@@ -2283,7 +2283,7 @@ public void testWriteFailureIndex() {
             system,
             randomBoolean(),
             randomBoolean() ? IndexMode.STANDARD : IndexMode.TIME_SERIES,
-            DataStreamLifecycleTests.randomLifecycle(),
+            DataStreamLifecycleTests.randomDataLifecycle(),
             DataStreamOptions.FAILURE_STORE_DISABLED,
             List.of(),
             replicated == false && randomBoolean(),
@@ -2301,7 +2301,7 @@ public void testWriteFailureIndex() {
             system,
             randomBoolean(),
             randomBoolean() ? IndexMode.STANDARD : IndexMode.TIME_SERIES,
-            DataStreamLifecycleTests.randomLifecycle(),
+            DataStreamLifecycleTests.randomDataLifecycle(),
             DataStreamOptions.FAILURE_STORE_ENABLED,
             List.of(),
             replicated == false && randomBoolean(),
@@ -2326,7 +2326,7 @@ public void testWriteFailureIndex() {
             system,
             randomBoolean(),
             randomBoolean() ? IndexMode.STANDARD : IndexMode.TIME_SERIES,
-            DataStreamLifecycleTests.randomLifecycle(),
+            DataStreamLifecycleTests.randomDataLifecycle(),
             DataStreamOptions.FAILURE_STORE_ENABLED,
             failureIndices,
             replicated == false && randomBoolean(),
@@ -2350,7 +2350,7 @@ public void testIsFailureIndex() {
             system,
             randomBoolean(),
             randomBoolean() ? IndexMode.STANDARD : IndexMode.TIME_SERIES,
-            DataStreamLifecycleTests.randomLifecycle(),
+            DataStreamLifecycleTests.randomDataLifecycle(),
             DataStreamOptions.FAILURE_STORE_DISABLED,
             List.of(),
             replicated == false && randomBoolean(),
@@ -2372,7 +2372,7 @@ public void testIsFailureIndex() {
             system,
             randomBoolean(),
             randomBoolean() ? IndexMode.STANDARD : IndexMode.TIME_SERIES,
-            DataStreamLifecycleTests.randomLifecycle(),
+            DataStreamLifecycleTests.randomDataLifecycle(),
             DataStreamOptions.FAILURE_STORE_ENABLED,
             List.of(),
             replicated == false && randomBoolean(),
@@ -2403,7 +2403,7 @@ public void testIsFailureIndex() {
             system,
             randomBoolean(),
             randomBoolean() ? IndexMode.STANDARD : IndexMode.TIME_SERIES,
-            DataStreamLifecycleTests.randomLifecycle(),
+            DataStreamLifecycleTests.randomDataLifecycle(),
             DataStreamOptions.FAILURE_STORE_ENABLED,
             failureIndices,
             replicated == false && randomBoolean(),

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ static void putComposableIndexTemplate(`
`128`	`128`	`assertTrue(client().execute(TransportPutComposableIndexTemplateAction.TYPE, request).actionGet().isAcknowledged());`
`129`	`129`	`}`
`130`	`130`
`131`		`- static DataStreamLifecycle.Template randomLifecycleTemplate() {`
	`131`	`+ static DataStreamLifecycle.Template randomDataLifecycleTemplate() {`
`132`	`132`	`return DataStreamLifecycle.createDataLifecycleTemplate(`
`133`	`133`	`frequently(),`
`134`	`134`	`randomResettable(ESTestCase::randomTimeValue),`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public static ComposableIndexTemplate randomInstance() {`
`74`	`74`	`builder.aliases(randomAliases());`
`75`	`75`	`}`
`76`	`76`	`if (dataStreamTemplate != null && randomBoolean()) {`
`77`		`- builder.lifecycle(DataStreamLifecycleTemplateTests.randomLifecycleTemplate());`
	`77`	`+ builder.lifecycle(DataStreamLifecycleTemplateTests.randomDataLifecycleTemplate());`
`78`	`78`	`}`
`79`	`79`	`template = builder.build();`
`80`	`80`	`}`
`@@ -174,7 +174,9 @@ public static ComposableIndexTemplate mutateTemplate(ComposableIndexTemplate ori`
`174`	`174`	`.mappings(randomMappings(orig.getDataStreamTemplate()))`
`175`	`175`	`.aliases(randomAliases())`
`176`	`176`	`.lifecycle(`
`177`		`- orig.getDataStreamTemplate() == null ? null : DataStreamLifecycleTemplateTests.randomLifecycleTemplate()`
	`177`	`+ orig.getDataStreamTemplate() == null`
	`178`	`+ ? null`
	`179`	`+ : DataStreamLifecycleTemplateTests.randomDataLifecycleTemplate()`
`178`	`180`	`)`
`179`	`181`	`.build()`
`180`	`182`	`)`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected Writeable.Reader<DataStreamLifecycle.Template> instanceReader() {`
`31`	`31`
`32`	`32`	`@Override`
`33`	`33`	`protected DataStreamLifecycle.Template createTestInstance() {`
`34`		`- return randomLifecycleTemplate();`
	`34`	`+ return randomDataLifecycleTemplate();`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
`@@ -165,7 +165,7 @@ public void testInvalidDownsamplingConfiguration() {`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`		`- public static DataStreamLifecycle.Template randomLifecycleTemplate() {`
	`168`	`+ public static DataStreamLifecycle.Template randomDataLifecycleTemplate() {`
`169`	`169`	`return DataStreamLifecycle.createDataLifecycleTemplate(randomBoolean(), randomRetention(), randomDownsampling());`
`170`	`170`	`}`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected Writeable.Reader<DataStreamLifecycle> instanceReader() {`
`53`	`53`
`54`	`54`	`@Override`
`55`	`55`	`protected DataStreamLifecycle createTestInstance() {`
`56`		`- return randomLifecycle();`
	`56`	`+ return randomDataLifecycle();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Override`
`@@ -400,7 +400,7 @@ public void testEffectiveRetentionParams() {`
`400`	`400`	`}`
`401`	`401`	`}`
`402`	`402`
`403`		`- public static DataStreamLifecycle randomLifecycle() {`
	`403`	`+ public static DataStreamLifecycle randomDataLifecycle() {`
`404`	`404`	`return DataStreamLifecycle.dataLifecycleBuilder()`
`405`	`405`	`.dataRetention(randomBoolean() ? null : randomTimeValue(1, 365, TimeUnit.DAYS))`
`406`	`406`	`.downsampling(randomBoolean() ? null : randomDownsampling())`