From b7259db65274bde73f3b4cc1f9585a7cf5c53715 Mon Sep 17 00:00:00 2001
From: Haroon Khan <haroonkhan79@gmail.com>
Date: Thu, 20 Jan 2022 17:08:07 +0000
Subject: [PATCH] [JAVA-9385] Fix code to use List for matrix vars

---
 .../baeldung/matrix/controller/EmployeeController.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-web-modules/spring-mvc-java-2/src/main/java/com/baeldung/matrix/controller/EmployeeController.java b/spring-web-modules/spring-mvc-java-2/src/main/java/com/baeldung/matrix/controller/EmployeeController.java
index 3f9de2179a..3d5df0653d 100644
--- a/spring-web-modules/spring-mvc-java-2/src/main/java/com/baeldung/matrix/controller/EmployeeController.java
+++ b/spring-web-modules/spring-mvc-java-2/src/main/java/com/baeldung/matrix/controller/EmployeeController.java
@@ -34,7 +34,7 @@ public class EmployeeController {
     public @ResponseBody Employee getEmployeeById(@PathVariable final long Id) {
         return employeeMap.get(Id);
     }
-    
+
     @RequestMapping(value = "/addEmployee", method = RequestMethod.POST)
     public String submit(@ModelAttribute("employee") final Employee employee, final BindingResult result, final ModelMap model) {
         if (result.hasErrors()) {
@@ -65,7 +65,7 @@ public class EmployeeController {
 
     @RequestMapping(value = "/employeesContacts/{contactNumber}", method = RequestMethod.GET)
     @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>();
         for (final Map.Entry<Long, Employee> employeeEntry : employeeMap.entrySet()) {
             final Employee employee = employeeEntry.getValue();
@@ -84,9 +84,9 @@ public class EmployeeController {
 
     @RequestMapping(value = "employeeArea/{workingArea}", method = RequestMethod.GET)
     @ResponseBody
-    public ResponseEntity<List<Employee>> getEmployeeByWorkingArea(@MatrixVariable final Map<String, LinkedList<String>> matrixVars) {
-        final List<Employee> employeesList = new ArrayList<Employee>();
-        final LinkedList<String> workingArea = matrixVars.get("workingArea");
+    public ResponseEntity<List<Employee>> getEmployeeByWorkingArea(@MatrixVariable final Map<String, List<String>> matrixVars) {
+        final List<Employee> employeesList = new ArrayList<>();
+        final Collection<String> workingArea = matrixVars.get("workingArea");
         for (final Map.Entry<Long, Employee> employeeEntry : employeeMap.entrySet()) {
             final Employee employee = employeeEntry.getValue();
             for (final String area : workingArea) {