SONAR-9206 Extract Organization protobuff definition to ws-commons

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
index b936d79a242a98dd2500bfdb32f8e709e7c57eb2..22dc2cd127e647099efc368a083b3c35a102c182 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
@@ -59,7 +59,6 @@ import org.sonar.server.measure.index.ProjectMeasuresQuery;
 import org.sonar.server.project.Visibility;
 import org.sonar.server.user.UserSession;
 import org.sonarqube.ws.Common;
-import org.sonarqube.ws.Components;
 import org.sonarqube.ws.Components.Component;
 import org.sonarqube.ws.Components.SearchProjectsWsResponse;
 
@@ -342,7 +341,7 @@ public class SearchProjectsAction implements ComponentsWsAction {
       .map(response -> {
         organizationsByUuidForAdditionalInfo.values().stream().forEach(
           dto -> response.addOrganizations(
-            Components.Organization.newBuilder()
+            Common.Organization.newBuilder()
               .setKey(dto.getKey())
               .setName(dto.getName())
               .build()));

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java
index 6436512c13ffcfe9e54992342f202258d8a42df5..45eb5c7fc70f284b134ebe8244f575f7a4ab3b10 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SuggestionsAction.java
@@ -72,7 +72,7 @@ import static org.sonar.core.util.stream.MoreCollectors.toSet;
 import static org.sonar.server.component.index.SuggestionQuery.DEFAULT_LIMIT;
 import static org.sonar.server.es.DefaultIndexSettings.MINIMUM_NGRAM_LENGTH;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
-import static org.sonarqube.ws.Components.Organization;
+import static org.sonarqube.ws.Common.Organization;
 import static org.sonarqube.ws.Components.SuggestionsWsResponse.newBuilder;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.ACTION_SUGGESTIONS;
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java
index 5d8c55557c05b27a629077e4ebc054cc146a8c8b..755859ff383162fee50a8f51787270331049563f 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java
@@ -49,7 +49,7 @@ import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
-import org.sonarqube.ws.Components.Organization;
+import org.sonarqube.ws.Common.Organization;
 import org.sonarqube.ws.Components.SuggestionsWsResponse;
 import org.sonarqube.ws.Components.SuggestionsWsResponse.Category;
 import org.sonarqube.ws.Components.SuggestionsWsResponse.Project;

diff --git a/sonar-ws/src/main/protobuf/ws-commons.proto b/sonar-ws/src/main/protobuf/ws-commons.proto
index 947e24876570e55630651063d98e69bbb754cbf0..106a3ab1f6f1b1a2c0eba0a3efea1c917b5a71a6 100644 (file)
--- a/sonar-ws/src/main/protobuf/ws-commons.proto
+++ b/sonar-ws/src/main/protobuf/ws-commons.proto
@@ -129,3 +129,8 @@ enum BranchType {
   SHORT = 2;
   PULL_REQUEST = 3;
 }
+
+message Organization {
+  optional string key = 1;
+  optional string name = 2;
+}

diff --git a/sonar-ws/src/main/protobuf/ws-components.proto b/sonar-ws/src/main/protobuf/ws-components.proto
index 0218de0edeed75e27d4dfd17ddfb077d37de87c0..bd1fbefd23f186ba13535f50c505769d744e919f 100644 (file)
--- a/sonar-ws/src/main/protobuf/ws-components.proto
+++ b/sonar-ws/src/main/protobuf/ws-components.proto
@@ -50,7 +50,7 @@ message ShowWsResponse {
 message SuggestionsWsResponse {
   repeated Category results = 1;
   optional string warning = 2;
-  repeated Organization organizations = 3;
+  repeated sonarqube.ws.commons.Organization organizations = 3;
   repeated Project projects = 4;
 
   message Category {
@@ -78,7 +78,7 @@ message SuggestionsWsResponse {
 // WS api/components/search_projects
 message SearchProjectsWsResponse {
   optional sonarqube.ws.commons.Paging paging = 1;
-  repeated Organization organizations = 2;
+  repeated sonarqube.ws.commons.Organization organizations = 2;
   repeated Component components = 3;
   optional sonarqube.ws.commons.Facets facets = 4;
 }
@@ -125,10 +125,6 @@ message Component {
   }
 }
 
-message Organization {
-  optional string key = 1;
-  optional string name = 2;
-}