From 9b8d4d064f0c719ae1a96fc2140912a90b367706 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Mon, 9 Dec 2013 16:58:52 +0100 Subject: [PATCH] Fix quality flaws --- .../java/org/sonar/api/issue/IssueFilter.java | 1 + .../sonar/api/issue/batch/package-info.java | 23 +++++++++++++++++++ .../sonar/server/rule/RubyRuleService.java | 1 - .../java/org/sonar/server/ui/JRubyFacade.java | 22 ++++-------------- 4 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 sonar-plugin-api/src/main/java/org/sonar/api/issue/batch/package-info.java diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueFilter.java index fbde9018825..b05728184a1 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueFilter.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueFilter.java @@ -25,6 +25,7 @@ import org.sonar.api.BatchExtension; * @since 3.6 * @deprecated since 4.0 */ +@Deprecated public interface IssueFilter extends BatchExtension { boolean accept(Issue issue); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/batch/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/batch/package-info.java new file mode 100644 index 00000000000..2bfef008c8a --- /dev/null +++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/batch/package-info.java @@ -0,0 +1,23 @@ +/* + * 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.api.issue.batch; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java b/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java index 9b64b61a573..e2807da24c6 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java @@ -25,7 +25,6 @@ import org.picocontainer.Startable; import org.sonar.api.ServerComponent; import org.sonar.api.rules.Rule; import org.sonar.core.i18n.RuleI18nManager; -import org.sonar.server.user.UserSession; import javax.annotation.CheckForNull; diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index 002d62c8b31..52ddfd748a0 100644 --- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -19,8 +19,6 @@ */ package org.sonar.server.ui; -import org.sonar.core.preview.PreviewCache; - import org.slf4j.LoggerFactory; import org.sonar.api.CoreProperties; import org.sonar.api.config.License; @@ -42,16 +40,12 @@ import org.sonar.api.test.MutableTestable; import org.sonar.api.test.TestPlan; import org.sonar.api.test.Testable; import org.sonar.api.utils.ValidationMessages; -import org.sonar.api.web.Footer; -import org.sonar.api.web.NavigationSection; -import org.sonar.api.web.Page; -import org.sonar.api.web.RubyRailsWebservice; -import org.sonar.api.web.Widget; +import org.sonar.api.web.*; import org.sonar.core.component.SnapshotPerspectives; -import org.sonar.core.i18n.RuleI18nManager; import org.sonar.core.measure.MeasureFilterEngine; import org.sonar.core.measure.MeasureFilterResult; import org.sonar.core.persistence.Database; +import org.sonar.core.preview.PreviewCache; import org.sonar.core.purge.PurgeDao; import org.sonar.core.resource.ResourceIndexerDao; import org.sonar.core.resource.ResourceKeyUpdaterDao; @@ -63,11 +57,7 @@ import org.sonar.server.platform.Platform; import org.sonar.server.platform.ServerIdGenerator; import org.sonar.server.platform.ServerSettings; import org.sonar.server.platform.SettingsChangeNotifier; -import org.sonar.server.plugins.DefaultServerPluginRepository; -import org.sonar.server.plugins.InstalledPluginReferentialFactory; -import org.sonar.server.plugins.PluginDeployer; -import org.sonar.server.plugins.PluginDownloader; -import org.sonar.server.plugins.UpdateCenterMatrixFactory; +import org.sonar.server.plugins.*; import org.sonar.server.rules.ProfilesConsole; import org.sonar.server.rules.RulesConsole; import org.sonar.server.user.NewUserNotifier; @@ -79,11 +69,7 @@ import javax.annotation.Nullable; import java.net.InetAddress; import java.sql.Connection; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static com.google.common.collect.Lists.newArrayList; -- 2.39.5