clean up dependency on static IssueStorage#insertChanges

and move IssueStorage to server-common

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStep.java

@@ -40,14 +40,16 @@ public class PersistIssuesStep implements ComputationStep {
   private final UpdateConflictResolver conflictResolver;
   private final RuleRepository ruleRepository;
   private final IssueCache issueCache;
+  private final IssueStorage issueStorage;
 
   public PersistIssuesStep(DbClient dbClient, System2 system2, UpdateConflictResolver conflictResolver,
-    RuleRepository ruleRepository, IssueCache issueCache) {
+    RuleRepository ruleRepository, IssueCache issueCache, IssueStorage issueStorage) {
     this.dbClient = dbClient;
     this.system2 = system2;
     this.conflictResolver = conflictResolver;
     this.ruleRepository = ruleRepository;
     this.issueCache = issueCache;
+    this.issueStorage = issueStorage;
   }
 
   @Override
@@ -61,7 +63,7 @@ public void execute() {
         DefaultIssue issue = issues.next();
         boolean saved = persistIssueIfRequired(mapper, issue);
         if (saved) {
-          IssueStorage.insertChanges(changeMapper, issue);
+          issueStorage.insertChanges(changeMapper, issue);
         }
       }
       dbSession.flushStatements();

server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepTest.java

@@ -50,6 +50,7 @@
 import org.sonar.db.rule.RuleDefinitionDto;
 import org.sonar.db.rule.RuleTesting;
 import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.server.issue.IssueStorage;
 import org.sonar.server.rule.ExternalRuleCreator;
 import org.sonar.server.util.cache.DiskCache;
 
@@ -79,7 +80,6 @@ public class PersistIssuesStepTest extends BaseStepTest {
 
   private DbSession session = db.getSession();
   private DbClient dbClient = db.getDbClient();
-  private System2 system2;
   private IssueCache issueCache;
   private ComputationStep step;
 
@@ -93,11 +93,11 @@ protected ComputationStep step() {
   @Before
   public void setup() throws Exception {
     issueCache = new IssueCache(temp.newFile(), System2.INSTANCE);
-    system2 = mock(System2.class);
+    System2 system2 = mock(System2.class);
     when(system2.now()).thenReturn(NOW);
     reportReader.setMetadata(ScannerReport.Metadata.getDefaultInstance());
 
-    step = new PersistIssuesStep(dbClient, system2, new UpdateConflictResolver(), new RuleRepositoryImpl(externalRuleCreator, dbClient, analysisMetadataHolder), issueCache);
+    step = new PersistIssuesStep(dbClient, system2, new UpdateConflictResolver(), new RuleRepositoryImpl(externalRuleCreator, dbClient, analysisMetadataHolder), issueCache, new IssueStorage());
   }
 
   @After

server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java

@@ -95,6 +95,7 @@
 import org.sonar.server.extension.CoreExtensionStopper;
 import org.sonar.server.favorite.FavoriteUpdater;
 import org.sonar.server.issue.IssueFieldsSetter;
+import org.sonar.server.issue.IssueStorage;
 import org.sonar.server.issue.index.IssueIndex;
 import org.sonar.server.issue.index.IssueIndexer;
 import org.sonar.server.issue.index.IssueIteratorFactory;
@@ -404,6 +405,7 @@ private static void populateLevel4(ComponentContainer container, Props props) {
       ViewIndex.class,
 
       // issues
+      IssueStorage.class,
       IssueIndexer.class,
       IssueIteratorFactory.class,
       PermissionIndexer.class,

server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java

@@ -97,7 +97,7 @@ public void test_real_start() throws IOException {
       assertThat(picoContainer.getComponentAdapters())
         .hasSize(
           CONTAINER_ITSELF
-            + 71 // level 4
+            + 72 // level 4
             + 6 // content of CeConfigurationModule
             + 4 // content of CeQueueModule
             + 4 // content of CeHttpModule

server/sonar-server-common/src/main/java/org/sonar/server/issue/IssueStorage.java

@@ -0,0 +1,47 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.
+ */
+package org.sonar.server.issue;
+
+import org.sonar.core.issue.DefaultIssue;
+import org.sonar.core.issue.DefaultIssueComment;
+import org.sonar.core.issue.FieldDiffs;
+import org.sonar.db.issue.IssueChangeDto;
+import org.sonar.db.issue.IssueChangeMapper;
+
+public class IssueStorage {
+  public void insertChanges(IssueChangeMapper mapper, DefaultIssue issue) {
+    for (DefaultIssueComment comment : issue.defaultIssueComments()) {
+      if (comment.isNew()) {
+        IssueChangeDto changeDto = IssueChangeDto.of(comment);
+        mapper.insert(changeDto);
+      }
+    }
+    FieldDiffs diffs = issue.currentChange();
+    if (issue.isCopied()) {
+      for (FieldDiffs d : issue.changes()) {
+        IssueChangeDto changeDto = IssueChangeDto.of(issue.key(), d);
+        mapper.insert(changeDto);
+      }
+    } else if (!issue.isNew() && diffs != null) {
+      IssueChangeDto changeDto = IssueChangeDto.of(issue.key(), diffs);
+      mapper.insert(changeDto);
+    }
+  }
+}

server/sonar-server/src/main/java/org/sonar/server/issue/IssueUpdater.java

@@ -45,12 +45,12 @@
 public class IssueUpdater {
 
   private final DbClient dbClient;
-  private final IssueStorage issueStorage;
+  private final WebIssueStorage issueStorage;
   private final NotificationManager notificationService;
   private final IssueChangePostProcessor issueChangePostProcessor;
 
-  public IssueUpdater(DbClient dbClient, IssueStorage issueStorage, NotificationManager notificationService,
-    IssueChangePostProcessor issueChangePostProcessor) {
+  public IssueUpdater(DbClient dbClient, WebIssueStorage issueStorage, NotificationManager notificationService,
+                      IssueChangePostProcessor issueChangePostProcessor) {
     this.dbClient = dbClient;
     this.issueStorage = issueStorage;
     this.notificationService = notificationService;

server/sonar-server/src/main/java/org/sonar/server/issue/IssueStorage.java → server/sonar-server/src/main/java/org/sonar/server/issue/WebIssueStorage.java

@@ -29,16 +29,16 @@
 import org.sonar.api.issue.Issue;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RuleFinder;
+import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.System2;
 import org.sonar.core.issue.DefaultIssue;
-import org.sonar.core.issue.DefaultIssueComment;
-import org.sonar.core.issue.FieldDiffs;
 import org.sonar.db.BatchSession;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
-import org.sonar.db.issue.IssueChangeDto;
+import org.sonar.db.component.ComponentDto;
 import org.sonar.db.issue.IssueChangeMapper;
 import org.sonar.db.issue.IssueDto;
+import org.sonar.server.issue.index.IssueIndexer;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.collect.Lists.newArrayList;
@@ -51,19 +51,20 @@
  * <li>once at the end of scan, even on multi-module projects</li>
  * <li>on each server-side action initiated by UI or web service</li>
  * </ul>
- *
- * @since 3.6
  */
-public abstract class IssueStorage {
+@ServerSide
+public class WebIssueStorage extends IssueStorage {
 
   private final System2 system2;
   private final RuleFinder ruleFinder;
   private final DbClient dbClient;
+  private final IssueIndexer indexer;
 
-  protected IssueStorage(System2 system2, DbClient dbClient, RuleFinder ruleFinder) {
+  public WebIssueStorage(System2 system2, DbClient dbClient, RuleFinder ruleFinder, IssueIndexer indexer) {
     this.system2 = system2;
     this.dbClient = dbClient;
     this.ruleFinder = ruleFinder;
+    this.indexer = indexer;
   }
 
   protected DbClient getDbClient() {
@@ -103,8 +104,8 @@ private Collection<IssueDto> doSave(DbSession dbSession, Iterable<DefaultIssue>
       .collect(toSet(issuesToInsert.size() + issuesToUpdate.size()));
   }
 
-  protected void doAfterSave(DbSession dbSession, Collection<IssueDto> issues) {
-    // overridden on server-side to index ES
+  private void doAfterSave(DbSession dbSession, Collection<IssueDto> issues) {
+    indexer.commitAndIndexIssues(dbSession, issues);
   }
 
   /**
@@ -128,7 +129,23 @@ private Collection<IssueDto> insert(DbSession session, Iterable<DefaultIssue> is
     return inserted;
   }
 
-  protected abstract IssueDto doInsert(DbSession batchSession, long now, DefaultIssue issue);
+  private IssueDto doInsert(DbSession session, long now, DefaultIssue issue) {
+    ComponentDto component = component(session, issue);
+    ComponentDto project = project(session, issue);
+    int ruleId = rule(issue).getId();
+    IssueDto dto = IssueDto.toDtoForServerInsert(issue, component, project, ruleId, now);
+
+    getDbClient().issueDao().insert(session, dto);
+    return dto;
+  }
+
+  ComponentDto component(DbSession session, DefaultIssue issue) {
+    return getDbClient().componentDao().selectOrFailByUuid(session, issue.componentUuid());
+  }
+
+  ComponentDto project(DbSession session, DefaultIssue issue) {
+    return getDbClient().componentDao().selectOrFailByUuid(session, issue.projectUuid());
+  }
 
   /**
    * @return the keys of the updated issues
@@ -149,25 +166,10 @@ private Collection<IssueDto> update(List<DefaultIssue> issuesToUpdate, long now)
     return updated;
   }
 
-  protected abstract IssueDto doUpdate(DbSession batchSession, long now, DefaultIssue issue);
-
-  public static void insertChanges(IssueChangeMapper mapper, DefaultIssue issue) {
-    for (DefaultIssueComment comment : issue.defaultIssueComments()) {
-      if (comment.isNew()) {
-        IssueChangeDto changeDto = IssueChangeDto.of(comment);
-        mapper.insert(changeDto);
-      }
-    }
-    FieldDiffs diffs = issue.currentChange();
-    if (issue.isCopied()) {
-      for (FieldDiffs d : issue.changes()) {
-        IssueChangeDto changeDto = IssueChangeDto.of(issue.key(), d);
-        mapper.insert(changeDto);
-      }
-    } else if (!issue.isNew() && diffs != null) {
-      IssueChangeDto changeDto = IssueChangeDto.of(issue.key(), diffs);
-      mapper.insert(changeDto);
-    }
+  private IssueDto doUpdate(DbSession session, long now, DefaultIssue issue) {
+    IssueDto dto = IssueDto.toDtoForUpdate(issue, now);
+    getDbClient().issueDao().update(session, dto);
+    return dto;
   }
 
   protected Rule rule(Issue issue) {

server/sonar-server/src/main/java/org/sonar/server/issue/ws/BulkChangeAction.java

@@ -55,7 +55,7 @@
 import org.sonar.server.issue.AddTagsAction;
 import org.sonar.server.issue.AssignAction;
 import org.sonar.server.issue.IssueChangePostProcessor;
-import org.sonar.server.issue.IssueStorage;
+import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.RemoveTagsAction;
 import org.sonar.server.issue.notification.IssueChangeNotification;
 import org.sonar.server.notification.NotificationManager;
@@ -107,12 +107,12 @@ public class BulkChangeAction implements IssuesWsAction {
   private final System2 system2;
   private final UserSession userSession;
   private final DbClient dbClient;
-  private final IssueStorage issueStorage;
+  private final WebIssueStorage issueStorage;
   private final NotificationManager notificationService;
   private final List<Action> actions;
   private final IssueChangePostProcessor issueChangePostProcessor;
 
-  public BulkChangeAction(System2 system2, UserSession userSession, DbClient dbClient, IssueStorage issueStorage,
+  public BulkChangeAction(System2 system2, UserSession userSession, DbClient dbClient, WebIssueStorage issueStorage,
     NotificationManager notificationService, List<Action> actions,
     IssueChangePostProcessor issueChangePostProcessor) {
     this.system2 = system2;

server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java

@@ -23,8 +23,8 @@
 import org.sonar.server.issue.IssueFieldsSetter;
 import org.sonar.server.issue.IssueFinder;
 import org.sonar.server.issue.IssueQueryFactory;
+import org.sonar.server.issue.WebIssueStorage;
 import org.sonar.server.issue.IssueUpdater;
-import org.sonar.server.issue.ServerIssueStorage;
 import org.sonar.server.issue.TransitionService;
 import org.sonar.server.issue.workflow.FunctionExecutor;
 import org.sonar.server.issue.workflow.IssueWorkflow;
@@ -40,7 +40,7 @@ protected void configureModule() {
       IssueUpdater.class,
       IssueFinder.class,
       TransitionService.class,
-      ServerIssueStorage.class,
+      WebIssueStorage.class,
       IssueFieldsSetter.class,
       FunctionExecutor.class,
       IssueWorkflow.class,