Merge pull request #11 from PaperMC/fix/trailing-slash

fix: strip trailing slash from configured api URL

Author: jpenilla

src/main/java/io/papermc/fill/gradle/task/PublishToFillTask.java

@@ -169,6 +169,11 @@ private void runWithGit(final Git git) {
     }
   }
 
+  private static String apiUrl(final FillExtension extension) {
+    final String url = extension.getApiUrl().get();
+    return url.endsWith("/") ? url.substring(0, url.length() - 1) : url;
+  }
+
   private URI requestUploadUrl(
     final FillExtension extension,
     final String apiToken,
@@ -177,7 +182,7 @@ private URI requestUploadUrl(
   ) throws IOException, InterruptedException {
     final StageRequest request = new StageRequest(id, upload.download(), upload.contentType(), upload.contentMd5());
     final HttpRequest httpRequest = HttpRequest.newBuilder()
-      .uri(URI.create(extension.getApiUrl().get() + "/v3/publishing/stage"))
+      .uri(URI.create(apiUrl(extension) + "/v3/publishing/stage"))
       .header("Authorization", apiToken)
       .header("Content-Type", "application/json")
       .header("User-Agent", USER_AGENT)
@@ -210,7 +215,7 @@ private void publish(
     final PublishRequest request
   ) throws IOException, InterruptedException {
     final HttpRequest httpRequest = HttpRequest.newBuilder()
-      .uri(URI.create(extension.getApiUrl().get() + "/v3/publishing/publish"))
+      .uri(URI.create(apiUrl(extension) + "/v3/publishing/publish"))
       .header("Authorization", apiToken)
       .header("Content-Type", "application/json")
       .header("User-Agent", USER_AGENT)
@@ -352,7 +357,7 @@ private List<BuildResponse> fetchLastVersionBuilds(final FillExtension extension
   private VersionsResponse getVersions(final FillExtension extension) {
     final String url = String.format(
       "%s/v3/projects/%s/versions",
-      extension.getApiUrl().get(),
+      apiUrl(extension),
       extension.getProject().get()
     );
     try {
@@ -376,7 +381,7 @@ private VersionsResponse getVersions(final FillExtension extension) {
   private List<BuildResponse> getBuilds(final FillExtension extension, final String version) {
     final String url = String.format(
       "%s/v3/projects/%s/versions/%s/builds",
-      extension.getApiUrl().get(),
+      apiUrl(extension),
       extension.getProject().get(),
       version
     );