Revert changes to SearchRequest and follow pipeline model

Signed-off-by: Peter Nied <[email protected]>
peternied · Feb 13, 2024 · cba189e · cba189e
1 parent 6e9dffb
commit cba189e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/view/SearchViewAction.java b/server/src/main/java/org/opensearch/action/admin/indices/view/SearchViewAction.java
@@ -61,8 +61,8 @@ public static class Request extends SearchRequest {
 
         private final String view;
 
-        public Request(final String view) {
-            super();
+        public Request(final String view, final SearchRequest searchRequest) {
+            super(searchRequest);
             this.view = view;
         }
 

diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequest.java b/server/src/main/java/org/opensearch/action/search/SearchRequest.java
@@ -82,13 +82,13 @@ public class SearchRequest extends ActionRequest implements IndicesRequest.Repla
 
     private static final long DEFAULT_ABSOLUTE_START_MILLIS = -1;
 
-    protected final String localClusterAlias;
-    protected final long absoluteStartMillis;
-    protected final boolean finalReduce;
+    private final String localClusterAlias;
+    private final long absoluteStartMillis;
+    private final boolean finalReduce;
 
     private SearchType searchType = SearchType.DEFAULT;
 
-    protected String[] indices = Strings.EMPTY_ARRAY;
+    private String[] indices = Strings.EMPTY_ARRAY;
 
     @Nullable
     private String routing;
@@ -189,7 +189,7 @@ static SearchRequest subSearchRequest(
         return new SearchRequest(originalSearchRequest, indices, clusterAlias, absoluteStartMillis, finalReduce);
     }
 
-    protected SearchRequest(
+    private SearchRequest(
         SearchRequest searchRequest,
         String[] indices,
         String localClusterAlias,

diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestViewAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestViewAction.java
@@ -14,6 +14,7 @@
 import org.opensearch.action.admin.indices.view.ListViewNamesAction;
 import org.opensearch.action.admin.indices.view.SearchViewAction;
 import org.opensearch.action.admin.indices.view.UpdateViewAction;
+import org.opensearch.action.search.SearchRequest;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.ValidationException;
 import org.opensearch.common.annotation.ExperimentalApi;
@@ -212,7 +213,7 @@ public String getName() {
         public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
             final String viewId = request.param(VIEW_NAME);
 
-            final SearchViewAction.Request viewSearchRequest = new SearchViewAction.Request(viewId);
+            final SearchViewAction.Request viewSearchRequest = new SearchViewAction.Request(viewId, new SearchRequest());
             final IntConsumer setSize = size -> viewSearchRequest.source().size(size);
 
             request.withContentOrSourceParamParserOrNull(

diff --git a/server/src/test/java/org/opensearch/action/admin/indices/view/SearchViewRequestTests.java b/server/src/test/java/org/opensearch/action/admin/indices/view/SearchViewRequestTests.java
@@ -42,7 +42,7 @@ public void testValidateRequest() throws IOException {
     }
 
     public void testValidateRequestWithoutName() {
-        final SearchViewAction.Request request = new SearchViewAction.Request((String) null);
+        final SearchViewAction.Request request = new SearchViewAction.Request((String) null, new SearchRequest());
         final ActionRequestValidationException e = request.validate();
 
         MatcherAssert.assertThat(e.validationErrors().size(), equalTo(1));

diff --git a/server/src/test/java/org/opensearch/action/admin/indices/view/ViewServiceTest.java b/server/src/test/java/org/opensearch/action/admin/indices/view/ViewServiceTest.java
@@ -10,6 +10,7 @@
 
 import org.opensearch.ResourceNotFoundException;
 import org.opensearch.action.search.SearchAction;
+import org.opensearch.action.search.SearchRequest;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.ClusterState;
@@ -176,7 +177,7 @@ public void listViewNames_noViews() {
     }
 
     public void searchView() {
-        final var request = spy(new SearchViewAction.Request(randomAlphaOfLength(8)));
+        final var request = spy(new SearchViewAction.Request(randomAlphaOfLength(8), new SearchRequest()));
         final var listener = mock(ActionListener.class);
         setGetViewOrThrowExceptionToReturnTypicalView();