Make CreateDataStreamClusterStateUpdateRequest a record (#113282) (#113291)

No need to extend `ClusterStateUpdateRequest` here.

Author: DaveCTurner

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

@@ -21,7 +21,6 @@
 import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ClusterStateUpdateTask;
-import org.elasticsearch.cluster.ack.ClusterStateUpdateRequest;
 import org.elasticsearch.cluster.routing.allocation.allocator.AllocationActionListener;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.Priority;
@@ -143,13 +142,19 @@ public ClusterState createDataStream(
         );
     }
 
-    public static final class CreateDataStreamClusterStateUpdateRequest extends ClusterStateUpdateRequest<
-        CreateDataStreamClusterStateUpdateRequest> {
-
-        private final boolean performReroute;
-        private final String name;
-        private final long startTime;
-        private final SystemDataStreamDescriptor descriptor;
+    public record CreateDataStreamClusterStateUpdateRequest(
+        String name,
+        long startTime,
+        @Nullable SystemDataStreamDescriptor systemDataStreamDescriptor,
+        TimeValue masterNodeTimeout,
+        TimeValue ackTimeout,
+        boolean performReroute
+    ) {
+        public CreateDataStreamClusterStateUpdateRequest {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(masterNodeTimeout);
+            Objects.requireNonNull(ackTimeout);
+        }
 
         public CreateDataStreamClusterStateUpdateRequest(String name) {
             this(name, System.currentTimeMillis(), null, TimeValue.ZERO, TimeValue.ZERO, true);
@@ -159,42 +164,14 @@ public CreateDataStreamClusterStateUpdateRequest(
             String name,
             SystemDataStreamDescriptor systemDataStreamDescriptor,
             TimeValue masterNodeTimeout,
-            TimeValue timeout,
+            TimeValue ackTimeout,
             boolean performReroute
         ) {
-            this(name, System.currentTimeMillis(), systemDataStreamDescriptor, masterNodeTimeout, timeout, performReroute);
-        }
-
-        public CreateDataStreamClusterStateUpdateRequest(
-            String name,
-            long startTime,
-            SystemDataStreamDescriptor systemDataStreamDescriptor,
-            TimeValue masterNodeTimeout,
-            TimeValue timeout,
-            boolean performReroute
-        ) {
-            this.name = name;
-            this.startTime = startTime;
-            this.descriptor = systemDataStreamDescriptor;
-            this.performReroute = performReroute;
-            masterNodeTimeout(masterNodeTimeout);
-            ackTimeout(timeout);
+            this(name, System.currentTimeMillis(), systemDataStreamDescriptor, masterNodeTimeout, ackTimeout, performReroute);
         }
 
         public boolean isSystem() {
-            return descriptor != null;
-        }
-
-        public boolean performReroute() {
-            return performReroute;
-        }
-
-        public SystemDataStreamDescriptor getSystemDataStreamDescriptor() {
-            return descriptor;
-        }
-
-        long getStartTime() {
-            return startTime;
+            return systemDataStreamDescriptor != null;
         }
     }
 
@@ -243,7 +220,7 @@ static ClusterState createDataStream(
         boolean initializeFailureStore
     ) throws Exception {
         String dataStreamName = request.name;
-        SystemDataStreamDescriptor systemDataStreamDescriptor = request.getSystemDataStreamDescriptor();
+        SystemDataStreamDescriptor systemDataStreamDescriptor = request.systemDataStreamDescriptor();
         boolean isSystemDataStreamName = metadataCreateIndexService.getSystemIndices().isSystemDataStream(request.name);
         assert (isSystemDataStreamName && systemDataStreamDescriptor != null)
             || (isSystemDataStreamName == false && systemDataStreamDescriptor == null)
@@ -292,13 +269,13 @@ static ClusterState createDataStream(
             if (isSystem) {
                 throw new IllegalArgumentException("Failure stores are not supported on system data streams");
             }
-            String failureStoreIndexName = DataStream.getDefaultFailureStoreName(dataStreamName, initialGeneration, request.getStartTime());
+            String failureStoreIndexName = DataStream.getDefaultFailureStoreName(dataStreamName, initialGeneration, request.startTime());
             currentState = createFailureStoreIndex(
                 metadataCreateIndexService,
                 "initialize_data_stream",
                 settings,
                 currentState,
-                request.getStartTime(),
+                request.startTime(),
                 dataStreamName,
                 template,
                 failureStoreIndexName,
@@ -308,7 +285,7 @@ static ClusterState createDataStream(
         }
 
         if (writeIndex == null) {
-            String firstBackingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, initialGeneration, request.getStartTime());
+            String firstBackingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, initialGeneration, request.startTime());
             currentState = createBackingIndex(
                 metadataCreateIndexService,
                 currentState,
@@ -397,7 +374,7 @@ private static ClusterState createBackingIndex(
             firstBackingIndexName
         ).dataStreamName(dataStreamName)
             .systemDataStreamDescriptor(systemDataStreamDescriptor)
-            .nameResolvedInstant(request.getStartTime())
+            .nameResolvedInstant(request.startTime())
             .performReroute(request.performReroute())
             .setMatchingTemplate(template);
 

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

@@ -244,8 +244,8 @@ public void testCreateDataStreamWithFailureStoreInitialized() throws Exception {
             ActionListener.noop(),
             true
         );
-        var backingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1, req.getStartTime());
-        var failureStoreIndexName = DataStream.getDefaultFailureStoreName(dataStreamName, 1, req.getStartTime());
+        var backingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1, req.startTime());
+        var failureStoreIndexName = DataStream.getDefaultFailureStoreName(dataStreamName, 1, req.startTime());
         assertThat(newState.metadata().dataStreams().size(), equalTo(1));
         assertThat(newState.metadata().dataStreams().get(dataStreamName).getName(), equalTo(dataStreamName));
         assertThat(newState.metadata().dataStreams().get(dataStreamName).isSystem(), is(false));
@@ -284,8 +284,8 @@ public void testCreateDataStreamWithFailureStoreUninitialized() throws Exception
             ActionListener.noop(),
             false
         );
-        var backingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1, req.getStartTime());
-        var failureStoreIndexName = DataStream.getDefaultFailureStoreName(dataStreamName, 1, req.getStartTime());
+        var backingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1, req.startTime());
+        var failureStoreIndexName = DataStream.getDefaultFailureStoreName(dataStreamName, 1, req.startTime());
         assertThat(newState.metadata().dataStreams().size(), equalTo(1));
         assertThat(newState.metadata().dataStreams().get(dataStreamName).getName(), equalTo(dataStreamName));
         assertThat(newState.metadata().dataStreams().get(dataStreamName).isSystem(), is(false));
@@ -321,8 +321,8 @@ public void testCreateDataStreamWithFailureStoreWithRefreshRate() throws Excepti
             ActionListener.noop(),
             true
         );
-        var backingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1, req.getStartTime());
-        var failureStoreIndexName = DataStream.getDefaultFailureStoreName(dataStreamName, 1, req.getStartTime());
+        var backingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, 1, req.startTime());
+        var failureStoreIndexName = DataStream.getDefaultFailureStoreName(dataStreamName, 1, req.startTime());
         assertThat(newState.metadata().dataStreams().size(), equalTo(1));
         assertThat(newState.metadata().dataStreams().get(dataStreamName).getName(), equalTo(dataStreamName));
         assertThat(newState.metadata().index(backingIndexName), notNullValue());