Add fUpdateAge on Issue show WS

3 files changed, 12 insertions, 1 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java
index 463515e35be..c8e5f77fd87 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java
@@ -118,6 +118,7 @@ public class IssueShowWsHandler implements RequestHandler {
       .prop("fCreationDate", formatDate(issue.creationDate()))
       .prop("updateDate", updateDate != null ? DateUtils.formatDateTime(updateDate) : null)
       .prop("fUpdateDate", formatDate(updateDate))
+      .prop("fUpdateAge", formatAgeDate(updateDate))
       .prop("closeDate", closeDate != null ? DateUtils.formatDateTime(closeDate) : null)
       .prop("fCloseDate", formatDate(issue.closeDate()));
 
@@ -177,7 +178,7 @@ public class IssueShowWsHandler implements RequestHandler {
         .prop("raw", comment.markdownText())
         .prop("html", Markdown.convertToHtml(comment.markdownText()))
         .prop("createdAt", DateUtils.formatDateTime(comment.createdAt()))
-        .prop("fCreatedAge", i18n.ageFromNow(UserSession.get().locale(), comment.createdAt()))
+        .prop("fCreatedAge", formatAgeDate(comment.createdAt()))
         .prop("updatable", UserSession.get().isLoggedIn() && UserSession.get().login().equals(comment.userLogin()))
         .endObject();
     }
@@ -221,4 +222,12 @@ public class IssueShowWsHandler implements RequestHandler {
     }
     return null;
   }
+
+  @CheckForNull
+  private String formatAgeDate(@Nullable Date date) {
+    if (date != null) {
+      return i18n.ageFromNow(UserSession.get().locale(), date);
+    }
+    return null;
+  }
 }
diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java
index 1c0983d4d0c..7ef9cb93c40 100644
--- a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java
@@ -195,6 +195,7 @@ public class IssueShowWsHandlerTest {
 
     when(i18n.formatDateTime(any(Locale.class), eq(creationDate))).thenReturn("Jan 22, 2014 10:03 AM");
     when(i18n.formatDateTime(any(Locale.class), eq(updateDate))).thenReturn("Jan 23, 2014 10:03 AM");
+    when(i18n.ageFromNow(any(Locale.class), eq(updateDate))).thenReturn("9 days");
     when(i18n.formatDateTime(any(Locale.class), eq(closedDate))).thenReturn("Jan 24, 2014 10:03 AM");
 
     MockUserSession.set();
diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_dates.json b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_dates.json
index 21b27b9187e..9de9bd41d9d 100644
--- a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_dates.json
+++ b/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowWsHandlerTest/show_issue_with_dates.json
@@ -12,6 +12,7 @@
     "fCreationDate": "Jan 22, 2014 10:03 AM",
     "updateDate": "2014-01-23T19:10:03+0100",
     "fUpdateDate": "Jan 23, 2014 10:03 AM",
+    "fUpdateAge": "9 days",
     "closeDate": "2014-01-24T19:10:03+0100",
     "fCloseDate": "Jan 24, 2014 10:03 AM",
     "transitions": [],