fix Streams to Stream in test

master
Stephane Maldini 9 years ago
parent 9a1492e401
commit 70b8848492
  1. 19
      spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java

@ -29,7 +29,6 @@ import reactor.Mono;
import reactor.io.buffer.Buffer; import reactor.io.buffer.Buffer;
import reactor.rx.Promise; import reactor.rx.Promise;
import reactor.rx.Stream; import reactor.rx.Stream;
import reactor.rx.Streams;
import rx.Observable; import rx.Observable;
import rx.Single; import rx.Single;
@ -359,7 +358,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati
@RequestMapping("/param") @RequestMapping("/param")
@ResponseBody @ResponseBody
public Publisher<String> handleWithParam(@RequestParam String name) { public Publisher<String> handleWithParam(@RequestParam String name) {
return Streams.just("Hello ", name, "!"); return Stream.just("Hello ", name, "!");
} }
@RequestMapping("/person") @RequestMapping("/person")
@ -378,7 +377,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati
@ResponseBody @ResponseBody
public Publisher<ByteBuffer> rawResponseBody() { public Publisher<ByteBuffer> rawResponseBody() {
JacksonJsonEncoder encoder = new JacksonJsonEncoder(); JacksonJsonEncoder encoder = new JacksonJsonEncoder();
return encoder.encode(Streams.just(new Person("Robert")), return encoder.encode(Stream.just(new Person("Robert")),
ResolvableType.forClass(Person.class), MediaType.APPLICATION_JSON); ResolvableType.forClass(Person.class), MediaType.APPLICATION_JSON);
} }
@ -409,7 +408,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati
@RequestMapping("/publisher") @RequestMapping("/publisher")
@ResponseBody @ResponseBody
public Publisher<Person> publisherResponseBody() { public Publisher<Person> publisherResponseBody() {
return Streams.just(new Person("Robert"), new Person("Marie")); return Stream.just(new Person("Robert"), new Person("Marie"));
} }
@RequestMapping("/observable") @RequestMapping("/observable")
@ -421,13 +420,13 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati
@RequestMapping("/stream") @RequestMapping("/stream")
@ResponseBody @ResponseBody
public Stream<Person> reactorStreamResponseBody() { public Stream<Person> reactorStreamResponseBody() {
return Streams.just(new Person("Robert"), new Person("Marie")); return Stream.just(new Person("Robert"), new Person("Marie"));
} }
@RequestMapping("/publisher-capitalize") @RequestMapping("/publisher-capitalize")
@ResponseBody @ResponseBody
public Publisher<Person> publisherCapitalize(@RequestBody Publisher<Person> persons) { public Publisher<Person> publisherCapitalize(@RequestBody Publisher<Person> persons) {
return Streams.from(persons).map(person -> { return Stream.from(persons).map(person -> {
person.setName(person.getName().toUpperCase()); person.setName(person.getName().toUpperCase());
return person; return person;
}); });
@ -481,7 +480,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati
@RequestMapping("/promise-capitalize") @RequestMapping("/promise-capitalize")
@ResponseBody @ResponseBody
public Promise<Person> promiseCapitalize(@RequestBody Promise<Person> personFuture) { public Promise<Person> promiseCapitalize(@RequestBody Promise<Person> personFuture) {
return Streams.from(personFuture.map(person -> { return Stream.from(personFuture.map(person -> {
person.setName(person.getName().toUpperCase()); person.setName(person.getName().toUpperCase());
return person; return person;
})).promise(); })).promise();
@ -489,12 +488,12 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati
@RequestMapping("/publisher-create") @RequestMapping("/publisher-create")
public Publisher<Void> publisherCreate(@RequestBody Publisher<Person> personStream) { public Publisher<Void> publisherCreate(@RequestBody Publisher<Person> personStream) {
return Streams.from(personStream).toList().doOnSuccess(persons::addAll).after(); return Stream.from(personStream).toList().doOnSuccess(persons::addAll).after();
} }
@RequestMapping("/stream-create") @RequestMapping("/stream-create")
public Publisher<Void> streamCreate(@RequestBody Stream<Person> personStream) { public Publisher<Void> streamCreate(@RequestBody Stream<Person> personStream) {
return Streams.from(personStream.toList().doOnSuccess(persons::addAll).after()).promise(); return Stream.from(personStream.toList().doOnSuccess(persons::addAll).after()).promise();
} }
@RequestMapping("/observable-create") @RequestMapping("/observable-create")
@ -517,7 +516,7 @@ public class RequestMappingIntegrationTests extends AbstractHttpHandlerIntegrati
@ExceptionHandler @ExceptionHandler
@ResponseBody @ResponseBody
public Publisher<String> handleException(IllegalStateException ex) { public Publisher<String> handleException(IllegalStateException ex) {
return Streams.just("Recovered from error: " + ex.getMessage()); return Stream.just("Recovered from error: " + ex.getMessage());
} }
//TODO add mixed and T request mappings tests //TODO add mixed and T request mappings tests

Loading…
Cancel
Save