diff --git a/2021-02/spring-20/spring-20-exercise/pom.xml b/2021-02/spring-20/spring-20-exercise/pom.xml index 71bbd272..7fb51891 100644 --- a/2021-02/spring-20/spring-20-exercise/pom.xml +++ b/2021-02/spring-20/spring-20-exercise/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.4.RELEASE + 2.4.5 diff --git a/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/Main.java b/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/Main.java index dcecffd5..e6fbbc70 100644 --- a/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/Main.java +++ b/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/Main.java @@ -22,35 +22,35 @@ 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 ) ) + .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; @@ -61,18 +61,18 @@ public class Main { 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 ); + 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/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java b/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java index 0f1a75b5..fc3bded8 100644 --- a/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java +++ b/2021-02/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 ).delayElements( Duration.ofSeconds( 1 ) ); + 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/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/PersonController.java b/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/PersonController.java index 0ed2451c..c6f2df03 100644 --- a/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/PersonController.java +++ b/2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/PersonController.java @@ -31,7 +31,7 @@ public class PersonController { } @GetMapping("/person/find") - public Flux byName(@RequestParam("name") String name){ - return repository.findAllByLastName( name ); + public Flux byName(@RequestParam("name") String name) { + return repository.findAllByLastName(name); } } diff --git a/2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java b/2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java index 0ecf3ca8..2f373b60 100644 --- a/2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java +++ b/2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java @@ -1,17 +1,14 @@ package ru.otus.spring.repository; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest; -import org.springframework.test.context.junit4.SpringRunner; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import ru.otus.spring.domain.Person; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; -@RunWith(SpringRunner.class) @DataMongoTest public class PersonRepositoryTest { diff --git a/2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/rest/PersonControllerTest.java b/2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/rest/PersonControllerTest.java index b6eb9806..d1504547 100644 --- a/2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/rest/PersonControllerTest.java +++ b/2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/rest/PersonControllerTest.java @@ -1,19 +1,17 @@ package ru.otus.spring.rest; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.ServerResponse; -@RunWith(SpringRunner.class) @SpringBootTest public class PersonControllerTest { @Autowired - private RouterFunction route; + private RouterFunction route; @Test public void testRoute() { @@ -27,6 +25,4 @@ public class PersonControllerTest { .expectStatus() .isOk(); } - - } diff --git a/2021-02/spring-20/spring-20-solution/pom.xml b/2021-02/spring-20/spring-20-solution/pom.xml index 13d66a4f..60a6d129 100644 --- a/2021-02/spring-20/spring-20-solution/pom.xml +++ b/2021-02/spring-20/spring-20-solution/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.4.RELEASE + 2.4.5 diff --git a/2021-02/spring-20/spring-20-solution/src/main/java/ru/otus/spring/Main.java b/2021-02/spring-20/spring-20-solution/src/main/java/ru/otus/spring/Main.java index 934532de..3a07de5c 100644 --- a/2021-02/spring-20/spring-20-solution/src/main/java/ru/otus/spring/Main.java +++ b/2021-02/spring-20/spring-20-solution/src/main/java/ru/otus/spring/Main.java @@ -6,9 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; import ru.otus.spring.domain.Person; import ru.otus.spring.repository.PersonRepository; diff --git a/2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java b/2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java index 037dc9b7..2f373b60 100644 --- a/2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java +++ b/2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java @@ -1,17 +1,14 @@ package ru.otus.spring.repository; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest; -import org.springframework.test.context.junit4.SpringRunner; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import ru.otus.spring.domain.Person; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; -@RunWith(SpringRunner.class) @DataMongoTest public class PersonRepositoryTest { @@ -28,17 +25,4 @@ public class PersonRepositoryTest { .expectComplete() .verify(); } - - @Test - public void shouldFindByAge() { - repository.save(new Person("Pushkin", 18)).block(); - - StepVerifier.create( - repository.findAllByAge(18) - ) - .expectFusion() - .expectNextCount(1) - .expectComplete() - .verify(); - } } diff --git a/2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/rest/PersonControllerTest.java b/2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/rest/PersonControllerTest.java index b6eb9806..d1504547 100644 --- a/2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/rest/PersonControllerTest.java +++ b/2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/rest/PersonControllerTest.java @@ -1,19 +1,17 @@ package ru.otus.spring.rest; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.ServerResponse; -@RunWith(SpringRunner.class) @SpringBootTest public class PersonControllerTest { @Autowired - private RouterFunction route; + private RouterFunction route; @Test public void testRoute() { @@ -27,6 +25,4 @@ public class PersonControllerTest { .expectStatus() .isOk(); } - - }