SONAR-14625 Upgrade to Hazelcast 4.2

2 files changed, 9 insertions, 10 deletions

diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImpl.java
index d2c45b8be67..d8db18f1d2a 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImpl.java
@@ -19,8 +19,8 @@
  */
 package org.sonar.server.platform.monitoring.cluster;
 
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MemberSelector;
+import com.hazelcast.cluster.Member;
+import com.hazelcast.cluster.MemberSelector;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -57,7 +57,7 @@ public class AppNodesInfoLoaderImpl implements AppNodesInfoLoader {
     MemberSelector memberSelector = HazelcastMemberSelectors.selectorForProcessIds(ProcessId.WEB_SERVER, ProcessId.COMPUTE_ENGINE);
     DistributedAnswer<ProtobufSystemInfo.SystemInfo> distributedAnswer = hzMember.call(ProcessInfoProvider::provide, memberSelector, DISTRIBUTED_TIMEOUT_MS);
     for (Member member : distributedAnswer.getMembers()) {
-      String nodeName = member.getStringAttribute(NODE_NAME.getKey());
+      String nodeName = member.getAttribute(NODE_NAME.getKey());
       NodeInfo nodeInfo = nodesByName.computeIfAbsent(nodeName, name -> {
         NodeInfo info = new NodeInfo(name);
         info.setHost(member.getAddress().getHost());
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImplTest.java
index ec34e93e52e..d36ce91ee3a 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImplTest.java
@@ -19,9 +19,9 @@
  */
 package org.sonar.server.platform.monitoring.cluster;
 
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MemberSelector;
-import com.hazelcast.nio.Address;
+import com.hazelcast.cluster.Address;
+import com.hazelcast.cluster.Member;
+import com.hazelcast.cluster.MemberSelector;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.Collection;
@@ -41,7 +41,6 @@ import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-
 public class AppNodesInfoLoaderImplTest {
 
   private static final InetAddress AN_ADDRESS = InetAddress.getLoopbackAddress();
@@ -49,8 +48,8 @@ public class AppNodesInfoLoaderImplTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
-  private HazelcastMember hzMember = mock(HazelcastMember.class);
-  private AppNodesInfoLoaderImpl underTest = new AppNodesInfoLoaderImpl(hzMember);
+  private final HazelcastMember hzMember = mock(HazelcastMember.class);
+  private final AppNodesInfoLoaderImpl underTest = new AppNodesInfoLoaderImpl(hzMember);
 
   @Test
   public void load_info_from_all_nodes() throws Exception {
@@ -90,7 +89,7 @@ public class AppNodesInfoLoaderImplTest {
 
   private Member newMember(String name) {
     Member member = mock(Member.class, Mockito.RETURNS_MOCKS);
-    when(member.getStringAttribute(HazelcastMember.Attribute.NODE_NAME.getKey())).thenReturn(name);
+    when(member.getAttribute(HazelcastMember.Attribute.NODE_NAME.getKey())).thenReturn(name);
     when(member.getAddress()).thenReturn(new Address(AN_ADDRESS, 6789));
     return member;
   }