diff options
13 files changed, 76 insertions, 144 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java index 41973ea7239..25c5d0942bf 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java @@ -43,13 +43,13 @@ public abstract class AbstractCoverageDecorator implements Decorator { } public void decorate(final Resource resource, final DecoratorContext context) { - if (shouldDecorate(resource, context)) { + if (shouldDecorate(resource)) { computeMeasure(context); computeMeasureForNewCode(context); } } - protected boolean shouldDecorate(final Resource resource, final DecoratorContext context) { + protected boolean shouldDecorate(final Resource resource) { return !ResourceUtils.isUnitTestClass(resource); } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java index 3423b73ee21..a79c13b6df1 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java @@ -45,12 +45,12 @@ public class UnitTestDecorator implements Decorator { return !Project.AnalysisType.STATIC.equals(project.getAnalysisType()); } - public boolean shouldDecorateResource(Resource resource, DecoratorContext context) { + public boolean shouldDecorateResource(Resource resource) { return ResourceUtils.isUnitTestClass(resource) || !ResourceUtils.isEntity(resource); } public void decorate(Resource resource, DecoratorContext context) { - if (shouldDecorateResource(resource, context)) { + if (shouldDecorateResource(resource)) { sumChildren(context, CoreMetrics.TEST_EXECUTION_TIME); sumChildren(context, CoreMetrics.SKIPPED_TESTS); Double tests = sumChildren(context, CoreMetrics.TESTS); diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java index 72c96d129ba..4af3a08a1c2 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java @@ -72,7 +72,7 @@ public class Monitor { for (JavaCommand command : commands) { try { ProcessRef processRef = launcher.launch(command); - monitor(command, processRef); + monitor(processRef); } catch (RuntimeException e) { // fail to start or to monitor stop(); @@ -91,7 +91,7 @@ public class Monitor { } } - private void monitor(JavaCommand command, ProcessRef processRef) { + private void monitor(ProcessRef processRef) { // physically watch if process is alive WatcherThread watcherThread = new WatcherThread(processRef, this); watcherThread.start(); diff --git a/sonar-batch/src/main/java/org/sonar/batch/dependency/DependencyCache.java b/sonar-batch/src/main/java/org/sonar/batch/dependency/DependencyCache.java index 18dab70aaa3..7a064d520fc 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/dependency/DependencyCache.java +++ b/sonar-batch/src/main/java/org/sonar/batch/dependency/DependencyCache.java @@ -26,7 +26,6 @@ import org.sonar.api.batch.fs.internal.DefaultInputFile; import org.sonar.batch.index.Cache; import org.sonar.batch.index.Cache.Entry; import org.sonar.batch.index.Caches; -import org.sonar.batch.scan.filesystem.InputPathCache; import javax.annotation.CheckForNull; @@ -38,7 +37,7 @@ public class DependencyCache implements BatchComponent { private final Cache<OutgoingDependency> cache; - public DependencyCache(Caches caches, InputPathCache inputPathCache) { + public DependencyCache(Caches caches) { cache = caches.createCache("dependencies"); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateVerifier.java b/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateVerifier.java index 872381d6f5f..36eabaec79f 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateVerifier.java +++ b/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateVerifier.java @@ -99,11 +99,11 @@ public class QualityGateVerifier implements Decorator { @Override public void decorate(Resource resource, DecoratorContext context) { if (ResourceUtils.isRootProject(resource)) { - checkProjectConditions(resource, context); + checkProjectConditions(context); } } - private void checkProjectConditions(Resource resource, DecoratorContext context) { + private void checkProjectConditions(DecoratorContext context) { Metric.Level globalLevel = Metric.Level.OK; QualityGateDetails details = new QualityGateDetails(); List<String> labels = Lists.newArrayList(); diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java index 2706e54731f..1eda06b2684 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java @@ -74,7 +74,7 @@ public class DefaultModuleFileSystem extends DefaultFileSystem implements Module this(moduleInputFileCache, def.getKey(), settings, indexer, initializer, null); } - public DefaultModuleFileSystem(ModuleInputFileCache moduleInputFileCache, ProjectDefinition def, Project project, + public DefaultModuleFileSystem(ModuleInputFileCache moduleInputFileCache, Project project, Settings settings, FileIndexer indexer, ModuleFileSystemInitializer initializer, ComponentIndexer componentIndexer) { diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java index b26bb8cc0e7..315191efc1c 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java @@ -26,7 +26,6 @@ import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; import org.sonar.api.CoreProperties; -import org.sonar.api.batch.bootstrap.ProjectDefinition; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.fs.internal.DeprecatedDefaultInputFile; import org.sonar.api.config.Settings; @@ -59,13 +58,13 @@ public class DefaultModuleFileSystemTest { @Test public void test_equals_and_hashCode() throws Exception { - DefaultModuleFileSystem foo1 = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem foo1 = new DefaultModuleFileSystem(moduleInputFileCache, new Project("foo"), settings, fileIndexer, initializer, componentIndexer); - DefaultModuleFileSystem foo2 = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem foo2 = new DefaultModuleFileSystem(moduleInputFileCache, new Project("foo"), settings, fileIndexer, initializer, componentIndexer); - DefaultModuleFileSystem bar = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem bar = new DefaultModuleFileSystem(moduleInputFileCache, new Project("bar"), settings, fileIndexer, initializer, componentIndexer); - DefaultModuleFileSystem branch = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem branch = new DefaultModuleFileSystem(moduleInputFileCache, new Project("bar", "branch", "My project"), settings, fileIndexer, initializer, componentIndexer); assertThat(foo1.moduleKey()).isEqualTo("foo"); @@ -80,7 +79,7 @@ public class DefaultModuleFileSystemTest { @Test public void default_source_encoding() { - DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, new Project("foo"), settings, fileIndexer, initializer, componentIndexer); assertThat(fs.sourceCharset()).isEqualTo(Charset.defaultCharset()); @@ -90,7 +89,7 @@ public class DefaultModuleFileSystemTest { @Test public void source_encoding_is_set() { settings.setProperty(CoreProperties.ENCODING_PROPERTY, "Cp1124"); - DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, new Project("foo"), settings, fileIndexer, initializer, componentIndexer); assertThat(fs.encoding()).isEqualTo(Charset.forName("Cp1124")); @@ -120,7 +119,7 @@ public class DefaultModuleFileSystemTest { javaTest.mkdirs(); when(initializer.tests()).thenReturn(Arrays.asList(javaTest, additionalTest)); - DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, new Project("foo"), settings, fileIndexer, initializer, componentIndexer); assertThat(fs.baseDir().getCanonicalPath()).isEqualTo(basedir.getCanonicalPath()); @@ -138,7 +137,7 @@ public class DefaultModuleFileSystemTest { when(initializer.workingDir()).thenReturn(basedir); when(initializer.sources()).thenReturn(Arrays.asList(new File(basedir, "src/main/java"))); - DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, new Project("foo"), settings, fileIndexer, initializer, componentIndexer); File existingDir = temp.newFolder("new_folder"); @@ -159,7 +158,7 @@ public class DefaultModuleFileSystemTest { @Test public void should_search_input_files() throws Exception { - DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, new Project("foo"), settings, fileIndexer, initializer, componentIndexer); File mainFile = temp.newFile(); @@ -177,7 +176,7 @@ public class DefaultModuleFileSystemTest { @Test public void should_index() throws Exception { - DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, ProjectDefinition.create(), + DefaultModuleFileSystem fs = new DefaultModuleFileSystem(moduleInputFileCache, new Project("foo"), settings, fileIndexer, initializer, componentIndexer); verifyZeroInteractions(fileIndexer); diff --git a/sonar-core/src/main/java/org/sonar/core/config/package-info.java b/sonar-core/src/main/java/org/sonar/core/config/package-info.java new file mode 100644 index 00000000000..e2df78bded3 --- /dev/null +++ b/sonar-core/src/main/java/org/sonar/core/config/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 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.config; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/package-info.java b/sonar-core/src/main/java/org/sonar/core/dashboard/package-info.java new file mode 100644 index 00000000000..e354181289e --- /dev/null +++ b/sonar-core/src/main/java/org/sonar/core/dashboard/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 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.dashboard; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/maven/MavenPlugin.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/maven/MavenPlugin.java index 7df378027eb..a73c125ae8c 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/maven/MavenPlugin.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/maven/MavenPlugin.java @@ -393,11 +393,13 @@ public class MavenPlugin { if (pom.getPluginManagement() != null && pom.getPluginManagement().getPlugins() != null) { unregisterPlugin(pom.getPluginManagement().getPlugins(), groupId, artifactId); } - if (pom.getBuildPlugins() != null && pom.getBuildPlugins() != null) { - unregisterPlugin(pom.getBuildPlugins(), groupId, artifactId); + List plugins = pom.getBuildPlugins(); + if (plugins != null) { + unregisterPlugin(plugins, groupId, artifactId); } - if (pom.getReportPlugins() != null) { - unregisterReportPlugin(pom.getReportPlugins(), groupId, artifactId); + plugins = pom.getReportPlugins(); + if (plugins != null) { + unregisterReportPlugin(plugins, groupId, artifactId); } } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java index e6c114e5b31..13f642867e3 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java @@ -72,7 +72,7 @@ public class RuleMeasure extends Measure { } /** - * @deprecated since 4.4 use {@link #setRuleKey()} + * @deprecated since 4.4 use {@link #setRuleKey(org.sonar.api.rule.RuleKey)} */ @Deprecated public RuleMeasure setRule(Rule rule) { @@ -112,28 +112,12 @@ public class RuleMeasure extends Measure { return this; } - /** - * @deprecated since 2.5. See SONAR-2007. - */ - @Deprecated - public Integer getRuleCategory() { - return null; - } - - /** - * @deprecated since 2.5. See SONAR-2007. - */ - @Deprecated - public void setRuleCategory(Integer ruleCategory) { - // nothing - } - @Override public boolean equals(Object obj) { if (obj == null) { return false; } - if (!(obj.getClass().equals(RuleMeasure.class))) {// NOSONAR should be refactored but kept in the current state + if (!(obj.getClass().equals(RuleMeasure.class))) { // for the moment. return false; } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/profiles/RulesProfile.java b/sonar-plugin-api/src/main/java/org/sonar/api/profiles/RulesProfile.java index c3813ba404e..795eb19a465 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/profiles/RulesProfile.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/profiles/RulesProfile.java @@ -205,45 +205,6 @@ public class RulesProfile implements Cloneable { } /** - * @deprecated since 3.3 not replaced - */ - @Deprecated - public Boolean getProvided() { - return false; - } - - /** - * @deprecated since 3.3 not replaced - */ - @Deprecated - public void setProvided(Boolean b) { - } - - /** - * @deprecated since 3.3. Always return true. - */ - @Deprecated - public Boolean getEnabled() { - return Boolean.TRUE; - } - - /** - * @deprecated since 3.3. Always return true. - */ - @Deprecated - public boolean isEnabled() { - return true; - } - - /** - * @deprecated since 3.3. - */ - @Deprecated - public RulesProfile setEnabled(Boolean b) { - throw new UnsupportedOperationException("The field RulesProfile#enabled is not supported since 3.3."); - } - - /** * @return the profile language */ public String getLanguage() { @@ -293,14 +254,6 @@ public class RulesProfile implements Cloneable { } /** - * @deprecated since 2.3 use {@link #getActiveRulesByRepository(String)} instead. - */ - @Deprecated - public List<ActiveRule> getActiveRulesByPlugin(String repositoryKey) { - return getActiveRulesByRepository(repositoryKey); - } - - /** * Get the active rules of a specific repository. * Only enabled rules are selected. Disabled rules are excluded. */ diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java index 006eb0866cd..624002758e5 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java @@ -220,23 +220,6 @@ public class Rule { return this; } - /** - * @deprecated since 2.5 use {@link #getRepositoryKey()} instead - */ - @Deprecated - public String getPluginName() { - return pluginName; - } - - /** - * @deprecated since 2.5 use {@link #setRepositoryKey(String)} instead - */ - @Deprecated - public Rule setPluginName(String pluginName) { - this.pluginName = pluginName; - return this; - } - public String getConfigKey() { return configKey; } @@ -261,14 +244,6 @@ public class Rule { return this; } - /** - * @deprecated in 3.6. Replaced by {@link #setStatus(String status)}. - */ - @Deprecated - public Rule setEnabled(Boolean enabled) { - throw new UnsupportedOperationException("No more supported since version 3.6."); - } - public Boolean isEnabled() { return !STATUS_REMOVED.equals(status); } @@ -314,14 +289,6 @@ public class Rule { } /** - * @deprecated since 2.5. See http://jira.codehaus.org/browse/SONAR-2007 - */ - @Deprecated - public Integer getCategoryId() { - return null; - } - - /** * @since 2.5 */ public RulePriority getSeverity() { @@ -341,24 +308,6 @@ public class Rule { return this; } - /** - * @deprecated since 2.5 use {@link #getSeverity()} instead. See http://jira.codehaus.org/browse/SONAR-1829 - */ - @Deprecated - public RulePriority getPriority() { - return priority; - } - - /** - * Sets the rule priority. If null, uses the default priority - * - * @deprecated since 2.5 use {@link #setSeverity(RulePriority)} instead. See http://jira.codehaus.org/browse/SONAR-1829 - */ - @Deprecated - public Rule setPriority(RulePriority priority) { - return setSeverity(priority); - } - public String getRepositoryKey() { return pluginName; } @@ -531,7 +480,7 @@ public class Rule { /** * For internal use only. * - * @deprecated since 4.4, use {@link #setCharacteristicKey(@Nullable String characteristicKey)} + * @deprecated since 4.4, use {@link #setCharacteristicKey(String)} * @since 4.3 */ @Deprecated @@ -555,7 +504,7 @@ public class Rule { /** * For internal use only. * - * @deprecated since 4.4, use {@link #setDefaultCharacteristicKey(@Nullable String defaultCharacteristicKey)} + * @deprecated since 4.4, use {@link #setDefaultCharacteristicKey(String)} * @since 4.3 */ @Deprecated |