You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/07/16 03:06:48 UTC

[incubator-servicecomb-java-chassis] branch master updated: [SCB-747] add jaxrs upload file demo

This is an automated email from the ASF dual-hosted git repository.

wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 51d57ea  [SCB-747] add jaxrs upload file demo
51d57ea is described below

commit 51d57eaa4d1f70179c07406bda6f81ce44384490
Author: weichao666 <we...@huawei.com>
AuthorDate: Sat Jul 14 11:00:20 2018 +0800

    [SCB-747] add jaxrs upload file demo
---
 .../jaxrs/client/CodeFirstRestTemplateJaxrs.java   | 69 ++++++++++++++++++++++
 .../demo/jaxrs/server/CodeFirstJaxrs.java          | 41 ++++++++++++-
 .../src/main/resources/microservice.yaml           |  2 +
 3 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java
index 935ad52..429a12f 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java
+++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java
@@ -17,8 +17,19 @@
 
 package org.apache.servicecomb.demo.jaxrs.client;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
+import org.apache.commons.io.FileUtils;
 import org.apache.servicecomb.demo.CodeFirstRestTemplate;
 import org.apache.servicecomb.demo.TestMgr;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.web.client.RestTemplate;
 
 public class CodeFirstRestTemplateJaxrs extends CodeFirstRestTemplate {
@@ -34,4 +45,62 @@ public class CodeFirstRestTemplateJaxrs extends CodeFirstRestTemplate {
         template.getForObject(cseUrlPrefix.substring(0, cseUrlPrefix.length() - 1), Integer.class);
     TestMgr.check(100, result);
   }
+
+  @Override
+  protected void testOnlyRest(RestTemplate template, String cseUrlPrefix) {
+    try {
+      testUpload(template, cseUrlPrefix);
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
+    super.testOnlyRest(template, cseUrlPrefix);
+  }
+
+  private void testUpload(RestTemplate template, String cseUrlPrefix) throws IOException {
+    String file1Content = "Hello World";
+    File file1 = File.createTempFile("jaxrstest1", ".txt");
+    FileUtils.writeStringToFile(file1, file1Content);
+
+    testFileUpload(template, cseUrlPrefix, file1, file1Content);
+    testFileAndStringUpload(template, cseUrlPrefix, file1, file1Content);
+  }
+
+  private void testFileUpload(RestTemplate template, String cseUrlPrefix, File file1, String file1Content)
+      throws IOException {
+    Map<String, Object> map = new HashMap<>();
+    map.put("file1", new FileSystemResource(file1));
+    String file2Content = "Hello EveryOne";
+    File file2 = File.createTempFile("测试2", ".txt");
+    FileUtils.writeStringToFile(file2, file2Content);
+    map.put("file2", new FileSystemResource(file2));
+
+    String result1 = template.postForObject(cseUrlPrefix + "/upload1", new HttpEntity<>(new HashMap<>()), String.class);
+    TestMgr.check("null file", result1);
+
+    String expect = String.format("%s:%s:%s\n" + "%s:%s:%s",
+        file1.getName(),
+        MediaType.TEXT_PLAIN,
+        file1Content,
+        file2.getName(),
+        MediaType.TEXT_PLAIN,
+        file2Content);
+    String result2 = template.postForObject(cseUrlPrefix + "/upload1", new HttpEntity<>(map), String.class);
+    TestMgr.check(expect, result2);
+  }
+
+  private void testFileAndStringUpload(RestTemplate template, String cseUrlPrefix, File file1, String file1Content) {
+    Map<String, Object> map = new HashMap<>();
+    String message = "hi";
+    map.put("file1", new FileSystemResource(file1));
+    map.put("message", message);
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(org.springframework.http.MediaType.MULTIPART_FORM_DATA);
+    String expect = String.format("%s:%s:%s:%s",
+        file1.getName(),
+        MediaType.TEXT_PLAIN,
+        file1Content,
+        message);
+    String result = template.postForObject(cseUrlPrefix + "/upload2", new HttpEntity<>(map, headers), String.class);
+    TestMgr.check(expect, result);
+  }
 }
diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java
index 11987e3..8d12fc3 100644
--- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java
+++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java
@@ -17,11 +17,14 @@
 
 package org.apache.servicecomb.demo.jaxrs.server;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Part;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.CookieParam;
 import javax.ws.rs.DELETE;
@@ -37,6 +40,7 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response.Status;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.servicecomb.common.rest.codec.RestObjectMapper;
 import org.apache.servicecomb.core.Const;
 import org.apache.servicecomb.demo.compute.Person;
@@ -51,7 +55,6 @@ import org.apache.servicecomb.swagger.invocation.Response;
 import org.apache.servicecomb.swagger.invocation.context.ContextUtils;
 import org.apache.servicecomb.swagger.invocation.context.InvocationContext;
 import org.apache.servicecomb.swagger.invocation.response.Headers;
-
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiResponse;
@@ -197,7 +200,7 @@ public class CodeFirstJaxrs {
     return new OutputModelForTestIgnore("output_id", input.getInputId(), input.getContent(), input.getInputObject(),
         input.getInputJsonObject(), input.getInputIgnoreInterface(),
         new Person("outputSomeone"), new JsonObject("{\"OutputJsonKey\" : \"OutputJsonValue\"}"), () -> {
-    });
+        });
   }
 
   @SuppressWarnings("unchecked")
@@ -219,4 +222,38 @@ public class CodeFirstJaxrs {
   public String getTraceId() {
     return ContextUtils.getInvocationContext().getContext(Const.TRACE_ID_NAME);
   }
+
+  @Path("/upload1")
+  @POST
+  @Produces(MediaType.TEXT_PLAIN)
+  public String fileUpload1(@FormParam("file1") Part file1, @FormParam("file2") Part file2) throws IOException {
+    if (file1 == null || file2 == null) {
+      return "null file";
+    }
+    try (InputStream is1 = file1.getInputStream(); InputStream is2 = file2.getInputStream()) {
+      String content1 = IOUtils.toString(is1);
+      String content2 = IOUtils.toString(is2);
+      return String.format("%s:%s:%s\n" + "%s:%s:%s",
+          file1.getSubmittedFileName(),
+          file1.getContentType(),
+          content1,
+          file2.getSubmittedFileName(),
+          file2.getContentType(),
+          content2);
+    }
+  }
+
+  @Path("/upload2")
+  @POST
+  @Produces(MediaType.TEXT_PLAIN)
+  public String fileUpload2(@FormParam("file1") Part file1, @FormParam("message") String message) throws IOException {
+    try (InputStream is1 = file1.getInputStream()) {
+      String content1 = IOUtils.toString(is1);
+      return String.format("%s:%s:%s:%s",
+          file1.getSubmittedFileName(),
+          file1.getContentType(),
+          content1,
+          message);
+    }
+  }
 }
diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml b/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml
index f32d547..89f324c 100644
--- a/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml
+++ b/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml
@@ -31,3 +31,5 @@ servicecomb:
     chain:
       Provider:
         default: bizkeeper-provider
+  uploads:
+    directory: target
\ No newline at end of file