Skip to content

Commit

Permalink
addressed comments
Browse files Browse the repository at this point in the history
Signed-off-by: Junwei Dai <[email protected]>
  • Loading branch information
Junwei Dai committed Jan 22, 2025
1 parent 5f404e7 commit 03b16d5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

/**
* Wrapper for SearchRequestProcessor to track execution details.
*
* @opensearch.internal
*/
public class TrackingSearchRequestProcessorWrapper implements SearchRequestProcessor {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

package org.opensearch.search.pipeline;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.action.search.SearchRequest;
import org.opensearch.action.search.SearchResponse;
import org.opensearch.core.action.ActionListener;
Expand All @@ -18,11 +16,12 @@

/**
* Wrapper for SearchResponseProcessor to track execution details.
*
* @opensearch.internal
*/
public class TrackingSearchResponseProcessorWrapper implements SearchResponseProcessor {

private final SearchResponseProcessor wrappedProcessor;
private static final Logger logger = LogManager.getLogger(TrackingSearchResponseProcessorWrapper.class);

/**
* Constructor for the wrapper.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1828,10 +1828,11 @@ public void testVerbosePipelineWithoutDefinedPipelineThrowsException() {
SearchRequest searchRequest = new SearchRequest();
searchRequest.source(SearchSourceBuilder.searchSource().verbosePipeline(true));

expectThrows(
IllegalArgumentException e = expectThrows(
IllegalArgumentException.class,
() -> searchPipelineService.resolvePipeline(searchRequest, indexNameExpressionResolver)
);
assertTrue(e.getMessage(), e.getMessage().contains("The 'verbose pipeline' option requires a search pipeline to be defined."));
}

public void testVerbosePipelineWithRequestProcessorOnly() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@ public void testProcessResponse() throws Exception {
assertEquals(ProcessorExecutionDetail.ProcessorStatus.SUCCESS, detail.getStatus());
}

public void testConstructorThrowsExceptionWhenProcessorIsNull() {
IllegalArgumentException exception = expectThrows(
IllegalArgumentException.class,
() -> new TrackingSearchResponseProcessorWrapper(null)
);

assertEquals("Wrapped processor cannot be null.", exception.getMessage());
}

public void testProcessResponseAsync() {
SearchRequest mockRequest = new SearchRequest();
SearchResponse inputResponse = Mockito.mock(SearchResponse.class);
Expand Down

0 comments on commit 03b16d5

Please sign in to comment.