Revert changes to save backward compatibility

reportportal · Jan 10, 2024 · 15bb715 · 15bb715
1 parent aa3a4dd
commit 15bb715
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/com/epam/reportportal/service/statistics/DummyClient.java b/src/main/java/com/epam/reportportal/service/statistics/DummyClient.java
@@ -26,7 +26,7 @@ public class DummyClient implements Statistics {
 
 	@Override
 	public Maybe<Response<ResponseBody>> send(StatisticsItem item) {
-		return Maybe.create(e -> e.onSuccess(Response.success(ResponseBody.create("", MediaType.get("text/plain")))));
+		return Maybe.create(e -> e.onSuccess(Response.success(ResponseBody.create(MediaType.get("text/plain"), ""))));
 	}
 
 	@Override

diff --git a/src/main/java/com/epam/reportportal/utils/http/HttpRequestUtils.java b/src/main/java/com/epam/reportportal/utils/http/HttpRequestUtils.java
@@ -60,11 +60,12 @@ private HttpRequestUtils() {
 	public static List<MultipartBody.Part> buildLogMultiPartRequest(List<SaveLogRQ> rqs) {
 		List<MultipartBody.Part> result = new ArrayList<>();
 		try {
-			String payload = MAPPER.writerFor(new TypeReference<List<SaveLogRQ>>() {
-			}).writeValueAsString(rqs);
 			result.add(MultipartBody.Part.createFormData(Constants.LOG_REQUEST_JSON_PART,
 					null,
-					RequestBody.create(payload, okhttp3.MediaType.get("application/json; charset=utf-8"))
+					RequestBody.create(okhttp3.MediaType.get("application/json; charset=utf-8"),
+							MAPPER.writerFor(new TypeReference<List<SaveLogRQ>>() {
+							}).writeValueAsString(rqs)
+					)
 			));
 		} catch (JsonProcessingException e) {
 			throw new InternalReportPortalClientException("Unable to process JSON", e);
@@ -84,7 +85,7 @@ public static List<MultipartBody.Part> buildLogMultiPartRequest(List<SaveLogRQ>
 				}
 				result.add(MultipartBody.Part.createFormData(Constants.LOG_REQUEST_BINARY_PART,
 						file.getName(),
-						RequestBody.create(file.getContent(), type)
+						RequestBody.create(type, file.getContent())
 				));
 			}
 		}