Address comments

Signed-off-by: Arpit Bandejiya <[email protected]>
Arpit-Bandejiya · Jul 12, 2024 · 9743a41 · 9743a41
1 parent 1d35d5f
commit 9743a41
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java
@@ -154,7 +154,6 @@ public class RemoteClusterStateService implements Closeable {
     private RemoteClusterStateAttributesManager remoteClusterStateAttributesManager;
     private RemoteManifestManager remoteManifestManager;
     private ClusterSettings clusterSettings;
-    private final ClusterService clusterService;
     private final NamedWriteableRegistry namedWriteableRegistry;
     private final String CLUSTER_STATE_UPLOAD_TIME_LOG_STRING = "writing cluster state for version [{}] took [{}ms]";
     private final String METADATA_UPDATE_LOG_STRING = "wrote metadata for [{}] indices and skipped [{}] unchanged "
@@ -196,7 +195,6 @@ public RemoteClusterStateService(
         this.remoteStateStats = new RemotePersistenceStats();
         this.namedWriteableRegistry = namedWriteableRegistry;
         this.indexMetadataUploadListeners = indexMetadataUploadListeners;
-        this.clusterService = clusterService;
         this.isPublicationEnabled = FeatureFlags.isEnabled(REMOTE_PUBLICATION_EXPERIMENTAL)
             && RemoteStoreNodeAttribute.isRemoteStoreClusterStateEnabled(settings)
             && RemoteStoreNodeAttribute.isRemoteRoutingTableEnabled(settings);

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
@@ -94,12 +94,11 @@ public String getClusterName() {
         return clusterName;
     }
 
-    public BlobPath getBasePath() {
-        return blobStoreRepository.basePath();
-    }
-
     public BlobPath getBlobPathPrefix(String clusterUUID) {
-        return getBasePath().add(RemoteClusterStateUtils.encodeString(getClusterName())).add(CLUSTER_STATE_PATH_TOKEN).add(clusterUUID);
+        return blobStoreRepository.basePath()
+            .add(RemoteClusterStateUtils.encodeString(getClusterName()))
+            .add(CLUSTER_STATE_PATH_TOKEN)
+            .add(clusterUUID);
     }
 
     public BlobPath getBlobPathForUpload(final AbstractRemoteWritableBlobEntity<T> obj) {

diff --git a/server/src/main/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTable.java b/server/src/main/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTable.java
@@ -68,10 +68,6 @@ public RemoteIndexRoutingTable(String blobName, String clusterUUID, Compressor c
         this.blobName = blobName;
     }
 
-    public Index getIndex() {
-        return index;
-    }
-
     @Override
     public BlobPathParameters getBlobPathParameters() {
         return new BlobPathParameters(List.of(indexRoutingTable.getIndex().getUUID()), INDEX_ROUTING_FILE);