From 770de79a92774209e824571330b8e7fa8186e277 Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Wed, 30 Mar 2016 14:42:13 +0200
Subject: [PATCH] Remove DiscoveryNode#id in favour of existing 
 DiscoveryNode#getId

Original commit: elastic/x-pack-elasticsearch@69bd4a96408fd2f7cfd62f559b1cad1547ddeef9
---
 .../marvel/agent/collector/node/NodeStatsCollector.java         | 2 +-
 .../agent/resolver/cluster/ClusterStateResolverTests.java       | 2 +-
 .../shield/action/realm/ClearRealmCacheResponse.java            | 2 +-
 .../shield/action/role/ClearRolesCacheResponse.java             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollector.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollector.java
index 6523c03a250..bdd9bd20975 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollector.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollector.java
@@ -84,7 +84,7 @@ public class NodeStatsCollector extends AbstractCollector<NodeStatsCollector> {
         nodeStatsDoc.setClusterUUID(clusterUUID());
         nodeStatsDoc.setTimestamp(System.currentTimeMillis());
         nodeStatsDoc.setSourceNode(sourceNode);
-        nodeStatsDoc.setNodeId(sourceNode.id());
+        nodeStatsDoc.setNodeId(sourceNode.getId());
         nodeStatsDoc.setNodeMaster(isLocalNodeMaster());
         nodeStatsDoc.setNodeStats(nodeStats);
         nodeStatsDoc.setMlockall(BootstrapInfo.isMemoryLocked());
diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStateResolverTests.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStateResolverTests.java
index c7bbe235ac8..a1e349c2387 100644
--- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStateResolverTests.java
+++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStateResolverTests.java
@@ -38,7 +38,7 @@ public class ClusterStateResolverTests extends MonitoringIndexNameResolverTestCa
         DiscoveryNode masterNode = new DiscoveryNode("master", new LocalTransportAddress("master"),
                 emptyMap(), emptySet(), Version.CURRENT);
         DiscoveryNode otherNode = new DiscoveryNode("other", new LocalTransportAddress("other"), emptyMap(), emptySet(), Version.CURRENT);
-        DiscoveryNodes discoveryNodes = DiscoveryNodes.builder().put(masterNode).put(otherNode).masterNodeId(masterNode.id()).build();
+        DiscoveryNodes discoveryNodes = DiscoveryNodes.builder().put(masterNode).put(otherNode).masterNodeId(masterNode.getId()).build();
         ClusterState clusterState = ClusterState.builder(new ClusterName("test")).nodes(discoveryNodes).build();
         doc.setClusterState(clusterState);
         return doc;
diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/realm/ClearRealmCacheResponse.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/realm/ClearRealmCacheResponse.java
index d2b093ffb08..53701c52384 100644
--- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/realm/ClearRealmCacheResponse.java
+++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/realm/ClearRealmCacheResponse.java
@@ -53,7 +53,7 @@ public class ClearRealmCacheResponse extends BaseNodesResponse<ClearRealmCacheRe
         builder.field("cluster_name", getClusterName().value());
         builder.startObject("nodes");
         for (ClearRealmCacheResponse.Node node: getNodes()) {
-            builder.startObject(node.getNode().id());
+            builder.startObject(node.getNode().getId());
             builder.field("name", node.getNode().name());
             builder.endObject();
         }
diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/role/ClearRolesCacheResponse.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/role/ClearRolesCacheResponse.java
index 18e6387207c..771b4b6d96f 100644
--- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/role/ClearRolesCacheResponse.java
+++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/role/ClearRolesCacheResponse.java
@@ -53,7 +53,7 @@ public class ClearRolesCacheResponse extends BaseNodesResponse<ClearRolesCacheRe
         builder.field("cluster_name", getClusterName().value());
         builder.startObject("nodes");
         for (ClearRolesCacheResponse.Node node: getNodes()) {
-            builder.startObject(node.getNode().id());
+            builder.startObject(node.getNode().getId());
             builder.field("name", node.getNode().name());
             builder.endObject();
         }