Skip to content

[httpclient] Don't consume HTTP responses #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baev merged 1 commit into from
Mar 26, 2021
Merged

[httpclient] Don't consume HTTP responses #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 6 additions & 30 deletions allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,13 @@
import io.qameta.allure.attachment.DefaultAttachmentProcessor;
import io.qameta.allure.attachment.FreemarkerAttachmentRenderer;
import io.qameta.allure.attachment.http.HttpResponseAttachment;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpResponseInterceptor;
import org.apache.http.entity.HttpEntityWrapper;
import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.protocol.HttpContext;
import org.apache.http.util.EntityUtils;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.stream.Stream;

import static io.qameta.allure.attachment.http.HttpResponseAttachment.Builder.create;
Expand Down Expand Up @@ -67,37 +63,17 @@ public void process(final HttpResponse response,
.forEach(header -> builder.setHeader(header.getName(), header.getValue()));

if (response.getEntity() != null) {
final LoggableEntity loggableEntity = new LoggableEntity(response.getEntity());
response.setEntity(loggableEntity);
if (!response.getEntity().isRepeatable()) {
final BufferedHttpEntity bufferedEntity = new BufferedHttpEntity(response.getEntity());
response.setEntity(bufferedEntity);
}

builder.setBody(loggableEntity.getBody());
builder.setBody(EntityUtils.toString(response.getEntity()));
} else {
builder.setBody("No body present");
}

final HttpResponseAttachment responseAttachment = builder.build();
processor.addAttachment(responseAttachment, renderer);
}

/**
* Required to allow consume httpEntity twice.
*/
private static class LoggableEntity extends HttpEntityWrapper {

private final byte[] rawContent;

LoggableEntity(final HttpEntity wrappedEntity) throws IOException {
super(wrappedEntity);
rawContent = EntityUtils.toByteArray(wrappedEntity);
}

public String getBody() {
return new String(rawContent, StandardCharsets.UTF_8);
}

@Override
public InputStream getContent() {
return new ByteArrayInputStream(rawContent);
}
}
}
20 changes: 20 additions & 0 deletions allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
Expand Down Expand Up @@ -187,4 +188,23 @@ void shouldCreateRequestAttachmentWithEmptyBodyWhenNoContentIsReturned() throws
.extracting("body")
.containsNull();
}

@Test
void shouldNotConsumeBody() throws Exception {
final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);

final HttpClientBuilder builder = HttpClientBuilder.create()
.addInterceptorLast(new AllureHttpClientResponse(renderer, processor));

try (CloseableHttpClient httpClient = builder.build()) {
final HttpGet httpGet = new HttpGet(String.format("http://localhost:%d/hello", server.port()));
try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
response.getStatusLine().getStatusCode();
BufferedHttpEntity ent = new BufferedHttpEntity(response.getEntity());
assertThat(EntityUtils.toString(ent))
.isEqualTo(BODY_STRING);
}
}
}
}