2020-05 - 20

This commit is contained in:
ydvorzhetskiy
2020-08-14 19:51:11 +03:00
parent 6fad82f578
commit 7751bb116b
18 changed files with 712 additions and 0 deletions
+4
View File
@@ -0,0 +1,4 @@
.idea/
*.iml
target/
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ru.otus</groupId>
<artifactId>spring-20</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<modules>
<module>spring-20-exercise</module>
<module>spring-20-solution</module>
</modules>
</project>
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ru.otus</groupId>
<artifactId>spring-20-exercise</artifactId>
<version>1.0</version>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.4.RELEASE</version>
</parent>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
<!-- Зависимости WebFlux -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<!-- Зависимости Reactive SpringData -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
</dependency>
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
</dependency>
<!-- Тестирование -->
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,80 @@
package ru.otus.spring;
import org.springframework.boot.SpringApplication;
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;
import java.util.Arrays;
import static org.springframework.http.MediaType.APPLICATION_JSON;
import static org.springframework.web.reactive.function.BodyInserters.fromObject;
import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
import static org.springframework.web.reactive.function.server.RouterFunctions.route;
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 );
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<ServerResponse> composedRoutes( PersonRepository repository ) {
PersonHandler handler = new PersonHandler( repository );
RouterFunction<ServerResponse> 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/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 ) {
this.repository = repository;
}
Mono<ServerResponse> list( ServerRequest request ) {
return ok().contentType( APPLICATION_JSON ).body( repository.findAll(), Person.class );
}
Mono<ServerResponse> 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 );
}
}
}
@@ -0,0 +1,55 @@
package ru.otus.spring.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
@Document
public class Person {
@Id
private String id;
@JsonProperty("name")
@Field("name")
private String lastName;
private int age;
public Person() {
}
public Person(String lastName) {
this.lastName = lastName;
}
public Person(String lastName, int age) {
this.lastName = lastName;
this.age = age;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getLastName() {
return lastName;
}
public void setLastName(String lastName) {
this.lastName = lastName;
}
public int getAge() {
return age;
}
public void setAge(int age) {
this.age = age;
}
}
@@ -0,0 +1,20 @@
package ru.otus.spring.repository;
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import ru.otus.spring.domain.Person;
public interface PersonRepository
extends ReactiveMongoRepository<Person, String> {
Flux<Person> findAll();
Mono<Person> findById(String id);
Mono<Person> save(Mono<Person> person);
Flux<Person> findAllByLastName(String lastName);
Flux<Person> findAllByAge(int age);
}
@@ -0,0 +1,33 @@
package ru.otus.spring.rest;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.Duration;
@RestController
public class AnnotatedController {
@GetMapping("/flux/one")
public Mono<String> one() {
return Mono.just( "one" );
}
@GetMapping("/flux/ten")
public Flux<Integer> list() {
return Flux.range( 1, 10 ).delayElements( Duration.ofSeconds( 1 ) );
}
@GetMapping(path = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public Flux<String> stream() {
return Flux.generate( () -> 0, ( state, emitter ) -> {
emitter.next( state );
return state + 1;
} )
.delayElements( Duration.ofSeconds( 1L ) )
.map( i -> "" + i );
}
}
@@ -0,0 +1,37 @@
package ru.otus.spring.rest;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import ru.otus.spring.domain.Person;
import ru.otus.spring.repository.PersonRepository;
@RestController
public class PersonController {
private final PersonRepository repository;
public PersonController(PersonRepository repository) {
this.repository = repository;
}
@GetMapping("/person")
public Flux<Person> all() {
return repository.findAll();
}
@GetMapping("/person/{id}")
public Mono<Person> byId(@PathVariable("id") String id) {
return repository.findById(id);
}
@PostMapping("/person")
public Mono<Person> save(@RequestBody Mono<Person> dto) {
return repository.save(dto);
}
@GetMapping("/person/find")
public Flux<Person> byName(@RequestParam("name") String name){
return repository.findAllByLastName( name );
}
}
@@ -0,0 +1,31 @@
package ru.otus.spring.repository;
import org.junit.Test;
import org.junit.runner.RunWith;
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;
@RunWith(SpringRunner.class)
@DataMongoTest
public class PersonRepositoryTest {
@Autowired
private PersonRepository repository;
@Test
public void shouldSetIdOnSave() {
Mono<Person> personMono = repository.save(new Person("Bill", 12));
StepVerifier
.create(personMono)
.assertNext(person -> assertNotNull(person.getId()))
.expectComplete()
.verify();
}
}
@@ -0,0 +1,32 @@
package ru.otus.spring.rest;
import org.junit.Test;
import org.junit.runner.RunWith;
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;
@RunWith(SpringRunner.class)
@SpringBootTest
public class PersonControllerTest {
@Autowired
private RouterFunction route;
@Test
public void testRoute() {
WebTestClient client = WebTestClient
.bindToRouterFunction(route)
.build();
client.get()
.uri("/func/person")
.exchange()
.expectStatus()
.isOk();
}
}
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ru.otus</groupId>
<artifactId>spring-20-solution</artifactId>
<version>1.0</version>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.4.RELEASE</version>
</parent>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
<!-- Зависимости WebFlux -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<!-- Зависимости Reactive SpringData -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
</dependency>
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
</dependency>
<!-- Тестирование -->
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,58 @@
package ru.otus.spring;
import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.SpringApplication;
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;
import java.util.Arrays;
import static org.springframework.http.MediaType.APPLICATION_JSON;
import static org.springframework.web.reactive.function.BodyInserters.fromObject;
import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
import static org.springframework.web.reactive.function.server.RequestPredicates.queryParam;
import static org.springframework.web.reactive.function.server.RouterFunctions.route;
import static org.springframework.web.reactive.function.server.ServerResponse.notFound;
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);
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<ServerResponse> composedRoutes(PersonRepository repository) {
return route()
.GET("/func/person", queryParam("name", StringUtils::isNotEmpty),
request -> request.queryParam("name")
.map(repository::findAllByLastName)
.map(persons -> ok().body(persons, Person.class))
.orElse(notFound().build())
)
.GET("/func/person", accept(APPLICATION_JSON),
request -> ok().contentType(APPLICATION_JSON).body(repository.findAll(), Person.class))
.GET("/func/person/{id}", accept(APPLICATION_JSON),
request -> repository.findById(request.pathVariable("id"))
.flatMap(person -> ok().contentType(APPLICATION_JSON).body(fromObject(person)))
).build();
}
}
@@ -0,0 +1,55 @@
package ru.otus.spring.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
@Document
public class Person {
@Id
private String id;
@JsonProperty("name")
@Field("name")
private String lastName;
private int age;
public Person() {
}
public Person(String lastName) {
this.lastName = lastName;
}
public Person(String lastName, int age) {
this.lastName = lastName;
this.age = age;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getLastName() {
return lastName;
}
public void setLastName(String lastName) {
this.lastName = lastName;
}
public int getAge() {
return age;
}
public void setAge(int age) {
this.age = age;
}
}
@@ -0,0 +1,20 @@
package ru.otus.spring.repository;
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import ru.otus.spring.domain.Person;
public interface PersonRepository
extends ReactiveMongoRepository<Person, String> {
Flux<Person> findAll();
Mono<Person> findById(String id);
Mono<Person> save(Mono<Person> person);
Flux<Person> findAllByLastName(String lastName);
Flux<Person> findAllByAge(int age);
}
@@ -0,0 +1,33 @@
package ru.otus.spring.rest;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.Duration;
@RestController
public class AnnotatedController {
@GetMapping("/flux/one")
public Mono<String> one() {
return Mono.just("one");
}
@GetMapping("/flux/ten")
public Flux<Integer> list() {
return Flux.range(1, 10);
}
@GetMapping(path = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public Flux<String> stream() {
return Flux.generate(() -> 0, (state, emitter) -> {
emitter.next(state);
return state + 1;
})
.delayElements(Duration.ofSeconds(1L))
.map(i -> "" + i);
}
}
@@ -0,0 +1,42 @@
package ru.otus.spring.rest;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import ru.otus.spring.domain.Person;
import ru.otus.spring.repository.PersonRepository;
@RestController
public class PersonController {
private PersonRepository repository;
public PersonController(PersonRepository repository) {
this.repository = repository;
}
@GetMapping("/person")
public Flux<Person> all() {
return repository.findAll();
}
@GetMapping("/person/{id}")
public Mono<Person> byId(@PathVariable("id") String id) {
return repository.findById(id);
}
@GetMapping("/person/byname")
public Flux<Person> byName(@RequestParam("name") String lastName) {
return repository.findAllByLastName(lastName);
}
@GetMapping("/person/byage")
public Flux<Person> byAge(@RequestParam int age) {
return repository.findAllByAge(age);
}
@PostMapping("/person")
public Mono<Person> save(@RequestBody Mono<Person> dto) {
return repository.save(dto);
}
}
@@ -0,0 +1,43 @@
package ru.otus.spring.repository;
import org.junit.Test;
import org.junit.runner.RunWith;
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;
@RunWith(SpringRunner.class)
@DataMongoTest
public class PersonRepositoryTest {
@Autowired
private PersonRepository repository;
@Test
public void shouldSetIdOnSave() {
Mono<Person> personMono = repository.save(new Person("Bill", 12));
StepVerifier
.create(personMono)
.assertNext(person -> assertNotNull(person.getId()))
.expectComplete()
.verify();
}
@Test
public void shouldFindByAge() {
repository.save(new Person("Pushkin", 18)).subscribe();
StepVerifier.create(
repository.findAllByAge(18)
)
.expectNextCount(1)
.expectComplete()
.verify();
}
}
@@ -0,0 +1,32 @@
package ru.otus.spring.rest;
import org.junit.Test;
import org.junit.runner.RunWith;
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;
@RunWith(SpringRunner.class)
@SpringBootTest
public class PersonControllerTest {
@Autowired
private RouterFunction route;
@Test
public void testRoute() {
WebTestClient client = WebTestClient
.bindToRouterFunction(route)
.build();
client.get()
.uri("/func/person")
.exchange()
.expectStatus()
.isOk();
}
}