Skip to content

Commit 766d22c

Browse files
committed
Refactor to be more consistent with other projects
1 parent 4f24a76 commit 766d22c

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/CategoryController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class CategoryController {
3838
description = "Adds a category to menu",
3939
operationId = "AddMenuCategory")
4040
@CreateAPIResponses
41-
ResponseEntity<ResourceCreatedResponse> addMenuCategory(
41+
ResponseEntity<ResourceCreatedResponse> createCategory(
4242
@Parameter(description = "Menu id", required = true) @PathVariable("id") UUID menuId,
4343
@Valid @RequestBody CreateCategoryRequest body,
4444
@Parameter(hidden = true) @RequestAttribute("CorrelationId") String correlationId) {
@@ -53,7 +53,7 @@ ResponseEntity<ResourceCreatedResponse> addMenuCategory(
5353
description = "Update a category to menu",
5454
operationId = "UpdateMenuCategory")
5555
@UpdateAPIResponses
56-
ResponseEntity<ResourceUpdatedResponse> updateMenuCategory(
56+
ResponseEntity<ResourceUpdatedResponse> updateCategory(
5757
@Parameter(description = "Menu id", required = true) @PathVariable("id") UUID menuId,
5858
@Parameter(description = "Category id", required = true) @PathVariable("categoryId")
5959
UUID categoryId,

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/ItemController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class ItemController {
3838
description = "Adds a menu item",
3939
operationId = "AddMenuItem")
4040
@CreateAPIResponses
41-
ResponseEntity<ResourceCreatedResponse> addMenuItem(
41+
ResponseEntity<ResourceCreatedResponse> createItem(
4242
@Parameter(description = "Menu id", required = true) @PathVariable("id") UUID menuId,
4343
@Parameter(description = "Category id", required = true) @PathVariable("categoryId")
4444
UUID categoryId,

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/MenuController.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
import java.util.UUID;
2929
import java.util.stream.Collectors;
3030
import javax.validation.Valid;
31-
import org.slf4j.Logger;
32-
import org.slf4j.LoggerFactory;
33-
import org.springframework.beans.factory.annotation.Autowired;
3431
import org.springframework.http.HttpStatus;
3532
import org.springframework.http.MediaType;
3633
import org.springframework.http.ResponseEntity;
@@ -49,11 +46,15 @@
4946
@RestController
5047
public class MenuController {
5148

52-
Logger logger = LoggerFactory.getLogger(MenuController.class);
49+
private final MenuMapper menuMapper;
5350

54-
@Autowired private MenuMapper menuMapper;
51+
private final SearchMenuResultItemMapper searchMenuResultItemMapper;
5552

56-
@Autowired private SearchMenuResultItemMapper searchMenuResultItemMapper;
53+
public MenuController(
54+
MenuMapper menuMapper, SearchMenuResultItemMapper searchMenuResultItemMapper) {
55+
this.menuMapper = menuMapper;
56+
this.searchMenuResultItemMapper = searchMenuResultItemMapper;
57+
}
5758

5859
@PostMapping
5960
@Operation(
@@ -115,9 +116,7 @@ ResponseEntity<SearchMenuResult> searchMenu(
115116
new SearchMenuResult(
116117
pageSize,
117118
pageNumber,
118-
menuList.stream()
119-
.map(m -> searchMenuResultItemMapper.toDto(m))
120-
.collect(Collectors.toList())));
119+
menuList.stream().map(searchMenuResultItemMapper::toDto).collect(Collectors.toList())));
121120
}
122121

123122
@GetMapping(value = "/{id}")

java/src/main/java/com/amido/stacks/workloads/menu/api/v2/MenuControllerV2.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.swagger.v3.oas.annotations.responses.ApiResponse;
1212
import java.util.ArrayList;
1313
import java.util.UUID;
14-
import org.springframework.beans.factory.annotation.Autowired;
1514
import org.springframework.http.MediaType;
1615
import org.springframework.http.ResponseEntity;
1716
import org.springframework.web.bind.annotation.GetMapping;
@@ -24,7 +23,11 @@
2423
@RestController
2524
public class MenuControllerV2 {
2625

27-
@Autowired private MenuMapper menuMapper;
26+
private final MenuMapper menuMapper;
27+
28+
public MenuControllerV2(MenuMapper menuMapper) {
29+
this.menuMapper = menuMapper;
30+
}
2831

2932
@GetMapping(value = "/{id}")
3033
@Operation(

0 commit comments

Comments
 (0)