cleanup

Author: masseyke

modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportGetDataStreamMappingsAction.java

@@ -58,7 +58,7 @@ public TransportGetDataStreamMappingsAction(
 
     @Override
     protected ClusterBlockException checkBlock(GetDataStreamMappingsAction.Request request, ProjectState state) {
-        return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE);
+        return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_READ);
     }
 
     @Override

modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportUpdateDataStreamMappingsAction.java

@@ -21,11 +21,10 @@
 import org.elasticsearch.cluster.block.ClusterBlockLevel;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.metadata.MetadataDataStreamsService;
-import org.elasticsearch.cluster.metadata.MetadataUpdateSettingsService;
 import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.compress.CompressedXContent;
-import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.mapper.Mapping;
@@ -38,20 +37,15 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 public class TransportUpdateDataStreamMappingsAction extends TransportMasterNodeAction<
     UpdateDataStreamMappingsAction.Request,
     UpdateDataStreamMappingsAction.Response> {
     private static final Logger logger = LogManager.getLogger(TransportUpdateDataStreamMappingsAction.class);
-    private static final Set<String> APPLY_TO_BACKING_INDICES = Set.of("index.lifecycle.name");
-    private static final Set<String> APPLY_TO_DATA_STREAM_ONLY = Set.of("index.number_of_shards");
     private final MetadataDataStreamsService metadataDataStreamsService;
-    private final MetadataUpdateSettingsService updateSettingsService;
     private final IndexNameExpressionResolver indexNameExpressionResolver;
     private final SystemIndices systemIndices;
     private final ProjectResolver projectResolver;
-    private final SettingsFilter settingsFilter;
 
     @Inject
     public TransportUpdateDataStreamMappingsAction(
@@ -61,10 +55,8 @@ public TransportUpdateDataStreamMappingsAction(
         ActionFilters actionFilters,
         ProjectResolver projectResolver,
         MetadataDataStreamsService metadataDataStreamsService,
-        MetadataUpdateSettingsService updateSettingsService,
         IndexNameExpressionResolver indexNameExpressionResolver,
-        SystemIndices systemIndices,
-        SettingsFilter settingsFilter
+        SystemIndices systemIndices
     ) {
         super(
             UpdateDataStreamMappingsAction.NAME,
@@ -78,10 +70,8 @@ public TransportUpdateDataStreamMappingsAction(
         );
         this.projectResolver = projectResolver;
         this.metadataDataStreamsService = metadataDataStreamsService;
-        this.updateSettingsService = updateSettingsService;
         this.indexNameExpressionResolver = indexNameExpressionResolver;
         this.systemIndices = systemIndices;
-        this.settingsFilter = settingsFilter;
     }
 
     @Override
@@ -121,7 +111,7 @@ protected void masterOperation(
                         new UpdateDataStreamMappingsAction.DataStreamMappingsResponse(
                             dataStreamName,
                             false,
-                            e.getMessage(),
+                            Strings.hasText(e.getMessage()) ? e.getMessage() : e.toString(),
                             Mapping.EMPTY.toCompressedXContent(),
                             Mapping.EMPTY.toCompressedXContent()
                         )

server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamMappingsAction.java

@@ -13,6 +13,7 @@
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
+import org.elasticsearch.action.support.TransportAction;
 import org.elasticsearch.action.support.local.LocalClusterStateRequest;
 import org.elasticsearch.common.collect.Iterators;
 import org.elasticsearch.common.compress.CompressedXContent;
@@ -89,26 +90,26 @@ public int hashCode() {
     }
 
     public static class Response extends ActionResponse implements ChunkedToXContentObject {
-        private final List<DataStreamMappingsResponse> DataStreamMappingsResponses;
+        private final List<DataStreamMappingsResponse> dataStreamMappingsResponses;
 
         public Response(List<DataStreamMappingsResponse> DataStreamMappingsResponses) {
-            this.DataStreamMappingsResponses = DataStreamMappingsResponses;
+            this.dataStreamMappingsResponses = DataStreamMappingsResponses;
         }
 
         public List<DataStreamMappingsResponse> getDataStreamMappingsResponses() {
-            return DataStreamMappingsResponses;
+            return dataStreamMappingsResponses;
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            assert false : "This ought to never be called because this action only runs locally";
+            TransportAction.localOnly();
         }
 
         @Override
         public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params params) {
             return Iterators.concat(
                 Iterators.single((builder, params1) -> builder.startObject().startArray("data_streams")),
-                DataStreamMappingsResponses.stream().map(DataStreamMappingsResponse -> (ToXContent) DataStreamMappingsResponse).iterator(),
+                dataStreamMappingsResponses.stream().map(DataStreamMappingsResponse -> (ToXContent) DataStreamMappingsResponse).iterator(),
                 Iterators.single((builder, params1) -> builder.endArray().endObject())
             );
         }
@@ -128,7 +129,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             Map<String, Object> uncompressedEffectiveMappings = XContentHelper.convertToMap(
                 effectiveMappings.uncompressed(),
                 true,
-                XContentType.JSON
+                builder.contentType()
             ).v2();
             builder.field("effective_mappings");
             builder.map(uncompressedEffectiveMappings);

server/src/main/java/org/elasticsearch/action/datastreams/UpdateDataStreamMappingsAction.java

@@ -28,7 +28,6 @@
 import org.elasticsearch.tasks.TaskId;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -203,15 +202,16 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             if (dataStreamErrorMessage != null) {
                 builder.field("error", dataStreamErrorMessage);
             }
-            Map<String, Object> uncompressedMappings = XContentHelper.convertToMap(mappings.uncompressed(), true, XContentType.JSON).v2();
+            Map<String, Object> uncompressedMappings = XContentHelper.convertToMap(mappings.uncompressed(), true, builder.contentType())
+                .v2();
             if (uncompressedMappings.isEmpty() == false) {
                 builder.field("mappings");
                 builder.map(uncompressedMappings);
             }
             Map<String, Object> uncompressedEffectiveMappings = XContentHelper.convertToMap(
                 effectiveMappings.uncompressed(),
                 true,
-                XContentType.JSON
+                builder.contentType()
             ).v2();
             if (uncompressedEffectiveMappings.isEmpty() == false) {
                 builder.field("effective_mappings");