From d66cbc23b1bec45d61dd38967637d8f32e636892 Mon Sep 17 00:00:00 2001 From: kataus Date: Fri, 14 Feb 2020 21:40:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BC=D0=B5=D1=80=20=D0=BA?= =?UTF-8?q?=2020=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8E=20(WebFlux)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/otus/spring/Main.java | 47 ++++++++++++------- .../otus/spring/rest/AnnotatedController.java | 14 +++--- .../ru/otus/spring/rest/PersonController.java | 5 ++ 3 files changed, 42 insertions(+), 24 deletions(-) diff --git a/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/Main.java b/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/Main.java index c9b686ae..dcecffd5 100644 --- a/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/Main.java +++ b/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/Main.java @@ -22,44 +22,57 @@ import static org.springframework.web.reactive.function.server.ServerResponse.ok @SpringBootApplication public class Main { - public static void main(String[] args) { - ApplicationContext context = SpringApplication.run(Main.class); - PersonRepository repository = context.getBean(PersonRepository.class); + public static void main( String[] args ) { + ApplicationContext context = SpringApplication.run( Main.class ); + PersonRepository repository = context.getBean( PersonRepository.class ); - repository.saveAll(Arrays.asList( - new Person("Pushkin", 22), - new Person("Lermontov", 22), - new Person("Tolstoy", 60) - )).subscribe(p -> System.out.println(p.getLastName())); + repository.saveAll( Arrays.asList( + new Person( "Pushkin", 22 ), + new Person( "Lermontov", 22 ), + new Person( "Tolstoy", 60 ) + ) ).subscribe( p -> System.out.println( p.getLastName() ) ); } @Bean - public RouterFunction composedRoutes(PersonRepository repository) { + public RouterFunction composedRoutes( PersonRepository repository ) { - PersonHandler handler = new PersonHandler(repository); + PersonHandler handler = new PersonHandler( repository ); RouterFunction route = route() - .GET("/func/person", accept(APPLICATION_JSON), handler::list) - .GET("/func/person/{id}", accept(APPLICATION_JSON), - request -> repository.findById(request.pathVariable("id")) - .flatMap(person -> ok().contentType(APPLICATION_JSON).body(fromObject(person))) + .GET( "/func/person", accept( APPLICATION_JSON ), handler::list ) + .GET( "/func/person/{id}", accept( APPLICATION_JSON ), + request -> repository.findById( request.pathVariable( "id" ) ) + .flatMap( person -> ok().contentType( APPLICATION_JSON ).body( fromObject( person ) ) ) ) + .GET( "/func/person/age/{age}", accept( APPLICATION_JSON ), + serverRequest -> ok().contentType( APPLICATION_JSON ) + .body( repository.findAllByAge( Integer.valueOf( serverRequest.pathVariable( "age" ) ) ), Person.class ) ) + .GET( "/func/person/find", accept( APPLICATION_JSON ), + serverRequest -> ok().contentType( APPLICATION_JSON ) + .body( repository.findAllByAge( Integer.valueOf( serverRequest.queryParam( "age" ).get() ) ), Person.class ) ) .build(); return route; } + static class PersonHandler { private PersonRepository repository; - PersonHandler(PersonRepository repository) { + PersonHandler( PersonRepository repository ) { this.repository = repository; } - Mono list(ServerRequest request) { - return ok().contentType(APPLICATION_JSON).body(repository.findAll(), Person.class); + Mono list( ServerRequest request ) { + return ok().contentType( APPLICATION_JSON ).body( repository.findAll(), Person.class ); + } + + Mono listAge( ServerRequest request ) { + System.out.println( "I'm here" ); + return ok().contentType( APPLICATION_JSON ) + .body( repository.findAllByAge( Integer.valueOf( request.queryParam( "age" ).get() ) ), Person.class ); } } } diff --git a/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java b/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java index 3d723f35..0f1a75b5 100644 --- a/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java +++ b/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java @@ -13,21 +13,21 @@ public class AnnotatedController { @GetMapping("/flux/one") public Mono one() { - return Mono.just("one"); + return Mono.just( "one" ); } @GetMapping("/flux/ten") public Flux list() { - return Flux.range(1, 10); + return Flux.range( 1, 10 ).delayElements( Duration.ofSeconds( 1 ) ); } @GetMapping(path = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE) public Flux stream() { - return Flux.generate(() -> 0, (state, emitter) -> { - emitter.next(state); + return Flux.generate( () -> 0, ( state, emitter ) -> { + emitter.next( state ); return state + 1; - }) - .delayElements(Duration.ofSeconds(1L)) - .map(i -> "" + i); + } ) + .delayElements( Duration.ofSeconds( 1L ) ) + .map( i -> "" + i ); } } diff --git a/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/PersonController.java b/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/PersonController.java index d1a8c364..0ed2451c 100644 --- a/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/PersonController.java +++ b/2019-11/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/PersonController.java @@ -29,4 +29,9 @@ public class PersonController { public Mono save(@RequestBody Mono dto) { return repository.save(dto); } + + @GetMapping("/person/find") + public Flux byName(@RequestParam("name") String name){ + return repository.findAllByLastName( name ); + } }