Merge branch 'master' of https://github.com/OtusTeam/Spring

spring-13-data-jpa updated

2021-02/spring-20/.gitignore

@@ -0,0 +1,4 @@
+.idea/
+*.iml
+
+target/

2021-02/spring-20/pom.xml

@@ -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>

2021-02/spring-20/spring-20-exercise/pom.xml

@@ -0,0 +1,61 @@
+<?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.4.5</version>
+        <relativePath/>
+    </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>

2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/Main.java

@@ -0,0 +1,69 @@
+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.BodyInserters.fromValue;
+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.*;
+
+@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", accept(APPLICATION_JSON), new PersonHandler(repository)::list)
+                // Обратите внимание на использование pathVariable
+                .GET("/func/person/{id}", accept(APPLICATION_JSON),
+                        request -> repository.findById(request.pathVariable("id"))
+                                .flatMap(person -> ok().contentType(APPLICATION_JSON).body(fromValue(person)))
+                                .switchIfEmpty(notFound().build())
+                ).build();
+    }
+
+    // Это пример хэндлера, который даже не бин
+    static class PersonHandler {
+
+        private final PersonRepository repository;
+
+        PersonHandler(PersonRepository repository) {
+            this.repository = repository;
+        }
+
+        Mono<ServerResponse> list(ServerRequest request) {
+            // Обратите внимание на пример другого порядка создания response от Flux
+            return ok().contentType(APPLICATION_JSON).body(repository.findAll(), Person.class);
+        }
+    }
+}
+
+

2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/domain/Person.java

@@ -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;
+    }
+}

2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/repository/PersonRepository.java

@@ -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);
+}

2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java

@@ -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);
+    }
+}

2021-02/spring-20/spring-20-exercise/src/main/java/ru/otus/spring/rest/PersonController.java

@@ -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);
+    }
+}

2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java

@@ -0,0 +1,28 @@
+package ru.otus.spring.repository;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+import ru.otus.spring.domain.Person;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@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();
+    }
+}

2021-02/spring-20/spring-20-exercise/src/test/java/ru/otus/spring/rest/PersonControllerTest.java

@@ -0,0 +1,28 @@
+package ru.otus.spring.rest;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.reactive.function.server.ServerResponse;
+
+@SpringBootTest
+public class PersonControllerTest {
+
+    @Autowired
+    private RouterFunction<ServerResponse> route;
+
+    @Test
+    public void testRoute() {
+        WebTestClient client = WebTestClient
+                .bindToRouterFunction(route)
+                .build();
+
+        client.get()
+                .uri("/func/person")
+                .exchange()
+                .expectStatus()
+                .isOk();
+    }
+}

2021-02/spring-20/spring-20-solution/pom.xml

@@ -0,0 +1,61 @@
+<?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.4.5</version>
+        <relativePath/>
+    </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>

2021-02/spring-20/spring-20-solution/src/main/java/ru/otus/spring/Main.java

@@ -0,0 +1,82 @@
+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.BodyInserters.fromValue;
+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.*;
+
+@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()
+                // эта функция должна стоять раньше findAll - порядок следования роутов - важен
+                .GET("/func/person", queryParam("name", StringUtils::isNotEmpty),
+                        request -> request.queryParam("name")
+                                .map(repository::findAllByLastName)
+                                .map(persons -> ok().body(persons, Person.class))
+                                .orElse(badRequest().build())
+                )
+                // пример другой реализации - начиная с запроса репозитория
+                .GET("/func/person", queryParam("age", StringUtils::isNotEmpty),
+                        req -> repository.findAllByLastName(
+                                req.queryParam("age").orElseThrow(IllegalArgumentException::new)
+                        )
+                                .collectList()
+                                .flatMap(persons -> ok().body(persons, Person.class)))
+                // Обратите внимание на использование хэндлера
+                .GET("/func/person", accept(APPLICATION_JSON), new PersonHandler(repository)::list)
+                // Обратите внимание на использование pathVariable
+                .GET("/func/person/{id}", accept(APPLICATION_JSON),
+                        request -> repository.findById(request.pathVariable("id"))
+                                .flatMap(person -> ok().contentType(APPLICATION_JSON).body(fromValue(person)))
+                                .switchIfEmpty(notFound().build())
+                ).build();
+    }
+
+    // Это пример хэндлера, который даже не бин
+    static class PersonHandler {
+
+        private final PersonRepository repository;
+
+        PersonHandler(PersonRepository repository) {
+            this.repository = repository;
+        }
+
+        Mono<ServerResponse> list(ServerRequest request) {
+            // Обратите внимание на пример другого порядка создания response от Flux
+            return ok().contentType(APPLICATION_JSON).body(repository.findAll(), Person.class);
+        }
+    }
+}
+
+

2021-02/spring-20/spring-20-solution/src/main/java/ru/otus/spring/domain/Person.java

@@ -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;
+    }
+}

2021-02/spring-20/spring-20-solution/src/main/java/ru/otus/spring/repository/PersonRepository.java

@@ -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);
+}

2021-02/spring-20/spring-20-solution/src/main/java/ru/otus/spring/rest/AnnotatedController.java

@@ -0,0 +1,34 @@
+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")
+                .map(String::toUpperCase);
+    }
+
+    @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);
+    }
+}

2021-02/spring-20/spring-20-solution/src/main/java/ru/otus/spring/rest/PersonController.java

@@ -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);
+    }
+}

2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java

@@ -0,0 +1,28 @@
+package ru.otus.spring.repository;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+import ru.otus.spring.domain.Person;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@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();
+    }
+}

2021-02/spring-20/spring-20-solution/src/test/java/ru/otus/spring/rest/PersonControllerTest.java

@@ -0,0 +1,28 @@
+package ru.otus.spring.rest;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.reactive.function.server.ServerResponse;
+
+@SpringBootTest
+public class PersonControllerTest {
+
+    @Autowired
+    private RouterFunction<ServerResponse> route;
+
+    @Test
+    public void testRoute() {
+        WebTestClient client = WebTestClient
+                .bindToRouterFunction(route)
+                .build();
+
+        client.get()
+                .uri("/func/person")
+                .exchange()
+                .expectStatus()
+                .isOk();
+    }
+}