From 6cfd531766b90df62d7ed1eb9ecb0c9172c92007 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 3 Jan 2014 17:17:41 +0100 Subject: [PATCH] SONAR-4776 Fix WS and UI due to introduction of issue change creation date --- .../src/main/webapp/WEB-INF/app/models/issue.rb | 3 +-- .../WEB-INF/app/views/issue/_changelog.html.erb | 2 +- .../java/org/sonar/wsclient/issue/IssueChange.java | 4 +--- .../wsclient/issue/internal/DefaultIssueChange.java | 8 ++------ .../wsclient/issue/internal/IssueJsonParserTest.java | 12 ++++-------- 5 files changed, 9 insertions(+), 20 deletions(-) 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 c8325772718..e3314ec66de 100644 --- 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 4b95f4b330b..15827f5df3f 100644 --- 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) %> - <%= format_datetime(change.createdAt()) -%> + <%= format_datetime(change.creationDate()) -%> <%= h(user.name()) if user -%> <% 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 d7fb2f8afc8..01cca570c7f 100644 --- 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 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 382cb5d6835..325933a1640 100644 --- 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 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 461268d8fbc..795431389a3 100644 --- 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); -- 2.39.5