Skip to content

Commit 411bd4b

Browse files
gregturngregturn
committed
Revert "Empty Comments - All Chapters"
This reverts commit 979696e.
1 parent 979696e commit 411bd4b

File tree

53 files changed

+473
-472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+473
-472
lines changed

‎2-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/CartService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ class CartService {
3737
}
3838

3939
Mono<Cart> addToCart(String cartId, String id) { // <3>
40-
return this.cartRepository.findById(cartId)
41-
.defaultIfEmpty(new Cart(cartId))
42-
.flatMap(cart -> cart.getCartItems().stream()
43-
.filter(cartItem -> cartItem.getItem().getId().equals(id))
44-
.findAny()
40+
return this.cartRepository.findById(cartId) //
41+
.defaultIfEmpty(new Cart(cartId)) //
42+
.flatMap(cart -> cart.getCartItems().stream() //
43+
.filter(cartItem -> cartItem.getItem().getId().equals(id)) //
44+
.findAny() //
4545
.map(cartItem -> {
4646
cartItem.increment();
4747
return Mono.just(cart);
4848
}) //
4949
.orElseGet(() -> {
50-
return this.itemRepository.findById(id)
50+
return this.itemRepository.findById(id) //
5151
.map(CartItem::new) // <4>
52-
.doOnNext(cartItem -> cart.getCartItems().add(cartItem))
52+
.doOnNext(cartItem -> cart.getCartItems().add(cartItem)) //
5353
.map(cartItem -> cart);
5454
}))
5555
.flatMap(this.cartRepository::save); // <5>

‎2-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/HomeController.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ Mono<Rendering> home() { // <1>
5757
@GetMapping("/add/{id}") // <1>
5858
Mono<String> addToCart(@PathVariable String id) { // <2>
5959
return this.cartRepository.findById("My Cart") // <3>
60-
.defaultIfEmpty(new Cart("My Cart"))
60+
.defaultIfEmpty(new Cart("My Cart")) //
6161
.flatMap(cart -> cart.getCartItems().stream() // <4>
62-
.filter(cartItem -> cartItem.getItem().getId().equals(id))
63-
.findAny()
62+
.filter(cartItem -> cartItem.getItem().getId().equals(id)) //
63+
.findAny() //
6464
.map(cartItem -> {
6565
cartItem.increment();
6666
return Mono.just(cart);
6767
}) //
6868
.orElseGet(() -> { // <5>
69-
return this.itemRepository.findById(id)
70-
.map(item -> new CartItem(item))
69+
return this.itemRepository.findById(id) //
70+
.map(item -> new CartItem(item)) //
7171
.map(cartItem -> {
7272
cart.getCartItems().add(cartItem);
7373
return cart;
@@ -80,13 +80,13 @@ Mono<String> addToCart(@PathVariable String id) { // <2>
8080

8181
@PostMapping
8282
Mono<String> createItem(@ModelAttribute Item newItem) {
83-
return this.itemRepository.save(newItem)
83+
return this.itemRepository.save(newItem) //
8484
.then(Mono.just("redirect:/"));
8585
}
8686

8787
@GetMapping("/delete/{id}")
8888
Mono<String> deleteItem(@PathVariable String id) {
89-
return this.itemRepository.deleteById(id)
89+
return this.itemRepository.deleteById(id) //
9090
.then(Mono.just("redirect:/"));
9191
}
9292
}

‎2-reactive/src/test/java/com/greglturnquist/hackingspringboot/reactive/HomeController2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public HomeController2(CartService cartService) {
3636
// tag::4[]
3737
@GetMapping("/add/{id}")
3838
Mono<String> addToCart(@PathVariable String id) {
39-
return this.cartService.addToCart("My Cart", id)
39+
return this.cartService.addToCart("My Cart", id) //
4040
.then(Mono.just("redirect:/"));
4141
}
4242
// end::4[]

‎2-reactive/src/test/java/com/greglturnquist/hackingspringboot/reactive/Sample1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void demo2() {
4646
Cart cart = new Cart("My Cart");
4747

4848
// tag::2[]
49-
if (cart.getCartItems().stream()
49+
if (cart.getCartItems().stream() //
5050
.anyMatch(cartItem -> cartItem.getItem().getId().equals("5"))) {
5151
// increment
5252
} else {

‎2b-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/CartService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ class CartService {
3636
}
3737

3838
Mono<Cart> addToCart(String cartId, String id) { // <3>
39-
return this.cartRepository.findById(cartId)
40-
.defaultIfEmpty(new Cart(cartId))
41-
.flatMap(cart -> cart.getCartItems().stream()
42-
.filter(cartItem -> cartItem.getItem().getId().equals(id))
43-
.findAny()
39+
return this.cartRepository.findById(cartId) //
40+
.defaultIfEmpty(new Cart(cartId)) //
41+
.flatMap(cart -> cart.getCartItems().stream() //
42+
.filter(cartItem -> cartItem.getItem().getId().equals(id)) //
43+
.findAny() //
4444
.map(cartItem -> {
4545
cartItem.increment();
4646
return Mono.just(cart);
4747
}).orElseGet(() -> {
48-
return this.itemRepository.findById(id)
48+
return this.itemRepository.findById(id) //
4949
.map(CartItem::new) // <4>
50-
.doOnNext(cartItem -> cart.getCartItems().add(cartItem))
50+
.doOnNext(cartItem -> cart.getCartItems().add(cartItem)) //
5151
.map(cartItem -> cart);
5252
}))
5353
.flatMap(this.cartRepository::save); // <5>

‎2b-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/HomeController.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ Mono<Rendering> home() { // <1>
6161
// <1>
6262
Mono<String> addToCart(@PathVariable String id) { // <2>
6363
return this.cartRepository.findById("My Cart") // <3>
64-
.defaultIfEmpty(new Cart("My Cart"))
64+
.defaultIfEmpty(new Cart("My Cart")) //
6565
.flatMap(cart -> cart.getCartItems().stream() // <4>
66-
.filter(cartItem -> cartItem.getItem().getId().equals(id))
67-
.findAny()
66+
.filter(cartItem -> cartItem.getItem().getId().equals(id)) //
67+
.findAny() //
6868
.map(cartItem -> {
6969
cartItem.increment();
7070
return Mono.just(cart);
7171
}).orElseGet(() -> { // <5>
72-
return this.itemRepository.findById(id)
73-
.map(item -> new CartItem(item))
72+
return this.itemRepository.findById(id) //
73+
.map(item -> new CartItem(item)) //
7474
.map(cartItem -> {
7575
cart.getCartItems().add(cartItem);
7676
return cart;
@@ -83,13 +83,13 @@ Mono<String> addToCart(@PathVariable String id) { // <2>
8383

8484
@PostMapping
8585
Mono<String> createItem(@ModelAttribute Item newItem) {
86-
return this.itemRepository.save(newItem)
86+
return this.itemRepository.save(newItem) //
8787
.then(Mono.just("redirect:/"));
8888
}
8989

9090
@GetMapping("/delete/{id}")
9191
Mono<String> deleteItem(@PathVariable String id) {
92-
return this.itemRepository.deleteById(id)
92+
return this.itemRepository.deleteById(id) //
9393
.then(Mono.just("redirect:/"));
9494
}
9595

‎2b-reactive/src/test/java/com/greglturnquist/hackingspringboot/reactive/HomeController2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public HomeController2(CartService cartService) {
3838
// tag::4[]
3939
@GetMapping("/add/{id}")
4040
Mono<String> addToCart(@PathVariable String id) {
41-
return this.cartService.addToCart("My Cart", id)
41+
return this.cartService.addToCart("My Cart", id) //
4242
.then(Mono.just("redirect:/"));
4343
}
4444
// end::4[]

‎2b-reactive/src/test/java/com/greglturnquist/hackingspringboot/reactive/Sample1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void demo2() {
4646
Cart cart = new Cart("My Cart");
4747

4848
// tag::2[]
49-
if (cart.getCartItems().stream()
49+
if (cart.getCartItems().stream() //
5050
.anyMatch(cartItem -> cartItem.getItem().getId().equals("5"))) {
5151
// increment
5252
} else {

‎3-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/CartService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ class CartService {
3636
}
3737

3838
Mono<Cart> addToCart(String cartId, String id) { // <3>
39-
return this.cartRepository.findById(cartId)
40-
.defaultIfEmpty(new Cart(cartId))
41-
.flatMap(cart -> cart.getCartItems().stream()
42-
.filter(cartItem -> cartItem.getItem().getId().equals(id))
43-
.findAny()
39+
return this.cartRepository.findById(cartId) //
40+
.defaultIfEmpty(new Cart(cartId)) //
41+
.flatMap(cart -> cart.getCartItems().stream() //
42+
.filter(cartItem -> cartItem.getItem().getId().equals(id)) //
43+
.findAny() //
4444
.map(cartItem -> {
4545
cartItem.increment();
4646
return Mono.just(cart);
4747
}).orElseGet(() -> {
48-
return this.itemRepository.findById(id)
48+
return this.itemRepository.findById(id) //
4949
.map(CartItem::new) // <4>
50-
.doOnNext(cartItem -> cart.getCartItems().add(cartItem))
50+
.doOnNext(cartItem -> cart.getCartItems().add(cartItem)) //
5151
.map(cartItem -> cart);
5252
}))
5353
.flatMap(this.cartRepository::save); // <5>

‎3-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/HomeController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public HomeController(InventoryService inventoryService) {
4141
@GetMapping
4242
Mono<Rendering> home() {
4343
// tag::2[]
44-
return Mono.just(Rendering.view("home.html")
45-
.modelAttribute("items", this.inventoryService.getInventory())
46-
.modelAttribute("cart", this.inventoryService.getCart("My Cart")
44+
return Mono.just(Rendering.view("home.html") //
45+
.modelAttribute("items", this.inventoryService.getInventory()) //
46+
.modelAttribute("cart", this.inventoryService.getCart("My Cart") //
4747
.defaultIfEmpty(new Cart("My Cart")))
4848
.build());
4949
// end::2[]
@@ -63,13 +63,13 @@ Mono<String> removeFromCart(@PathVariable String id) {
6363

6464
@PostMapping
6565
Mono<String> createItem(@ModelAttribute Item newItem) {
66-
return this.inventoryService.saveItem(newItem)
66+
return this.inventoryService.saveItem(newItem) //
6767
.then(Mono.just("redirect:/"));
6868
}
6969

7070
@GetMapping("/delete/{id}")
7171
Mono<String> deleteItem(@PathVariable String id) {
72-
return this.inventoryService.deleteItem(id)
72+
return this.inventoryService.deleteItem(id) //
7373
.then(Mono.just("redirect:/"));
7474
}
7575
}

‎3-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/InventoryService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,19 @@ Mono<Void> deleteItem(String id) {
5959
Mono<Cart> addItemToCart(String cartId, String itemId) {
6060
return this.cartRepository.findById(cartId)
6161
.log("foundCart")
62-
.defaultIfEmpty(new Cart(cartId))
62+
.defaultIfEmpty(new Cart(cartId)) //
6363
.log("emptyCart")
6464
.flatMap(cart -> cart.getCartItems().stream()
6565
.filter(cartItem -> cartItem.getItem().getId().equals(itemId))
6666
.findAny() //
6767
.map(cartItem -> {
6868
cartItem.increment();
6969
return Mono.just(cart).log("newCartItem");
70-
})
70+
}) //
7171
.orElseGet(() -> {
72-
return this.itemRepository.findById(itemId)
72+
return this.itemRepository.findById(itemId) //
7373
.log("fetchedItem")
74-
.map(item -> new CartItem(item))
74+
.map(item -> new CartItem(item)) //
7575
.log("cartItem")
7676
.map(cartItem -> {
7777
cart.getCartItems().add(cartItem);
@@ -94,7 +94,7 @@ Mono<Cart> removeOneFromCart(String cartId, String itemId) {
9494
.map(cartItem -> {
9595
cartItem.decrement();
9696
return Mono.just(cart);
97-
})
97+
}) //
9898
.orElse(Mono.empty()))
9999
.map(cart -> new Cart(cart.getId(), cart.getCartItems().stream()
100100
.filter(cartItem -> cartItem.getQuantity() > 0)

‎4-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/AltInventoryService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ Mono<Cart> addItemToCart(String cartId, String itemId) {
6060
.defaultIfEmpty(new Cart(cartId))
6161
.block();
6262

63-
return Mono.just(myCart)
63+
return Mono.just(myCart) //
6464
.flatMap(cart -> cart.getCartItems().stream()
6565
.filter(cartItem -> cartItem.getItem().getId().equals(itemId))
66-
.findAny()
66+
.findAny() //
6767
.map(cartItem -> {
6868
cartItem.increment();
6969
return Mono.just(cart);
70-
})
70+
}) //
7171
.orElseGet(() -> {
72-
return this.itemRepository.findById(itemId)
73-
.map(item -> new CartItem(item))
72+
return this.itemRepository.findById(itemId) //
73+
.map(item -> new CartItem(item)) //
7474
.map(cartItem -> {
7575
cart.getCartItems().add(cartItem);
7676
return cart;

‎4-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/CartService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ class CartService {
3636
}
3737

3838
Mono<Cart> addToCart(String cartId, String id) { // <3>
39-
return this.cartRepository.findById(cartId)
40-
.defaultIfEmpty(new Cart(cartId))
41-
.flatMap(cart -> cart.getCartItems().stream()
42-
.filter(cartItem -> cartItem.getItem().getId().equals(id))
39+
return this.cartRepository.findById(cartId) //
40+
.defaultIfEmpty(new Cart(cartId)) //
41+
.flatMap(cart -> cart.getCartItems().stream() //
42+
.filter(cartItem -> cartItem.getItem().getId().equals(id)) //
4343
.findAny() //
4444
.map(cartItem -> {
4545
cartItem.increment();
4646
return Mono.just(cart);
4747
}).orElseGet(() -> {
48-
return this.itemRepository.findById(id)
48+
return this.itemRepository.findById(id) //
4949
.map(CartItem::new) // <4>
50-
.doOnNext(cartItem -> cart.getCartItems().add(cartItem))
50+
.doOnNext(cartItem -> cart.getCartItems().add(cartItem)) //
5151
.map(cartItem -> cart);
5252
}))
5353
.flatMap(this.cartRepository::save); // <5>

‎4-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/HomeController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ Mono<String> removeFromCart(@PathVariable String id) {
6363

6464
@PostMapping
6565
Mono<String> createItem(@ModelAttribute Item newItem) {
66-
return this.inventoryService.saveItem(newItem)
66+
return this.inventoryService.saveItem(newItem) //
6767
.then(Mono.just("redirect:/"));
6868
}
6969

7070
@GetMapping("/delete/{id}")
7171
Mono<String> deleteItem(@PathVariable String id) {
72-
return this.inventoryService.deleteItem(id)
72+
return this.inventoryService.deleteItem(id) //
7373
.then(Mono.just("redirect:/"));
7474
}
7575
}

‎4-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/InventoryService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ Mono<Void> deleteItem(String id) {
5757

5858
Mono<Cart> addItemToCart(String cartId, String itemId) {
5959
return this.cartRepository.findById(cartId)
60-
.defaultIfEmpty(new Cart(cartId))
60+
.defaultIfEmpty(new Cart(cartId)) //
6161
.flatMap(cart -> cart.getCartItems().stream()
6262
.filter(cartItem -> cartItem.getItem().getId().equals(itemId))
63-
.findAny()
63+
.findAny() //
6464
.map(cartItem -> {
6565
cartItem.increment();
6666
return Mono.just(cart);
67-
})
67+
}) //
6868
.orElseGet(() -> {
69-
return this.itemRepository.findById(itemId)
70-
.map(item -> new CartItem(item))
69+
return this.itemRepository.findById(itemId) //
70+
.map(item -> new CartItem(item)) //
7171
.map(cartItem -> {
7272
cart.getCartItems().add(cartItem);
7373
return cart;
@@ -85,7 +85,7 @@ Mono<Cart> removeOneFromCart(String cartId, String itemId) {
8585
.map(cartItem -> {
8686
cartItem.decrement();
8787
return Mono.just(cart);
88-
})
88+
}) //
8989
.orElse(Mono.empty()))
9090
.map(cart -> new Cart(cart.getId(), cart.getCartItems().stream()
9191
.filter(cartItem -> cartItem.getQuantity() > 0)

‎4-reactive/src/test/java/com/greglturnquist/hackingspringboot/reactive/HomeControllerSliceTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ public class HomeControllerSliceTest {
4343

4444
@Test
4545
void homePage() {
46-
when(inventoryService.getInventory()).thenReturn(Flux.just(
47-
new Item("id1", "name1", "desc1", 1.99),
48-
new Item("id2", "name2", "desc2", 9.99)
46+
when(inventoryService.getInventory()).thenReturn(Flux.just( //
47+
new Item("id1", "name1", "desc1", 1.99), //
48+
new Item("id2", "name2", "desc2", 9.99) //
4949
));
5050
when(inventoryService.getCart("My Cart")).thenReturn(Mono.just(new Cart("My Cart")));
5151

52-
client.get().uri("/").exchange()
53-
.expectStatus().isOk()
54-
.expectBody(String.class)
52+
client.get().uri("/").exchange() //
53+
.expectStatus().isOk() //
54+
.expectBody(String.class) //
5555
.consumeWith(exchangeResult -> {
5656
assertThat(exchangeResult.getResponseBody()).contains("<a href=\"/add/id1\">");
5757
assertThat(exchangeResult.getResponseBody()).contains("<a href=\"/add/id2\">");

‎5-reactive/src/main/java/com/greglturnquist/hackingspringboot/reactive/AltInventoryService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ Mono<Cart> addItemToCart(String cartId, String itemId) {
6060
.defaultIfEmpty(new Cart(cartId))
6161
.block();
6262

63-
return Mono.just(myCart)
63+
return Mono.just(myCart) //
6464
.flatMap(cart -> cart.getCartItems().stream()
6565
.filter(cartItem -> cartItem.getItem().getId().equals(itemId))
66-
.findAny()
66+
.findAny() //
6767
.map(cartItem -> {
6868
cartItem.increment();
6969
return Mono.just(cart);
@@ -88,7 +88,7 @@ Mono<Cart> removeOneFromCart(String cartId, String itemId) {
8888
.map(cartItem -> {
8989
cartItem.decrement();
9090
return Mono.just(cart);
91-
})
91+
}) //
9292
.orElse(Mono.empty()))
9393
.map(cart -> new Cart(cart.getId(), cart.getCartItems().stream()
9494
.filter(cartItem -> cartItem.getQuantity() > 0)

0 commit comments

Comments
 (0)