Remove deprecated code 2.0

src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java

@@ -9,7 +9,6 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
 import com.mojang.util.UUIDTypeAdapter;
 import com.voxelmodpack.hdskins.HDSkinManager;
-import com.voxelmodpack.hdskins.upload.ThreadMultipartPostUpload;
 
 import net.minecraft.util.Session;
 import org.apache.logging.log4j.LogManager;
@@ -93,7 +92,15 @@ public class LegacySkinServer implements SkinServer {
         return CallableFutures.asyncFailableFuture(() -> {
             SkinServer.verifyServerConnection(session, SERVER_ID);
 
-            String response = new ThreadMultipartPostUpload(gateway, createHeaders(session, upload)).uploadMultipart();
+            NetClient client = new NetClient("POST", gateway);
+
+            client.putFormData(createHeaders(session, upload), "image/png");
+
+            if (upload.getImage() != null) {
+                client.putFile(upload.getType().toString().toLowerCase(Locale.US), "image/png", upload.getImage());
+            }
+
+            String response = client.send().text();
 
             if (response.startsWith("ERROR: ")) {
                 response = response.substring(7);
@@ -119,8 +126,6 @@ public class LegacySkinServer implements SkinServer {
 
         if (upload.getImage() == null) {
             builder.put("clear", "1");
-        } else {
-            builder.put(upload.getType().toString().toLowerCase(Locale.US), upload.getImage());
         }
 
         return builder.build();

src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java

@@ -20,6 +20,7 @@ import java.util.concurrent.Executor;
 public class NetClient {
 
     private final RequestBuilder rqBuilder;
+    private MultipartEntityBuilder entityBuilder;
 
     private Map<String, ?> headers;
 
@@ -28,14 +29,29 @@ public class NetClient {
     }
 
     public NetClient putFile(String key, String contentType, URI file) {
+        if (entityBuilder == null) {
+            entityBuilder= MultipartEntityBuilder.create();
+        }
+
         File f = new File(file);
-        HttpEntity entity = MultipartEntityBuilder.create().addBinaryBody(key, f, ContentType.create(contentType), f.getName()).build();
+        HttpEntity entity = entityBuilder.addBinaryBody(key, f, ContentType.create(contentType), f.getName()).build();
 
         rqBuilder.setEntity(entity);
 
         return this;
     }
 
+    public NetClient putFormData(Map<String, ?> data, String contentTypes) {
+        if (entityBuilder == null) {
+            entityBuilder= MultipartEntityBuilder.create();
+        }
+
+        for (Map.Entry<String, ?> i : data.entrySet()) {
+            entityBuilder.addTextBody(i.getKey(), i.getValue().toString());
+        }
+        return this;
+    }
+
     public NetClient putHeaders(Map<String, ?> headers) {
         this.headers = headers;
 
@@ -43,6 +59,10 @@ public class NetClient {
     }
 
     public MoreHttpResponses send() throws IOException {
+        if (entityBuilder != null) {
+            rqBuilder.setEntity(entityBuilder.build());
+        }
+
         HttpUriRequest request = rqBuilder.build();
 
         if (headers != null) {

src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadMultipartPostUpload.java

@@ -1,111 +0,0 @@
-package com.voxelmodpack.hdskins.upload;
-
-import org.apache.commons.io.IOUtils;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.annotation.Nullable;
-
-/**
- * Uploader for Multipart form data
- *
- * @author Adam Mummery-Smith
- * @deprecated Use httpmime multipart upload
- */
-@Deprecated
-public class ThreadMultipartPostUpload {
-    protected final Map<String, ?> sourceData;
-
-    protected final String method;
-
-    protected final String authorization;
-
-    protected final String urlString;
-
-    protected HttpURLConnection httpClient;
-
-    protected static final String CRLF = "\r\n";
-
-    protected static final String twoHyphens = "--";
-
-    protected static final String boundary = "----------AaB03x";
-
-    public String response;
-
-    public ThreadMultipartPostUpload(String method, String url, Map<String, ?> sourceData, @Nullable String authorization) {
-        this.method = method;
-        this.urlString = url;
-        this.sourceData = sourceData;
-        this.authorization = authorization;
-    }
-
-    public ThreadMultipartPostUpload(String url, Map<String, ?> sourceData) {
-        this("POST", url, sourceData, null);
-    }
-
-    public String uploadMultipart() throws IOException {
-        // open a URL connection
-        URL url = new URL(this.urlString);
-
-        // Open a HTTP connection to the URL
-        this.httpClient = (HttpURLConnection) url.openConnection();
-        this.httpClient.setDoOutput(true);
-        this.httpClient.setUseCaches(false);
-
-        this.httpClient.setRequestMethod(this.method);
-        this.httpClient.setRequestProperty("Connection", "Close");
-        this.httpClient.addRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)"); // For CloudFlare
-
-        if (this.sourceData.size() > 0) {
-            this.httpClient.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
-        }
-
-        if (this.authorization != null) {
-            this.httpClient.addRequestProperty("Authorization", this.authorization);
-        }
-
-        try (DataOutputStream outputStream = new DataOutputStream(this.httpClient.getOutputStream())) {
-
-            for (Entry<String, ?> data : this.sourceData.entrySet()) {
-                outputStream.writeBytes(twoHyphens + boundary + CRLF);
-
-                String paramName = data.getKey();
-                Object paramData = data.getValue();
-
-                if (paramData instanceof URI) {
-                    Path uploadPath = Paths.get((URI) paramData);
-
-                    outputStream.writeBytes("Content-Disposition: form-data; name=\"" + paramName + "\"; filename=\"" + uploadPath.getFileName() + "\"" + CRLF);
-                    outputStream.writeBytes("Content-Type: image/png" + CRLF + CRLF);
-
-
-                    Files.copy(uploadPath, outputStream);
-                } else {
-                    outputStream.writeBytes("Content-Disposition: form-data; name=\"" + paramName + "\"" + CRLF + CRLF);
-
-                    outputStream.writeBytes(paramData.toString());
-                }
-
-                outputStream.writeBytes(ThreadMultipartPostUpload.CRLF);
-            }
-
-            outputStream.writeBytes(twoHyphens + boundary + twoHyphens + CRLF);
-        }
-
-        try (InputStream input = this.httpClient.getInputStream()) {
-            return IOUtils.toString(input, StandardCharsets.UTF_8);
-        }
-    }
-
-}