diff options
8 files changed, 14 insertions, 17 deletions
diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/check/BreakCheck.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/check/BreakCheck.java index 4cfc734457d..88bdc973ff1 100644 --- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/check/BreakCheck.java +++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/check/BreakCheck.java @@ -36,7 +36,7 @@ public class BreakCheck extends JavaAstVisitor { @Override public List<Integer> getWantedTokens() { - return wantedTokens; + return WANTED_TOKENS; } @Override @@ -50,6 +50,6 @@ public class BreakCheck extends JavaAstVisitor { } } - private static final List<Integer> wantedTokens = Arrays.asList(TokenTypes.LITERAL_BREAK); + private static final List<Integer> WANTED_TOKENS = Arrays.asList(TokenTypes.LITERAL_BREAK); } diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/check/ContinueCheck.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/check/ContinueCheck.java index dd6898e134f..7e32e777baf 100644 --- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/check/ContinueCheck.java +++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/check/ContinueCheck.java @@ -36,7 +36,7 @@ public class ContinueCheck extends JavaAstVisitor { @Override public List<Integer> getWantedTokens() { - return wantedTokens; + return WANTED_TOKENS; } @Override @@ -49,6 +49,6 @@ public class ContinueCheck extends JavaAstVisitor { sourceFile.log(message); } - private static final List<Integer> wantedTokens = Arrays.asList(TokenTypes.LITERAL_CONTINUE); + private static final List<Integer> WANTED_TOKENS = Arrays.asList(TokenTypes.LITERAL_CONTINUE); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/InitializersExecutor.java b/sonar-batch/src/main/java/org/sonar/batch/phases/InitializersExecutor.java index 50b0d975170..14cf9eee5a4 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/phases/InitializersExecutor.java +++ b/sonar-batch/src/main/java/org/sonar/batch/phases/InitializersExecutor.java @@ -35,7 +35,7 @@ import java.util.Collection; public class InitializersExecutor { - private static final Logger logger = LoggerFactory.getLogger(SensorsExecutor.class); + private static final Logger LOG = LoggerFactory.getLogger(SensorsExecutor.class); private MavenPluginExecutor mavenExecutor; @@ -52,14 +52,14 @@ public class InitializersExecutor { public void execute() { Collection<Initializer> initializers = selector.select(Initializer.class, project, true); - if (logger.isDebugEnabled()) { - logger.debug("Initializers : {}", StringUtils.join(initializers, " -> ")); + if (LOG.isDebugEnabled()) { + LOG.debug("Initializers : {}", StringUtils.join(initializers, " -> ")); } for (Initializer initializer : initializers) { executeMavenPlugin(initializer); - TimeProfiler profiler = new TimeProfiler(logger).start("Initializer " + initializer); + TimeProfiler profiler = new TimeProfiler(LOG).start("Initializer " + initializer); initializer.execute(project); profiler.stop(); } @@ -69,7 +69,7 @@ public class InitializersExecutor { if (sensor instanceof DependsUponMavenPlugin) { MavenPluginHandler handler = ((DependsUponMavenPlugin) sensor).getMavenPluginHandler(project); if (handler != null) { - TimeProfiler profiler = new TimeProfiler(logger).start("Execute maven plugin " + handler.getArtifactId()); + TimeProfiler profiler = new TimeProfiler(LOG).start("Execute maven plugin " + handler.getArtifactId()); mavenExecutor.execute(project, projectDef, handler); profiler.stop(); } diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java b/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java index bf3477f2663..13b41beff8e 100644 --- a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java +++ b/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java @@ -84,7 +84,7 @@ public class RemotePlugin { } public String getPluginFilename() { - return (filenames.size()>0 ? filenames.get(0) : null); + return (!filenames.isEmpty() ? filenames.get(0) : null); } @Override diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/User.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/User.java index dc0b318cab8..6a978782109 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/User.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/User.java @@ -89,6 +89,6 @@ public class User extends BaseIdentifiable { @Override public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE); } } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/security/UserRole.java b/sonar-plugin-api/src/main/java/org/sonar/api/security/UserRole.java index 7925e55513f..40b9c0ef1a5 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/security/UserRole.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/security/UserRole.java @@ -83,6 +83,6 @@ public class UserRole extends BaseIdentifiable { @Override public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE); } } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/IocContainer.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/IocContainer.java index 9d348f248c9..bc25f9e4bd4 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/IocContainer.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/IocContainer.java @@ -34,6 +34,7 @@ import org.sonar.api.platform.ComponentContainer; * @since 1.10 * @deprecated since 2.12. To be replaced by {@link org.sonar.api.platform.ComponentContainer} */ +@Deprecated public class IocContainer { private final MutablePicoContainer pico; diff --git a/sonar-server/src/main/java/org/sonar/server/database/JndiDatabaseConnector.java b/sonar-server/src/main/java/org/sonar/server/database/JndiDatabaseConnector.java index d4742cda149..76c8445698b 100644 --- a/sonar-server/src/main/java/org/sonar/server/database/JndiDatabaseConnector.java +++ b/sonar-server/src/main/java/org/sonar/server/database/JndiDatabaseConnector.java @@ -90,11 +90,7 @@ public class JndiDatabaseConnector extends AbstractDatabaseConnector { } public Connection getConnection() throws SQLException { - if (datasource != null) { - Connection connection = datasource.getConnection(); - return connection; - } - return null; + return datasource != null ? datasource.getConnection() : null; } @Override |