TransportGetFieldMappingsAction implements TransportIndicesResolvingAction

Author: lukasz-soszynski-eliatra

server/src/main/java/org/opensearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java

@@ -34,8 +34,10 @@
 
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
+import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
@@ -55,7 +57,8 @@
  *
  * @opensearch.internal
  */
-public class TransportGetFieldMappingsAction extends HandledTransportAction<GetFieldMappingsRequest, GetFieldMappingsResponse> {
+public class TransportGetFieldMappingsAction extends HandledTransportAction<GetFieldMappingsRequest, GetFieldMappingsResponse> implements
+    TransportIndicesResolvingAction<GetFieldMappingsRequest> {
 
     private final ClusterService clusterService;
     private final TransportGetFieldMappingsIndexAction shardAction;
@@ -78,7 +81,7 @@ public TransportGetFieldMappingsAction(
     @Override
     protected void doExecute(Task task, GetFieldMappingsRequest request, final ActionListener<GetFieldMappingsResponse> listener) {
         ClusterState clusterState = clusterService.state();
-        String[] concreteIndices = indexNameExpressionResolver.concreteIndexNames(clusterState, request);
+        String[] concreteIndices = resolveIndices(request, clusterState);
         final AtomicInteger indexCounter = new AtomicInteger();
         final AtomicInteger completionCounter = new AtomicInteger(concreteIndices.length);
         final AtomicReferenceArray<Object> indexResponses = new AtomicReferenceArray<>(concreteIndices.length);
@@ -110,6 +113,15 @@ public void onFailure(Exception e) {
         }
     }
 
+    private String[] resolveIndices(GetFieldMappingsRequest request, ClusterState clusterState) {
+        return indexNameExpressionResolver.concreteIndexNames(clusterState, request);
+    }
+
+    @Override
+    public ResolvedIndices resolveIndices(GetFieldMappingsRequest request) {
+        return ResolvedIndices.of(resolveIndices(request, clusterService.state()));
+    }
+
     private GetFieldMappingsResponse merge(AtomicReferenceArray<Object> indexResponses) {
         Map<String, Map<String, GetFieldMappingsResponse.FieldMappingMetadata>> mergedResponses = new HashMap<>();
         for (int i = 0; i < indexResponses.length(); i++) {