diff --git a/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java b/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java index f8e0bb29..0926d411 100644 --- a/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java +++ b/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java @@ -2,10 +2,12 @@ package ru.otus.spring.dao; import org.springframework.stereotype.Repository; import ru.otus.spring.domain.Person; +import ru.otus.spring.logging.LogMe; @Repository public class PersonDaoSimple implements PersonDao { + @LogMe public Person findByName(String name) { return new Person(name, 18); } diff --git a/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/logging/LogMe.java b/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/logging/LogMe.java new file mode 100644 index 00000000..cc2ef8c4 --- /dev/null +++ b/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/logging/LogMe.java @@ -0,0 +1,11 @@ +package ru.otus.spring.logging; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface LogMe { +} diff --git a/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java b/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java index a5622c3d..4da7fce8 100644 --- a/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java +++ b/2022-05/spring-04-aop/aop-classwork/solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Component public class LoggingAspect { - @Before("execution(* ru.otus.spring.dao.PersonDaoSimple.*(..))") + @Before("@annotation(ru.otus.spring.logging.LogMe)") public void logBefore(JoinPoint joinPoint) { System.out.println("Прокси : " + joinPoint.getThis().getClass().getName()); System.out.println("Класс : " + joinPoint.getTarget().getClass().getName()); diff --git a/2022-05/spring-04-aop/aop-demo/aop-custom/src/main/java/ru/otus/demo/domain/Person.java b/2022-05/spring-04-aop/aop-demo/aop-custom/src/main/java/ru/otus/demo/domain/Person.java index 80ee7acf..53d6310a 100644 --- a/2022-05/spring-04-aop/aop-demo/aop-custom/src/main/java/ru/otus/demo/domain/Person.java +++ b/2022-05/spring-04-aop/aop-demo/aop-custom/src/main/java/ru/otus/demo/domain/Person.java @@ -17,4 +17,12 @@ public class Person { public int getAge() { return age; } + + @Override + public String toString() { + return "Person{" + + "name='" + name + '\'' + + ", age=" + age + + '}'; + } } diff --git a/2022-05/spring-21/spring-21-reactive-spring-data/src/main/java/ru/otus/spring/repostory/PersonRepository.java b/2022-05/spring-21/spring-21-reactive-spring-data/src/main/java/ru/otus/spring/repostory/PersonRepository.java index 26b562e2..87ad0c54 100644 --- a/2022-05/spring-21/spring-21-reactive-spring-data/src/main/java/ru/otus/spring/repostory/PersonRepository.java +++ b/2022-05/spring-21/spring-21-reactive-spring-data/src/main/java/ru/otus/spring/repostory/PersonRepository.java @@ -8,6 +8,8 @@ import ru.otus.spring.domain.Person; public interface PersonRepository extends ReactiveMongoRepository { + // -ooo---ooo---ooo|--------- + // --------------------X----- Flux findByName(String name); @Query("{ 'name': ?0 }") diff --git a/2022-05/spring-21/spring-21-reactor/src/main/java/ru/otus/spring/Main.java b/2022-05/spring-21/spring-21-reactor/src/main/java/ru/otus/spring/Main.java index ff27392b..389bcf8e 100644 --- a/2022-05/spring-21/spring-21-reactor/src/main/java/ru/otus/spring/Main.java +++ b/2022-05/spring-21/spring-21-reactor/src/main/java/ru/otus/spring/Main.java @@ -13,7 +13,9 @@ public class Main { ReactiveProcessingService service = context.getBean(ReactiveProcessingService.class); - service.printHello("Ivan"); + for (int i = 0; i < 100000; ++i) { + service.printHello("Ivan"); + } } } diff --git a/2022-05/spring-21/spring-21-reactor/src/main/java/ru/otus/spring/reactor/ReactiveProcessingService.java b/2022-05/spring-21/spring-21-reactor/src/main/java/ru/otus/spring/reactor/ReactiveProcessingService.java index 99836fe0..09c892c6 100644 --- a/2022-05/spring-21/spring-21-reactor/src/main/java/ru/otus/spring/reactor/ReactiveProcessingService.java +++ b/2022-05/spring-21/spring-21-reactor/src/main/java/ru/otus/spring/reactor/ReactiveProcessingService.java @@ -21,9 +21,10 @@ public class ReactiveProcessingService { // Создаём sink (ранее - процессор) // Это reactor-овская реализация reactive-stream интерфейса // Обрабатывает данные как простой последовательный вызов методов :) - sink = Sinks.many().multicast().directBestEffort(); + sink = Sinks.many().unicast().onBackpressureBuffer(); // Здесь мы настраиваем flow flow = sink.asFlux() + .parallel(2) .map(nonFluxService::nonFluxSayHello) .subscribe(this::printMessage); // в идеале в коде выше должен быть doOnNext @@ -36,7 +37,7 @@ public class ReactiveProcessingService { * @param name это имя будет приходить из не-reactor окружения */ public void printHello(String name) { - sink.tryEmitNext(new Message(name)); + if (sink.tryEmitNext(new Message(name)).isFailure()) logger.error("!!!!!!"); } /** diff --git a/2022-05/spring-21/spring-21-web-flux/src/main/java/ru/otus/spring/ReactorController.java b/2022-05/spring-21/spring-21-web-flux/src/main/java/ru/otus/spring/ReactorController.java index e18864a4..da37d26a 100644 --- a/2022-05/spring-21/spring-21-web-flux/src/main/java/ru/otus/spring/ReactorController.java +++ b/2022-05/spring-21/spring-21-web-flux/src/main/java/ru/otus/spring/ReactorController.java @@ -8,6 +8,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import java.time.Duration; +import java.util.List; @RestController public class ReactorController { @@ -17,8 +18,14 @@ public class ReactorController { return Mono.just("one"); } + @GetMapping("/flux/three") + public Flux three() { + return Flux.just(300, 600, 900); + } + @GetMapping("/flux/ten") public Flux list() { + // 12345678910|------ return Flux.range(1, 10); } diff --git a/2022-05/spring-21/spring-21-web-flux/src/main/java/ru/otus/spring/RxJava2Controller.java b/2022-05/spring-21/spring-21-web-flux/src/main/java/ru/otus/spring/RxJava2Controller.java index edf0035f..6df801d9 100644 --- a/2022-05/spring-21/spring-21-web-flux/src/main/java/ru/otus/spring/RxJava2Controller.java +++ b/2022-05/spring-21/spring-21-web-flux/src/main/java/ru/otus/spring/RxJava2Controller.java @@ -2,19 +2,28 @@ package ru.otus.spring; import io.reactivex.Flowable; import io.reactivex.Single; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.concurrent.TimeUnit; + @RestController public class RxJava2Controller { @GetMapping("/rx/one") - public Single single() { - return Single.just("one"); + public Single single() { + return Single.just("one") + .map(s -> s.length()); } - @GetMapping("/rx/ten") - public Flowable list() { - return Flowable.range(1, 10); + // single() + // .subscribe(response -> request.sendToClient(response)) + + @GetMapping(value = "/rx/ten") + public Flowable list() { + // --0--1--2--3--4--... + return Flowable.interval(2, TimeUnit.SECONDS) + .map(i -> i + 1); } } diff --git a/2022-05/spring-22/.gitignore b/2022-05/spring-22/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2022-05/spring-22/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2022-05/spring-22/pom.xml b/2022-05/spring-22/pom.xml new file mode 100644 index 00000000..615a9dde --- /dev/null +++ b/2022-05/spring-22/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + ru.otus + spring-22 + 1.0 + + pom + + + spring-22-exercise + spring-22-solution + + diff --git a/2022-05/spring-22/spring-22-exercise/pom.xml b/2022-05/spring-22/spring-22-exercise/pom.xml new file mode 100644 index 00000000..4bb3b696 --- /dev/null +++ b/2022-05/spring-22/spring-22-exercise/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + ru.otus + spring-22-exercise + 1.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.4.5 + + + + + 11 + + + + + + org.springframework.boot + spring-boot-starter-webflux + + + + + org.springframework.boot + spring-boot-starter-data-mongodb-reactive + + + de.flapdoodle.embed + de.flapdoodle.embed.mongo + + + + + io.projectreactor + reactor-test + test + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/Main.java b/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/Main.java new file mode 100644 index 00000000..7b3c42bf --- /dev/null +++ b/2022-05/spring-22/spring-22-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 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 list(ServerRequest request) { + // Обратите внимание на пример другого порядка создания response от Flux + return ok().contentType(APPLICATION_JSON).body(repository.findAll(), Person.class); + } + } +} + + diff --git a/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/domain/Person.java b/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/domain/Person.java new file mode 100644 index 00000000..d40218ec --- /dev/null +++ b/2022-05/spring-22/spring-22-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; + } +} diff --git a/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/repository/PersonRepository.java b/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/repository/PersonRepository.java new file mode 100644 index 00000000..0584f0cb --- /dev/null +++ b/2022-05/spring-22/spring-22-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 { + + Flux findAll(); + + Mono findById(String id); + + Mono save(Mono person); + + Flux findAllByLastName(String lastName); + + Flux findAllByAge(int age); +} diff --git a/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java b/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/rest/AnnotatedController.java new file mode 100644 index 00000000..fc3bded8 --- /dev/null +++ b/2022-05/spring-22/spring-22-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 one() { + return Mono.just("one"); + } + + @GetMapping("/flux/ten") + public Flux list() { + 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 state + 1; + }) + .delayElements(Duration.ofSeconds(1L)) + .map(i -> "" + i); + } +} diff --git a/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/rest/PersonController.java b/2022-05/spring-22/spring-22-exercise/src/main/java/ru/otus/spring/rest/PersonController.java new file mode 100644 index 00000000..c6f2df03 --- /dev/null +++ b/2022-05/spring-22/spring-22-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 all() { + return repository.findAll(); + } + + @GetMapping("/person/{id}") + public Mono byId(@PathVariable("id") String id) { + return repository.findById(id); + } + + @PostMapping("/person") + public Mono save(@RequestBody Mono dto) { + return repository.save(dto); + } + + @GetMapping("/person/find") + public Flux byName(@RequestParam("name") String name) { + return repository.findAllByLastName(name); + } +} diff --git a/2022-05/spring-22/spring-22-exercise/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java b/2022-05/spring-22/spring-22-exercise/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java new file mode 100644 index 00000000..2f373b60 --- /dev/null +++ b/2022-05/spring-22/spring-22-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 personMono = repository.save(new Person("Bill", 12)); + + StepVerifier + .create(personMono) + .assertNext(person -> assertNotNull(person.getId())) + .expectComplete() + .verify(); + } +} diff --git a/2022-05/spring-22/spring-22-exercise/src/test/java/ru/otus/spring/rest/PersonControllerTest.java b/2022-05/spring-22/spring-22-exercise/src/test/java/ru/otus/spring/rest/PersonControllerTest.java new file mode 100644 index 00000000..d1504547 --- /dev/null +++ b/2022-05/spring-22/spring-22-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 route; + + @Test + public void testRoute() { + WebTestClient client = WebTestClient + .bindToRouterFunction(route) + .build(); + + client.get() + .uri("/func/person") + .exchange() + .expectStatus() + .isOk(); + } +} diff --git a/2022-05/spring-22/spring-22-solution/pom.xml b/2022-05/spring-22/spring-22-solution/pom.xml new file mode 100644 index 00000000..0b076478 --- /dev/null +++ b/2022-05/spring-22/spring-22-solution/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + ru.otus + spring-22-solution + 1.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.4.5 + + + + + 11 + + + + + + org.springframework.boot + spring-boot-starter-webflux + + + + + org.springframework.boot + spring-boot-starter-data-mongodb-reactive + + + de.flapdoodle.embed + de.flapdoodle.embed.mongo + + + + + io.projectreactor + reactor-test + test + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/Main.java b/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/Main.java new file mode 100644 index 00000000..8bad8f3d --- /dev/null +++ b/2022-05/spring-22/spring-22-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 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 list(ServerRequest request) { + // Обратите внимание на пример другого порядка создания response от Flux + return ok().contentType(APPLICATION_JSON).body(repository.findAll(), Person.class); + } + } +} + + diff --git a/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/domain/Person.java b/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/domain/Person.java new file mode 100644 index 00000000..d40218ec --- /dev/null +++ b/2022-05/spring-22/spring-22-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; + } +} diff --git a/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/repository/PersonRepository.java b/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/repository/PersonRepository.java new file mode 100644 index 00000000..0584f0cb --- /dev/null +++ b/2022-05/spring-22/spring-22-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 { + + Flux findAll(); + + Mono findById(String id); + + Mono save(Mono person); + + Flux findAllByLastName(String lastName); + + Flux findAllByAge(int age); +} diff --git a/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/rest/AnnotatedController.java b/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/rest/AnnotatedController.java new file mode 100644 index 00000000..184da872 --- /dev/null +++ b/2022-05/spring-22/spring-22-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 one() { + return Mono.just("one") + .map(String::toUpperCase); + } + + @GetMapping("/flux/ten") + public Flux list() { + return Flux.range(1, 10); + } + + @GetMapping(path = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE) + public Flux stream() { + return Flux.generate(() -> 0, (state, emitter) -> { + emitter.next(state); + return state + 1; + }) + .delayElements(Duration.ofSeconds(1L)) + .map(i -> "" + i); + } +} diff --git a/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/rest/PersonController.java b/2022-05/spring-22/spring-22-solution/src/main/java/ru/otus/spring/rest/PersonController.java new file mode 100644 index 00000000..2edcaea9 --- /dev/null +++ b/2022-05/spring-22/spring-22-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 all() { + return repository.findAll(); + } + + @GetMapping("/person/{id}") + public Mono byId(@PathVariable("id") String id) { + return repository.findById(id); + } + + @GetMapping("/person/byname") + public Flux byName(@RequestParam("name") String lastName) { + return repository.findAllByLastName(lastName); + } + + @GetMapping("/person/byage") + public Flux byAge(@RequestParam int age) { + return repository.findAllByAge(age); + } + + @PostMapping("/person") + public Mono save(@RequestBody Mono dto) { + return repository.save(dto); + } +} diff --git a/2022-05/spring-22/spring-22-solution/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java b/2022-05/spring-22/spring-22-solution/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java new file mode 100644 index 00000000..2f373b60 --- /dev/null +++ b/2022-05/spring-22/spring-22-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 personMono = repository.save(new Person("Bill", 12)); + + StepVerifier + .create(personMono) + .assertNext(person -> assertNotNull(person.getId())) + .expectComplete() + .verify(); + } +} diff --git a/2022-05/spring-22/spring-22-solution/src/test/java/ru/otus/spring/rest/PersonControllerTest.java b/2022-05/spring-22/spring-22-solution/src/test/java/ru/otus/spring/rest/PersonControllerTest.java new file mode 100644 index 00000000..d1504547 --- /dev/null +++ b/2022-05/spring-22/spring-22-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 route; + + @Test + public void testRoute() { + WebTestClient client = WebTestClient + .bindToRouterFunction(route) + .build(); + + client.get() + .uri("/func/person") + .exchange() + .expectStatus() + .isOk(); + } +}