SONAR-4776 Fix WS and UI due to introduction of issue change creation date

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb
index c8325772718cb37315ae387b0b449f881a3860c0..e3314ec66deaf3019e069bb9b94d46b380d1c1ba 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb
@@ -64,8 +64,7 @@ class Issue
 
       hash_change = {}
       hash_change[:user] = user.login() if user
-      hash_change[:createdAt] = Api::Utils.format_datetime(change.createdAt()) if change.createdAt()
-      hash_change[:updatedAt] = Api::Utils.format_datetime(change.updatedAt()) if change.updatedAt()
+      hash_change[:creationDate] = Api::Utils.format_datetime(change.creationDate()) if change.creationDate()
       hash_change[:diffs] = []
 
       change.diffs.entrySet().each do |entry|

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb
index 4b95f4b330b39e6537e79da3dd7e4bbebfe9bb25..15827f5df3f275e889b51eb10a7e76e5a0520069 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb
@@ -9,7 +9,7 @@
        user = @changelog.user(change)
   %>
     <tr>
-      <td class="thin left top" nowrap><%= format_datetime(change.createdAt()) -%></td>
+      <td class="thin left top" nowrap><%= format_datetime(change.creationDate()) -%></td>
       <td class="thin left top" nowrap><%= h(user.name()) if user -%></td>
       <td class="left top">
         <%

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueChange.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueChange.java
index d7fb2f8afc867ae930dd5961e95469f975168975..01cca570c7f93b71fc66dbaf382a656c6dfddd25 100644 (file)
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueChange.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueChange.java
@@ -29,9 +29,7 @@ public interface IssueChange {
 
   String user();
 
-  Date createdAt();
-
-  Date updatedAt();
+  Date creationDate();
 
   List<IssueChangeDiff> diffs();
 

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssueChange.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssueChange.java
index 382cb5d6835bdc20289788ecd543bb791d50a6d1..325933a164007bd6cf7bd2d7395fcfe09cb91af0 100644 (file)
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssueChange.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssueChange.java
@@ -43,12 +43,8 @@ public class DefaultIssueChange implements IssueChange {
     return JsonUtils.getString(json, "user");
   }
 
-  public Date createdAt() {
-    return JsonUtils.getDateTime(json, "createdAt");
-  }
-
-  public Date updatedAt() {
-    return JsonUtils.getDateTime(json, "updatedAt");
+  public Date creationDate() {
+    return JsonUtils.getDateTime(json, "creationDate");
   }
 
   public List<IssueChangeDiff> diffs() {

diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/internal/IssueJsonParserTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/internal/IssueJsonParserTest.java
index 461268d8fbc84f66a3b7320b858006d0b205c2c6..795431389a3b5fd901f0b1241679dda040237e81 100644 (file)
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/internal/IssueJsonParserTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/internal/IssueJsonParserTest.java
@@ -217,8 +217,7 @@ public class IssueJsonParserTest {
     assertThat(changes).hasSize(2);
     IssueChange change1 = changes.get(0);
     assertThat(change1.user()).isEqualTo("julien");
-    assertThat(change1.createdAt().getTime()).isEqualTo(1383202235000l);
-    assertThat(change1.updatedAt().getTime()).isEqualTo(1383202235000l);
+    assertThat(change1.creationDate().getTime()).isEqualTo(1383202235000l);
     assertThat(change1.diffs()).hasSize(1);
     IssueChangeDiff diffChange1 = change1.diffs().get(0);
     assertThat(diffChange1.key()).isEqualTo("actionPlan");
@@ -227,8 +226,7 @@ public class IssueJsonParserTest {
 
     IssueChange change2 = changes.get(1);
     assertThat(change2.user()).isEqualTo("simon");
-    assertThat(change2.createdAt().getTime()).isEqualTo(1383202239000l);
-    assertThat(change2.updatedAt().getTime()).isEqualTo(1383202239000l);
+    assertThat(change2.creationDate().getTime()).isEqualTo(1383202239000l);
     assertThat(change2.diffs()).hasSize(2);
     IssueChangeDiff diff1Change2 = change2.diffs().get(0);
     assertThat(diff1Change2.key()).isEqualTo("severity");
@@ -248,8 +246,7 @@ public class IssueJsonParserTest {
     assertThat(changes).hasSize(1);
     IssueChange change = changes.get(0);
     assertThat(change.user()).isEqualTo("julien");
-    assertThat(change.createdAt().getTime()).isEqualTo(1383202235000l);
-    assertThat(change.updatedAt().getTime()).isEqualTo(1383202235000l);
+    assertThat(change.creationDate().getTime()).isEqualTo(1383202235000l);
 
     assertThat(change.diffs()).hasSize(1);
     IssueChangeDiff changeDiff = change.diffs().get(0);
@@ -274,8 +271,7 @@ public class IssueJsonParserTest {
     assertThat(changes).hasSize(1);
     IssueChange change = changes.get(0);
     assertThat(change.user()).isEqualTo("julien");
-    assertThat(change.createdAt().getTime()).isEqualTo(1383202235000l);
-    assertThat(change.updatedAt().getTime()).isEqualTo(1383202235000l);
+    assertThat(change.creationDate().getTime()).isEqualTo(1383202235000l);
 
     assertThat(change.diffs()).hasSize(1);
     IssueChangeDiff changeDiff = change.diffs().get(0);