Fixup: content-type of POST requests with files (#686)

* Fixup: content-type of POST requests with files * Using the opportunity to fix a typo
Wikidata · May 15, 2022 · f2575db · f2575db
1 parent ccc9a59
commit f2575db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/wdtk-wikibaseapi/src/main/java/org/wikidata/wdtk/wikibaseapi/ApiConnection.java b/wdtk-wikibaseapi/src/main/java/org/wikidata/wdtk/wikibaseapi/ApiConnection.java
@@ -169,7 +169,7 @@ public ApiConnection(String apiBaseUrl, Map<String, String> tokens) {
 	}
 
 	/**
-	 * Subclasses can customized their own {@link OkHttpClient.Builder} instances.
+	 * Subclasses can customize their own {@link OkHttpClient.Builder} instances.
 	 *
 	 * An example:
 	 * <pre>
@@ -434,12 +434,14 @@ public InputStream sendRequest(String requestMethod,
 		} else if ("POST".equalsIgnoreCase(requestMethod)) {
 			RequestBody body;
 			if (files != null && !files.isEmpty()) {
+				MediaType formDataMediaType = MediaType.parse("multipart/form-data");
 				MultipartBody.Builder builder = new MultipartBody.Builder();
+				builder.setType(formDataMediaType);
 				parameters.entrySet().stream()
 					.forEach(entry -> builder.addFormDataPart(entry.getKey(), entry.getValue()));
 				files.entrySet().stream()
 					.forEach(entry -> builder.addFormDataPart(entry.getKey(), entry.getValue().getLeft(),
-							RequestBody.create(MediaType.parse("application/octet-stream"),entry.getValue().getRight())));
+							RequestBody.create(formDataMediaType,entry.getValue().getRight())));
 				body = builder.build();
 			} else {
 				body = RequestBody.create(queryString, URLENCODED_MEDIA_TYPE);

diff --git a/wdtk-wikibaseapi/src/test/java/org/wikidata/wdtk/wikibaseapi/BasicApiConnectionTest.java b/wdtk-wikibaseapi/src/test/java/org/wikidata/wdtk/wikibaseapi/BasicApiConnectionTest.java
@@ -103,7 +103,8 @@ public MockResponse dispatch(RecordedRequest request) throws InterruptedExceptio
 					String requestBody = request.getBody().readUtf8();
 					// in the case of file uploads, the string representation of the request body is not stable
 					// so we only check that some file was uploaded (for testPostFile)
-					if (requestBody.contains("Content-Disposition: form-data; name=\"file\"; filename=\"hello.txt\"")) {
+					if (requestBody.contains("Content-Disposition: form-data; name=\"file\"; filename=\"hello.txt\"") &&
+							requestBody.contains("multipart/form-data")) {
 						return new MockResponse()
 								.setHeader("Content-Type", "application/json; charset=utf-8")
 								.setBody("{\"success\":\"true\"}");