Move resolve views and aliases to IndexAbstractionOptions

Author: jfreden

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

@@ -41,10 +41,10 @@ public static final class Request extends AcknowledgedRequest<Request> implement
                     .matchOpen(true)
                     .matchClosed(true)
                     .includeHidden(false)
-                    .resolveAliases(false)
                     .allowEmptyExpressions(true)
                     .build()
             )
+            .indexAbstractionOptions(IndicesOptions.IndexAbstractionOptions.builder().resolveAliases(false))
             .gatekeeperOptions(
                 IndicesOptions.GatekeeperOptions.builder()
                     .allowAliasToMultipleIndices(false)

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

@@ -36,9 +36,8 @@ public static final class Request extends AcknowledgedRequest<Request> implement
         private String[] names;
         private IndicesOptions indicesOptions = IndicesOptions.builder()
             .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
-            .wildcardOptions(
-                IndicesOptions.WildcardOptions.builder().matchOpen(true).matchClosed(true).allowEmptyExpressions(true).resolveAliases(false)
-            )
+            .wildcardOptions(IndicesOptions.WildcardOptions.builder().matchOpen(true).matchClosed(true).allowEmptyExpressions(true))
+            .indexAbstractionOptions(IndicesOptions.IndexAbstractionOptions.builder().resolveAliases(false))
             .gatekeeperOptions(
                 IndicesOptions.GatekeeperOptions.builder().allowAliasToMultipleIndices(false).allowClosedIndices(true).allowSelectors(false)
             )

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

@@ -57,9 +57,8 @@ public static class Request extends LocalClusterStateRequest implements IndicesR
         private String[] names;
         private IndicesOptions indicesOptions = IndicesOptions.builder()
             .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
-            .wildcardOptions(
-                IndicesOptions.WildcardOptions.builder().matchOpen(true).matchClosed(true).allowEmptyExpressions(true).resolveAliases(false)
-            )
+            .wildcardOptions(IndicesOptions.WildcardOptions.builder().matchOpen(true).matchClosed(true).allowEmptyExpressions(true))
+            .indexAbstractionOptions(IndicesOptions.IndexAbstractionOptions.builder().resolveAliases(false))
             .gatekeeperOptions(
                 IndicesOptions.GatekeeperOptions.builder().allowAliasToMultipleIndices(false).allowClosedIndices(true).allowSelectors(false)
             )

server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java

@@ -61,12 +61,12 @@ public class IndicesAliasesRequest extends AcknowledgedRequest<IndicesAliasesReq
     // expressions only against indices
     private static final IndicesOptions INDICES_OPTIONS = IndicesOptions.builder()
         .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
+        .indexAbstractionOptions(IndicesOptions.IndexAbstractionOptions.builder().resolveAliases(false).build())
         .wildcardOptions(
             IndicesOptions.WildcardOptions.builder()
                 .matchOpen(true)
                 .matchClosed(false)
                 .includeHidden(false)
-                .resolveAliases(false)
                 .allowEmptyExpressions(false)
                 .build()
         )

server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java

@@ -31,14 +31,8 @@ public class DeleteIndexRequest extends AcknowledgedRequest<DeleteIndexRequest>
 
     public static final IndicesOptions DEFAULT_INDICES_OPTIONS = IndicesOptions.builder()
         .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
-        .wildcardOptions(
-            IndicesOptions.WildcardOptions.builder()
-                .matchOpen(true)
-                .matchClosed(true)
-                .allowEmptyExpressions(true)
-                .resolveAliases(false)
-                .build()
-        )
+        .indexAbstractionOptions(IndicesOptions.IndexAbstractionOptions.builder().resolveAliases(false).build())
+        .wildcardOptions(IndicesOptions.WildcardOptions.builder().matchOpen(true).matchClosed(true).allowEmptyExpressions(true).build())
         .gatekeeperOptions(
             IndicesOptions.GatekeeperOptions.builder()
                 .allowAliasToMultipleIndices(false)

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java

@@ -68,12 +68,7 @@ public class PutMappingRequest extends AcknowledgedRequest<PutMappingRequest> im
     private IndicesOptions indicesOptions = IndicesOptions.builder()
         .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
         .wildcardOptions(
-            IndicesOptions.WildcardOptions.builder()
-                .matchOpen(true)
-                .matchClosed(true)
-                .includeHidden(false)
-                .allowEmptyExpressions(false)
-                .resolveAliases(true)
+            IndicesOptions.WildcardOptions.builder().matchOpen(true).matchClosed(true).includeHidden(false).allowEmptyExpressions(false)
         )
         .gatekeeperOptions(
             IndicesOptions.GatekeeperOptions.builder()

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java

@@ -160,7 +160,8 @@ protected ClusterBlockException checkBlock(RolloverRequest request, ClusterState
                 .matchClosed(request.indicesOptions().expandWildcardsClosed())
                 .build(),
             IndicesOptions.GatekeeperOptions.DEFAULT,
-            IndicesOptions.CrossProjectModeOptions.DEFAULT
+            IndicesOptions.CrossProjectModeOptions.DEFAULT,
+            IndicesOptions.IndexAbstractionOptions.DEFAULT
         );
         ResolvedExpression resolvedRolloverTarget = SelectorResolver.parseExpression(request.getRolloverTarget(), request.indicesOptions());
         final IndexAbstraction indexAbstraction = projectMetadata.getIndicesLookup().get(resolvedRolloverTarget.resource());
@@ -257,7 +258,8 @@ protected void masterOperation(
             IndicesOptions.ConcreteTargetOptions.ALLOW_UNAVAILABLE_TARGETS,
             IndicesOptions.WildcardOptions.builder().matchClosed(true).allowEmptyExpressions(false).build(),
             IndicesOptions.GatekeeperOptions.DEFAULT,
-            IndicesOptions.CrossProjectModeOptions.DEFAULT
+            IndicesOptions.CrossProjectModeOptions.DEFAULT,
+            IndicesOptions.IndexAbstractionOptions.DEFAULT
         );
         // Make sure to recombine any selectors on the stats request
         IndicesStatsRequest statsRequest = new IndicesStatsRequest().indices(resolvedRolloverTarget.combined())

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

@@ -42,12 +42,12 @@ public Request() {
                 null,
                 IndicesOptions.builder()
                     .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
+                    .indexAbstractionOptions(IndicesOptions.IndexAbstractionOptions.builder().resolveAliases(false).build())
                     .wildcardOptions(
                         IndicesOptions.WildcardOptions.builder()
                             .matchOpen(true)
                             .matchClosed(true)
                             .includeHidden(false)
-                            .resolveAliases(false)
                             .allowEmptyExpressions(true)
                             .build()
                     )

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

@@ -48,14 +48,8 @@ public static class Request extends MasterNodeRequest<Request> implements Indice
         private final boolean wildcardExpressionsOriginallySpecified;
         private IndicesOptions indicesOptions = IndicesOptions.builder()
             .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
-            .wildcardOptions(
-                IndicesOptions.WildcardOptions.builder()
-                    .matchOpen(true)
-                    .matchClosed(true)
-                    .resolveAliases(false)
-                    .allowEmptyExpressions(true)
-                    .build()
-            )
+            .indexAbstractionOptions(IndicesOptions.IndexAbstractionOptions.builder().resolveAliases(false).build())
+            .wildcardOptions(IndicesOptions.WildcardOptions.builder().matchOpen(true).matchClosed(true).allowEmptyExpressions(true).build())
             .gatekeeperOptions(
                 IndicesOptions.GatekeeperOptions.builder()
                     .allowAliasToMultipleIndices(false)

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

@@ -62,12 +62,12 @@ public static class Request extends LocalClusterStateRequest implements IndicesR
         private String[] names;
         private IndicesOptions indicesOptions = IndicesOptions.builder()
             .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
+            .indexAbstractionOptions(IndicesOptions.IndexAbstractionOptions.builder().resolveAliases(false).build())
             .wildcardOptions(
                 IndicesOptions.WildcardOptions.builder()
                     .matchOpen(true)
                     .matchClosed(true)
                     .includeHidden(false)
-                    .resolveAliases(false)
                     .allowEmptyExpressions(true)
                     .build()
             )