Migrate to org.apache.httpcomponents

Author: Kiber2009

build.gradle.kts

@@ -35,7 +35,8 @@ tasks {
         description = ""
         dependsOn("publishAllPublicationsToMavenCentralRepository")
         doLast {
-            val path = "https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/$namespace?publishing_type=automatic"
+            val path =
+                "https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/$namespace?publishing_type=automatic"
             val auth = Base64.getEncoder().encodeToString(
                 "${System.getenv("MAVEN_CENTRAL_USERNAME")}:${System.getenv("MAVEN_CENTRAL_PASSWORD")}"
                     .toByteArray()
@@ -94,6 +95,9 @@ repositories {
 dependencies {
     @Suppress("VulnerableLibrariesLocal", "RedundantSuppression")
     compileOnly("io.papermc.paper:paper-api:${mcVersion}.build.+")
+
+    compileOnly("org.apache.httpcomponents:httpclient:4.5.14")
+    compileOnly("org.apache.httpcomponents:httpmime:4.5.14")
 }
 
 java {

src/main/java/io/github/kiber2009/plugin/contentapi/uploading/LobfileUploadProvider.java

@@ -2,20 +2,21 @@
 
 import com.google.gson.*;
 import io.github.kiber2009.plugin.contentapi.ContentApiPlugin;
-import io.github.kiber2009.plugin.contentapi.utils.HttpUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
 import org.jspecify.annotations.NonNull;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.util.UUID;
 
 public class LobfileUploadProvider implements UploadProvider {
     private static final URI UPLOAD_URI = URI.create("https://lobfile.com/api/v3/upload");
-    private static final HttpClient HTTP_CLIENT = HttpClient.newHttpClient();
 
     private final String apiKey;
 
@@ -24,23 +25,23 @@ public LobfileUploadProvider(final String apiKey) {
     }
 
     @Override
-    public @NonNull String uploadBytes(final byte @NonNull [] bytes) {
-        final String boundary = UUID.randomUUID().toString();
-        try {
-            final HttpRequest request = HttpRequest.newBuilder()
-                    .uri(UPLOAD_URI)
-                    .header("X-API-Key", apiKey)
-                    .header("Content-Type", "multipart/form-data; boundary=" + boundary)
-                    .POST(HttpRequest.BodyPublishers.ofByteArray(HttpUtils.createMultipartBody(boundary,
-                            new HttpUtils.MultipartEntry("file", bytes))))
-                    .build();
-            final HttpResponse<String> httpResponse = HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofString());
-            final Response response = ContentApiPlugin.GSON.fromJson(httpResponse.body(), Response.class);
-            if (response.success)
-                return response.url;
-            else
-                throw new RuntimeException("Error: " + response.error);
-        } catch (final IOException | InterruptedException e) {
+    public @NonNull String uploadBytes(final @NonNull String fileName, final byte @NonNull [] bytes) {
+        try (final CloseableHttpClient client = HttpClients.createDefault()) {
+            final HttpPost request = new HttpPost(UPLOAD_URI);
+            request.setHeader("X-API-Key", apiKey);
+            request.setEntity(MultipartEntityBuilder.create()
+                    .addBinaryBody("file", bytes, ContentType.APPLICATION_OCTET_STREAM, fileName)
+                    .addTextBody("sha256", "john_doe")
+                    .build());
+            try (final CloseableHttpResponse httpResponse = client.execute(request)) {
+                final String responseString = EntityUtils.toString(httpResponse.getEntity());
+                final Response response = ContentApiPlugin.GSON.fromJson(responseString, Response.class);
+                if (response.success)
+                    return response.url;
+                else
+                    throw new RuntimeException("Error: " + response.error);
+            }
+        } catch (final IOException e) {
             throw new RuntimeException(e);
         }
     }

src/main/java/io/github/kiber2009/plugin/contentapi/uploading/UploadProvider.java

@@ -3,5 +3,5 @@
 import org.jspecify.annotations.NonNull;
 
 public interface UploadProvider {
-    @NonNull String uploadBytes(final byte @NonNull [] bytes);
+    @NonNull String uploadBytes(final @NonNull String fileName, final byte @NonNull [] bytes);
 }

src/main/java/io/github/kiber2009/plugin/contentapi/utils/HttpUtils.java

@@ -3,4 +3,6 @@ version: $version
 main: io.github.kiber2009.plugin.contentapi.ContentApiPlugin
 api-version: $mcVersion
 author: $author
-description: $description
+description: $description
+libraries:
+  - org.apache.httpcomponents:httpmime:4.5.14