Resolving conflicts

Signed-off-by: Varun Jain <[email protected]>
opensearch-project · Apr 20, 2024 · 8910cbf · 8910cbf
1 parent e3f8e84
commit 8910cbf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...java/org/opensearch/neuralsearch/query/aggregation/BaseAggregationsWithHybridQueryIT.java b/...java/org/opensearch/neuralsearch/query/aggregation/BaseAggregationsWithHybridQueryIT.java
@@ -15,7 +15,7 @@
 import java.util.Set;
 import java.util.stream.IntStream;
 
-import static org.opensearch.neuralsearch.TestUtils.RELATION_EQUAL_TO;
+import static org.opensearch.neuralsearch.util.TestUtils.RELATION_EQUAL_TO;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getNestedHits;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getTotalHits;
 

diff --git a/...va/org/opensearch/neuralsearch/query/aggregation/BucketAggregationsWithHybridQueryIT.java b/...va/org/opensearch/neuralsearch/query/aggregation/BucketAggregationsWithHybridQueryIT.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.opensearch.neuralsearch.TestUtils.DELTA_FOR_SCORE_ASSERTION;
+import static org.opensearch.neuralsearch.util.TestUtils.DELTA_FOR_SCORE_ASSERTION;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getAggregationBuckets;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getAggregationValue;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getAggregationValues;

diff --git a/...va/org/opensearch/neuralsearch/query/aggregation/MetricAggregationsWithHybridQueryIT.java b/...va/org/opensearch/neuralsearch/query/aggregation/MetricAggregationsWithHybridQueryIT.java
@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.opensearch.neuralsearch.TestUtils.DELTA_FOR_SCORE_ASSERTION;
+import static org.opensearch.neuralsearch.util.TestUtils.DELTA_FOR_SCORE_ASSERTION;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getAggregationValue;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getAggregationValues;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getAggregations;

diff --git a/.../org/opensearch/neuralsearch/query/aggregation/PipelineAggregationsWithHybridQueryIT.java b/.../org/opensearch/neuralsearch/query/aggregation/PipelineAggregationsWithHybridQueryIT.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.opensearch.neuralsearch.TestUtils.DELTA_FOR_SCORE_ASSERTION;
+import static org.opensearch.neuralsearch.util.TestUtils.DELTA_FOR_SCORE_ASSERTION;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getAggregationBuckets;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getAggregationValue;
 import static org.opensearch.neuralsearch.util.AggregationsTestUtils.getAggregationValues;