Remove get/set method from interface

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
shiv0408 · Jun 5, 2024 · e1eddbe · e1eddbe
1 parent caf61a6
commit e1eddbe
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 149 deletions.
diff --git a/server/src/main/java/org/opensearch/common/remote/RemoteWritableEntityStore.java b/server/src/main/java/org/opensearch/common/remote/RemoteWritableEntityStore.java
@@ -22,7 +22,7 @@ public interface RemoteWritableEntityStore<T, U extends RemoteWriteableEntity<T>
 
     public void writeAsync(U entity, ActionListener<Void> listener);
 
-    public U read(U entity) throws IOException;
+    public T read(U entity) throws IOException;
 
     public void readAsync(U entity, ActionListener<T> listener);
 }
diff --git a/server/src/main/java/org/opensearch/common/remote/RemoteWriteableEntity.java b/server/src/main/java/org/opensearch/common/remote/RemoteWriteableEntity.java
@@ -18,17 +18,6 @@
  * @param <T> The object type which can be uploaded to or downloaded from remote storage.
  */
 public interface RemoteWriteableEntity<T> {
-
-    /**
-     * @param object The object T which is to be set in this writable entity
-     */
-    public void set(T object);
-
-    /**
-     * @return The entity T contained within this class
-     */
-    public T get();
-
     /**
      * @return An InputStream created by serializing the entity T
      * @throws IOException Exception encountered while serialization

diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManager.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManager.java
@@ -193,7 +193,7 @@ Metadata getGlobalMetadata(String clusterUUID, ClusterMetadataManifest clusterMe
             if (globalMetadataFileName != null) {
                 RemoteGlobalMetadata remoteGlobalMetadata = new RemoteGlobalMetadata(globalMetadataFileName, clusterUUID,
                     compressor, namedXContentRegistry);
-                return globalMetadataBlobStore.read(remoteGlobalMetadata).get();
+                return globalMetadataBlobStore.read(remoteGlobalMetadata);
             } else if (clusterMetadataManifest.hasMetadataAttributesFiles()) {
                 CoordinationMetadata coordinationMetadata = getCoordinationMetadata(
                     clusterUUID,
@@ -239,7 +239,7 @@ public CoordinationMetadata getCoordinationMetadata(String clusterUUID, String c
             if (coordinationMetadataFileName != null) {
                 RemoteCoordinationMetadata remoteCoordinationMetadata = new RemoteCoordinationMetadata(coordinationMetadataFileName, clusterUUID,
                     compressor, namedXContentRegistry);
-                return coordinationMetadataBlobStore.read(remoteCoordinationMetadata).get();
+                return coordinationMetadataBlobStore.read(remoteCoordinationMetadata);
             } else {
                 return CoordinationMetadata.EMPTY_METADATA;
             }
@@ -257,7 +257,7 @@ public Settings getSettingsMetadata(String clusterUUID, String settingsMetadataF
             if (settingsMetadataFileName != null) {
                 RemotePersistentSettingsMetadata remotePersistentSettingsMetadata = new RemotePersistentSettingsMetadata(settingsMetadataFileName, clusterUUID,
                     compressor, namedXContentRegistry);
-                return persistentSettingsBlobStore.read(remotePersistentSettingsMetadata).get();
+                return persistentSettingsBlobStore.read(remotePersistentSettingsMetadata);
             } else {
                 return Settings.EMPTY;
             }
@@ -275,7 +275,7 @@ public TemplatesMetadata getTemplatesMetadata(String clusterUUID, String templat
             if (templatesMetadataFileName != null) {
                 RemoteTemplatesMetadata remoteTemplatesMetadata = new RemoteTemplatesMetadata(templatesMetadataFileName, clusterUUID,
                     compressor, namedXContentRegistry);
-                return templatesMetadataBlobStore.read(remoteTemplatesMetadata).get();
+                return templatesMetadataBlobStore.read(remoteTemplatesMetadata);
             } else {
                 return TemplatesMetadata.EMPTY_METADATA;
             }
@@ -292,7 +292,7 @@ public Metadata.Custom getCustomsMetadata(String clusterUUID, String customMetad
         try {
             // Fetch Custom metadata
             RemoteCustomMetadata remoteCustomMetadata = new RemoteCustomMetadata(customMetadataFileName, custom, clusterUUID, compressor, namedXContentRegistry);
-            return customMetadataBlobStore.read(remoteCustomMetadata).get();
+            return customMetadataBlobStore.read(remoteCustomMetadata);
         } catch (IOException e) {
             throw new IllegalStateException(
                 String.format(Locale.ROOT, "Error while downloading Custom Metadata - %s", customMetadataFileName),

diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteIndexMetadataManager.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteIndexMetadataManager.java
@@ -93,7 +93,7 @@ IndexMetadata getIndexMetadata(
         RemoteIndexMetadata remoteIndexMetadata = new RemoteIndexMetadata(RemoteClusterStateUtils.getFormattedFileName(
             uploadedIndexMetadata.getUploadedFilename(), manifestCodecVersion), clusterUUID, compressor, namedXContentRegistry);
         try {
-            return indexMetadataBlobStore.read(remoteIndexMetadata).get();
+            return indexMetadataBlobStore.read(remoteIndexMetadata);
         } catch (IOException e) {
             throw new IllegalStateException(
                 String.format(Locale.ROOT, "Error while downloading IndexMetadata - %s", uploadedIndexMetadata.getUploadedFilename()),

diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteManifestManager.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteManifestManager.java
@@ -186,7 +186,7 @@ ClusterMetadataManifest fetchRemoteClusterMetadataManifest(String clusterName, S
         try {
             String fullBlobName = getManifestFolderPath(clusterName, clusterUUID).buildAsString() + filename;
             RemoteClusterMetadataManifest remoteClusterMetadataManifest = new RemoteClusterMetadataManifest(fullBlobName, clusterUUID, compressor, namedXContentRegistry);
-            return manifestBlobStore.read(remoteClusterMetadataManifest).get();
+            return manifestBlobStore.read(remoteClusterMetadataManifest);
         } catch (IOException e) {
             throw new IllegalStateException(String.format(Locale.ROOT, "Error while downloading cluster metadata - %s", filename), e);
         }

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterBlocks.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterBlocks.java
@@ -79,17 +79,6 @@ public UploadedMetadata getUploadedMetadata() {
         return new UploadedMetadataAttribute(CLUSTER_BLOCKS, blobName);
     }
 
-    @Override
-    public void set(final ClusterBlocks clusterBlocks) {
-        this.clusterBlocks = clusterBlocks;
-    }
-
-    @Override
-    public ClusterBlocks get() {
-        return clusterBlocks;
-    }
-
-
     @Override
     public InputStream serialize() throws IOException {
         return CLUSTER_BLOCKS_FORMAT.serialize(clusterBlocks, generateBlobFileName(), getCompressor(), RemoteClusterStateUtils.FORMAT_PARAMS).streamInput();

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
@@ -100,16 +100,6 @@ public UploadedMetadata getUploadedMetadata() {
         return new UploadedMetadataAttribute(MANIFEST_PATH_TOKEN, blobName);
     }
 
-    @Override
-    public void set(final ClusterMetadataManifest manifest) {
-        this.clusterMetadataManifest = manifest;
-    }
-
-    @Override
-    public ClusterMetadataManifest get() {
-        return clusterMetadataManifest;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         return CLUSTER_METADATA_MANIFEST_FORMAT.serialize(clusterMetadataManifest, generateBlobFileName(), getCompressor(),

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterStateBlobStore.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterStateBlobStore.java
@@ -51,7 +51,6 @@ public RemoteClusterStateBlobStore(
 
     @Override
     public void writeAsync(final U entity, final ActionListener<Void> listener) {
-        assert entity.get() != null;
         try {
             try (InputStream inputStream = entity.serialize()) {
                 BlobPath blobPath = getBlobPathForUpload(entity);
@@ -64,19 +63,17 @@ public void writeAsync(final U entity, final ActionListener<Void> listener) {
     }
 
     @Override
-    public U read(final U entity) throws IOException {
+    public T read(final U entity) throws IOException {
         // TODO Add timing logs and tracing
-        assert entity.get() == null && entity.getFullBlobName() != null;
-        T object = entity.deserialize(transferService.downloadBlob(getBlobPathForDownload(entity), entity.getBlobFileName()));
-        entity.set(object);
-        return entity;
+        assert entity.getFullBlobName() != null;
+        return entity.deserialize(transferService.downloadBlob(getBlobPathForDownload(entity), entity.getBlobFileName()));
     }
 
     @Override
     public void readAsync(final U entity, final ActionListener<T> listener) {
         executorService.execute(() -> {
             try {
-                listener.onResponse(read(entity).get());
+                listener.onResponse(read(entity));
             } catch (Exception e) {
                 listener.onFailure(e);
             }

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterStateCustoms.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterStateCustoms.java
@@ -86,16 +86,6 @@ public ClusterMetadataManifest.UploadedMetadata getUploadedMetadata() {
         return new ClusterMetadataManifest.UploadedMetadataAttribute(String.join(CUSTOM_DELIMITER, CLUSTER_STATE_CUSTOM, customType), blobName);
     }
 
-    @Override
-    public void set(Custom custom) {
-        this.custom = custom;
-    }
-
-    @Override
-    public ClusterState.Custom get() {
-        return custom;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         return clusterStateCustomBlobStoreFormat.serialize(custom, generateBlobFileName(), getCompressor(), RemoteClusterStateUtils.FORMAT_PARAMS).streamInput();

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteCoordinationMetadata.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteCoordinationMetadata.java
@@ -72,16 +72,6 @@ public String generateBlobFileName() {
         return blobFileName;
     }
 
-    @Override
-    public void set(final CoordinationMetadata coordinationMetadata) {
-        this.coordinationMetadata = coordinationMetadata;
-    }
-
-    @Override
-    public CoordinationMetadata get() {
-        return coordinationMetadata;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         return COORDINATION_METADATA_FORMAT.serialize(coordinationMetadata, generateBlobFileName(), getCompressor(), RemoteClusterStateUtils.FORMAT_PARAMS).streamInput();

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteCustomMetadata.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteCustomMetadata.java
@@ -94,16 +94,6 @@ public String generateBlobFileName() {
         return blobFileName;
     }
 
-    @Override
-    public void set(final Custom custom) {
-        this.custom = custom;
-    }
-
-    @Override
-    public Custom get() {
-        return custom;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         return customBlobStoreFormat.serialize(custom, generateBlobFileName(), getCompressor(), RemoteClusterStateUtils.FORMAT_PARAMS).streamInput();

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteDiscoveryNodes.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteDiscoveryNodes.java
@@ -79,16 +79,6 @@ public UploadedMetadata getUploadedMetadata() {
         return new UploadedMetadataAttribute(DISCOVERY_NODES, blobName);
     }
 
-    @Override
-    public void set(final DiscoveryNodes discoveryNodes) {
-        this.discoveryNodes = discoveryNodes;
-    }
-
-    @Override
-    public DiscoveryNodes get() {
-        return discoveryNodes;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         return DISCOVERY_NODES_FORMAT.serialize(discoveryNodes, generateBlobFileName(), getCompressor(), RemoteClusterStateUtils.FORMAT_PARAMS).streamInput();

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteGlobalMetadata.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteGlobalMetadata.java
@@ -53,16 +53,6 @@ public UploadedMetadata getUploadedMetadata() {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void set(final Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    @Override
-    public Metadata get() {
-        return metadata;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         throw new UnsupportedOperationException();

diff --git a/...r/src/main/java/org/opensearch/gateway/remote/model/RemoteHashesOfConsistentSettings.java b/...r/src/main/java/org/opensearch/gateway/remote/model/RemoteHashesOfConsistentSettings.java
@@ -72,16 +72,6 @@ public ClusterMetadataManifest.UploadedMetadata getUploadedMetadata() {
         return new ClusterMetadataManifest.UploadedMetadataAttribute(HASHES_OF_CONSISTENT_SETTINGS, blobName);
     }
 
-    @Override
-    public void set(final DiffableStringMap hashesOfConsistentSettings) {
-        this.hashesOfConsistentSettings = hashesOfConsistentSettings;
-    }
-
-    @Override
-    public DiffableStringMap get() {
-        return hashesOfConsistentSettings;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         return HASHES_OF_CONSISTENT_SETTINGS_FORMAT.serialize(hashesOfConsistentSettings, generateBlobFileName(), getCompressor(), RemoteClusterStateUtils.FORMAT_PARAMS).streamInput();

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteIndexMetadata.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteIndexMetadata.java
@@ -52,18 +52,6 @@ public RemoteIndexMetadata(final String blobName, final String clusterUUID, fina
         this.blobName = blobName;
     }
 
-    @Override
-    public void set(final IndexMetadata indexMetadata) {
-        this.indexMetadata = indexMetadata;
-    }
-
-    @Override
-    public IndexMetadata get() {
-        return indexMetadata;
-    }
-
-
-
     @Override
     public BlobPathParameters getBlobPathParameters() {
         return new BlobPathParameters(List.of(INDEX_PATH_TOKEN, indexMetadata.getIndexUUID()), "metadata");

diff --git a/...r/src/main/java/org/opensearch/gateway/remote/model/RemotePersistentSettingsMetadata.java b/...r/src/main/java/org/opensearch/gateway/remote/model/RemotePersistentSettingsMetadata.java
@@ -72,16 +72,6 @@ public String generateBlobFileName() {
         return blobFileName;
     }
 
-    @Override
-    public void set(final Settings settings) {
-        this.persistentSettings = settings;
-    }
-
-    @Override
-    public Settings get() {
-        return persistentSettings;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         return SETTINGS_METADATA_FORMAT.serialize(persistentSettings, generateBlobFileName(), getCompressor(), RemoteClusterStateUtils.FORMAT_PARAMS)

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteTemplatesMetadata.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteTemplatesMetadata.java
@@ -73,16 +73,6 @@ public String generateBlobFileName() {
         return blobFileName;
     }
 
-    @Override
-    public void set(final TemplatesMetadata templatesMetadata) {
-        this.templatesMetadata = templatesMetadata;
-    }
-
-    @Override
-    public TemplatesMetadata get() {
-        return templatesMetadata;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         return TEMPLATES_METADATA_FORMAT.serialize(templatesMetadata, generateBlobFileName(), getCompressor(), RemoteClusterStateUtils.FORMAT_PARAMS)

diff --git a/...er/src/main/java/org/opensearch/gateway/remote/model/RemoteTransientSettingsMetadata.java b/...er/src/main/java/org/opensearch/gateway/remote/model/RemoteTransientSettingsMetadata.java
@@ -72,16 +72,6 @@ public String generateBlobFileName() {
         return blobFileName;
     }
 
-    @Override
-    public void set(final Settings settings) {
-        this.transientSettings = settings;
-    }
-
-    @Override
-    public Settings get() {
-        return transientSettings;
-    }
-
     @Override
     public InputStream serialize() throws IOException {
         return SETTINGS_METADATA_FORMAT.serialize(transientSettings, generateBlobFileName(), getCompressor(), RemoteClusterStateUtils.FORMAT_PARAMS)