Revert change to get blobstoreformat using codec version

Signed-off-by: Sooraj Sinha <[email protected]>
opensearch-project · Oct 22, 2024 · bd7249e · bd7249e
1 parent 9317040
commit bd7249e
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterMetadataManifest.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterMetadataManifest.java
@@ -123,8 +123,7 @@ public UploadedMetadata getUploadedMetadata() {
 
     @Override
     public InputStream serialize() throws IOException {
-        ChecksumBlobStoreFormat<ClusterMetadataManifest> blobStoreFormat = getClusterMetadataManifestBlobStoreFormatForUpload();
-        return blobStoreFormat.serialize(
+        return CLUSTER_METADATA_MANIFEST_FORMAT.serialize(
             clusterMetadataManifest,
             generateBlobFileName(),
             getCompressor(),
@@ -134,7 +133,7 @@ public InputStream serialize() throws IOException {
 
     @Override
     public ClusterMetadataManifest deserialize(final InputStream inputStream) throws IOException {
-        ChecksumBlobStoreFormat<ClusterMetadataManifest> blobStoreFormat = getClusterMetadataManifestBlobStoreFormatForDownload();
+        ChecksumBlobStoreFormat<ClusterMetadataManifest> blobStoreFormat = getClusterMetadataManifestBlobStoreFormat();
         return blobStoreFormat.deserialize(blobName, getNamedXContentRegistry(), Streams.readFully(inputStream));
     }
 
@@ -152,17 +151,8 @@ int getManifestCodecVersion() {
         }
     }
 
-    private ChecksumBlobStoreFormat<ClusterMetadataManifest> getClusterMetadataManifestBlobStoreFormatForDownload() {
+    private ChecksumBlobStoreFormat<ClusterMetadataManifest> getClusterMetadataManifestBlobStoreFormat() {
         long codecVersion = getManifestCodecVersion();
-        return getClusterMetadataManifestBlobStoreFormat(codecVersion);
-    }
-
-    private ChecksumBlobStoreFormat<ClusterMetadataManifest> getClusterMetadataManifestBlobStoreFormatForUpload() {
-        long codecVersion = clusterMetadataManifest.getCodecVersion();
-        return getClusterMetadataManifestBlobStoreFormat(codecVersion);
-    }
-
-    private ChecksumBlobStoreFormat<ClusterMetadataManifest> getClusterMetadataManifestBlobStoreFormat(long codecVersion) {
         if (codecVersion == ClusterMetadataManifest.MANIFEST_CURRENT_CODEC_VERSION) {
             return CLUSTER_METADATA_MANIFEST_FORMAT;
         } else if (codecVersion == ClusterMetadataManifest.CODEC_V3) {