Fix more comments

Signed-off-by: Atri Sharma <atri.jiit@gmail.com>

Author: atris

server/src/main/java/org/opensearch/search/query/ConcurrentQueryPhaseSearcher.java

@@ -10,7 +10,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.lucene.search.Collector;
 import org.apache.lucene.search.CollectorManager;
 import org.apache.lucene.search.Query;
@@ -24,7 +23,6 @@
 
 import java.io.IOException;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 
@@ -50,21 +48,7 @@ public boolean searchWith(
         boolean hasFilterCollector,
         boolean hasTimeout
     ) throws IOException {
-        List<QueryPhaseExtension> extensions = queryPhaseExtensions();
-
-        // Execute beforeScoreCollection extensions
-        for (QueryPhaseExtension extension : extensions) {
-            try {
-                extension.beforeScoreCollection(searchContext);
-            } catch (Exception e) {
-                LOGGER.warn(
-                    new ParameterizedMessage("Failed to execute beforeScoreCollection extension [{}]", extension.getClass().getName()),
-                    e
-                );
-            }
-        }
-
-        try {
+        return executeWithExtensions(searchContext, () -> {
             QueryCollectorContext queryCollectorContext = getQueryCollectorContext(searchContext, hasFilterCollector);
             return searchWithCollectorManager(
                 searchContext,
@@ -75,19 +59,7 @@ public boolean searchWith(
                 hasFilterCollector,
                 hasTimeout
             );
-        } finally {
-            // Execute afterScoreCollection extensions
-            for (QueryPhaseExtension extension : extensions) {
-                try {
-                    extension.afterScoreCollection(searchContext);
-                } catch (Exception e) {
-                    LOGGER.warn(
-                        new ParameterizedMessage("Failed to execute afterScoreCollection extension [{}]", extension.getClass().getName()),
-                        e
-                    );
-                }
-            }
-        }
+        });
     }
 
     @Override

server/src/main/java/org/opensearch/search/query/QueryPhase.java

@@ -431,6 +431,17 @@ public boolean searchWith(
             boolean hasFilterCollector,
             boolean hasTimeout
         ) throws IOException {
+            return executeWithExtensions(
+                searchContext,
+                () -> searchWithCollector(searchContext, searcher, query, collectors, hasFilterCollector, hasTimeout)
+            );
+        }
+
+        /**
+         * Executes the provided search operation with before/after extension hooks.
+         * This method handles extension execution and error handling consistently.
+         */
+        protected boolean executeWithExtensions(SearchContext searchContext, SearchOperation searchOperation) throws IOException {
             List<QueryPhaseExtension> extensions = queryPhaseExtensions();
 
             // Execute beforeScoreCollection extensions
@@ -446,7 +457,7 @@ public boolean searchWith(
             }
 
             try {
-                return searchWithCollector(searchContext, searcher, query, collectors, hasFilterCollector, hasTimeout);
+                return searchOperation.execute();
             } finally {
                 // Execute afterScoreCollection extensions
                 for (QueryPhaseExtension extension : extensions) {
@@ -465,6 +476,14 @@ public boolean searchWith(
             }
         }
 
+        /**
+         * Functional interface for search operations that can throw IOException
+         */
+        @FunctionalInterface
+        protected interface SearchOperation {
+            boolean execute() throws IOException;
+        }
+
         @Override
         public AggregationProcessor aggregationProcessor(SearchContext searchContext) {
             return aggregationProcessor;