Skip to content

Commit 07040d0

Browse files
committed
Merge branch 'release/1.0.2'
2 parents def37d3 + 0b46144 commit 07040d0

File tree

8 files changed

+25
-10
lines changed

8 files changed

+25
-10
lines changed

domino-rest-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.1</version>
8+
<version>1.0.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

domino-rest-jaxrs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.dominokit</groupId>
77
<artifactId>domino-rest</artifactId>
8-
<version>1.0.1</version>
8+
<version>1.0.2</version>
99
</parent>
1010

1111
<artifactId>domino-rest-jaxrs</artifactId>

domino-rest-jvm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.1</version>
8+
<version>1.0.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

domino-rest-processor/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>domino-rest</artifactId>
66
<groupId>org.dominokit</groupId>
7-
<version>1.0.1</version>
7+
<version>1.0.2</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

domino-rest-shared/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.1</version>
8+
<version>1.0.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.dominokit.rest.shared.request;
1717

18+
import static java.util.Objects.isNull;
1819
import static java.util.Objects.nonNull;
1920

2021
import java.util.Arrays;
@@ -119,14 +120,28 @@ private void handleResponse(
119120
if (Arrays.stream(request.getSuccessCodes())
120121
.anyMatch(code -> code.equals(response.getStatusCode()))) {
121122
callSuccessGlobalHandlers(request, response);
122-
callBack.onSuccess(request.getResponseReader().read(response));
123+
callBack.onSuccess(readResponse(request, response));
123124
} else {
124125
FailedResponseBean failedResponse = new FailedResponseBean(request, response);
125126
callFailedResponseHandlers(request, failedResponse);
126127
callBack.onFailure(failedResponse);
127128
}
128129
}
129130

131+
private <R, S> S readResponse(ServerRequest<R, S> request, Response response) {
132+
int statusCode = response.getStatusCode();
133+
switch (statusCode) {
134+
case 204:
135+
{
136+
if (isNull(response.getBodyAsString()) || response.getBodyAsString().isEmpty()) {
137+
return null;
138+
}
139+
}
140+
default:
141+
return request.getResponseReader().read(response);
142+
}
143+
}
144+
130145
private void callSuccessGlobalHandlers(ServerRequest<R, S> request, Response response) {
131146
DominoRestContext.make()
132147
.getConfig()

domino-rest-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.1</version>
8+
<version>1.0.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.dominokit</groupId>
77
<artifactId>domino-rest</artifactId>
8-
<version>1.0.1</version>
8+
<version>1.0.2</version>
99
<packaging>pom</packaging>
1010

1111
<name>domino-rest</name>
@@ -70,7 +70,7 @@
7070

7171
<properties>
7272
<snapshot.version>HEAD-SNAPSHOT</snapshot.version>
73-
<next.release.version>1.0.1</next.release.version>
73+
<next.release.version>1.0.2</next.release.version>
7474
<maven.compiler.source>11</maven.compiler.source>
7575
<maven.compiler.target>11</maven.compiler.target>
7676
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -90,7 +90,7 @@
9090

9191
<gwt.version>2.10.0</gwt.version>
9292
<domino.logger.version>1.0.3</domino.logger.version>
93-
<domino.jackson.version>1.0.3</domino.jackson.version>
93+
<domino.jackson.version>1.0.4</domino.jackson.version>
9494
<domino.history.version>1.0.2</domino.history.version>
9595
<domino.aggregator.version>1.0.2</domino.aggregator.version>
9696
<jax.rs.version>2.1.1</jax.rs.version>

0 commit comments

Comments
 (0)