Merge branch 'master' of github.com:xxlabaza/feign-form

Author: xxlabaza

feign-form/src/main/java/feign/form/multipart/AbstractWriter.java

@@ -66,9 +66,12 @@ protected void writeFileMetadata (Output output, String name, String fileName, S
 
  String fileContentType = contentType;
  if (fileContentType == null) {
- fileContentType = fileName != null
- ? URLConnection.guessContentTypeFromName(fileName)
- : "application/octet-stream";
+ if (fileName != null) {
+ fileContentType = URLConnection.guessContentTypeFromName(fileName);
+ }
+ if (fileContentType == null) {
+ fileContentType = "application/octet-stream";
+ }
  }
 
  val string = new StringBuilder()

feign-form/src/test/java/feign/form/BasicClientTest.java

@@ -149,4 +149,13 @@ public void testUploadWithJson () throws Exception {
  Assert.assertNotNull(response);
  Assert.assertEquals(200, response.status());
  }
+
+ @Test
+ public void testUnknownTypeFile() throws Exception {
+ val path = Paths.get(this.getClass().getClassLoader().getResource("file.abc").toURI());
+ Assert.assertTrue(Files.exists(path));
+
+ val stringResponse = api.uploadUnknownType(path.toFile());
+ Assert.assertEquals("application/octet-stream", stringResponse);
+ }
 }

feign-form/src/test/java/feign/form/Server.java

@@ -167,4 +167,15 @@ public ResponseEntity<String> uploadByteArray (@RequestPart("file") MultipartFil
  : I_AM_A_TEAPOT;
  return ResponseEntity.status(status).body(file.getOriginalFilename());
  }
+
+ @PostMapping(
+ path = "/upload/unknown_type",
+ consumes = MULTIPART_FORM_DATA_VALUE
+ )
+ public ResponseEntity<String> uploadUnknownType (@RequestPart("file") MultipartFile file) {
+ val status = file != null
+ ? OK
+ : I_AM_A_TEAPOT;
+ return ResponseEntity.status(status).body(file.getContentType());
+ }
 }

feign-form/src/test/java/feign/form/TestClient.java

@@ -65,4 +65,8 @@ public interface TestClient {
  @RequestLine("POST /upload/with_json")
  @Headers("Content-Type: multipart/form-data")
  Response uploadWithJson (@Param("dto") Dto dto, @Param("file") File file);
+
+ @RequestLine("POST /upload/unknown_type")
+ @Headers("Content-Type: multipart/form-data")
+ String uploadUnknownType (@Param("file") File file);
 }