Fix some Java compiler warnings

2 files changed, 7 insertions, 6 deletions

diff --git a/server/sonar-process/src/main/java/org/sonar/process/Jmx.java b/server/sonar-process/src/main/java/org/sonar/process/Jmx.java
index 52cae4d3ae4..e7e63988f8b 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/Jmx.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Jmx.java
@@ -42,7 +42,7 @@ public class Jmx {
    */
   public static void register(String name, Object instance) {
     try {
-      Class mbeanInterface = guessMBeanInterface(instance);
+      Class<Object> mbeanInterface = guessMBeanInterface(instance);
       ManagementFactory.getPlatformMBeanServer().registerMBean(new StandardMBean(instance, mbeanInterface), new ObjectName(name));
 
     } catch (MalformedObjectNameException | NotCompliantMBeanException | InstanceAlreadyExistsException | MBeanRegistrationException e) {
@@ -58,10 +58,11 @@ public class Jmx {
    * To avoid the last convention, we wrap the mbean within a StandardMBean. That
    * requires to find the related interface.
    */
-  private static Class guessMBeanInterface(Object instance) {
-    Class mbeanInterface = null;
-    Class<?>[] interfaces = instance.getClass().getInterfaces();
-    for (Class<?> anInterface : interfaces) {
+
+  private static Class<Object> guessMBeanInterface(Object instance) {
+    Class<Object> mbeanInterface = null;
+    Class<Object>[] interfaces = (Class<Object>[])instance.getClass().getInterfaces();
+    for (Class<Object> anInterface : interfaces) {
       if (anInterface.getName().endsWith("MBean")) {
         mbeanInterface = anInterface;
         break;
diff --git a/server/sonar-process/src/test/java/org/sonar/process/cluster/health/HealthStateRefresherTest.java b/server/sonar-process/src/test/java/org/sonar/process/cluster/health/HealthStateRefresherTest.java
index 2b88d03f13c..0d4428265f1 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/cluster/health/HealthStateRefresherTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/cluster/health/HealthStateRefresherTest.java
@@ -27,7 +27,7 @@ import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
 
 import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;