Remove unused methods in WebIssueStorage

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 31a7fc5a5ac73d90dcdc9ddd55ad97d0d8b86409..754380cbbae733898fc250646f84a7f92eaec7c1 100644 (file)
--- 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<String> notificationTypes) {
     Collection<String> 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 594ebc48dbdfd10b232d03a0787b69f56d06c8d6..5dd75eddb2827c5683e468aa73575afb6de789d9 100644 (file)
--- 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<RuleDefinitionDto> 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 27f4b214b675b110456e60bbd191c59288ec4f75..b3875328c52f6c8a273bc3e9e6597076cca1f0e7 100644 (file)
--- 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<IssueDto> save(Iterable<DefaultIssue> issues) {
-    try (DbSession session = dbClient.openSession(true)) {
-      return doSave(session, issues);
-    }
-  }
-
-  private Collection<IssueDto> doSave(DbSession dbSession, Iterable<DefaultIssue> issues) {
+  public Collection<IssueDto> save(DbSession dbSession, Iterable<DefaultIssue> 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 32abb96c1a08f74b4ef640b6f559d77d6e66ec17..85670f5fbf79b19cecdc616659abd8fe163146ea 100644 (file)
--- 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<DefaultIssue> 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 788decf1177085640719a22f0fa9c32642bc57db..31b29cfe98fb382dbe041178d7853c3888cd2010 100644 (file)
--- 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) {