Adapt GitHubClient to the new API versioning (closes #113)

lescastcodeurs · Dec 30, 2022 · 101c86a · 101c86a
1 parent dbfafcb
commit 101c86a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Changed
 
 - Filter out past conferences in the _Conférences_ section (#109).
+- Adapt GitHubClient to the new API versioning (#113).
 
 ### Fixed
 

diff --git a/src/main/java/com/lescastcodeurs/bot/github/GitHubClient.java b/src/main/java/com/lescastcodeurs/bot/github/GitHubClient.java
@@ -25,6 +25,9 @@
 @ApplicationScoped
 public class GitHubClient {
 
+  private static final String API_VERSION = "2022-11-28";
+  private static final String API_MEDIA_TYPE = "application/vnd.github+json";
+
   private static final String GITHUB_URL = "https://github.com";
   private static final String GITHUB_API_URL = "https://api.github.com";
 
@@ -69,8 +72,9 @@ public String createOrUpdateFile(String repository, String filename, String cont
 
     send(
         HttpRequest.newBuilder(URI.create(gitHubApiUrl(repository, filename)))
-            .header("Accept", "application/vnd.github.v3+json")
+            .header("Accept", API_MEDIA_TYPE)
             .header("Authorization", "token " + token)
+            .header("X-GitHub-Api-Version", API_VERSION)
             .PUT(HttpRequest.BodyPublishers.ofString(body))
             .build(),
         200,
@@ -79,27 +83,15 @@ public String createOrUpdateFile(String repository, String filename, String cont
     return gitHubUrl(repository, filename);
   }
 
-  public String getContent(String repository, String filename) throws InterruptedException {
-    HttpResponse<String> response =
-        send(
-            HttpRequest.newBuilder(URI.create(gitHubApiUrl(repository, filename)))
-                .header("Accept", "application/vnd.github.v3.raw")
-                .header("Authorization", "token " + token)
-                .GET()
-                .build(),
-            200);
-
-    return response.body();
-  }
-
   private Optional<String> getSha(String repository, String filename) throws InterruptedException {
     String sha = null;
 
     HttpResponse<String> response =
         send(
             HttpRequest.newBuilder(URI.create(gitHubApiUrl(repository, filename)))
-                .header("Accept", "application/vnd.github.v3+json")
+                .header("Accept", API_MEDIA_TYPE)
                 .header("Authorization", "token " + token)
+                .header("X-GitHub-Api-Version", API_VERSION)
                 .GET()
                 .build(),
             200,