SONAR-6582 Revert to old serialization format for search, start putti…

…ng referential data in write action responses
SonarSource · Jun 19, 2015 · 0eaa521 · 0eaa521
1 parent ef9cd05
commit 0eaa521
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 52 deletions.
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
@@ -75,6 +75,7 @@
 import org.sonar.server.search.QueryContext;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.user.index.UserIndex;
+import org.sonar.server.user.ws.UserJsonWriter;
 import org.sonar.server.util.RubyUtils;
 import org.sonar.server.util.Validation;
 
@@ -112,6 +113,7 @@ public class InternalRubyIssueService {
   private final UserIndex userIndex;
   private final DbClient dbClient;
   private final UserSession userSession;
+  private final UserJsonWriter userWriter;
 
   public InternalRubyIssueService(
     IssueService issueService,
@@ -121,7 +123,7 @@ public InternalRubyIssueService(
     ResourceDao resourceDao, ActionService actionService,
     IssueFilterService issueFilterService, IssueBulkChangeService issueBulkChangeService,
     IssueJsonWriter issueWriter, IssueComponentHelper issueComponentHelper, UserIndex userIndex, DbClient dbClient,
-    UserSession userSession) {
+    UserSession userSession, UserJsonWriter userWriter) {
     this.issueService = issueService;
     this.issueQueryService = issueQueryService;
     this.commentService = commentService;
@@ -136,6 +138,7 @@ public InternalRubyIssueService(
     this.userIndex = userIndex;
     this.dbClient = dbClient;
     this.userSession = userSession;
+    this.userWriter = userWriter;
   }
 
   public Issue getIssueByKey(String issueKey) {
@@ -699,7 +702,11 @@ public boolean isUserIssueAdmin(String projectUuid) {
    * @param issue
    * @return the JSON representation of the modified issue, as a ready to use string
    */
-  public String writeIssueJson(Issue issue) {
+  public String writeIssueJson(@Nullable Issue issue) {
+    if (issue == null) {
+      return "{}";
+    }
+
     StringWriter writer = new StringWriter();
     JsonWriter json = JsonWriter.of(writer);
     DbSession dbSession = dbClient.openSession(false);
@@ -738,6 +745,14 @@ public String writeIssueJson(Issue issue) {
         ImmutableMultimap.<String, DefaultIssueComment>of(),
         ImmutableMap.<String, ActionPlan>of(),
         ImmutableList.of(IssueJsonWriter.ACTIONS_EXTRA_FIELD, IssueJsonWriter.TRANSITIONS_EXTRA_FIELD));
+
+      json.name("users").beginArray();
+      String assignee = issue.assignee();
+      if (assignee != null && usersByLogin.containsKey(assignee)) {
+        userWriter.write(json, usersByLogin.get(assignee));
+      }
+      json.endArray();
+
       json.endObject().close();
     } finally {
       MyBatis.closeQuietly(dbSession);
@@ -748,11 +763,13 @@ public String writeIssueJson(Issue issue) {
 
   private Map<String, User> getIssueUsersByLogin(Issue issue) {
     Map<String, User> usersByLogin = Maps.newHashMap();
-    if (issue.assignee() != null) {
+    String assignee = issue.assignee();
-      usersByLogin.put(issue.assignee(), userIndex.getByLogin(issue.assignee()));
+    if (assignee != null) {
+      usersByLogin.put(assignee, userIndex.getByLogin(assignee));
     }
-    if (issue.reporter() != null) {
+    String reporter = issue.reporter();
-      usersByLogin.put(issue.reporter(), userIndex.getByLogin(issue.reporter()));
+    if (reporter != null) {
+      usersByLogin.put(reporter, userIndex.getByLogin(reporter));
     }
     return usersByLogin;
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueJsonWriter.java
@@ -42,7 +42,6 @@
 import org.sonar.core.component.ComponentDto;
 import org.sonar.markdown.Markdown;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.user.ws.UserJsonWriter;
 
 public class IssueJsonWriter {
 
@@ -57,14 +56,12 @@ public class IssueJsonWriter {
   private final I18n i18n;
   private final Durations durations;
   private final UserSession userSession;
-  private final UserJsonWriter userWriter;
   private final IssueActionsWriter actionsWriter;
 
-  public IssueJsonWriter(I18n i18n, Durations durations, UserSession userSession, UserJsonWriter userWriter, IssueActionsWriter actionsWriter) {
+  public IssueJsonWriter(I18n i18n, Durations durations, UserSession userSession, IssueActionsWriter actionsWriter) {
     this.i18n = i18n;
     this.durations = durations;
     this.userSession = userSession;
-    this.userWriter = userWriter;
     this.actionsWriter = actionsWriter;
   }
 
@@ -98,18 +95,14 @@ public void write(JsonWriter json, Issue issue, Map<String, User> usersByLogin,
       .prop("message", issue.message())
       .prop("line", issue.line())
       .prop("debt", debt != null ? durations.encode(debt) : null)
+      .prop("assignee", issue.assignee())
       .prop("reporter", issue.reporter())
       .prop("author", issue.authorLogin())
       .prop("actionPlan", actionPlanKey)
       .prop("creationDate", isoDate(issue.creationDate()))
       .prop("updateDate", isoDate(updateDate))
-      // TODO Remove as part of Front-end rework on Issue Domain
-      .prop("fUpdateAge", formatAgeDate(updateDate))
       .prop("closeDate", isoDate(issue.closeDate()));
 
-    json.name("assignee");
-    userWriter.write(json, usersByLogin.get(issue.assignee()));
-
     writeTags(issue, json);
     writeIssueComments(commentsByIssues.get(issue.key()), usersByLogin, json);
     writeIssueAttributes(issue, json);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java
@@ -54,6 +54,7 @@
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.user.ThreadLocalUserSession;
 import org.sonar.server.user.index.UserIndex;
+import org.sonar.server.user.ws.UserJsonWriter;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Maps.newHashMap;
@@ -101,6 +102,8 @@ public class InternalRubyIssueServiceTest {
 
   DbSession dbSession;
 
+  UserJsonWriter userWriter;
+
   @Before
   public void setUp() {
     issueService = mock(IssueService.class);
@@ -117,12 +120,13 @@ public void setUp() {
     userIndex = mock(UserIndex.class);
     dbClient = mock(DbClient.class);
     dbSession = mock(DbSession.class);
+    userWriter = mock(UserJsonWriter.class);
 
     ResourceDto project = new ResourceDto().setKey("org.sonar.Sample");
     when(resourceDao.getResource(any(ResourceQuery.class))).thenReturn(project);
 
     service = new InternalRubyIssueService(issueService, issueQueryService, commentService, changelogService, actionPlanService, resourceDao, actionService,
-      issueFilterService, issueBulkChangeService, issueWriter, issueComponentHelper, userIndex, dbClient, userSessionRule);
+      issueFilterService, issueBulkChangeService, issueWriter, issueComponentHelper, userIndex, dbClient, userSessionRule, userWriter);
   }
 
   @Test

diff --git a/.../sonar/server/issue/ws/SearchActionComponentsMediumTest/issues_on_different_projects.json b/.../sonar/server/issue/ws/SearchActionComponentsMediumTest/issues_on_different_projects.json
@@ -8,8 +8,7 @@
       "status": "OPEN",
       "resolution": "OPEN",
       "severity": "MAJOR",
-      "updateDate": "2017-12-04T00:00:00+0100",
+      "updateDate": "2017-12-04T00:00:00+0100"
-      "fUpdateAge": "less than a minute"
     },
     {
       "key": "92fd47d4-b650-4037-80bc-7b112bd4eac2",
@@ -19,8 +18,7 @@
       "status": "OPEN",
       "resolution": "OPEN",
       "severity": "MAJOR",
-      "updateDate": "2017-12-04T00:00:00+0100",
+      "updateDate": "2017-12-04T00:00:00+0100"
-      "fUpdateAge": "less than a minute"
     }
   ],
   "components": [

diff --git a/...sources/org/sonar/server/issue/ws/SearchActionMediumTest/assigned_to_me_facet_sticky.json b/...sources/org/sonar/server/issue/ws/SearchActionMediumTest/assigned_to_me_facet_sticky.json
@@ -8,10 +8,7 @@
       "status": "OPEN",
       "severity": "MAJOR",
       "debt": "10min",
-      "fUpdateAge": "less than a minute",
+      "assignee": "alice"
-      "assignee": {
-        "login": "alice"
-      }
     }
   ],
   "facets": [

diff --git a/...r/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json b/...r/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json
@@ -7,8 +7,7 @@
       "rule": "xoo:x1",
       "status": "OPEN",
       "severity": "MAJOR",
-      "debt": "10min",
+      "debt": "10min"
-      "fUpdateAge": "less than a minute"
     }
   ],
   "facets": [

diff --git a/.../test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_zero_facets.json b/.../test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_zero_facets.json
@@ -7,8 +7,7 @@
       "rule": "xoo:x1",
       "status": "OPEN",
       "severity": "MAJOR",
-      "debt": "10min",
+      "debt": "10min"
-      "fUpdateAge": "less than a minute"
     }
   ],
   "facets": [

diff --git a/.../resources/org/sonar/server/issue/ws/SearchActionMediumTest/filter_by_assigned_to_me.json b/.../resources/org/sonar/server/issue/ws/SearchActionMediumTest/filter_by_assigned_to_me.json
@@ -8,10 +8,7 @@
       "status": "OPEN",
       "severity": "MAJOR",
       "debt": "10min",
-      "fUpdateAge": "less than a minute",
+      "assignee": "john"
-      "assignee": {
-        "login": "john"
-      }
     }
   ],
   "facets": [

diff --git a/...erver/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/hide_rules.json b/...erver/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/hide_rules.json
@@ -7,8 +7,7 @@
       "rule": "xoo:x1",
       "status": "OPEN",
       "severity": "MAJOR",
-      "debt": "10min",
+      "debt": "10min"
-      "fUpdateAge": "less than a minute"
     }
   ],
   "rules": []

diff --git a/...nar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue.json b/...nar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue.json
@@ -13,16 +13,10 @@
       "severity": "MAJOR",
       "debt": "10min",
       "author": "John",
-      "assignee": {
+      "assignee": "simon",
-        "login": "simon",
-        "name": "Simon",
-        "active": true,
-        "email": "simon@email.com"
-      },
       "reporter": "fabrice",
       "actionPlan": "AP-ABCD",
-      "updateDate": "2017-12-04T00:00:00+0100",
+      "updateDate": "2017-12-04T00:00:00+0100"
-      "fUpdateAge": "less than a minute"
     }
   ],
   "rules": [

diff --git a/...ources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_linked_on_removed_file.json b/...ources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_linked_on_removed_file.json
@@ -8,8 +8,7 @@
       "status": "OPEN",
       "resolution": "OPEN",
       "severity": "MAJOR",
-      "updateDate": "2017-12-04T00:00:00+0100",
+      "updateDate": "2017-12-04T00:00:00+0100"
-      "fUpdateAge": "less than a minute"
     }
   ],
   "components": [

diff --git a/...t/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_extra_fields.json b/...t/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_extra_fields.json
@@ -2,12 +2,7 @@
   "issues": [
     {
       "key": "82fd47d4-b650-4037-80bc-7b112bd4eac2",
-      "assignee": {
+      "assignee": "simon",
-        "login": "simon",
-        "name": "Simon",
-        "active": true,
-        "email": "simon@email.com"
-      },
       "reporter": "fabrice",
       "reporterName": "Fabrice",
       "actionPlan": "AP-ABCD",

diff --git a/...c/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_snippet.json b/...c/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/issue_with_snippet.json
@@ -17,8 +17,7 @@
       "author": "John",
       "assignee": "simon",
       "reporter": "fabrice",
-      "updateDate": "2014-12-04T00:00:00+0100",
+      "updateDate": "2014-12-04T00:00:00+0100"
-      "fUpdateAge": "less than a minute"
     }
   ],
   "rules": [