Fix formatting on merge conflict resolution

Signed-off-by: Michael Froh <froh@amazon.com>
opensearch-project · Jul 2, 2023 · 502c703 · 502c703
1 parent 67645ab
commit 502c703
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/server/src/test/java/org/opensearch/search/pipeline/SearchPipelineServiceTests.java b/server/src/test/java/org/opensearch/search/pipeline/SearchPipelineServiceTests.java
@@ -86,10 +86,8 @@ public Map<String, Processor.Factory<SearchResponseProcessor>> getResponseProces
         }
 
         @Override
-        public Map<String, Processor.Factory<SearchPhaseResultsProcessor>> getSearchPhaseResultsProcessors(
-            Processor.Parameters parameters
-        ) {
-            return Map.of("zoe", (factories, tag, description, config) -> null);
+        public Map<String, Processor.Factory<SearchPhaseResultsProcessor>> getSearchPhaseResultsProcessors(Parameters parameters) {
+            return Map.of("zoe", (factories, tag, description, config, ctx) -> null);
         }
     };
 
@@ -319,7 +317,7 @@ private SearchPipelineService createWithProcessors() {
         });
 
         Map<String, Processor.Factory<SearchPhaseResultsProcessor>> searchPhaseProcessors = new HashMap<>();
-        searchPhaseProcessors.put("max_score", (processorFactories, tag, description, config) -> {
+        searchPhaseProcessors.put("max_score", (processorFactories, tag, description, config, context) -> {
             final float finalScore = config.containsKey("score") ? ((Number) config.remove("score")).floatValue() : 100f;
             final Consumer<SearchPhaseResult> querySearchResultConsumer = (result) -> result.queryResult().topDocs().maxScore = finalScore;
             return new FakeSearchPhaseResultsProcessor("max_score", tag, description, querySearchResultConsumer);
@@ -364,9 +362,7 @@ public Map<String, Processor.Factory<SearchResponseProcessor>> getResponseProces
                 }
 
                 @Override
-                public Map<String, Processor.Factory<SearchPhaseResultsProcessor>> getSearchPhaseResultsProcessors(
-                    Processor.Parameters parameters
-                ) {
+                public Map<String, Processor.Factory<SearchPhaseResultsProcessor>> getSearchPhaseResultsProcessors(Parameters parameters) {
                     return phaseProcessors;
                 }
 
@@ -1097,7 +1093,11 @@ public void testAdHocRejectingProcessor() {
             return new FakeRequestProcessor(processorType, t, d, r -> {});
         });
 
-        SearchPipelineService searchPipelineService = createWithProcessors(requestProcessorFactories, Collections.emptyMap());
+        SearchPipelineService searchPipelineService = createWithProcessors(
+            requestProcessorFactories,
+            Collections.emptyMap(),
+            Collections.emptyMap()
+        );
 
         String id = "_id";
         SearchPipelineService.PipelineHolder pipeline = searchPipelineService.getPipelines().get(id);