Remove warnings

4 files changed, 31 insertions, 23 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
index 0c2b1b75415..b0e7dec94fd 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
@@ -24,12 +24,23 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.builder.xml.XMLMapperBuilder;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.Environment;
-import org.apache.ibatis.session.*;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.core.dashboard.*;
+import org.sonar.core.dashboard.ActiveDashboardDto;
+import org.sonar.core.dashboard.ActiveDashboardMapper;
+import org.sonar.core.dashboard.DashboardDto;
+import org.sonar.core.dashboard.DashboardMapper;
+import org.sonar.core.dashboard.WidgetDto;
+import org.sonar.core.dashboard.WidgetMapper;
+import org.sonar.core.dashboard.WidgetPropertyDto;
+import org.sonar.core.dashboard.WidgetPropertyMapper;
 import org.sonar.core.duplication.DuplicationMapper;
 import org.sonar.core.duplication.DuplicationUnitDto;
 import org.sonar.core.properties.PropertiesMapper;
@@ -37,7 +48,11 @@ import org.sonar.core.properties.PropertyDto;
 import org.sonar.core.purge.PurgeMapper;
 import org.sonar.core.purge.PurgeVendorMapper;
 import org.sonar.core.purge.PurgeableSnapshotDto;
-import org.sonar.core.resource.*;
+import org.sonar.core.resource.ResourceDto;
+import org.sonar.core.resource.ResourceIndexDto;
+import org.sonar.core.resource.ResourceIndexerMapper;
+import org.sonar.core.resource.ResourceMapper;
+import org.sonar.core.resource.SnapshotDto;
 import org.sonar.core.review.ReviewDto;
 import org.sonar.core.review.ReviewMapper;
 import org.sonar.core.rule.RuleDto;
@@ -47,19 +62,18 @@ import org.sonar.core.template.LoadedTemplateMapper;
 import org.sonar.core.user.AuthorDto;
 import org.sonar.core.user.AuthorMapper;
 
-import java.io.IOException;
 import java.io.InputStream;
 
 public class MyBatis implements BatchComponent, ServerComponent {
 
-  private Database database;
+  private final Database database;
   private SqlSessionFactory sessionFactory;
 
   public MyBatis(Database database) {
     this.database = database;
   }
 
-  public MyBatis start() throws IOException {
+  public MyBatis start() {
     LogFactory.useSlf4jLogging();
     Configuration conf = new Configuration();
     conf.setEnvironment(new Environment("production", createTransactionFactory(), database.getDataSource()));
@@ -128,7 +142,7 @@ public class MyBatis implements BatchComponent, ServerComponent {
     }
   }
 
-  private void loadMapper(Configuration conf, Class mapperClass) throws IOException {
+  private void loadMapper(Configuration conf, Class mapperClass) {
     // trick to use database-specific XML files for a single Mapper Java interface
     InputStream input = getPathToMapper(mapperClass);
     try {
@@ -143,7 +157,7 @@ public class MyBatis implements BatchComponent, ServerComponent {
 
   private InputStream getPathToMapper(Class mapperClass) {
     InputStream input = getClass().getResourceAsStream(
-      "/" + StringUtils.replace(mapperClass.getName(), ".", "/") + "-" + database.getDialect().getId() + ".xml");
+        "/" + StringUtils.replace(mapperClass.getName(), ".", "/") + "-" + database.getDialect().getId() + ".xml");
     if (input == null) {
       input = getClass().getResourceAsStream("/" + StringUtils.replace(mapperClass.getName(), ".", "/") + ".xml");
     }
diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DefaultDatabaseTest.java b/sonar-core/src/test/java/org/sonar/core/persistence/DefaultDatabaseTest.java
index 0fc45efaac0..048c5d3df49 100644
--- a/sonar-core/src/test/java/org/sonar/core/persistence/DefaultDatabaseTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/DefaultDatabaseTest.java
@@ -26,7 +26,6 @@ import org.sonar.api.config.Settings;
 import org.sonar.core.persistence.dialect.Oracle;
 import org.sonar.core.persistence.dialect.PostgreSql;
 
-import java.sql.SQLException;
 import java.util.Properties;
 
 import static org.hamcrest.Matchers.nullValue;
@@ -38,7 +37,6 @@ public class DefaultDatabaseTest {
     DerbyUtils.fixDerbyLogs();
   }
 
-
   @Test
   public void shouldLoadDefaultValues() {
     DefaultDatabase db = new DefaultDatabase(new Settings());
@@ -97,7 +95,7 @@ public class DefaultDatabaseTest {
   }
 
   @Test
-  public void shouldStart() throws SQLException {
+  public void shouldStart() {
     Settings settings = new Settings();
     settings.setProperty("sonar.jdbc.url", "jdbc:derby:memory:sonar;create=true;user=sonar;password=sonar");
     settings.setProperty("sonar.jdbc.driverClassName", "org.apache.derby.jdbc.EmbeddedDriver");
@@ -116,7 +114,6 @@ public class DefaultDatabaseTest {
     }
   }
 
-
   @Test
   public void shouldInitSchema() {
     Settings settings = new Settings();
diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/InMemoryDatabaseTest.java b/sonar-core/src/test/java/org/sonar/core/persistence/InMemoryDatabaseTest.java
index 23d7bc30be1..3e6bb1b6fa6 100644
--- a/sonar-core/src/test/java/org/sonar/core/persistence/InMemoryDatabaseTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/InMemoryDatabaseTest.java
@@ -47,12 +47,11 @@ public class InMemoryDatabaseTest {
       Connection connection = db.getDataSource().getConnection();
       assertNotNull(connection);
 
-      ResultSet resultSet = connection.getMetaData().getTables("", null, null, new String[]{"TABLE"});
+      ResultSet resultSet = connection.getMetaData().getTables("", null, null, new String[] {"TABLE"});
       while (resultSet.next()) {
         tables++;
       }
 
-
     } finally {
       db.stop();
     }
@@ -60,12 +59,12 @@ public class InMemoryDatabaseTest {
   }
 
   @Test
-  public void shouldLimitThePoolSize() throws SQLException {
+  public void shouldLimitThePoolSize() {
     InMemoryDatabase db = new InMemoryDatabase();
     try {
       db.startDatabase();
-      assertThat(((BasicDataSource)db.getDataSource()).getMaxActive(), Is.is(2));
-      assertThat(((BasicDataSource)db.getDataSource()).getMaxIdle(), Is.is(2));
+      assertThat(((BasicDataSource) db.getDataSource()).getMaxActive(), Is.is(2));
+      assertThat(((BasicDataSource) db.getDataSource()).getMaxIdle(), Is.is(2));
 
     } finally {
       db.stop();
diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/MyBatisTest.java b/sonar-core/src/test/java/org/sonar/core/persistence/MyBatisTest.java
index 1905ded8649..592bca54484 100644
--- a/sonar-core/src/test/java/org/sonar/core/persistence/MyBatisTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/MyBatisTest.java
@@ -27,8 +27,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.sonar.core.rule.RuleMapper;
 
-import java.io.IOException;
-
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
@@ -42,19 +40,19 @@ public class MyBatisTest {
   private static InMemoryDatabase database;
 
   @BeforeClass
-  public static void start() throws IOException {
+  public static void start() {
     database = new InMemoryDatabase();
     myBatis = new MyBatis(database.start());
     myBatis.start();
   }
 
   @AfterClass
-  public static void stop() throws IOException {
+  public static void stop() {
     database.stop();
   }
 
   @Test
-  public void shouldConfigureMyBatis() throws IOException {
+  public void shouldConfigureMyBatis() {
     Configuration conf = myBatis.getSessionFactory().getConfiguration();
     assertThat(conf.isUseGeneratedKeys(), Is.is(true));
     assertThat(conf.hasMapper(RuleMapper.class), Is.is(true));
@@ -62,7 +60,7 @@ public class MyBatisTest {
   }
 
   @Test
-  public void shouldOpenBatchSession() throws IOException {
+  public void shouldOpenBatchSession() {
     SqlSession session = myBatis.openBatchSession();
     try {
       assertThat(session.getConnection(), notNullValue());