From 453d6eb279f53cd16ac16fc8f0449430321351b7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Fri, 7 Feb 2014 14:07:44 +0100 Subject: [PATCH] Fix quality flaws --- .../org/sonar/core/persistence/MyBatis.java | 5 +--- .../profiling/ProfilingConnectionHandler.java | 6 +++-- .../persistence/profiling/package-info.java | 24 +++++++++++++++++++ .../core/persistence/AbstractDaoTestCase.java | 8 ++----- .../sonar/core/persistence/MyBatisTest.java | 5 ++-- .../sonar/core/persistence/TestDatabase.java | 2 +- 6 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 sonar-core/src/main/java/org/sonar/core/persistence/profiling/package-info.java 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 e98bf8ff668..8f3743004e5 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 @@ -30,7 +30,6 @@ import org.apache.ibatis.type.JdbcType; import org.slf4j.LoggerFactory; import org.sonar.api.BatchComponent; import org.sonar.api.ServerComponent; -import org.sonar.api.config.Settings; import org.sonar.api.database.model.MeasureMapper; import org.sonar.api.database.model.MeasureModel; import org.sonar.core.component.ComponentDto; @@ -73,13 +72,11 @@ import java.io.InputStream; public class MyBatis implements BatchComponent, ServerComponent { private final Database database; - private final Settings settings; private final Logback logback; private SqlSessionFactory sessionFactory; - public MyBatis(Database database, Settings settings, Logback logback) { + public MyBatis(Database database, Logback logback) { this.database = database; - this.settings = settings; this.logback = logback; } diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingConnectionHandler.java b/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingConnectionHandler.java index aa16400b629..8d405b0bdc1 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingConnectionHandler.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingConnectionHandler.java @@ -40,11 +40,13 @@ class ProfilingConnectionHandler implements InvocationHandler { if ("prepareStatement".equals(method.getName())) { PreparedStatement statement = (PreparedStatement) result; String sql = (String) args[0]; - return Proxy.newProxyInstance(ProfilingConnectionHandler.class.getClassLoader(), new Class[] { PreparedStatement.class }, new ProfilingPreparedStatementHandler(statement, sql)); + return Proxy.newProxyInstance(ProfilingConnectionHandler.class.getClassLoader(), new Class[] { PreparedStatement.class }, + new ProfilingPreparedStatementHandler(statement, sql)); } else if ("createStatement".equals(method.getName())) { Statement statement = (Statement) result; - return Proxy.newProxyInstance(ProfilingConnectionHandler.class.getClassLoader(), new Class[] { Statement.class }, new ProfilingStatementHandler(statement)); + return Proxy.newProxyInstance(ProfilingConnectionHandler.class.getClassLoader(), new Class[] { Statement.class }, + new ProfilingStatementHandler(statement)); } else { return result; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/package-info.java b/sonar-core/src/main/java/org/sonar/core/persistence/profiling/package-info.java new file mode 100644 index 00000000000..e53f5caaae5 --- /dev/null +++ b/sonar-core/src/main/java/org/sonar/core/persistence/profiling/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2013 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.core.persistence.profiling; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java b/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java index 4d208829db1..d1cae9dcd4b 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java +++ b/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java @@ -30,11 +30,7 @@ import org.dbunit.DatabaseUnitException; import org.dbunit.IDatabaseTester; import org.dbunit.database.DatabaseConfig; import org.dbunit.database.IDatabaseConnection; -import org.dbunit.dataset.CompositeDataSet; -import org.dbunit.dataset.DataSetException; -import org.dbunit.dataset.IDataSet; -import org.dbunit.dataset.ITable; -import org.dbunit.dataset.ReplacementDataSet; +import org.dbunit.dataset.*; import org.dbunit.dataset.filter.DefaultColumnFilter; import org.dbunit.dataset.xml.FlatXmlDataSet; import org.dbunit.ext.mssql.InsertIdentityOperation; @@ -88,7 +84,7 @@ public abstract class AbstractDaoTestCase { databaseCommands = DatabaseCommands.forDialect(database.getDialect()); databaseTester = new DataSourceDatabaseTester(database.getDataSource()); - myBatis = new MyBatis(database, settings, new Logback()); + myBatis = new MyBatis(database, new Logback()); myBatis.start(); } 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 44be4f26eb7..586f488424c 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 @@ -25,7 +25,6 @@ import org.hamcrest.core.Is; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.sonar.api.config.Settings; import org.sonar.core.config.Logback; import org.sonar.core.rule.RuleMapper; @@ -50,7 +49,7 @@ public class MyBatisTest { @Test public void shouldConfigureMyBatis() { - MyBatis myBatis = new MyBatis(database, new Settings(), logback); + MyBatis myBatis = new MyBatis(database, logback); myBatis.start(); Configuration conf = myBatis.getSessionFactory().getConfiguration(); @@ -61,7 +60,7 @@ public class MyBatisTest { @Test public void shouldOpenBatchSession() { - MyBatis myBatis = new MyBatis(database, new Settings(), logback); + MyBatis myBatis = new MyBatis(database, logback); myBatis.start(); SqlSession session = myBatis.openBatchSession(); diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/TestDatabase.java b/sonar-core/src/test/java/org/sonar/core/persistence/TestDatabase.java index 63a4c63798a..389a565e336 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/TestDatabase.java +++ b/sonar-core/src/test/java/org/sonar/core/persistence/TestDatabase.java @@ -107,7 +107,7 @@ public class TestDatabase extends ExternalResource { commands = DatabaseCommands.forDialect(db.getDialect()); tester = new DataSourceDatabaseTester(db.getDataSource()); - myBatis = new MyBatis(db, settings, new Logback()); + myBatis = new MyBatis(db, new Logback()); myBatis.start(); } commands.truncateDatabase(db.getDataSource()); -- 2.39.5