Fix some Java compiler warnings

9 files changed, 21 insertions, 21 deletions

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/ce/measure/test/TestMeasureComputerDefinitionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/ce/measure/test/TestMeasureComputerDefinitionTest.java
index a6a1e3b3e74..225b0db1d21 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/ce/measure/test/TestMeasureComputerDefinitionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/ce/measure/test/TestMeasureComputerDefinitionTest.java
@@ -34,7 +34,7 @@ public class TestMeasureComputerDefinitionTest {
   public ExpectedException thrown = ExpectedException.none();
 
   @Test
-  public void build_definition() throws Exception {
+  public void build_definition() {
     MeasureComputerDefinition definition = new MeasureComputerDefinitionBuilderImpl()
       .setInputMetrics("INPUT_1", "INPUT_2")
       .setOutputMetrics("OUTPUT_1", "OUTPUT_2")
@@ -45,7 +45,7 @@ public class TestMeasureComputerDefinitionTest {
   }
 
   @Test
-  public void build_definition_without_input_metric() throws Exception {
+  public void build_definition_without_input_metric() {
     MeasureComputerDefinition definition = new MeasureComputerDefinitionBuilderImpl()
       .setOutputMetrics("OUTPUT_1", "OUTPUT_2")
       .build();
@@ -55,18 +55,18 @@ public class TestMeasureComputerDefinitionTest {
   }
 
   @Test
-  public void fail_with_NPE_when_building_definition_with_null_input_metrics() throws Exception {
+  public void fail_with_NPE_when_building_definition_with_null_input_metrics() {
     thrown.expect(NullPointerException.class);
     thrown.expectMessage("Input metrics cannot be null");
 
     new MeasureComputerDefinitionBuilderImpl()
-      .setInputMetrics(null)
+      .setInputMetrics((String[]) null)
       .setOutputMetrics("OUTPUT_1", "OUTPUT_2")
       .build();
   }
 
   @Test
-  public void fail_with_NPE_when_building_definition_with_on_null_input_metric() throws Exception {
+  public void fail_with_NPE_when_building_definition_with_on_null_input_metric() {
     thrown.expect(NullPointerException.class);
     thrown.expectMessage("Null metric is not allowed");
 
@@ -77,18 +77,18 @@ public class TestMeasureComputerDefinitionTest {
   }
 
   @Test
-  public void fail_with_NPE_when_building_definition_with_null_output_metrics() throws Exception {
+  public void fail_with_NPE_when_building_definition_with_null_output_metrics() {
     thrown.expect(NullPointerException.class);
     thrown.expectMessage("Output metrics cannot be null");
 
     new MeasureComputerDefinitionBuilderImpl()
       .setInputMetrics("INPUT_1", "INPUT_2")
-      .setOutputMetrics(null)
+      .setOutputMetrics((String[]) null)
       .build();
   }
 
   @Test
-  public void fail_with_NPE_when_building_definition_without_output_metrics() throws Exception {
+  public void fail_with_NPE_when_building_definition_without_output_metrics() {
     thrown.expect(NullPointerException.class);
     thrown.expectMessage("Output metrics cannot be null");
 
@@ -98,7 +98,7 @@ public class TestMeasureComputerDefinitionTest {
   }
 
   @Test
-  public void fail_with_NPE_when_building_definition_with_on_null_ouput_metric() throws Exception {
+  public void fail_with_NPE_when_building_definition_with_on_null_ouput_metric() {
     thrown.expect(NullPointerException.class);
     thrown.expectMessage("Null metric is not allowed");
 
@@ -109,7 +109,7 @@ public class TestMeasureComputerDefinitionTest {
   }
 
   @Test
-  public void fail_with_IAE_when_building_definition_with_empty_output_metrics() throws Exception {
+  public void fail_with_IAE_when_building_definition_with_empty_output_metrics() {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("At least one output metric must be defined");
 
@@ -120,7 +120,7 @@ public class TestMeasureComputerDefinitionTest {
   }
 
   @Test
-  public void fail_with_IAE_when_building_definition_with_core_metrics_in_output_metrics() throws Exception {
+  public void fail_with_IAE_when_building_definition_with_core_metrics_in_output_metrics() {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Core metrics are not allowed");
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/internal/ApiVersionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/internal/ApiVersionTest.java
index 21715e281ec..76a30d39a08 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/internal/ApiVersionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/internal/ApiVersionTest.java
@@ -27,7 +27,7 @@ import org.sonar.api.utils.System2;
 import org.sonar.api.utils.Version;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/issue/NoSonarFilterTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/issue/NoSonarFilterTest.java
index 756e45e55a2..51066a572fd 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/issue/NoSonarFilterTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/issue/NoSonarFilterTest.java
@@ -32,7 +32,7 @@ import java.util.Set;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/NotConditionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/NotConditionTest.java
index f9fdef9ca61..13ba1e56c04 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/NotConditionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/issue/condition/NotConditionTest.java
@@ -24,7 +24,7 @@ import org.mockito.Mockito;
 import org.sonar.api.issue.Issue;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/profiles/AnnotationProfileParserTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/profiles/AnnotationProfileParserTest.java
index 854e780806b..4f1cb5e6385 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/profiles/AnnotationProfileParserTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/profiles/AnnotationProfileParserTest.java
@@ -31,7 +31,7 @@ import org.sonar.check.BelongsToProfile;
 import org.sonar.check.Priority;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/profiles/XMLProfileParserTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/profiles/XMLProfileParserTest.java
index 0b971ba6c81..4e454aeae52 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/profiles/XMLProfileParserTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/profiles/XMLProfileParserTest.java
@@ -29,7 +29,7 @@ import org.sonar.api.rules.RulePriority;
 import org.sonar.api.utils.ValidationMessages;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/MessageExceptionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/MessageExceptionTest.java
index da3d7dddb29..7dbddaef854 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/MessageExceptionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/MessageExceptionTest.java
@@ -35,14 +35,14 @@ public class MessageExceptionTest {
 
   @Test
   public void should_create_exception_with_status_and_l10n_message_with_param(){
-    MessageException exception = MessageException.ofL10n("key", new String[]{"value"});
+    MessageException exception = MessageException.ofL10n("key", "value");
     assertThat(exception.l10nKey()).isEqualTo("key");
     assertThat(exception.l10nParams()).containsOnly("value");
   }
 
   @Test
   public void should_create_exception_with_status_and_l10n_message_without_param(){
-    MessageException exception = MessageException.ofL10n("key", null);
+    MessageException exception = MessageException.ofL10n("key", (Object[])null);
     assertThat(exception.l10nKey()).isEqualTo("key");
     assertThat(exception.l10nParams()).isEmpty();
   }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/text/CsvWriterTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/text/CsvWriterTest.java
index 21eeb5fd7d9..833446cee7c 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/text/CsvWriterTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/text/CsvWriterTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/web/page/PageTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/web/page/PageTest.java
index 2ba1e6bb08f..54b2f54ef2e 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/web/page/PageTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/web/page/PageTest.java
@@ -94,10 +94,10 @@ public class PageTest {
   }
 
   @Test
-  public void fail_if_no_qualifier() {
+  public void fail_if_null_qualifiers() {
     expectedException.expect(NullPointerException.class);
 
-    underTest.setComponentQualifiers(null).build();
+    underTest.setComponentQualifiers((Qualifier[])null).build();
   }
 
   @Test