Skip to content

Commit 495eaf1

Browse files
committed
Removed validation of message in ServiceMethodInvoker.toRequest()
1 parent 401a1b4 commit 495eaf1

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

Issues.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import io.scalecube.services.api.ServiceMessage;
66
import io.scalecube.services.auth.Principal;
77
import io.scalecube.services.auth.PrincipalMapper;
8-
import io.scalecube.services.exceptions.BadRequestException;
98
import io.scalecube.services.exceptions.ForbiddenException;
109
import io.scalecube.services.exceptions.ServiceException;
1110
import io.scalecube.services.exceptions.ServiceProviderErrorMapper;
@@ -201,13 +200,6 @@ private Context enhanceRequestContext(
201200

202201
private Object toRequest(ServiceMessage message) {
203202
final var request = dataDecoder.apply(message, methodInfo.requestType());
204-
205-
if (!methodInfo.isRequestTypeVoid()
206-
&& !methodInfo.isRequestTypeServiceMessage()
207-
&& !request.hasData(methodInfo.requestType())) {
208-
throw new BadRequestException("Wrong request data type");
209-
}
210-
211203
return methodInfo.isRequestTypeServiceMessage() ? request : request.data();
212204
}
213205

services/src/test/java/io/scalecube/services/sut/GreetingServiceImpl.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io.scalecube.services.RequestContext;
55
import io.scalecube.services.annotations.Inject;
66
import io.scalecube.services.api.ServiceMessage;
7+
import io.scalecube.services.exceptions.BadRequestException;
78
import io.scalecube.services.exceptions.ForbiddenException;
89
import java.util.stream.LongStream;
910
import org.reactivestreams.Publisher;
@@ -34,8 +35,11 @@ public Mono<String> greeting(String name) {
3435
}
3536

3637
@Override
37-
public Mono<GreetingResponse> greetingPojo(GreetingRequest name) {
38-
return Mono.just(new GreetingResponse(" hello to: " + name));
38+
public Mono<GreetingResponse> greetingPojo(GreetingRequest request) {
39+
if (request == null) {
40+
throw new BadRequestException("Wrong request");
41+
}
42+
return Mono.just(new GreetingResponse(" hello to: " + request));
3943
}
4044

4145
@Override

0 commit comments

Comments
 (0)