Rename StreamReadWriteHandler to IndexIOStreamHandler

Signed-off-by: Varun Bansal <[email protected]>

Author: linuxpi

server/src/main/java/org/opensearch/common/io/StreamReadWriteHandler.java renamed to server/src/main/java/org/opensearch/common/io/IndexIOStreamHandler.java

@@ -19,7 +19,7 @@
  *
  * @opensearch.internal
  */
-public interface StreamReadWriteHandler<T> {
+public interface IndexIOStreamHandler<T> {
     /**
      * Implements logic to read content from file input stream {@code indexInput} and parse into {@link T}
      * @param indexInput file input stream

server/src/main/java/org/opensearch/common/io/VersionedCodecStreamWrapper.java

@@ -24,17 +24,17 @@
  */
 public class VersionedCodecStreamWrapper<T> {
     // TODO This can be updated to hold a streamReadWriteHandlerFactory and get relevant handler based on the stream versions
-    private final StreamReadWriteHandler<T> streamReadWriteHandler;
+    private final IndexIOStreamHandler<T> indexIOStreamHandler;
     private final int currentVersion;
     private final String codec;
 
     /**
-     * @param streamReadWriteHandler handler to read/write stream from T
+     * @param indexIOStreamHandler handler to read/write stream from T
      * @param currentVersion latest supported version of the stream
      * @param codec: stream codec
      */
-    public VersionedCodecStreamWrapper(StreamReadWriteHandler<T> streamReadWriteHandler, int currentVersion, String codec) {
-        this.streamReadWriteHandler = streamReadWriteHandler;
+    public VersionedCodecStreamWrapper(IndexIOStreamHandler<T> indexIOStreamHandler, int currentVersion, String codec) {
+        this.indexIOStreamHandler = indexIOStreamHandler;
         this.currentVersion = currentVersion;
         this.codec = codec;
     }
@@ -104,9 +104,9 @@ private void writeFooter(IndexOutput indexOutput) throws IOException {
      * Returns relevant handler for the version
      * @param version stream content version
      */
-    private StreamReadWriteHandler<T> getHandlerForVersion(int version) {
+    private IndexIOStreamHandler<T> getHandlerForVersion(int version) {
         // TODO implement factory and pick relevant handler based on version.
         // It should also take into account min and max supported versions
-        return this.streamReadWriteHandler;
+        return this.indexIOStreamHandler;
     }
 }

server/src/main/java/org/opensearch/index/store/remote/metadata/RemoteSegmentMetadata.java

@@ -11,7 +11,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.opensearch.common.io.VersionedCodecStreamWrapper;
 import org.opensearch.index.store.RemoteSegmentStoreDirectory;
 
 /**
@@ -71,12 +70,4 @@ public static RemoteSegmentMetadata fromMapOfStrings(Map<String, String> segment
                 )
         );
     }
-
-    /**
-     * Constructs {@link VersionedCodecStreamWrapper} for {@link RemoteSegmentMetadata}
-     * @return {@link VersionedCodecStreamWrapper}
-     */
-    public static VersionedCodecStreamWrapper<RemoteSegmentMetadata> createMetadataHandler() {
-        return new VersionedCodecStreamWrapper<>(new RemoteSegmentMetadataHandler(), CURRENT_VERSION, METADATA_CODEC);
-    }
 }

server/src/main/java/org/opensearch/index/store/remote/metadata/RemoteSegmentMetadataHandler.java

@@ -12,14 +12,14 @@
 
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
-import org.opensearch.common.io.StreamReadWriteHandler;
+import org.opensearch.common.io.IndexIOStreamHandler;
 
 /**
  * Handler for {@link RemoteSegmentMetadata}
  *
  * @opensearch.internal
  */
-public class RemoteSegmentMetadataHandler implements StreamReadWriteHandler<RemoteSegmentMetadata> {
+public class RemoteSegmentMetadataHandler implements IndexIOStreamHandler<RemoteSegmentMetadata> {
     /**
      * Reads metadata content from metadata file input stream and parsed into {@link RemoteSegmentMetadata}
      * @param indexInput metadata file input stream with {@link IndexInput#getFilePointer()} pointing to metadata content