From 774f0c8cf72cdb6d962928adc6694530ca38b184 Mon Sep 17 00:00:00 2001
From: Himshikha Gupta <himshikh@amazon.com>
Date: Wed, 15 May 2024 17:00:30 +0530
Subject: [PATCH] Fixig build failures

---
 .../coordination/PublicationTransportHandler.java      | 10 +++++-----
 .../gateway/remote/RemoteClusterStateUtils.java        |  2 +-
 .../index/remote/RemoteIndexPathUploader.java          |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java b/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java
index d65d730213ad4..99b0128f14c7d 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java
@@ -235,11 +235,6 @@ private PublishWithJoinResponse handleIncomingRemotePublishRequest(RemotePublish
         } else if (manifest.getDiffManifest().getFromStateUUID().equals(lastSeen.stateUUID()) == false) {
             logger.debug("Last cluster state not compatible with the diff");
             applyFullState = true;
-        } else {
-            ClusterState clusterState = remoteClusterStateService.getClusterStateUsingDiff(request.getClusterName(), manifest, lastSeenClusterState.get());
-            final PublishWithJoinResponse response = acceptState(clusterState);
-            lastSeenClusterState.compareAndSet(lastSeen, clusterState);
-            return response;
         }
 
         if (applyFullState == true) {
@@ -248,6 +243,11 @@ private PublishWithJoinResponse handleIncomingRemotePublishRequest(RemotePublish
             final PublishWithJoinResponse response = acceptState(clusterState);
             lastSeenClusterState.set(clusterState);
             return response;
+        } else {
+            ClusterState clusterState = remoteClusterStateService.getClusterStateUsingDiff(request.getClusterName(), manifest, lastSeenClusterState.get());
+            final PublishWithJoinResponse response = acceptState(clusterState);
+            lastSeenClusterState.compareAndSet(lastSeen, clusterState);
+            return response;
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateUtils.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateUtils.java
index 3fa9506192188..3263cabc50687 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateUtils.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateUtils.java
@@ -56,7 +56,7 @@ static BlobContainer clusterUUIDContainer(BlobStoreRepository blobStoreRepositor
     /**
      * Exception for Remote state transfer.
      */
-    static class RemoteStateTransferException extends RuntimeException {
+    public static class RemoteStateTransferException extends RuntimeException {
 
         public RemoteStateTransferException(String errorDesc) {
             super(errorDesc);
diff --git a/server/src/main/java/org/opensearch/index/remote/RemoteIndexPathUploader.java b/server/src/main/java/org/opensearch/index/remote/RemoteIndexPathUploader.java
index ff2114de54398..256cf8fbb4857 100644
--- a/server/src/main/java/org/opensearch/index/remote/RemoteIndexPathUploader.java
+++ b/server/src/main/java/org/opensearch/index/remote/RemoteIndexPathUploader.java
@@ -23,7 +23,7 @@
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.index.Index;
 import org.opensearch.gateway.remote.IndexMetadataUploadListener;
-import org.opensearch.gateway.remote.RemoteClusterStateService.RemoteStateTransferException;
+import static org.opensearch.gateway.remote.RemoteClusterStateUtils.RemoteStateTransferException;
 import org.opensearch.index.remote.RemoteStoreEnums.PathType;
 import org.opensearch.node.Node;
 import org.opensearch.node.remotestore.RemoteStoreNodeAttribute;