chibenwa commented on a change in pull request #711:
URL: https://github.com/apache/james-project/pull/711#discussion_r737442797
##########
File path:
server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/push_subscription/WebPushClient.scala
##########
@@ -89,27 +90,24 @@ class DefaultWebPushClient(configuration:
PushClientConfiguration) extends WebPu
override def push(pushServerUrl: PushSubscriptionServerURL, request:
PushRequest): Publisher[Unit] =
httpClient
.headers(builder => {
- builder.add(TIME_TO_LIVE, request.ttl.value.value)
+ builder.add(TIME_TO_LIVE, request.ttl.value)
builder.add(MESSAGE_URGENCY,
request.urgency.getOrElse(PushUrgency.default).value)
- request.topic.foreach(t => builder.add(TOPIC, t.value.value))
+ request.topic.foreach(t => builder.add(TOPIC, t.value))
})
.post()
.uri(pushServerUrl.value.toString)
.send(SMono.just(Unpooled.wrappedBuffer(request.payload)))
- .response()
- .doOnNext(httpResponse => afterHTTPResponseHandler(httpResponse))
-// .retryWhen(retrySpec)
+ .responseSingle((httpResponse, dataBuf) =>
afterHTTPResponseHandler(httpResponse, dataBuf))
.thenReturn(SMono.empty)
- private def afterHTTPResponseHandler(httpResponse: HttpClientResponse): Unit
= {
- httpResponse.status() match {
- case HttpResponseStatus.CREATED =>
- case HttpResponseStatus.BAD_REQUEST => throw new
WebPushInvalidRequestException
- case _ => throw new WebPushTemporarilyUnavailableException
- }
- }
-
- private def retrySpec: Retry =
Retry.max(configuration.maxRetryTimes.getOrElse(0))
- .filter(error =>
error.isInstanceOf[WebPushTemporarilyUnavailableException])
+ private def afterHTTPResponseHandler(httpResponse: HttpClientResponse,
dataBuf: ByteBufMono): Mono[Void] =
+ Mono.just(httpResponse.status())
+ .flatMap {
+ case HttpResponseStatus.CREATED => Mono.empty()
+ case HttpResponseStatus.BAD_REQUEST => dataBuf.asString()
Review comment:
```suggestion
case HttpResponseStatus.BAD_REQUEST => dataBuf.asString()
```
Can we only keep the first 1024 characters of this string? To ensure we
don't destroy our logging system...
##########
File path:
server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/push_subscription/WebPushClient.scala
##########
@@ -89,27 +90,24 @@ class DefaultWebPushClient(configuration:
PushClientConfiguration) extends WebPu
override def push(pushServerUrl: PushSubscriptionServerURL, request:
PushRequest): Publisher[Unit] =
httpClient
.headers(builder => {
- builder.add(TIME_TO_LIVE, request.ttl.value.value)
+ builder.add(TIME_TO_LIVE, request.ttl.value)
builder.add(MESSAGE_URGENCY,
request.urgency.getOrElse(PushUrgency.default).value)
- request.topic.foreach(t => builder.add(TOPIC, t.value.value))
+ request.topic.foreach(t => builder.add(TOPIC, t.value))
})
.post()
.uri(pushServerUrl.value.toString)
.send(SMono.just(Unpooled.wrappedBuffer(request.payload)))
- .response()
- .doOnNext(httpResponse => afterHTTPResponseHandler(httpResponse))
-// .retryWhen(retrySpec)
+ .responseSingle((httpResponse, dataBuf) =>
afterHTTPResponseHandler(httpResponse, dataBuf))
.thenReturn(SMono.empty)
- private def afterHTTPResponseHandler(httpResponse: HttpClientResponse): Unit
= {
- httpResponse.status() match {
- case HttpResponseStatus.CREATED =>
- case HttpResponseStatus.BAD_REQUEST => throw new
WebPushInvalidRequestException
- case _ => throw new WebPushTemporarilyUnavailableException
- }
- }
-
- private def retrySpec: Retry =
Retry.max(configuration.maxRetryTimes.getOrElse(0))
- .filter(error =>
error.isInstanceOf[WebPushTemporarilyUnavailableException])
+ private def afterHTTPResponseHandler(httpResponse: HttpClientResponse,
dataBuf: ByteBufMono): Mono[Void] =
+ Mono.just(httpResponse.status())
+ .flatMap {
+ case HttpResponseStatus.CREATED => Mono.empty()
+ case HttpResponseStatus.BAD_REQUEST => dataBuf.asString()
+ .flatMap(string =>
Mono.error(WebPushInvalidRequestException(string)))
+ case _ => dataBuf.asString()
+ .flatMap(string =>
Mono.error(WebPushTemporarilyUnavailableException(string)))
Review comment:
Idem...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
