From 8603945067f82c9d02b25007dc69cfc8681709d6 Mon Sep 17 00:00:00 2001
From: luyuncheng <luyuncheng@bytedance.com>
Date: Sat, 27 May 2023 19:34:59 +0800
Subject: [PATCH] 1. Remove calling deprecated document api 2. Fixed some
 calling and Tests 3. Spotless java

---
 .../org/opensearch/gateway/PersistedClusterStateService.java  | 4 +---
 .../java/org/opensearch/index/shard/ShardSplittingQuery.java  | 1 -
 .../java/org/opensearch/index/engine/InternalEngineTests.java | 1 -
 .../org/opensearch/index/shard/RefreshListenersTests.java     | 4 +---
 .../org/opensearch/search/lookup/LeafFieldsLookupTests.java   | 1 -
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/server/src/main/java/org/opensearch/gateway/PersistedClusterStateService.java b/server/src/main/java/org/opensearch/gateway/PersistedClusterStateService.java
index 2f0e5b57e1aeb..d1d21b2bbe5fc 100644
--- a/server/src/main/java/org/opensearch/gateway/PersistedClusterStateService.java
+++ b/server/src/main/java/org/opensearch/gateway/PersistedClusterStateService.java
@@ -512,9 +512,7 @@ private static void consumeFromType(IndexSearcher indexSearcher, String type, Ch
                 while (docIdSetIterator.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
                     if (isLiveDoc.test(docIdSetIterator.docID())) {
                         logger.trace("processing doc {}", docIdSetIterator.docID());
-                        bytesRefConsumer.accept(
-                            storedFields.document(docIdSetIterator.docID()).getBinaryValue(DATA_FIELD_NAME)
-                        );
+                        bytesRefConsumer.accept(storedFields.document(docIdSetIterator.docID()).getBinaryValue(DATA_FIELD_NAME));
                     }
                 }
             }
diff --git a/server/src/main/java/org/opensearch/index/shard/ShardSplittingQuery.java b/server/src/main/java/org/opensearch/index/shard/ShardSplittingQuery.java
index 1a499f98fca20..219ead931797a 100644
--- a/server/src/main/java/org/opensearch/index/shard/ShardSplittingQuery.java
+++ b/server/src/main/java/org/opensearch/index/shard/ShardSplittingQuery.java
@@ -38,7 +38,6 @@
 import org.apache.lucene.index.PostingsEnum;
 import org.apache.lucene.index.ReaderUtil;
 import org.apache.lucene.index.StoredFieldVisitor;
-import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.TermsEnum;
 import org.apache.lucene.search.ConstantScoreScorer;
diff --git a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
index d94e468d9446a..8d7d193633e66 100644
--- a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
@@ -62,7 +62,6 @@
 import org.apache.lucene.index.PointValues;
 import org.apache.lucene.index.SegmentInfos;
 import org.apache.lucene.index.SoftDeletesRetentionMergePolicy;
-import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.TermsEnum;
diff --git a/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java b/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java
index 3d79c47a41c1f..94b1ede8ea57f 100644
--- a/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java
@@ -370,9 +370,7 @@ public void testLotsOfThreads() throws Exception {
                             assertTrue("document not found", getResult.exists());
                             assertEquals(iteration, getResult.version());
                             StoredFields storedFields = getResult.docIdAndVersion().reader.storedFields();
-                            org.apache.lucene.document.Document document = storedFields.document(
-                                getResult.docIdAndVersion().docId
-                            );
+                            org.apache.lucene.document.Document document = storedFields.document(getResult.docIdAndVersion().docId);
                             assertThat(document.getValues("test"), arrayContaining(testFieldValue));
                         }
                     } catch (Exception t) {
diff --git a/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java b/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java
index 0a24a820e123f..85aacfbd63ee2 100644
--- a/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java
+++ b/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java
@@ -49,7 +49,6 @@
 import java.util.List;
 
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;