From 7696ef7a87b0c72d8236be8f7cdae143514b62aa Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Mon, 11 Sep 2017 15:45:11 +0200 Subject: [PATCH] Fix quality flaws --- .../main/java/org/sonar/db/permission/PermissionQuery.java | 2 +- .../sonar/server/duplication/ws/ShowResponseBuilder.java | 6 +----- .../main/java/org/sonar/server/issue/index/IssueIndex.java | 2 +- .../server/issue/notification/NewIssuesStatistics.java | 5 +---- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/permission/PermissionQuery.java b/server/sonar-db-dao/src/main/java/org/sonar/db/permission/PermissionQuery.java index d70c5f1994c..1d0f3cb6c4d 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/permission/PermissionQuery.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/permission/PermissionQuery.java @@ -183,7 +183,7 @@ public class PermissionQuery { } public PermissionQuery build() { - this.organizationUuid = requireNonNull(organizationUuid, "Organization UUID cannot be null"); + requireNonNull(organizationUuid, "Organization UUID cannot be null"); this.pageIndex = firstNonNull(pageIndex, DEFAULT_PAGE_INDEX); this.pageSize = firstNonNull(pageSize, DEFAULT_PAGE_SIZE); checkArgument(searchQuery == null || searchQuery.length() >= SEARCH_QUERY_MIN_LENGTH, "Search query should contains at least %s characters", SEARCH_QUERY_MIN_LENGTH); diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java index 58e1ac2e7ae..5b6e3955146 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowResponseBuilder.java @@ -74,11 +74,7 @@ public class ShowResponseBuilder { ComponentDto componentDto = duplication.file(); if (componentDto != null) { String componentKey = componentDto.getDbKey(); - ref = refByComponentKey.get(componentKey); - if (ref == null) { - ref = Integer.toString(refByComponentKey.size() + 1); - refByComponentKey.put(componentKey, ref); - } + ref = refByComponentKey.computeIfAbsent(componentKey, k -> Integer.toString(refByComponentKey.size() + 1)); } Block.Builder block = Block.newBuilder(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java index 6172308b6c7..b975c525d9d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java @@ -543,7 +543,7 @@ public class IssueIndex { .offset(offsetInSeconds + "s") // ES dateHistogram bounds are inclusive while createdBefore parameter is exclusive .extendedBounds(new ExtendedBounds(startTime, endTime - (offsetInSeconds*1_000L) -1L)); - dateHistogram = addEffortAggregationIfNeeded(query, dateHistogram); + addEffortAggregationIfNeeded(query, dateHistogram); return Optional.of(dateHistogram); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java index 336e6a8a4bd..b4746bed5f5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesStatistics.java @@ -50,10 +50,7 @@ public class NewIssuesStatistics { } private Stats getOrCreate(String assignee) { - if (assigneesStatistics.get(assignee) == null) { - assigneesStatistics.put(assignee, new Stats()); - } - return assigneesStatistics.get(assignee); + return assigneesStatistics.computeIfAbsent(assignee, a -> new Stats()); } public Map assigneesStatistics() { -- 2.39.5