Skip to content
This repository has been archived by the owner on Apr 16, 2022. It is now read-only.

Added Testing #858

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make HTTP post requests repeatable by wrapping entities into a repeat…
…able entity (#856)
ggalmazor authored and elduwa committed Mar 22, 2020
commit 223de3712d6f50c12ba53fc8264647a898aa093c
21 changes: 18 additions & 3 deletions src/org/opendatakit/briefcase/reused/http/CommonsHttp.java
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
import static org.opendatakit.briefcase.reused.http.RequestMethod.POST;

import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.net.SocketTimeoutException;
import java.net.URL;
@@ -30,6 +31,7 @@
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.conn.HttpHostConnectException;
import org.apache.http.entity.BasicHttpEntity;
import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.entity.mime.content.InputStreamBody;
@@ -128,10 +130,9 @@ private <T> Response<T> uncheckedExecute(Request<T> request, Executor executor)
part.getName(),
new InputStreamBody(part.getBody(), ContentType.create(part.getContentType()), part.getAttachmentName())
);
body = bodyBuilder.build();
body = makeRepeatable(bodyBuilder.build());
} else {
body = new BasicHttpEntity();
((BasicHttpEntity) body).setContent(request.getBody());
body = makeRepeatable(buildBasicEntity(request.getBody()));
}
commonsRequest.body(body);
}
@@ -149,6 +150,20 @@ private <T> Response<T> uncheckedExecute(Request<T> request, Executor executor)
}
}

private BasicHttpEntity buildBasicEntity(InputStream contents) {
BasicHttpEntity entity = new BasicHttpEntity();
entity.setContent(contents);
return entity;
}

private BufferedHttpEntity makeRepeatable(HttpEntity entity) {
try {
return new BufferedHttpEntity(entity);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}

private static org.apache.http.client.fluent.Request getCommonsRequest(Request<?> request) {
switch (request.getMethod()) {
case GET: