3 files changed, 14 insertions, 20 deletions
diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java
index 4507771468f..6b2921e61a4 100644
--- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java
+++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.plugins.dbcleaner;
 
+import com.google.common.collect.ImmutableList;
+import org.sonar.api.BatchExtension;
 import org.sonar.api.Properties;
 import org.sonar.api.Property;
 import org.sonar.api.PropertyType;
@@ -26,7 +28,6 @@ import org.sonar.api.SonarPlugin;
 import org.sonar.plugins.dbcleaner.api.DbCleanerConstants;
 import org.sonar.plugins.dbcleaner.period.DefaultPeriodCleaner;
 
-import java.util.Arrays;
 import java.util.List;
 
 @Properties({
@@ -50,11 +51,13 @@ import java.util.List;
     global = true,
     project = true,
     type = PropertyType.INTEGER)
-}
-)
+})
 public final class DbCleanerPlugin extends SonarPlugin {
 
-  public List getExtensions() {
-    return Arrays.asList(DefaultPeriodCleaner.class, DefaultPurgeTask.class, ProjectPurgePostJob.class);
+  public List<Class<? extends BatchExtension>> getExtensions() {
+    return ImmutableList.of(
+        DefaultPeriodCleaner.class,
+        DefaultPurgeTask.class,
+        ProjectPurgePostJob.class);
   }
 }
diff --git a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DbCleanerTestUtils.java b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DbCleanerTestUtils.java
index 9711b383533..3f7f7881077 100644
--- a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DbCleanerTestUtils.java
+++ b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DbCleanerTestUtils.java
@@ -24,9 +24,6 @@ import org.hamcrest.Description;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.core.purge.PurgeableSnapshotDto;
 
-import java.util.Date;
-import java.util.GregorianCalendar;
-
 public final class DbCleanerTestUtils {
 
   private DbCleanerTestUtils() {
diff --git a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest.java b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest.java
index 17317064d31..bea6ed413b6 100644
--- a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest.java
+++ b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/api/PurgeUtilsTest.java
@@ -19,30 +19,24 @@
  */
 package org.sonar.plugins.dbcleaner.api;
 
+import com.google.common.collect.Lists;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.junit.Test;
 import org.sonar.api.database.DatabaseSession;
-import org.sonar.api.database.model.ResourceModel;
-import org.sonar.api.database.model.Snapshot;
-import org.sonar.api.resources.Qualifiers;
-import org.sonar.api.resources.Scopes;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
-import com.google.common.collect.Lists;
+import javax.persistence.Query;
 
-import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.persistence.Query;
-
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class PurgeUtilsTest extends AbstractDbUnitTestCase {
 
@@ -59,7 +53,7 @@ public class PurgeUtilsTest extends AbstractDbUnitTestCase {
   }
 
   @Test
-  public void purgeSnapshots() throws SQLException {
+  public void purgeSnapshots() {
     setupData("purgeSnapshots");
 
     PurgeUtils.deleteSnapshotsData(getSession(), Arrays.asList(3, 4));
@@ -75,7 +69,7 @@ public class PurgeUtilsTest extends AbstractDbUnitTestCase {
     when(session.createNativeQuery(anyString())).thenReturn(query);
 
     List<Integer> ids = Lists.newArrayList();
-    for (int i = 0; i < PurgeUtils.MAX_IN_ELEMENTS + 1; i++) {
+    for (int i = 0; i < (PurgeUtils.MAX_IN_ELEMENTS + 1); i++) {
       ids.add(i);
     }