Changes for proofreading.

Author: gregturn

6-reactive/pom.xml

@@ -20,7 +20,6 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<auto-service.version>1.0-rc5</auto-service.version>
-		<spring-hateoas.version>1.1.0.BUILD-SNAPSHOT</spring-hateoas.version>
 	</properties>
 
 	<dependencies>

9-reactive-custom-config/src/main/java/com/greglturnquist/hackingspringboot/reactive/HomeController.java

@@ -44,8 +44,8 @@ Mono<Rendering> home(Authentication auth) { // <1>
 		return Mono.just(Rendering.view("home.html") //
 				.modelAttribute("items", this.inventoryService.getInventory()) //
 				.modelAttribute("cart", this.inventoryService.getCart(cartName(auth)) // <2>
-						.defaultIfEmpty(new Cart(cartName(auth)))) // <3>
-				.modelAttribute("auth", auth) // <4>
+						.defaultIfEmpty(new Cart(cartName(auth)))) //
+				.modelAttribute("auth", auth) // <3>
 				.build());
 	}
 	// end::user-cart[]

9-reactive-method-security/src/main/java/com/greglturnquist/hackingspringboot/reactive/ApiItemController.java

@@ -105,7 +105,7 @@ Mono<CollectionModel<EntityModel<Item>>> findAll(Authentication auth) {
 				.flatMap(links -> this.repository.findAll() //
 						.flatMap(item -> findOne(item.getId(), auth)) //
 						.collectList() //
-						.map(entityModels -> new CollectionModel<>(entityModels, links)));
+						.map(entityModels -> CollectionModel.of(entityModels, links)));
 	}
 	// end::find-all[]
 
@@ -117,14 +117,15 @@ Mono<EntityModel<Item>> findOne(@PathVariable String id, Authentication auth) {
 		Mono<Link> selfLink = linkTo(controller.findOne(id, auth)).withSelfRel() //
 				.toMono();
 
-		Mono<Link> aggregateLink = linkTo(controller.findAll(auth)).withRel(IanaLinkRelations.ITEM) //
-				.toMono();
+		Mono<Link> aggregateLink = linkTo(controller.findAll(auth)) //
+				.withRel(IanaLinkRelations.ITEM).toMono();
 
 		Mono<Links> allLinks; // <1>
 
 		if (auth.getAuthorities().contains(ROLE_INVENTORY)) { // <2>
-			allLinks = Mono.zip(selfLink, aggregateLink, //
-					linkTo(controller.deleteItem(id)).withRel("delete").toMono()) //
+			Mono<Link> deleteLink = linkTo(controller.deleteItem(id)).withRel("delete") //
+					.toMono();
+			allLinks = Mono.zip(selfLink, aggregateLink, deleteLink) //
 					.map(links -> Links.of(links.getT1(), links.getT2(), links.getT3()));
 		} else { // <3>
 			allLinks = Mono.zip(selfLink, aggregateLink) //
@@ -133,7 +134,7 @@ Mono<EntityModel<Item>> findOne(@PathVariable String id, Authentication auth) {
 
 		return allLinks // <4>
 				.flatMap(links -> this.repository.findById(id) //
-						.map(item -> new EntityModel<>(item, links)));
+						.map(item -> EntityModel.of(item, links)));
 	}
 
 	// end::find-one[]

9-reactive-method-security/src/main/java/com/greglturnquist/hackingspringboot/reactive/HomeController.java

@@ -40,8 +40,8 @@ Mono<Rendering> home(Authentication auth) { // <1>
 		return Mono.just(Rendering.view("home.html") //
 				.modelAttribute("items", this.inventoryService.getInventory()) //
 				.modelAttribute("cart", this.inventoryService.getCart(cartName(auth)) // <2>
-						.defaultIfEmpty(new Cart(cartName(auth)))) // <3>
-				.modelAttribute("auth", auth) // <4>
+						.defaultIfEmpty(new Cart(cartName(auth)))) //
+				.modelAttribute("auth", auth) // <3>
 				.build());
 	}
 	// end::user-cart[]

9-reactive-method-security/src/test/java/com/greglturnquist/hackingspringboot/reactive/ApiItemControllerTest.java

@@ -16,7 +16,11 @@
 package com.greglturnquist.hackingspringboot.reactive;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType.*;
 
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.hateoas.config.EnableHypermediaSupport;
+import org.springframework.hateoas.config.HypermediaWebTestClientConfigurer;
 import reactor.test.StepVerifier;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -38,23 +42,21 @@
 /**
  * @author Greg Turnquist
  */
-@SpringBootTest
+// tag::register[]
+@SpringBootTest()
+@EnableHypermediaSupport(type = HAL) // <1>
 @AutoConfigureWebTestClient
 public class ApiItemControllerTest {
 
-	@Autowired WebTestClient webTestClient;
+	@Autowired WebTestClient webTestClient; // <2>
 
 	@Autowired ItemRepository repository;
 
-	@Autowired WebClientConfigurer webClientConfigurer;
+	@Autowired HypermediaWebTestClientConfigurer webClientConfigurer; // <3>
 
-	// tag::register[]
-	@BeforeEach // <1>
+	@BeforeEach
 	void setUp() {
-		this.webTestClient = this.webTestClient //
-				.mutate() //
-				.exchangeStrategies(this.webClientConfigurer.hypermediaExchangeStrategies()) // <2>
-				.build();
+		this.webTestClient = this.webTestClient.mutateWith(webClientConfigurer); // <4>
 	}
 	// end::register[]
 
@@ -178,7 +180,7 @@ void navigateToItemWithoutInventoryAuthority() {
 	@Test
 	@WithMockUser(username = "alice", roles = { "INVENTORY" })
 	void navigateToItemWithInventoryAuthority() {
-		
+
 		// Navigate to the root URI of the API.
 		RepresentationModel<?> root = this.webTestClient.get().uri("/api") //
 				.exchange() //

9-reactive-oauth/src/main/resources/application.yml

@@ -4,5 +4,5 @@ spring:
       client:
         registration:
           google:
-            client-id: 76769467445-cg244gaa3heg88hphvlsfbkehj96opeh.apps.googleusercontent.com
+            client-id: 1234redacted5678opeh.apps.googleusercontent.com
             client-secret: ovj6b_va5fEB-EWEcE3FGOK6

9-reactive-repository/src/main/java/com/greglturnquist/hackingspringboot/reactive/User.java

@@ -26,21 +26,21 @@
 // tag::code[]
 public class User {
 
-	private @Id String id;
+	private @Id String id; // <1>
 	private String name;
 	private String password;
 	private List<String> roles;
 
-	private User() {} // <1>
+	private User() {} // <2>
 
-	public User(String id, String name, String password, List<String> roles) { // <2>
+	public User(String id, String name, String password, List<String> roles) { // <3>
 		this.id = id;
 		this.name = name;
 		this.password = password;
 		this.roles = roles;
 	}
 
-	public User(String name, String password, List<String> roles) { // <3>
+	public User(String name, String password, List<String> roles) { // <4>
 		this.name = name;
 		this.password = password;
 		this.roles = roles;

9-reactive-repository/src/main/java/com/greglturnquist/hackingspringboot/reactive/UserRepository.java

@@ -25,5 +25,6 @@
 public interface UserRepository extends CrudRepository<User, String> {
 
 	Mono<User> findByName(String name);
+
 }
 // end::code[]