From b93b7345a451fc032d34dbda78e207eeca41d125 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 23 Jul 2018 16:50:38 +0200 Subject: [PATCH] Remove unused methods in WebIssueStorage --- .../server/notification/NotificationService.java | 4 ++-- .../org/sonar/server/issue/IssueUpdater.java | 2 +- .../org/sonar/server/issue/WebIssueStorage.java | 16 +--------------- .../sonar/server/issue/ws/BulkChangeAction.java | 2 +- .../sonar/server/issue/WebIssueStorageTest.java | 13 +++++++------ 5 files changed, 12 insertions(+), 25 deletions(-) diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/notification/NotificationService.java b/server/sonar-server-common/src/main/java/org/sonar/server/notification/NotificationService.java index 31a7fc5a5ac..754380cbbae 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/notification/NotificationService.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/notification/NotificationService.java @@ -95,8 +95,8 @@ public class NotificationService { } /** - * Returns true if at least one user is subscribed to at least one notifications with given types. - * Subscription can be globally or on the specific project. + * Returns true if at least one user is subscribed to at least one notification with given types. + * Subscription can be global or on the specific project. */ public boolean hasProjectSubscribersForTypes(String projectUuid, Set notificationTypes) { Collection dispatcherKeys = new ArrayList<>(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java index 594ebc48dbd..5dd75eddb28 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java @@ -91,7 +91,7 @@ public class IssueUpdater { private IssueDto doSaveIssue(DbSession session, DefaultIssue issue, IssueChangeContext context, @Nullable String comment, Optional rule, ComponentDto project, ComponentDto component) { - IssueDto issueDto = issueStorage.save(session, issue); + IssueDto issueDto = issueStorage.save(session, singletonList(issue)).iterator().next(); if (issue.type() != RuleType.SECURITY_HOTSPOT) { String assigneeUuid = issue.assignee(); UserDto assignee = assigneeUuid == null ? null : dbClient.userDao().selectByUuid(session, assigneeUuid); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/WebIssueStorage.java b/server/sonar-server/src/main/java/org/sonar/server/issue/WebIssueStorage.java index 27f4b214b67..b3875328c52 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/WebIssueStorage.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/WebIssueStorage.java @@ -71,21 +71,7 @@ public class WebIssueStorage extends IssueStorage { return dbClient; } - public void save(DefaultIssue issue) { - save(newArrayList(issue)); - } - - public IssueDto save(DbSession session, DefaultIssue issue) { - return doSave(session, newArrayList(issue)).iterator().next(); - } - - public Collection save(Iterable issues) { - try (DbSession session = dbClient.openSession(true)) { - return doSave(session, issues); - } - } - - private Collection doSave(DbSession dbSession, Iterable issues) { + public Collection save(DbSession dbSession, Iterable issues) { // Batch session can not be used for updates. It does not return the number of updated rows, // required for detecting conflicts. long now = system2.now(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java index 32abb96c1a0..85670f5fbf7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java @@ -197,7 +197,7 @@ public class BulkChangeAction implements IssuesWsAction { List items = bulkChangeData.issues.stream() .filter(bulkChange(issueChangeContext, bulkChangeData, result)) .collect(MoreCollectors.toList()); - issueStorage.save(items); + issueStorage.save(dbSession, items); refreshLiveMeasures(dbSession, bulkChangeData, result); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java index 788decf1177..31b29cfe98f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java @@ -43,6 +43,7 @@ import org.sonar.db.organization.OrganizationDto; import org.sonar.db.rule.RuleDefinitionDto; import org.sonar.server.issue.index.IssueIndexer; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -61,8 +62,8 @@ public class WebIssueStorageTest { private WebIssueStorage underTest = new WebIssueStorage(system2, dbClient, new FakeRuleFinder(), mock(IssueIndexer.class)); @Before - public void setupDbClient() { - when(system2.now()).thenReturn(2000000000L); + public void setup() { + when(system2.now()).thenReturn(2_000_000_000L); } @Test @@ -118,7 +119,7 @@ public class WebIssueStorageTest { .setUpdateDate(date) .setCloseDate(date); - underTest.save(issue); + underTest.save(db.getSession(), singletonList(issue)); assertThat(db.countRowsOfTable("issues")).isEqualTo(1); assertThat(db.selectFirst("select * from issues")) @@ -162,7 +163,7 @@ public class WebIssueStorageTest { .setUpdateDate(date) .setCloseDate(date); - underTest.save(issue); + underTest.save(db.getSession(), singletonList(issue)); assertThat(db.countRowsOfTable("issues")).isEqualTo(1); assertThat(db.countRowsOfTable("issue_changes")).isEqualTo(0); @@ -195,7 +196,7 @@ public class WebIssueStorageTest { .setComponentKey("struts:Action") .setProjectKey("struts"); - underTest.save(updated); + underTest.save(db.getSession(), singletonList(updated)); assertThat(db.countRowsOfTable("issues")).isEqualTo(1); assertThat(db.selectFirst("select * from issues")) @@ -223,7 +224,7 @@ public class WebIssueStorageTest { .containsExactlyInAnyOrder("severity=INFO|BLOCKER", "diff", "user_uuid"); } - static class FakeRuleFinder implements RuleFinder { + private static class FakeRuleFinder implements RuleFinder { @Override public Rule findById(int ruleId) { -- 2.39.5