Decorator + import housekeeping

Signed-off-by: Finn Carroll <[email protected]>
finnegancarroll · Aug 22, 2024 · cd5f05f · cd5f05f
1 parent b4e61b8
commit cd5f05f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/search/SearchHit.java b/server/src/main/java/org/opensearch/search/SearchHit.java
@@ -38,6 +38,7 @@
 import org.opensearch.Version;
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.ExperimentalApi;
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.document.DocumentField;
 import org.opensearch.common.xcontent.XContentHelper;
@@ -236,6 +237,11 @@ public SearchHit(StreamInput in) throws IOException {
         this(new SearchHitSerDe().deserialize(in));
     }
 
+    /**
+     * Internal access for serialization interface.
+     * @opensearch.api
+     */
+    @ExperimentalApi
     public interface SerializationAccess {
         float getScore();
         Text getId();

diff --git a/server/src/main/java/org/opensearch/search/SearchHits.java b/server/src/main/java/org/opensearch/search/SearchHits.java
@@ -36,6 +36,7 @@
 import org.apache.lucene.search.TotalHits;
 import org.apache.lucene.search.TotalHits.Relation;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.ExperimentalApi;
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.Lucene;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -104,6 +105,11 @@ public SearchHits(
         this.collapseValues = collapseValues;
     }
 
+    /**
+     * Internal access for serialization interface.
+     * @opensearch.api
+     */
+    @ExperimentalApi
     public interface SerializationAccess {
         TotalHits getTotalHits();
         float getMaxScore();

diff --git a/server/src/main/java/org/opensearch/search/fetch/FetchSearchResult.java b/server/src/main/java/org/opensearch/search/fetch/FetchSearchResult.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.fetch;
 
+import org.opensearch.common.annotation.ExperimentalApi;
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -69,6 +70,11 @@ public FetchSearchResult(ShardSearchContextId id, SearchShardTarget shardTarget)
         setSearchShardTarget(shardTarget);
     }
 
+    /**
+     * Internal access for serialization interface.
+     * @opensearch.api
+     */
+    @ExperimentalApi
     public interface SerializationAccess {
         ShardSearchContextId getShardSearchContextId();
         SearchHits getHits();

diff --git a/server/src/main/java/org/opensearch/search/fetch/serde/SearchHitSerDe.java b/server/src/main/java/org/opensearch/search/fetch/serde/SearchHitSerDe.java
@@ -27,7 +27,9 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static java.util.Collections.*;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonMap;
+import static java.util.Collections.unmodifiableMap;
 import static org.opensearch.common.lucene.Lucene.readExplanation;
 import static org.opensearch.common.lucene.Lucene.writeExplanation;
 import static org.opensearch.search.SearchHit.SINGLE_MAPPING_TYPE;