Pull request #53: fix upload file multipartBody

Merge in SPM/gigachat-java-sdk from bugfix/ihubvb-413 to master

* commit '4161ce51e1ee7ec211a855b31e2946d58b79ee33':
  fix upload file multipartBody

Author: Бочарова Дарья Михайловна

README.md

@@ -24,7 +24,7 @@ GigaChat — это Java-библиотека для работы с [REST API G
 ### Gradle
 
 ```kotlin
-implementation("chat.giga:gigachat-java:0.1.6")
+implementation("chat.giga:gigachat-java:0.1.7")
 ```
 
 ### Maven
@@ -33,7 +33,7 @@ implementation("chat.giga:gigachat-java:0.1.6")
 <dependency>
     <groupId>chat.giga</groupId>
     <artifactId>gigachat-java</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
 </dependency>
 ```
 

build.gradle.kts

@@ -10,7 +10,7 @@ java {
 
 allprojects {
     group = "chat.giga"
-    version = "0.1.6"
+    version = "0.1.7"
 
     repositories {
         mavenCentral()

gigachat-java/src/main/java/chat/giga/client/BaseGigaChatClient.java

@@ -136,7 +136,7 @@ protected HttpRequest createUploadFileHttpRequest(UploadFileRequest request) {
                 .header(HttpHeaders.USER_AGENT, USER_AGENT_NAME)
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA + "; boundary=" + boundary)
                 .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON)
-                .body(requestBody.toString().getBytes(StandardCharsets.UTF_8));
+                .body(requestBody);
 
         authClient.authenticate(builder);
 

gigachat-java/src/main/java/chat/giga/util/FileUtils.java

@@ -5,19 +5,27 @@
 @UtilityClass
 public class FileUtils {
 
-    public StringBuilder createMultiPartBody(byte[] file, String boundary, String purpose, String contentType,
-            String fileName) {
-        var requestBody = new StringBuilder();
-        requestBody.append("--").append(boundary).append("\r\n");
-        requestBody.append("Content-Disposition: form-data; name=\"purpose\"\r\n\r\n");
-        requestBody.append(purpose).append("\r\n");
-        requestBody.append("--").append(boundary).append("\r\n");
-        requestBody.append("Content-Disposition: form-data; name=\"file\"; filename=\"").append(fileName)
-                .append("\"\r\n");
-        requestBody.append("Content-Type: ").append(contentType).append("\r\n\r\n");
-        requestBody.append(new String(file)).append("\r\n");
-        requestBody.append("--").append(boundary).append("--").append("\r\n");
+    public byte[] createMultiPartBody(byte[] fileBytes, String boundary, String purpose, String mimeType,
+                                      String fileName) {
 
-        return requestBody;
+        StringBuilder bodyBuilder = new StringBuilder();
+        bodyBuilder.append("--").append(boundary).append("\r\n")
+                .append("Content-Disposition: form-data; name=\"file\"; filename=\"").append(fileName).append("\"\r\n")
+                .append("Content-Type: ").append(mimeType).append("\r\n\r\n");
+
+        byte[] bodyStart = bodyBuilder.toString().getBytes();
+        bodyBuilder = new StringBuilder();
+        bodyBuilder.append("\r\n--").append(boundary).append("\r\n")
+                .append("Content-Disposition: form-data; name=\"purpose\"\r\n\r\n")
+                .append(purpose).append("\r\n")
+                .append("--").append(boundary).append("--\r\n");
+        byte[] bodyEnd = bodyBuilder.toString().getBytes();
+
+        byte[] multipartBody = new byte[bodyStart.length + fileBytes.length + bodyEnd.length];
+        System.arraycopy(bodyStart, 0, multipartBody, 0, bodyStart.length);
+        System.arraycopy(fileBytes, 0, multipartBody, bodyStart.length, fileBytes.length);
+        System.arraycopy(bodyEnd, 0, multipartBody, bodyStart.length + fileBytes.length, bodyEnd.length);
+
+        return multipartBody;
     }
 }