SONAR-14644 updated headers for github api

diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationHttpClientImpl.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationHttpClientImpl.java
index d5655e3b0484403c03d18853f293cad1edd8f9e7..0f56ffc5c52e758ff5bf9cbd32f2580a721a4c23 100644 (file)
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationHttpClientImpl.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationHttpClientImpl.java
@@ -51,8 +51,9 @@ public class GithubApplicationHttpClientImpl implements GithubApplicationHttpCli
 
   private static final Logger LOG = Loggers.get(GithubApplicationHttpClientImpl.class);
   private static final Pattern NEXT_LINK_PATTERN = Pattern.compile(".*<(.*)>; rel=\"next\"");
-  private static final String MACHINE_MAN_PREVIEW_JSON = "application/vnd.github.machine-man-preview+json";
+  private static final String GITHUB_API_VERSION_JSON = "application/vnd.github.v3+json";
   private static final String ANTIOPE_PREVIEW_JSON = "application/vnd.github.antiope-preview+json";
+  private static final String MACHINE_MAN_PREVIEW_JSON = "application/vnd.github.machine-man-preview+json";
 
   private final OkHttpClient client;
 
@@ -162,13 +163,10 @@ public class GithubApplicationHttpClientImpl implements GithubApplicationHttpCli
   }
 
   private static Request.Builder newRequestBuilder(String appUrl, @Nullable AccessToken token, String endPoint) {
-    Request.Builder url = new Request.Builder()
-        .url(toAbsoluteEndPoint(appUrl, endPoint));
+    Request.Builder url = new Request.Builder().url(toAbsoluteEndPoint(appUrl, endPoint));
     if (token != null) {
-      url
-          .addHeader("Authorization", token.getAuthorizationHeaderPrefix() + " " + token)
-          // TODO: Remove when CheckAPI is no longer in beta
-          .addHeader("Accept", ANTIOPE_PREVIEW_JSON + ", " + MACHINE_MAN_PREVIEW_JSON);
+      url.addHeader("Authorization", token.getAuthorizationHeaderPrefix() + " " + token);
+      url.addHeader("Accept", String.format("%s, %s, %s", ANTIOPE_PREVIEW_JSON, MACHINE_MAN_PREVIEW_JSON, GITHUB_API_VERSION_JSON));
     }
     return url;
   }

diff --git a/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationHttpClientImplTest.java b/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationHttpClientImplTest.java
index 44516fbaeafd850e7ea49b36a06a17cbe6cf4c19..5922ececdb235908c91a67e02094ac8bcf85db49 100644 (file)
--- a/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationHttpClientImplTest.java
+++ b/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationHttpClientImplTest.java
@@ -46,7 +46,9 @@ import static org.junit.Assert.fail;
 
 @RunWith(DataProviderRunner.class)
 public class GithubApplicationHttpClientImplTest {
-  private static final String BETA_API_HEADER = "application/vnd.github.antiope-preview+json, application/vnd.github.machine-man-preview+json";
+  private static final String BETA_API_HEADER = "application/vnd.github.antiope-preview+json, " +
+    "application/vnd.github.machine-man-preview+json, " +
+    "application/vnd.github.v3+json";
   @Rule
   public MockWebServer server = new MockWebServer();