Skip to content

Commit a52491f

Browse files
committed
Merge afterResponse() and afterResponseHandler()
1 parent 90a9f78 commit a52491f

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

client/src/main/java/io/avaje/http/client/DHttpClientContext.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,9 @@ <T> List<T> readList(Class<T> cls, BodyContent content) {
126126
return bodyAdapter.listReader(cls).read(content);
127127
}
128128

129-
130129
void afterResponse(DHttpClientRequest request) {
131130
if (requestListener != null) {
132131
requestListener.response(request.listenerEvent());
133132
}
134133
}
135-
136-
void afterResponseHandler(DHttpClientRequest request) {
137-
if (requestListener != null) {
138-
requestListener.response(request.listenerEvent());
139-
}
140-
}
141134
}

client/src/main/java/io/avaje/http/client/DHttpClientRequest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ private void readResponseContent() {
250250
this.httpResponse = response;
251251
context.check(response);
252252
encodedResponseBody = context.readContent(response);
253-
context.afterResponse(this);
254253
}
255254

256255
@Override
@@ -279,11 +278,11 @@ public <T> List<T> list(Class<T> cls) {
279278

280279
@Override
281280
public <T> HttpResponse<T> withResponseHandler(HttpResponse.BodyHandler<T> responseHandler) {
282-
long startNanos = System.nanoTime();
281+
final long startNanos = System.nanoTime();
283282
final HttpResponse<T> response = context.send(httpRequest, responseHandler);
284-
this.requestTimeNanos = System.nanoTime() - startNanos;
285-
this.httpResponse = response;
286-
context.afterResponseHandler(this);
283+
requestTimeNanos = System.nanoTime() - startNanos;
284+
httpResponse = response;
285+
context.afterResponse(this);
287286
return response;
288287
}
289288

client/src/test/java/io/avaje/http/client/HelloControllerTest.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,20 @@ void postForm_returningBean() {
137137
}
138138

139139
@Test
140-
void postForm_asVoid_invokesValidation_expect_badRequest_extractError() {
140+
void postForm_asVoid_validResponse() {
141+
HttpResponse<Void> res = clientContext.request()
142+
.path("hello/saveform")
143+
.formParam("name", "baz")
144+
.formParam("email", "user@foo.com")
145+
.formParam("url", "http://foo")
146+
.post()
147+
.asVoid();
141148

149+
assertEquals(201, res.statusCode());
150+
}
151+
152+
@Test
153+
void postForm_asVoid_invokesValidation_expect_badRequest_extractError() {
142154
try {
143155
clientContext.request()
144156
.path("hello/saveform")

0 commit comments

Comments
 (0)