Polish

Author: gregturn

3/part1/build.gradle

@@ -41,8 +41,7 @@ ext['thymeleaf.version'] = thymeleafVersion
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter-webflux')
 	// tag::dep-1[]
-	compile('org.springframework.boot:spring-boot-starter-data-mongodb')
-	compile('org.mongodb:mongodb-driver-reactivestreams')
+	compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
 	// end::dep-1[]
 	compile("org.thymeleaf:thymeleaf-spring5:${thymeleafVersion}")
 	compile('org.projectlombok:lombok')
@@ -53,7 +52,5 @@ dependencies {
 dependencyManagement {
 	imports {
 		mavenBom "io.projectreactor:reactor-bom:Aluminium-SR1"
-		// tag::dep-2[]
-		// end::dep-2[]
 	}
 }

3/part1/src/main/java/com/greglturnquist/learningspringboot/ImageRepository.java

@@ -22,7 +22,8 @@
  * @author Greg Turnquist
  */
 // tag::code[]
-public interface ImageRepository extends ReactiveCrudRepository<Image, String> {
+public interface ImageRepository
+	extends ReactiveCrudRepository<Image, String> {
 
 	Mono<Image> findByName(String name);
 }

3/part1/src/main/java/com/greglturnquist/learningspringboot/ImageService.java

@@ -46,7 +46,8 @@ public class ImageService {
 
 	private final ImageRepository imageRepository;
 
-	public ImageService(ResourceLoader resourceLoader, ImageRepository imageRepository) {
+	public ImageService(ResourceLoader resourceLoader,
+						ImageRepository imageRepository) {
 		this.resourceLoader = resourceLoader;
 		this.imageRepository = imageRepository;
 	}

3/part1/src/main/java/com/greglturnquist/learningspringboot/InitDatabase.java

@@ -51,7 +51,8 @@ public void run(String... args) throws Exception {
 				))
 			.then(() -> repository.findAll().collectList())
 			.then(images -> {
-				images.forEach(image -> System.out.println(image.toString()));
+				images.forEach(image ->
+					System.out.println(image.toString()));
 				return Mono.empty();
 			})
 			.block(Duration.ofSeconds(30));

3/part2/build.gradle

@@ -40,10 +40,7 @@ ext['thymeleaf.version'] = thymeleafVersion
 
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter-webflux')
-	// tag::dep-1[]
-	compile('org.springframework.boot:spring-boot-starter-data-mongodb')
-	compile('org.mongodb:mongodb-driver-reactivestreams')
-	// end::dep-1[]
+	compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
 	compile("org.thymeleaf:thymeleaf-spring5:${thymeleafVersion}")
 	compile('org.projectlombok:lombok')
 	testCompile('org.springframework.boot:spring-boot-starter-test')
@@ -53,7 +50,5 @@ dependencies {
 dependencyManagement {
 	imports {
 		mavenBom "io.projectreactor:reactor-bom:Aluminium-SR1"
-		// tag::dep-2[]
-		// end::dep-2[]
 	}
 }

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

@@ -81,7 +81,7 @@ public Mono<String> createFile(Flux<MultipartFile> files) {
 	@PostMapping(BASE_PATH + "/" + FILENAME)
 	public Mono<String> deleteFile(@PathVariable String filename) {
 		return imageService.deleteImage(filename)
-			.then(() -> Mono.just("redirect:/"));
+			.map(aVoid -> "redirect:/");
 	}
 
 }

3/part2/src/main/java/com/greglturnquist/learningspringboot/ImageRepository.java

@@ -22,7 +22,8 @@
  * @author Greg Turnquist
  */
 // tag::code[]
-public interface ImageRepository extends ReactiveCrudRepository<Image, String> {
+public interface ImageRepository
+	extends ReactiveCrudRepository<Image, String> {
 
 	Mono<Image> findByName(String name);
 }

3/part2/src/main/java/com/greglturnquist/learningspringboot/ImageService.java

@@ -45,7 +45,8 @@ public class ImageService {
 
 	private final ImageRepository imageRepository;
 
-	public ImageService(ResourceLoader resourceLoader, ImageRepository imageRepository) {
+	public ImageService(ResourceLoader resourceLoader,
+						ImageRepository imageRepository) {
 		this.resourceLoader = resourceLoader;
 		this.imageRepository = imageRepository;
 	}

3/part2/src/main/java/com/greglturnquist/learningspringboot/InitDatabase.java

@@ -42,11 +42,11 @@ public void run(String... args) throws Exception {
 			.then(() -> Mono.when(
 					repository.save(
 						new Image("1",
-							"learning-spring-boot.png"))
+							"learning-spring-boot-cover.jpg"))
 						.log("initDatabase"),
 					repository.save(
 						new Image("2",
-							"learning-spring-boot-2nd-edition.png"))
+							"learning-spring-boot-2nd-edition-cover.jpg"))
 						.log("initDatabase"),
 					repository.save(
 						new Image("3",
@@ -57,7 +57,8 @@ public void run(String... args) throws Exception {
 			.then(() -> repository.findAll().collectList())
 			.log("initDatabase")
 			.then(images -> {
-				images.forEach(image -> System.out.println(image.toString()));
+				images.forEach(image ->
+					System.out.println(image.toString()));
 				return Mono.empty();
 			})
 			.log("initDatabase")

3/part2/src/main/java/com/greglturnquist/learningspringboot/ReactiveThymeleafConfig.java

@@ -21,6 +21,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import org.springframework.web.reactive.result.view.UrlBasedViewResolver;
 import org.thymeleaf.spring5.ISpringWebReactiveTemplateEngine;
 import org.thymeleaf.spring5.SpringWebReactiveTemplateEngine;
 import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;