[#4476]use more stable apis to create InputStream (#4484)

apache · Aug 31, 2024 · 6ccef9d · 6ccef9d
1 parent f3dc998
commit 6ccef9d
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 6 deletions.
diff --git a/...client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownloadSchema.java b/...client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestDownloadSchema.java
@@ -30,6 +30,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
 
 import com.netflix.config.DynamicPropertyFactory;
@@ -39,6 +40,7 @@ public class TestDownloadSchema implements CategorizedTestCase {
   @Override
   public void testRestTransport() throws Exception {
     testDownloadFileAndDeleted();
+    testDownloadFileAndDeletedCN();
     testDownloadFileNotDeleted();
     testDownloadFileWithNull();
     testSetContentTypeByResponseEntity();
@@ -106,6 +108,19 @@ private void testDownloadFileAndDeleted() throws Exception {
     TestMgr.check(exists, false);
   }
 
+  private void testDownloadFileAndDeletedCN() throws Exception {
+    RestOperations restTemplate = RestTemplateBuilder.create();
+    ReadStreamPart readStreamPart = restTemplate
+        .getForObject("servicecomb://springmvc/download/deleteAfterFinished?content={1}&fileName={2}",
+            ReadStreamPart.class, "hello", "中文");
+    String hello = readStreamPart.saveAsString().get();
+    TestMgr.check(hello, "hello");
+
+    boolean exists = restTemplate
+        .getForObject("servicecomb://springmvc/download/assertLastFileDeleted", boolean.class);
+    TestMgr.check(exists, false);
+  }
+
   private void testDownloadFileWithNull() throws Exception {
     RestTemplate restTemplate = RestTemplateBuilder.create();
     ReadStreamPart readStreamPart = restTemplate

diff --git a/...c-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestUploadSchema.java b/...c-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestUploadSchema.java
@@ -41,6 +41,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
 
 @Component
@@ -59,6 +60,7 @@ public void testRestTransport() throws Exception {
     testUploadMultiBigFiles();
     testFileUploadMultiRpc();
     testUploadFileAndAttribute();
+    testUploadFileAndAttributeCN();
     testUploadFileRequestPartAttribute();
   }
 
@@ -126,6 +128,23 @@ private void testUploadFileAndAttribute() throws Exception {
     TestMgr.check("hi test", result);
   }
 
+  private void testUploadFileAndAttributeCN() throws Exception {
+    RestOperations template = RestTemplateBuilder.create();
+    Map<String, Object> map = new HashMap<>();
+    String message = "hi";
+    File file = File.createTempFile("中文名称", ".txt");
+    FileUtils.writeStringToFile(file, "test", StandardCharsets.UTF_8, false);
+
+    map.put("file", new FileSystemResource(file));
+    map.put("attribute", message);
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(org.springframework.http.MediaType.MULTIPART_FORM_DATA);
+    String result = template.postForObject("servicecomb://springmvc/upload/uploadFileAndAttribute",
+        new HttpEntity<>(map, headers), String.class);
+    TestMgr.check("hi test", result);
+  }
+
+
   private void testUploadFileRequestPartAttribute() throws Exception {
     RestTemplate template = RestTemplateBuilder.create();
     Map<String, Object> map = new HashMap<>();

diff --git a/...mvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java b/...mvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java
@@ -57,8 +57,15 @@ private File createTempFile(String name, String content) throws IOException {
   }
 
   @GetMapping(path = "/deleteAfterFinished")
-  public ResponseEntity<Part> deleteAfterFinished(@RequestParam("content") String content) throws IOException {
-    File file = createTempFile(content);
+  public ResponseEntity<Part> deleteAfterFinished(@RequestParam("content") String content,
+      @RequestParam(value = "fileName", required = false) String fileName) throws IOException {
+    File file;
+
+    if (StringUtils.isNotEmpty(fileName)) {
+      file = createTempFile(fileName, content);
+    } else {
+      file = createTempFile(content);
+    }
 
     return ResponseEntity
         .ok()

diff --git a/...undation-common/src/main/java/org/apache/servicecomb/foundation/common/part/FilePart.java b/...undation-common/src/main/java/org/apache/servicecomb/foundation/common/part/FilePart.java
@@ -18,9 +18,9 @@
 package org.apache.servicecomb.foundation.common.part;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 
 import org.apache.commons.io.FileUtils;
 
@@ -41,7 +41,7 @@ public FilePart(String name, File file) {
 
   @Override
   public InputStream getInputStream() throws IOException {
-    return new FileInputStream(file);
+    return Files.newInputStream(file.toPath());
   }
 
   @Override

diff --git a/...tion-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/FileUploadPart.java b/...tion-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/FileUploadPart.java
@@ -18,9 +18,9 @@
 package org.apache.servicecomb.foundation.vertx.http;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.servicecomb.foundation.common.part.AbstractPart;
@@ -36,7 +36,7 @@ public FileUploadPart(FileUpload fileUpload) {
 
   @Override
   public InputStream getInputStream() throws IOException {
-    return new FileInputStream(fileUpload.uploadedFileName());
+    return Files.newInputStream(new File(fileUpload.uploadedFileName()).toPath());
   }
 
   @Override