Remove deprecated method

Signed-off-by: Varun Bansal <bansvaru@amazon.com>

Author: linuxpi

server/src/main/java/org/opensearch/common/metadata/MetadataContentParser.java

@@ -12,7 +12,6 @@
 import org.apache.lucene.store.IndexOutput;
 
 import java.io.IOException;
-import java.util.Map;
 
 /**
  * Parser interface for Metadata. Holds methods to convert to/from file content streams to metadata object holder - {@link T}
@@ -31,15 +30,4 @@ public interface MetadataContentParser<T> {
      * @param indexOutput metadata file input stream
      */
     void writeContent(IndexOutput indexOutput, T content) throws IOException;
-
-    /**
-     * Implements logic to write metadata content from {@code content} to metadata file output stream {@code indexOutput}
-     * This method only supports metadata content in the form {@code Map<String, String>} to support RemoteSegment store metadata content.
-     * @param indexOutput metadata file input stream
-     * @param content metadata content
-     *
-     * TODO - This will removed in future releases and only {@link #writeContent(IndexOutput, Object)} should be used.
-     */
-    @Deprecated
-    void writeContent(IndexOutput indexOutput, Map<String, String> content) throws IOException;
 }

server/src/main/java/org/opensearch/common/metadata/MetadataParser.java

@@ -9,7 +9,6 @@
 package org.opensearch.common.metadata;
 
 import java.io.IOException;
-import java.util.Map;
 
 import org.apache.lucene.codecs.CodecUtil;
 import org.apache.lucene.store.BufferedChecksumIndexInput;
@@ -53,20 +52,6 @@ public T readMetadata(IndexInput indexInput) throws IOException {
         return metadata;
     }
 
-    /**
-     * Writes metadata to file output stream {@code indexOutput}
-     * @param indexOutput file output stream which will store metadata content
-     * @param metadata metadata content.
-     *
-     * TODO - This will removed in future releases and only {@link #writeMetadata(IndexOutput, Object)} should be used.
-     */
-    @Deprecated
-    public void writeMetadata(IndexOutput indexOutput, Map<String, String> metadata) throws IOException {
-        this.writeHeader(indexOutput);
-        this.parser.writeContent(indexOutput, metadata);
-        this.writeFooter(indexOutput);
-    }
-
     /**
      * Writes metadata to file output stream {@code indexOutput}
      * @param indexOutput file output stream which will store metadata content

server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java

@@ -361,7 +361,7 @@ public void uploadMetadata(Collection<String> segmentFiles, Directory storeDirec
                     throw new NoSuchFileException(file);
                 }
             }
-            this.remoteMetadataParser.writeMetadata(indexOutput, uploadedSegments);
+            this.remoteMetadataParser.writeMetadata(indexOutput, RemoteSegmentMetadata.fromMapOfStrings(uploadedSegments));
             indexOutput.close();
             storeDirectory.sync(Collections.singleton(metadataFilename));
             remoteMetadataDirectory.copyFrom(storeDirectory, metadataFilename, metadataFilename, IOContext.DEFAULT);

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

@@ -44,6 +44,14 @@ public Map<String, RemoteSegmentStoreDirectory.UploadedSegmentMetadata> getMetad
         return this.metadata;
     }
 
+    /**
+     * Generate {@code Map<String, String>} from {@link RemoteSegmentMetadata}
+     * @return {@code Map<String, String>}
+     */
+    public Map<String, String> toMapOfStrings() {
+        return this.metadata.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().toString()));
+    }
+
     /**
      * Generate {@link RemoteSegmentMetadata} from {@code segmentMetadata}
      * @param segmentMetadata metadata content in the form of {@code Map<String, String>}

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

@@ -9,7 +9,6 @@
 package org.opensearch.index.store.remote.metadata;
 
 import java.io.IOException;
-import java.util.Map;
 
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
@@ -35,15 +34,7 @@ public RemoteSegmentMetadata readContent(IndexInput indexInput) throws IOExcepti
      * @param content {@link RemoteSegmentMetadata} from which metadata content would be generated
      */
     @Override
-    public void writeContent(IndexOutput indexOutput, RemoteSegmentMetadata content) throws IOException {}
-
-    /**
-     * Writes metadata to file output stream
-     * @param indexOutput metadata file input stream
-     * @param content metadata content
-     */
-    @Override
-    public void writeContent(IndexOutput indexOutput, Map<String, String> content) throws IOException {
-        indexOutput.writeMapOfStrings(content);
+    public void writeContent(IndexOutput indexOutput, RemoteSegmentMetadata content) throws IOException {
+        indexOutput.writeMapOfStrings(content.toMapOfStrings());
     }
 }