From a81e398d5dd6c593ac6e534d9d9f33348da5d0ed Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 21 Jun 2013 08:34:02 +0200 Subject: [PATCH] Fix quality flaws and add some sonar version in class comments --- .../main/java/org/sonar/server/issue/ActionService.java | 3 +++ .../org/sonar/server/issue/InternalRubyIssueService.java | 2 ++ .../org/sonar/server/issue/IssueChangelogService.java | 3 +++ .../java/org/sonar/server/issue/IssueCommentService.java | 3 +++ .../java/org/sonar/server/issue/IssueFilterResult.java | 3 +++ .../java/org/sonar/server/issue/IssueFilterService.java | 8 +++++++- .../java/org/sonar/server/issue/IssueStatsFinder.java | 3 +++ .../java/org/sonar/server/issue/IssuesFinderSort.java | 3 +++ .../java/org/sonar/server/issue/ServerIssueStorage.java | 3 +++ 9 files changed, 30 insertions(+), 1 deletion(-) diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java b/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java index cc94316bb11..a79aead0e47 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java @@ -50,6 +50,9 @@ import java.util.List; import static com.google.common.collect.Lists.newArrayList; +/** + * @since 3.6 + */ public class ActionService implements ServerComponent { private final DefaultIssueFinder finder; diff --git a/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java index 24b091e3ab2..3da16a249bb 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java @@ -55,6 +55,8 @@ import java.util.Map; /** * All the issue features that are not published to public API. + * + * @since 3.6 */ public class InternalRubyIssueService implements ServerComponent { diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java index 3f9101e226c..809538a6f57 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java @@ -30,6 +30,9 @@ import org.sonar.server.user.UserSession; import java.util.Collection; import java.util.List; +/** + * @since 3.6 + */ public class IssueChangelogService implements ServerComponent { private final IssueChangeDao changeDao; diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java index ba8962c757f..10528901b28 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java @@ -39,6 +39,9 @@ import org.sonar.server.user.UserSession; import java.util.Arrays; import java.util.Date; +/** + * @since 3.6 + */ public class IssueCommentService implements ServerComponent { private final IssueUpdater updater; diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueFilterResult.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueFilterResult.java index 6f317e86c69..d1769f80350 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/IssueFilterResult.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueFilterResult.java @@ -23,6 +23,9 @@ package org.sonar.server.issue; import org.sonar.api.issue.IssueQuery; import org.sonar.api.issue.IssueQueryResult; +/** + * @since 3.7 + */ public class IssueFilterResult { private IssueQueryResult issueQueryResult; diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueFilterService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueFilterService.java index 94458ab3589..9c22a237e24 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/IssueFilterService.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueFilterService.java @@ -44,6 +44,9 @@ import java.util.Map; import static com.google.common.collect.Lists.newArrayList; +/** + * @since 3.7 + */ public class IssueFilterService implements ServerComponent { private final IssueFilterDao issueFilterDao; @@ -72,7 +75,10 @@ public class IssueFilterService implements ServerComponent { @CheckForNull public DefaultIssueFilter findById(Long id) { IssueFilterDto issueFilterDto = issueFilterDao.selectById(id); - return issueFilterDto.toIssueFilter(); + if (issueFilterDto != null) { + return issueFilterDto.toIssueFilter(); + } + return null; } public List findByUser(UserSession userSession) { diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java index 561272244d4..e0cbf41b4c5 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java @@ -38,6 +38,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +/** + * @since 3.6 + */ public class IssueStatsFinder implements ServerComponent { private final IssueStatsDao issuestatsDao; diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java b/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java index 9862a23d8ef..786b5f25b68 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java @@ -29,6 +29,9 @@ import java.util.Collection; import java.util.Date; import java.util.List; +/** + * @since 3.6 + */ class IssuesFinderSort { private List issues; diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java b/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java index ad1fce39df3..6c84ad9c2f0 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java @@ -28,6 +28,9 @@ import org.sonar.core.resource.ResourceDao; import org.sonar.core.resource.ResourceDto; import org.sonar.core.resource.ResourceQuery; +/** + * @since 3.6 + */ public class ServerIssueStorage extends IssueStorage implements ServerComponent { private final ResourceDao resourceDao; -- 2.39.5