iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11725 from hkhan/JAVA-9385-check-matrix-variables-article

Browse Source 
[JAVA-9385] Fix code to use List for matrix vars
This commit is contained in:
kwoyke 2022-01-21 16:19:21 +01:00 committed by GitHub
commit fcc4d47283
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web-modules/spring-mvc-java-2/src/main/java/com/baeldung/matrix/controller/EmployeeController.java
View File

@ -65,7 +65,7 @@ public class EmployeeController {
@RequestMapping(value = "/employeesContacts/{contactNumber}", method = RequestMethod.GET) @RequestMapping(value = "/employeesContacts/{contactNumber}", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public ResponseEntity<List<Employee>> getEmployeeBycontactNumber(@MatrixVariable(required = true) final String contactNumber) { public ResponseEntity<List<Employee>> getEmployeeByContactNumber(@MatrixVariable(required = true) final String contactNumber) {
final List<Employee> employeesList = new ArrayList<Employee>(); final List<Employee> employeesList = new ArrayList<Employee>();
for (final Map.Entry<Long, Employee> employeeEntry : employeeMap.entrySet()) { for (final Map.Entry<Long, Employee> employeeEntry : employeeMap.entrySet()) {
final Employee employee = employeeEntry.getValue(); final Employee employee = employeeEntry.getValue();
@ -84,9 +84,9 @@ public class EmployeeController {
@RequestMapping(value = "employeeArea/{workingArea}", method = RequestMethod.GET) @RequestMapping(value = "employeeArea/{workingArea}", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public ResponseEntity<List<Employee>> getEmployeeByWorkingArea(@MatrixVariable final Map<String, LinkedList<String>> matrixVars) { public ResponseEntity<List<Employee>> getEmployeeByWorkingArea(@MatrixVariable final Map<String, List<String>> matrixVars) {
final List<Employee> employeesList = new ArrayList<Employee>(); final List<Employee> employeesList = new ArrayList<>();
final LinkedList<String> workingArea = matrixVars.get("workingArea"); final Collection<String> workingArea = matrixVars.get("workingArea");
for (final Map.Entry<Long, Employee> employeeEntry : employeeMap.entrySet()) { for (final Map.Entry<Long, Employee> employeeEntry : employeeMap.entrySet()) {
final Employee employee = employeeEntry.getValue(); final Employee employee = employeeEntry.getValue();
for (final String area : workingArea) { for (final String area : workingArea) {