Polish up usage of @id.

gregturn · gregturn · commit 23355a1baa1f · 2020-04-09T13:18:32.000-05:00
diff --git a/2-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/2-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -22,7 +22,7 @@
 // tag::code[]
 public class Item {
 
-	private @Id String id;
+	@Id private String id;
 	private String name;
 	private double price;
 
diff --git a/2b-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/2b-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/3-classic/src/main/java/com/greglturnquist/hackingspringboot/reactive/ch3/Cart.java b/3-classic/src/main/java/com/greglturnquist/hackingspringboot/reactive/ch3/Cart.java
@@ -30,8 +30,7 @@
 @Entity
 class Cart {
 
-	@Id @GeneratedValue
-	private Long id;
+	@Id @GeneratedValue private Long id;
 
 	@OneToMany
 	private List<CartItem> cartItems = new ArrayList<>();
diff --git a/3-classic/src/main/java/com/greglturnquist/hackingspringboot/reactive/ch3/CartItem.java b/3-classic/src/main/java/com/greglturnquist/hackingspringboot/reactive/ch3/CartItem.java
@@ -28,8 +28,7 @@
 @Entity
 class CartItem {
 
-	@Id @GeneratedValue
-	private long id;
+	@Id @GeneratedValue private long id;
 
 	@OneToOne
 	private Item item;
diff --git a/3-classic/src/main/java/com/greglturnquist/hackingspringboot/reactive/ch3/Item.java b/3-classic/src/main/java/com/greglturnquist/hackingspringboot/reactive/ch3/Item.java
@@ -27,8 +27,7 @@
 @Entity
 public class Item {
 
-	@Id @GeneratedValue
-	private Long id;
+	@Id @GeneratedValue private Long id;
 
 	private String name;
 
diff --git a/3-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/3-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/4-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/4-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/5-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/HttpTraceWrapper.java b/5-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/HttpTraceWrapper.java
@@ -25,8 +25,7 @@
 // tag::code[]
 public class HttpTraceWrapper {
 
-    @Id
-    private String id; // <1>
+    @Id private String id; // <1>
     
     private HttpTrace httpTrace; // <2>
 
diff --git a/5-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/5-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/6-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/AffordancesItemController.java b/6-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/AffordancesItemController.java
@@ -137,7 +137,7 @@ public Mono<ResponseEntity<?>> updateItem(@RequestBody Mono<EntityModel<Item>> i
 	// end::update-item[]
 
 	// tag::profile[]
-	@GetMapping(value = "/affordances/items/profile"/, produces = MediaTypes.ALPS_JSON_VALUE)
+	@GetMapping(value = "/affordances/items/profile", produces = MediaTypes.ALPS_JSON_VALUE)
 	public Alps profile() {
 		return alps() //
 				.descriptor(Collections.singletonList(descriptor() //
diff --git a/6-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/6-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/7-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/7-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/8-reactive-client/src/main/java/com/greglturnquist/hackingspringboot/reactive/client/Item.java b/8-reactive-client/src/main/java/com/greglturnquist/hackingspringboot/reactive/client/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-	private @Id String id;
+	@Id private String id;
 	private String name;
 	private String description;
 	private double price;
diff --git a/8-reactive-client/src/main/resources/application.properties b/8-reactive-client/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-logging.level.com.greglturnquist.hackingspringboot=DEBUG
-logging.level.org.springframework.data=DEBUG
-logging.level.reactor=DEBUG
-logging.level.io.rsocket=DEBUG
+#logging.level.com.greglturnquist.hackingspringboot=DEBUG
+#logging.level.org.springframework.data=DEBUG
+#logging.level.reactor=DEBUG
+#logging.level.io.rsocket=DEBUG
diff --git a/8-reactive-client/src/test/java/com/greglturnquist/hackingspringboot/reactive/client/RSocketTest.java b/8-reactive-client/src/test/java/com/greglturnquist/hackingspringboot/reactive/client/RSocketTest.java
@@ -28,27 +28,34 @@
  * @author Greg Turnquist
  */
 // tag::setup[]
-@SpringBootTest
-@AutoConfigureWebTestClient
+@SpringBootTest // <1>
+@AutoConfigureWebTestClient // <2>
 public class RSocketTest {
 
-	@Autowired WebTestClient webTestClient;
-
-	@Autowired ItemRepository repository;
+	@Autowired WebTestClient webTestClient; // <3>
+	@Autowired ItemRepository repository; // <4>
+	// end::setup[]
 
+	// tag::fire-and-forget[]
 	@Test
 	void verifyRemoteOperationsThroughRSocketFireAndForget() throws InterruptedException {
-		this.repository.deleteAll().as(StepVerifier::create).verifyComplete();
 
-		this.webTestClient.post().uri("/items/fire-and-forget") // <1>
+		// Clean out the database
+		this.repository.deleteAll() // <1>
+				.as(StepVerifier::create) //
+				.verifyComplete();
+
+		// Create a new "item"
+		this.webTestClient.post().uri("/items/fire-and-forget") // <2>
 				.bodyValue(new Item("Alf alarm clock", "nothing important", 19.99)) //
 				.exchange() //
-				.expectStatus().isCreated() //
-				.expectBody().isEmpty();
+				.expectStatus().isCreated() // <3>
+				.expectBody().isEmpty(); // <4>
 
-		Thread.sleep(500); // <4>
+		Thread.sleep(500); //
 
-		this.repository.findAll() //
+		// Verify the "item" has been added to MongoDB
+		this.repository.findAll() // <5>
 				.as(StepVerifier::create) //
 				.expectNextMatches(item -> {
 					assertThat(item.getId()).isNotNull();
@@ -59,15 +66,22 @@ void verifyRemoteOperationsThroughRSocketFireAndForget() throws InterruptedExcep
 				}) //
 				.verifyComplete();
 	}
+	// end::fire-and-forget[]
 
+	// tag::request-response[]
 	@Test
 	void verifyRemoteOperationsThroughRSocketRequestResponse() throws InterruptedException {
-		this.repository.deleteAll().as(StepVerifier::create).verifyComplete();
 
-		this.webTestClient.post().uri("/items/request-response") // <1>
+		// Clean out the database
+		this.repository.deleteAll() // <1>
+				.as(StepVerifier::create) //
+				.verifyComplete();
+
+		// Create a new "item"
+		this.webTestClient.post().uri("/items/request-response") // <2>
 				.bodyValue(new Item("Alf alarm clock", "nothing important", 19.99)) //
 				.exchange() //
-				.expectStatus().isCreated() //
+				.expectStatus().isCreated() // <3>
 				.expectBody(Item.class) //
 				.value(item -> {
 					assertThat(item.getId()).isNotNull();
@@ -78,7 +92,8 @@ void verifyRemoteOperationsThroughRSocketRequestResponse() throws InterruptedExc
 
 		Thread.sleep(500); // <4>
 
-		this.repository.findAll() //
+		// Verify the "item" has been added to MongoDB
+		this.repository.findAll() // <4>
 				.as(StepVerifier::create) //
 				.expectNextMatches(item -> {
 					assertThat(item.getId()).isNotNull();
@@ -89,5 +104,6 @@ void verifyRemoteOperationsThroughRSocketRequestResponse() throws InterruptedExc
 				}) //
 				.verifyComplete();
 	}
+	// end::request-response[]
 
 }
diff --git a/8-reactive-server/src/main/java/com/greglturnquist/hackingspringboot/reactive/server/Item.java b/8-reactive-server/src/main/java/com/greglturnquist/hackingspringboot/reactive/server/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-	private @Id String id;
+	@Id private String id;
 	private String name;
 	private String description;
 	private double price;
diff --git a/8-reactive-server/src/main/resources/application.properties b/8-reactive-server/src/main/resources/application.properties
@@ -8,7 +8,7 @@ spring.rsocket.server.port=7000
 spring.rsocket.server.transport=tcp
 # end::code[]
 
-logging.level.com.greglturnquist.hackingspringboot=DEBUG
-logging.level.org.springframework.data=DEBUG
-logging.level.reactor=DEBUG
-logging.level.io.rsocket=DEBUG
+#logging.level.com.greglturnquist.hackingspringboot=DEBUG
+#logging.level.org.springframework.data=DEBUG
+#logging.level.reactor=DEBUG
+#logging.level.io.rsocket=DEBUG
diff --git a/9-reactive-custom-config/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/9-reactive-custom-config/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/9-reactive-method-security/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/9-reactive-method-security/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/9-reactive-oauth/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/9-reactive-oauth/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/9-reactive-quick/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/9-reactive-quick/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
diff --git a/9-reactive-repository/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java b/9-reactive-repository/src/main/java/com/greglturnquist/hackingspringboot/reactive/Item.java
@@ -23,7 +23,7 @@
 // tag::code[]
 public class Item {
 
-    private @Id String id;
+    @Id private String id;
     private String name;
     private String description;
     private double price;
