From f7af5333aba3718f1e60c67cbd2384e07e853a38 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Lesaint?=
 <sebastien.lesaint@sonarsource.com>
Date: Fri, 6 Dec 2019 14:23:31 +0100
Subject: [PATCH] SONAR-12719 move Changelog to ws-commons.proto

---
 .../server/issue/ws/ChangelogAction.java      |  2 +-
 .../server/issue/ws/ChangelogActionTest.java  |  2 +-
 sonar-ws/src/main/protobuf/ws-commons.proto   | 17 +++++++++++++++++
 sonar-ws/src/main/protobuf/ws-issues.proto    | 19 +------------------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java
index bf8c6e257db..675da21d846 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/ChangelogAction.java
@@ -46,8 +46,8 @@ import org.sonar.db.user.UserDto;
 import org.sonar.server.issue.AvatarResolver;
 import org.sonar.server.issue.IssueFinder;
 import org.sonar.server.user.UserSession;
+import org.sonarqube.ws.Common.Changelog;
 import org.sonarqube.ws.Issues.ChangelogWsResponse;
-import org.sonarqube.ws.Issues.ChangelogWsResponse.Changelog;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.emptyToNull;
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java
index 908ef73ffb2..02aa097e1dd 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java
@@ -42,8 +42,8 @@ import org.sonar.server.issue.IssueFinder;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.WsActionTester;
+import org.sonarqube.ws.Common.Changelog.Diff;
 import org.sonarqube.ws.Issues.ChangelogWsResponse;
-import org.sonarqube.ws.Issues.ChangelogWsResponse.Changelog.Diff;
 
 import static java.util.Optional.ofNullable;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-ws/src/main/protobuf/ws-commons.proto b/sonar-ws/src/main/protobuf/ws-commons.proto
index 46faaf4acef..e688e6212c9 100644
--- a/sonar-ws/src/main/protobuf/ws-commons.proto
+++ b/sonar-ws/src/main/protobuf/ws-commons.proto
@@ -105,6 +105,23 @@ message Location {
   optional string msg = 3;
 }
 
+message Changelog {
+  optional string user = 1;
+  optional string userName = 2;
+  // Email is no more returned since 6.3
+  optional string deprecatedEmail = 3;
+  optional string creationDate = 4;
+  repeated Diff diffs = 5;
+  optional string avatar = 6;
+  optional bool isUserActive = 7;
+
+  message Diff {
+    optional string key = 1;
+    optional string newValue = 2;
+    optional string oldValue = 3;
+  }
+}
+
 message Metric {
   optional string key = 1;
   optional string name = 2;
diff --git a/sonar-ws/src/main/protobuf/ws-issues.proto b/sonar-ws/src/main/protobuf/ws-issues.proto
index a11e01e7aec..7ab70dcbff6 100644
--- a/sonar-ws/src/main/protobuf/ws-issues.proto
+++ b/sonar-ws/src/main/protobuf/ws-issues.proto
@@ -226,24 +226,7 @@ message Component {
 
 // Response of GET api/issues/changelog
 message ChangelogWsResponse {
-  repeated Changelog changelog = 1;
-
-  message Changelog {
-    optional string user = 1;
-    optional string userName = 2;
-    // Email is no more returned since 6.3
-    optional string deprecatedEmail = 3;
-    optional string creationDate = 4;
-    repeated Diff diffs = 5;
-    optional string avatar = 6;
-    optional bool isUserActive = 7;
-
-    message Diff {
-      optional string key = 1;
-      optional string newValue = 2;
-      optional string oldValue = 3;
-    }
-  }
+  repeated sonarqube.ws.commons.Changelog changelog = 1;
 }
 
 // Response of POST api/issues/bulk_change
-- 
2.39.5