Remove duplicate methods

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>

Author: soosinha

server/src/main/java/org/opensearch/cluster/coordination/CoordinationState.java

@@ -39,8 +39,8 @@
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
 import org.opensearch.common.util.io.IOUtils;
-import org.opensearch.node.remotestore.RemoteStoreNodeAttribute;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -53,6 +53,7 @@
 import java.util.Set;
 
 import static org.opensearch.cluster.coordination.Coordinator.ZEN1_BWC_TERM;
+import static org.opensearch.common.util.FeatureFlags.REMOTE_PUBLICATION_EXPERIMENTAL;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.isRemoteStoreClusterStateEnabled;
 
 /**
@@ -104,7 +105,8 @@ public CoordinationState(
             .getLastAcceptedConfiguration();
         this.publishVotes = new VoteCollection();
         this.isRemoteStateEnabled = isRemoteStoreClusterStateEnabled(settings);
-        this.isRemotePublicationEnabled = RemoteStoreNodeAttribute.isRemotePublicationEnabled(settings);
+        this.isRemotePublicationEnabled = FeatureFlags.isEnabled(REMOTE_PUBLICATION_EXPERIMENTAL)
+            && localNode.isRemoteStatePublicationEnabled();
     }
 
     public boolean isRemotePublicationEnabled() {

server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java

@@ -469,6 +469,7 @@ public void onFailure(Exception e) {
             } else {
                 responseActionListener = listener;
             }
+            // TODO Decide to send remote state before starting publication by checking remote publication on all nodes
             if (sendRemoteState && destination.isRemoteStatePublicationEnabled()) {
                 logger.trace("sending remote cluster state version [{}] to [{}]", newState.version(), destination);
                 sendRemoteClusterState(destination, publishRequest.getAcceptedState(), responseActionListener);

server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java

@@ -472,31 +472,16 @@ public boolean isRemoteStoreNode() {
         return this.getAttributes().keySet().stream().anyMatch(key -> key.startsWith(REMOTE_STORE_NODE_ATTRIBUTE_KEY_PREFIX));
     }
 
-    /**
-     * Returns whether the node is a remote cluster state enabled node.
-     * @return true if the node contains remote cluster state node attribute, false otherwise
-     */
-    public boolean isRemoteClusterStateEnabled() {
-        return this.getAttributes()
-            .keySet()
-            .stream()
-            .anyMatch(key -> (key.equals(REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY)));
-    }
-
-    /**
-     * Returns whether remote routing table is enabled on the node
-     * @return true if the node contains remote routing table node attributes, false otherwise
-     */
-    public boolean isRemoteRoutingTableEnabled() {
-        return this.getAttributes().keySet().stream().anyMatch(key -> key.equals(REMOTE_STORE_ROUTING_TABLE_REPOSITORY_NAME_ATTRIBUTE_KEY));
-    }
-
     /**
      * Returns whether remote cluster state publication is enabled on this node
      * @return true if the node contains remote cluster state node attribute and remote routing table node attribute
      */
     public boolean isRemoteStatePublicationEnabled() {
-        return isRemoteClusterStateEnabled() && isRemoteRoutingTableEnabled();
+        return this.getAttributes()
+            .keySet()
+            .stream()
+            .anyMatch(key -> (key.equals(REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY)))
+            && this.getAttributes().keySet().stream().anyMatch(key -> key.equals(REMOTE_STORE_ROUTING_TABLE_REPOSITORY_NAME_ATTRIBUTE_KEY));
     }
 
     /**

server/src/main/java/org/opensearch/node/remotestore/RemoteStoreNodeAttribute.java

@@ -201,12 +201,6 @@ private static boolean isRemoteRoutingTableAttributePresent(Settings settings) {
             .isEmpty() == false;
     }
 
-    public static boolean isRemotePublicationEnabled(Settings settings) {
-        return FeatureFlags.isEnabled(REMOTE_PUBLICATION_EXPERIMENTAL)
-            && isRemoteRoutingTableAttributePresent(settings)
-            && isRemoteStoreClusterStateEnabled(settings);
-    }
-
     public static boolean isRemoteRoutingTableEnabled(Settings settings) {
         return FeatureFlags.isEnabled(REMOTE_PUBLICATION_EXPERIMENTAL) && isRemoteRoutingTableAttributePresent(settings);
     }

server/src/test/java/org/opensearch/cluster/coordination/PublicationTransportHandlerTests.java

@@ -140,7 +140,7 @@ public void writeTo(StreamOutput out) throws IOException {
         assertThat(e.getCause().getMessage(), containsString("Simulated failure of diff serialization"));
     }
 
-    public void testHandleRemoteIncomingPublishRequestWhenNoCurrentPublishRequest() {
+    public void testHandleIncomingRemotePublishRequestWhenNoCurrentPublishRequest() {
         RemoteClusterStateService remoteClusterStateService = mock(RemoteClusterStateService.class);
 
         PublishWithJoinResponse expectedPublishResponse = new PublishWithJoinResponse(new PublishResponse(TERM, VERSION), Optional.empty());
@@ -163,7 +163,7 @@ public void testHandleRemoteIncomingPublishRequestWhenNoCurrentPublishRequest()
         Mockito.verifyNoInteractions(remoteClusterStateService);
     }
 
-    public void testHandleRemoteIncomingPublishRequestWhenTermMismatch() {
+    public void testHandleIncomingRemotePublishRequestWhenTermMismatch() {
         RemoteClusterStateService remoteClusterStateService = mock(RemoteClusterStateService.class);
 
         PublishWithJoinResponse expectedPublishResponse = new PublishWithJoinResponse(new PublishResponse(TERM, VERSION), Optional.empty());
@@ -188,7 +188,7 @@ public void testHandleRemoteIncomingPublishRequestWhenTermMismatch() {
         Mockito.verifyNoInteractions(remoteClusterStateService);
     }
 
-    public void testHandleRemoteIncomingPublishRequestWhenVersionMismatch() {
+    public void testHandleIncomingRemotePublishRequestWhenVersionMismatch() {
         RemoteClusterStateService remoteClusterStateService = mock(RemoteClusterStateService.class);
 
         PublishWithJoinResponse expectedPublishResponse = new PublishWithJoinResponse(new PublishResponse(TERM, VERSION), Optional.empty());
@@ -213,7 +213,7 @@ public void testHandleRemoteIncomingPublishRequestWhenVersionMismatch() {
         Mockito.verifyNoInteractions(remoteClusterStateService);
     }
 
-    public void testHandleRemoteIncomingPublishRequestForLocalNode() throws IOException {
+    public void testHandleIncomingRemotePublishRequestForLocalNode() throws IOException {
         RemoteClusterStateService remoteClusterStateService = mock(RemoteClusterStateService.class);
 
         PublishWithJoinResponse expectedPublishResponse = new PublishWithJoinResponse(new PublishResponse(TERM, VERSION), Optional.empty());
@@ -235,7 +235,7 @@ public void testHandleRemoteIncomingPublishRequestForLocalNode() throws IOExcept
         Mockito.verifyNoInteractions(remoteClusterStateService);
     }
 
-    public void testHandleRemoteIncomingPublishRequestWhenManifestNotFound() throws IOException {
+    public void testHandleIncomingRemotePublishRequestWhenManifestNotFound() throws IOException {
         RemoteClusterStateService remoteClusterStateService = mock(RemoteClusterStateService.class);
 
         PublishWithJoinResponse expectedPublishResponse = new PublishWithJoinResponse(new PublishResponse(TERM, VERSION), Optional.empty());
@@ -261,7 +261,7 @@ public void testHandleRemoteIncomingPublishRequestWhenManifestNotFound() throws
         Mockito.verify(remoteClusterStateService, times(1)).getClusterMetadataManifestByFileName(Mockito.any(), Mockito.any());
     }
 
-    public void testHandleRemoteIncomingPublishRequestWhenNoLastSeenState() throws IOException {
+    public void testHandleIncomingRemotePublishRequestWhenNoLastSeenState() throws IOException {
         RemoteClusterStateService remoteClusterStateService = mock(RemoteClusterStateService.class);
 
         PublishWithJoinResponse expectedPublishResponse = new PublishWithJoinResponse(new PublishResponse(TERM, VERSION), Optional.empty());