apply spotless after rebase

Signed-off-by: HenryL27 <[email protected]>
opensearch-project · Dec 19, 2023 · bd64d0e · bd64d0e
1 parent 2c2ea47
commit bd64d0e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/src/main/java/org/opensearch/neuralsearch/ml/MLCommonsClientAccessor.java b/src/main/java/org/opensearch/neuralsearch/ml/MLCommonsClientAccessor.java
@@ -14,10 +14,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
-
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.util.CollectionUtils;
 import org.opensearch.ml.client.MachineLearningNodeClient;

diff --git a/src/main/java/org/opensearch/neuralsearch/processor/factory/RerankProcessorFactory.java b/src/main/java/org/opensearch/neuralsearch/processor/factory/RerankProcessorFactory.java
@@ -24,8 +24,6 @@
 import java.util.Set;
 import java.util.StringJoiner;
 
-import lombok.AllArgsConstructor;
-
 import org.opensearch.ingest.ConfigurationUtils;
 import org.opensearch.neuralsearch.ml.MLCommonsClientAccessor;
 import org.opensearch.neuralsearch.processor.rerank.ContextSourceFetcher;
@@ -38,6 +36,8 @@
 
 import com.google.common.collect.Sets;
 
+import lombok.AllArgsConstructor;
+
 /**
  * Factory for rerank processors. Must:
  * - Instantiate the right kind of rerank processor

diff --git a/src/main/java/org/opensearch/neuralsearch/processor/rerank/DocumentContextSourceFetcher.java b/src/main/java/org/opensearch/neuralsearch/processor/rerank/DocumentContextSourceFetcher.java
@@ -24,14 +24,14 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import lombok.AllArgsConstructor;
-
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.xcontent.ObjectPath;
 import org.opensearch.search.SearchHit;
 
+import lombok.AllArgsConstructor;
+
 /**
  * Context Source Fetcher that gets context from the search results (documents)
  */

diff --git a/src/main/java/org/opensearch/neuralsearch/processor/rerank/RerankProcessor.java b/src/main/java/org/opensearch/neuralsearch/processor/rerank/RerankProcessor.java
@@ -22,15 +22,15 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.search.pipeline.PipelineProcessingContext;
 import org.opensearch.search.pipeline.SearchResponseProcessor;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * Abstract base class for reranking processors
  */
@@ -106,7 +106,9 @@ public void processResponseAsync(
             generateRerankingContext(
                 request,
                 response,
-                ActionListener.wrap(context -> { rerank(response, context, responseListener); }, e -> { responseListener.onFailure(e); })
+                ActionListener.wrap(context -> { rerank(response, context, responseListener); }, e -> {
+                    responseListener.onFailure(e);
+                })
             );
         } catch (Exception e) {
             responseListener.onFailure(e);

diff --git a/src/main/java/org/opensearch/neuralsearch/query/ext/RerankSearchExtBuilder.java b/src/main/java/org/opensearch/neuralsearch/query/ext/RerankSearchExtBuilder.java
@@ -23,16 +23,16 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
-
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchExtBuilder;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.extern.log4j.Log4j2;
+
 @Log4j2
 @AllArgsConstructor
 public class RerankSearchExtBuilder extends SearchExtBuilder {

diff --git a/...test/java/org/opensearch/neuralsearch/processor/rerank/MLOpenSearchRerankProcessorIT.java b/...test/java/org/opensearch/neuralsearch/processor/rerank/MLOpenSearchRerankProcessorIT.java
@@ -22,9 +22,6 @@
 import java.util.List;
 import java.util.Map;
 
-import lombok.SneakyThrows;
-import lombok.extern.log4j.Log4j2;
-
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.message.BasicHeader;
@@ -38,6 +35,9 @@
 
 import com.google.common.collect.ImmutableList;
 
+import lombok.SneakyThrows;
+import lombok.extern.log4j.Log4j2;
+
 @Log4j2
 public class MLOpenSearchRerankProcessorIT extends BaseNeuralSearchIT {
 

diff --git a/...t/java/org/opensearch/neuralsearch/processor/rerank/MLOpenSearchRerankProcessorTests.java b/...t/java/org/opensearch/neuralsearch/processor/rerank/MLOpenSearchRerankProcessorTests.java
@@ -33,8 +33,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import lombok.extern.log4j.Log4j2;
-
 import org.junit.Before;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
@@ -61,6 +59,8 @@
 import org.opensearch.search.pipeline.Processor.PipelineContext;
 import org.opensearch.test.OpenSearchTestCase;
 
+import lombok.extern.log4j.Log4j2;
+
 @Log4j2
 public class MLOpenSearchRerankProcessorTests extends OpenSearchTestCase {
 

diff --git a/src/test/java/org/opensearch/neuralsearch/query/ext/RerankSearchExtBuilderTests.java b/src/test/java/org/opensearch/neuralsearch/query/ext/RerankSearchExtBuilderTests.java
@@ -23,8 +23,6 @@
 import java.util.List;
 import java.util.Map;
 
-import lombok.extern.log4j.Log4j2;
-
 import org.junit.Before;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.bytes.BytesReference;
@@ -35,6 +33,8 @@
 import org.opensearch.search.SearchExtBuilder;
 import org.opensearch.test.OpenSearchTestCase;
 
+import lombok.extern.log4j.Log4j2;
+
 @Log4j2
 public class RerankSearchExtBuilderTests extends OpenSearchTestCase {