Adjust to API changes

Author: gregturn

2/part1/src/test/java/com/greglturnquist/learningspringboot/ExampleTests.java

@@ -15,15 +15,15 @@
  */
 package com.greglturnquist.learningspringboot;
 
-import org.junit.Test;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
+import org.junit.Test;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 /**
  * @author Greg Turnquist
  */
@@ -76,7 +76,7 @@ public void data6() {
 			.flatMap(s -> Flux.fromArray(s.split("")))
 			.groupBy(String::toString)
 			.sort((o1, o2) -> o1.key().compareTo(o2.key()))
-			.flatMap(group -> Mono.just(group.key()).and(group.count()))
+			.flatMap(group -> Mono.just(group.key()).zipWith(group.count()))
 			.map(keyAndCount ->
 				keyAndCount.getT1() + " => " + keyAndCount.getT2())
 			.subscribe(System.out::println);

2/part2/src/main/java/com/greglturnquist/learningspringboot/ApiController.java

@@ -40,7 +40,7 @@ public class ApiController {
 	// tag::get[]
 	@GetMapping(API_BASE_PATH + "/images")
 	Flux<Image> images() {
-		Hooks.onOperator(operatorHook -> operatorHook.operatorStacktrace());
+		Hooks.onOperatorDebug();
 
 		return Flux.just(
 			new Image(1, "learning-spring-boot-cover.jpg"),
@@ -53,7 +53,7 @@ Flux<Image> images() {
 	// tag::post[]
 	@PostMapping(API_BASE_PATH + "/images")
 	Mono<Void> create(@RequestPart Flux<FilePart> images) {
-		Hooks.onOperator(operatorHook -> operatorHook.operatorStacktrace());
+		Hooks.onOperatorDebug();
 
 		return images
 			.map(image -> {

2/part2/src/test/java/com/greglturnquist/learningspringboot/ExampleTests.java

@@ -15,14 +15,14 @@
  */
 package com.greglturnquist.learningspringboot;
 
-import org.junit.Test;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
+import org.junit.Test;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 /**
  * @author Greg Turnquist
  */
@@ -75,7 +75,7 @@ public void data6() {
 			.flatMap(s -> Flux.fromArray(s.split("")))
 			.groupBy(String::toString)
 			.sort((o1, o2) -> o1.key().compareTo(o2.key()))
-			.flatMap(group -> Mono.just(group.key()).and(group.count()))
+			.flatMap(group -> Mono.just(group.key()).zipWith(group.count()))
 			.map(keyAndCount -> keyAndCount.getT1() + " => " + keyAndCount.getT2())
 			.subscribe(System.out::println);
 		// end::6[]

6/part1/src/main/java/com/greglturnquist/learningspringboot/HomeController.java

@@ -70,7 +70,7 @@ public Mono<String> index(Model model) {
 				.findAllImages()
 				.flatMap(image ->
 					Mono.just(image)
-					.and(repository.findByImageId(
+					.zipWith(repository.findByImageId(
 						image.getId()).collectList()))
 				.map(imageAndComments -> new HashMap<String, Object>(){{
 					put("id", imageAndComments.getT1().getId());

6/part2/src/main/java/com/greglturnquist/learningspringboot/HomeController.java

@@ -63,7 +63,7 @@ public Mono<String> index(Model model) {
 				.findAllImages()
 				.flatMap(image ->
 					Mono.just(image)
-						.and(repository.findByImageId(
+						.zipWith(repository.findByImageId(
 							image.getId()).collectList()))
 				.map(imageAndComments -> new HashMap<String, Object>(){{
 					put("id", imageAndComments.getT1().getId());

6/part3/src/main/java/com/greglturnquist/learningspringboot/HomeController.java

@@ -63,7 +63,7 @@ public Mono<String> index(Model model) {
 				.findAllImages()
 				.flatMap(image ->
 					Mono.just(image)
-						.and(repository.findByImageId(
+						.zipWith(repository.findByImageId(
 							image.getId()).collectList()))
 				.map(imageAndComments -> new HashMap<String, Object>(){{
 					put("id", imageAndComments.getT1().getId());

settings.gradle

@@ -1,54 +1,54 @@
 rootProject.name = 'learning-spring-boot'
 
-//include '1/part1'
-//
-//include '2/part1'
-//include '2/part2'
-//
-//include '3/part1'
-//include '3/part2'
-//
-//include '4/part1'
-//include '4/part2'
+include '1/part1'
+
+include '2/part1'
+include '2/part2'
+
+include '3/part1'
+include '3/part2'
+
+include '4/part1'
+include '4/part2'
 
 include '5/part1'
 include '5/part2'
 
-//include '6/part1'
-//include '6/part2'
-//include '6/part3'
-//
-//include '7/part1/eureka-server'
-//include '7/part1/images'
-//include '7/part1/comments'
-//include '7/part2/eureka-server'
-//include '7/part2/images'
-//include '7/part2/comments'
-//include '7/part2/hystrix-dashboard'
-//include '7/part3/eureka-server'
-//include '7/part3/images'
-//include '7/part3/comments'
-//include '7/part3/hystrix-dashboard'
-//include '7/part3/config-server'
-//
-//include '8/part1/eureka-server'
-//include '8/part1/images'
-//include '8/part1/comments'
-//include '8/part1/hystrix-dashboard'
-//include '8/part1/config-server'
-//include '8/part1/chat'
-//include '8/part2/eureka-server'
-//include '8/part2/images'
-//include '8/part2/comments'
-//include '8/part2/hystrix-dashboard'
-//include '8/part2/config-server'
-//include '8/part2/chat'
-//include '8/part3/eureka-server'
-//include '8/part3/images'
-//include '8/part3/comments'
-//include '8/part3/hystrix-dashboard'
-//include '8/part3/config-server'
-//include '8/part3/chat'
+include '6/part1'
+include '6/part2'
+include '6/part3'
+
+include '7/part1/eureka-server'
+include '7/part1/images'
+include '7/part1/comments'
+include '7/part2/eureka-server'
+include '7/part2/images'
+include '7/part2/comments'
+include '7/part2/hystrix-dashboard'
+include '7/part3/eureka-server'
+include '7/part3/images'
+include '7/part3/comments'
+include '7/part3/hystrix-dashboard'
+include '7/part3/config-server'
+
+include '8/part1/eureka-server'
+include '8/part1/images'
+include '8/part1/comments'
+include '8/part1/hystrix-dashboard'
+include '8/part1/config-server'
+include '8/part1/chat'
+include '8/part2/eureka-server'
+include '8/part2/images'
+include '8/part2/comments'
+include '8/part2/hystrix-dashboard'
+include '8/part2/config-server'
+include '8/part2/chat'
+include '8/part3/eureka-server'
+include '8/part3/images'
+include '8/part3/comments'
+include '8/part3/hystrix-dashboard'
+include '8/part3/config-server'
+include '8/part3/chat'
 
 include '9/part1/eureka-server'
 include '9/part1/images'