Made merger classes package private

Signed-off-by: Martin Gaievski <[email protected]>

src/main/java/org/opensearch/neuralsearch/search/query/HybridCollectorManager.java

@@ -19,8 +19,6 @@
 import org.opensearch.common.lucene.search.TopDocsAndMaxScore;
 import org.opensearch.neuralsearch.search.HitsThresholdChecker;
 import org.opensearch.neuralsearch.search.HybridTopScoreDocCollector;
-import org.opensearch.neuralsearch.search.util.HybridQueryScoreDocsMerger;
-import org.opensearch.neuralsearch.search.util.TopDocsMerger;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.internal.ContextIndexSearcher;
 import org.opensearch.search.internal.SearchContext;
@@ -54,8 +52,7 @@ public abstract class HybridCollectorManager implements CollectorManager<Collect
     @Nullable
     private final Weight filterWeight;
     private static final float boost_factor = 1f;
-    private final HybridQueryScoreDocsMerger<ScoreDoc> scoreDocsMerger = new HybridQueryScoreDocsMerger<>();
-    private final TopDocsMerger topDocsMerger = new TopDocsMerger(scoreDocsMerger);
+    private final TopDocsMerger topDocsMerger = new TopDocsMerger(new HybridQueryScoreDocsMerger<>());
 
     /**
      * Create new instance of HybridCollectorManager depending on the concurrent search beeing enabled or disabled.
@@ -227,6 +224,8 @@ private void reduceCollectorResults(
     ) {
         // this is case of first collector, query result object doesn't have any top docs set, so we can
         // just set new top docs without merge
+        // this call is effectively checking if QuerySearchResult.topDoc is null. using it in such way because
+        // getter throws exception in case topDocs is null
         if (result.hasConsumedTopDocs()) {
             result.topDocs(topDocsAndMaxScore, docValueFormats);
             return;

src/main/java/org/opensearch/neuralsearch/search/util/HybridQueryScoreDocsMerger.java → src/main/java/org/opensearch/neuralsearch/search/query/HybridQueryScoreDocsMerger.java

@@ -2,8 +2,9 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.opensearch.neuralsearch.search.util;
+package org.opensearch.neuralsearch.search.query;
 
+import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.lucene.search.ScoreDoc;
 
@@ -17,8 +18,8 @@
 /**
  * Merges two ScoreDoc arrays into one
  */
-@NoArgsConstructor
-public class HybridQueryScoreDocsMerger<T extends ScoreDoc> {
+@NoArgsConstructor(access = AccessLevel.PACKAGE)
+class HybridQueryScoreDocsMerger<T extends ScoreDoc> {
 
     private static final int MIN_NUMBER_OF_ELEMENTS_IN_SCORE_DOC = 3;
 

src/main/java/org/opensearch/neuralsearch/search/util/TopDocsMerger.java → src/main/java/org/opensearch/neuralsearch/search/query/TopDocsMerger.java

@@ -2,9 +2,10 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.opensearch.neuralsearch.search.util;
+package org.opensearch.neuralsearch.search.query;
 
 import com.google.common.annotations.VisibleForTesting;
+import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TopDocs;
@@ -17,8 +18,8 @@
 /**
  * Utility class for merging TopDocs and MaxScore across multiple search queries
  */
-@RequiredArgsConstructor
-public class TopDocsMerger {
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+class TopDocsMerger {
 
     private final HybridQueryScoreDocsMerger<ScoreDoc> scoreDocsMerger;
     @VisibleForTesting

src/test/java/org/opensearch/neuralsearch/search/util/HybridQueryScoreDocsMergerTests.java → src/test/java/org/opensearch/neuralsearch/search/query/HybridQueryScoreDocsMergerTests.java

@@ -2,12 +2,12 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.opensearch.neuralsearch.search.util;
+package org.opensearch.neuralsearch.search.query;
 
 import org.apache.lucene.search.ScoreDoc;
 import org.opensearch.neuralsearch.query.OpenSearchQueryTestCase;
 
-import static org.opensearch.neuralsearch.search.util.TopDocsMerger.SCORE_DOC_BY_SCORE_COMPARATOR;
+import static org.opensearch.neuralsearch.search.query.TopDocsMerger.SCORE_DOC_BY_SCORE_COMPARATOR;
 import static org.opensearch.neuralsearch.search.util.HybridSearchResultFormatUtil.createStartStopElementForHybridSearchResults;
 import static org.opensearch.neuralsearch.search.util.HybridSearchResultFormatUtil.createDelimiterElementForHybridSearchResults;
 import static org.opensearch.neuralsearch.search.util.HybridSearchResultFormatUtil.MAGIC_NUMBER_START_STOP;

src/test/java/org/opensearch/neuralsearch/search/util/TopDocsMergerTests.java → src/test/java/org/opensearch/neuralsearch/search/query/TopDocsMergerTests.java

@@ -2,7 +2,7 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.opensearch.neuralsearch.search.util;
+package org.opensearch.neuralsearch.search.query;
 
 import lombok.SneakyThrows;
 import org.apache.lucene.search.ScoreDoc;