Skip to content

Commit 14b647c

Browse files
committed
prepare for release
1 parent cbcc261 commit 14b647c

File tree

4 files changed

+23
-1
lines changed

4 files changed

+23
-1
lines changed

domino-rest-shared/src/main/java/org/dominokit/rest/shared/request/BaseRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public abstract class BaseRequest implements Request {
3939
};
4040

4141
protected CompleteHandler completeHandler = () -> {};
42+
protected CompleteHandler afterCompleteHandler = () -> {};
4243

4344
protected Fail fail = requestContext.getConfig().getDefaultFailHandler();
4445

@@ -64,6 +65,7 @@ protected void onCompleted() {
6465
.forEach(
6566
responseInterceptor ->
6667
responseInterceptor.onAfterCompleteCallback((ServerRequest) this));
68+
afterCompleteHandler.onCompleted();
6769
}
6870

6971
public BaseRequest() {

domino-rest-shared/src/main/java/org/dominokit/rest/shared/request/CanCompleteOrSend.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ public interface CanCompleteOrSend extends CanSend {
3030
* @return same instance to support builder pattern
3131
*/
3232
CanSend onComplete(CompleteHandler completeHandler);
33+
34+
CanSend onAfterComplete(CompleteHandler completeHandler);
3335
}

domino-rest-shared/src/main/java/org/dominokit/rest/shared/request/ServerRequest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,20 @@ public CanFailOrSend onComplete(CompleteHandler completeHandler) {
549549
return this;
550550
}
551551

552+
/**
553+
* define the on complete handler
554+
*
555+
* @param completeHandler the handler
556+
* @return same instance to support builder pattern
557+
*/
558+
@Override
559+
public CanFailOrSend onAfterComplete(CompleteHandler completeHandler) {
560+
if (nonNull(completeHandler)) {
561+
this.afterCompleteHandler = completeHandler;
562+
}
563+
return this;
564+
}
565+
552566
/**
553567
* sets the Content-type header
554568
*

domino-rest-test/src/test/java/org/dominokit/rest/test/ServerRequestHttpTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,22 +266,26 @@ void response_interceptor_before_after_success_and_complete_are_called() throws
266266
new ResponseInterceptor() {
267267
@Override
268268
public void onBeforeSuccessCallback(ServerRequest serverRequest, Response response) {
269+
LOGGER.info("onBeforeSuccessCallback called");
269270
beforeSuccess.set(true);
270271
}
271272

272273
@Override
273274
public void onBeforeCompleteCallback(ServerRequest serverRequest) {
275+
LOGGER.info("onBeforeCompleteCallback called");
274276
beforeComplete.set(true);
275277
}
276278

277279
@Override
278280
public void onAfterCompleteCallback(ServerRequest serverRequest) {
281+
LOGGER.info("onAfterCompleteCallback called");
279282
afterComplete.set(true);
280283
}
281284

282285
@Override
283286
public void onBeforeFailedCallback(
284287
ServerRequest serverRequest, FailedResponseBean failedResponse) {
288+
LOGGER.error("onBeforeFailedCallback called", failedResponse.getThrowable());
285289
beforeFailed.set(true);
286290
}
287291
};
@@ -519,7 +523,7 @@ private <R> Result runBeanRequest(ServerRequest<R, SampleObject> req)
519523
r.successBodyBean = body;
520524
})
521525
.onFailed(err -> r.error = err.getThrowable())
522-
.onComplete(done::countDown);
526+
.onAfterComplete(done::countDown);
523527
req.send();
524528
assertTrue(done.await(5, TimeUnit.SECONDS), "Request did not complete in time");
525529
return r;

0 commit comments

Comments
 (0)