From 6a484e1fa93750d8782932df00df3d24b5ee32c9 Mon Sep 17 00:00:00 2001
From: Duarte Meneses <duarte.meneses@sonarsource.com>
Date: Fri, 26 Jun 2020 14:26:45 -0500
Subject: [PATCH] SONAR-13475 SONAR-13473 SONAR-13474 Don't restrict to GHE

---
 .../server/telemetry/TelemetryDaemonTest.java    |  4 ++--
 .../src/main/protobuf/ws-alm_integrations.proto  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java
index 6863739f05f..2de208bafb9 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java
@@ -132,8 +132,8 @@ public class TelemetryDaemonTest {
 
     internalProperties.write("telemetry.lastPing", String.valueOf(sevenDaysAgo));
 
-    verify(dataJsonWriter, timeout(2_000)).writeTelemetryData(any(JsonWriter.class), same(SOME_TELEMETRY_DATA));
-    verify(client).upload(anyString());
+    verify(client,  timeout(2_000)).upload(anyString());
+    verify(dataJsonWriter).writeTelemetryData(any(JsonWriter.class), same(SOME_TELEMETRY_DATA));
   }
 
   @Test
diff --git a/sonar-ws/src/main/protobuf/ws-alm_integrations.proto b/sonar-ws/src/main/protobuf/ws-alm_integrations.proto
index d2f81d8d1ef..12df67c631f 100644
--- a/sonar-ws/src/main/protobuf/ws-alm_integrations.proto
+++ b/sonar-ws/src/main/protobuf/ws-alm_integrations.proto
@@ -55,24 +55,24 @@ message GithubClientIdWsResponse {
   optional string clientId = 1;
 }
 
-// WS api/alm_integrations/list_github_enterprise_organizations
-message ListGithubEnterpriseOrganizationsWsResponse {
+// WS api/alm_integrations/list_github_organizations
+message ListGithubOrganizationsWsResponse {
   optional sonarqube.ws.commons.Paging paging = 1;
-  repeated GithubEnterpriseOrganization organizations = 2;
+  repeated GithubOrganization organizations = 2;
 }
 
-message GithubEnterpriseOrganization {
+message GithubOrganization {
   optional string key = 1;
   optional string name = 2;
 }
 
-// WS api/alm_integrations/list_github_enterprise_repositories
-message ListGithubEnterpriseRepositoriesWsResponse {
+// WS api/alm_integrations/list_github_repositories
+message ListGithubRepositoriesWsResponse {
   optional sonarqube.ws.commons.Paging paging = 1;
-  repeated GithubEnterpriseRepository repositories = 2;
+  repeated GithubRepository repositories = 2;
 }
 
-message GithubEnterpriseRepository {
+message GithubRepository {
   optional int64 id = 1;
   optional string key = 2;
   optional string name = 3;
-- 
2.39.5