From a6988a040cc1b2ac1dda045559d33a20a2a3f9df Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 5 Jun 2013 11:21:49 +0200 Subject: [PATCH] Fix quality flaws --- .../IssueChangesEmailTemplate.java | 2 -- .../org/sonar/core/issue/db/IssueDto.java | 5 ++-- .../java/org/sonar/core/user/UserDao.java | 2 +- .../sonar/api/issue/action/package-info.java | 23 +++++++++++++++++++ .../api/issue/condition/package-info.java | 23 +++++++++++++++++++ .../api/issue/internal/package-info.java | 23 +++++++++++++++++++ .../java/org/sonar/api/user/UserFinder.java | 2 +- 7 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 sonar-plugin-api/src/main/java/org/sonar/api/issue/action/package-info.java create mode 100644 sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/package-info.java create mode 100644 sonar-plugin-api/src/main/java/org/sonar/api/issue/internal/package-info.java diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplate.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplate.java index f41758c93e5..9c689f3c0e4 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplate.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/notification/IssueChangesEmailTemplate.java @@ -19,7 +19,6 @@ */ package org.sonar.plugins.core.issue.notification; -import com.google.common.base.Objects; import com.google.common.base.Strings; import org.apache.commons.lang.StringUtils; import org.sonar.api.config.EmailSettings; @@ -39,7 +38,6 @@ import javax.annotation.Nullable; public class IssueChangesEmailTemplate extends EmailTemplate { private static final char NEW_LINE = '\n'; - private final EmailSettings settings; private final UserFinder userFinder; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java index b0d87a27c9b..232e1dbbc4c 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java @@ -29,6 +29,7 @@ import org.sonar.api.utils.KeyValueFormat; import javax.annotation.CheckForNull; import javax.annotation.Nullable; + import java.io.Serializable; import java.util.Date; @@ -366,7 +367,7 @@ public final class IssueDto implements Serializable { .setComponentId(componentId) .setRootComponentId(rootComponentId) .setActionPlanKey(issue.actionPlanKey()) - .setIssueAttributes(issue.attributes() != null ? KeyValueFormat.format(issue.attributes()) : "") + .setIssueAttributes(KeyValueFormat.format(issue.attributes())) .setAuthorLogin(issue.authorLogin()) .setIssueCreationDate(issue.creationDate()) .setIssueCloseDate(issue.closeDate()) @@ -391,7 +392,7 @@ public final class IssueDto implements Serializable { .setReporter(issue.reporter()) .setAssignee(issue.assignee()) .setActionPlanKey(issue.actionPlanKey()) - .setIssueAttributes(issue.attributes() != null ? KeyValueFormat.format(issue.attributes()) : "") + .setIssueAttributes(KeyValueFormat.format(issue.attributes())) .setAuthorLogin(issue.authorLogin()) .setIssueCreationDate(issue.creationDate()) .setIssueCloseDate(issue.closeDate()) diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserDao.java b/sonar-core/src/main/java/org/sonar/core/user/UserDao.java index 32b3978e6b0..42a28e35a5d 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserDao.java +++ b/sonar-core/src/main/java/org/sonar/core/user/UserDao.java @@ -25,7 +25,7 @@ import org.sonar.api.user.UserQuery; import org.sonar.core.persistence.MyBatis; import javax.annotation.CheckForNull; -import java.util.Collection; + import java.util.List; /** diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/action/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/action/package-info.java new file mode 100644 index 00000000000..ba6df125411 --- /dev/null +++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/action/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.action; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/package-info.java new file mode 100644 index 00000000000..50a8f4ef510 --- /dev/null +++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/condition/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.condition; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/internal/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/internal/package-info.java new file mode 100644 index 00000000000..4b2bea8a375 --- /dev/null +++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/internal/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.internal; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java b/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java index 6bf2c76017c..d55be48828a 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/user/UserFinder.java @@ -22,7 +22,7 @@ package org.sonar.api.user; import org.sonar.api.ServerComponent; import javax.annotation.CheckForNull; -import java.util.Collection; + import java.util.List; /** -- 2.39.5