Remove warnings

2 files changed, 9 insertions, 13 deletions

diff --git a/plugins/sonar-surefire-plugin/src/main/java/org/sonar/plugins/surefire/SurefirePlugin.java b/plugins/sonar-surefire-plugin/src/main/java/org/sonar/plugins/surefire/SurefirePlugin.java
index c076e954fb0..b4eb8cc5e5d 100644
--- a/plugins/sonar-surefire-plugin/src/main/java/org/sonar/plugins/surefire/SurefirePlugin.java
+++ b/plugins/sonar-surefire-plugin/src/main/java/org/sonar/plugins/surefire/SurefirePlugin.java
@@ -19,26 +19,26 @@
  */
 package org.sonar.plugins.surefire;
 
+import com.google.common.collect.ImmutableList;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.Properties;
 import org.sonar.api.Property;
 import org.sonar.api.SonarPlugin;
 
-import java.util.Arrays;
 import java.util.List;
 
 @Properties({
-    @Property(
-        key = CoreProperties.SUREFIRE_REPORTS_PATH_PROPERTY,
-        name = "Report path",
-        description = "Path (absolute or relative) to XML report files.",
-        project = true,
-        global = false)
+  @Property(
+    key = CoreProperties.SUREFIRE_REPORTS_PATH_PROPERTY,
+    name = "Report path",
+    description = "Path (absolute or relative) to XML report files.",
+    project = true,
+    global = false)
 })
 public final class SurefirePlugin extends SonarPlugin {
 
-  public List getExtensions() {
-    return Arrays.asList(SurefireSensor.class);
+  public List<Class<SurefireSensor>> getExtensions() {
+    return ImmutableList.of(SurefireSensor.class);
   }
 
 }
diff --git a/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/data/SurefireStaxHandlerTest.java b/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/data/SurefireStaxHandlerTest.java
index 8cdbe6cf062..e99590d2712 100644
--- a/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/data/SurefireStaxHandlerTest.java
+++ b/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/data/SurefireStaxHandlerTest.java
@@ -21,8 +21,6 @@ package org.sonar.plugins.surefire.data;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.sonar.api.measures.CoreMetrics;
-import org.sonar.api.resources.JavaFile;
 import org.sonar.api.utils.StaxParser;
 import org.sonar.test.TestUtils;
 
@@ -32,8 +30,6 @@ import java.io.File;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
 
 public class SurefireStaxHandlerTest {