Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2

Revert "BAEL-3275: Using blocking queue for pub-sub"

spring-mvc-java/src/main/java/com/baeldung/web/BeanA.java

@@ -0,0 +1,15 @@
+package com.baeldung.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BeanA {
+
+    @Autowired
+    private BeanB b;
+
+    public BeanA() {
+        super();
+    }
+}

spring-mvc-java/src/main/java/com/baeldung/web/BeanB.java

@@ -0,0 +1,11 @@
+package com.baeldung.web;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class BeanB {
+
+    public BeanB() {
+        super();
+    }
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/ChatController.java

@@ -0,0 +1,23 @@
+package com.baeldung.web.controller;
+
+import com.baeldung.model.Message;
+import com.baeldung.model.OutputMessage;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.SendTo;
+import org.springframework.stereotype.Controller;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Controller
+public class ChatController {
+
+    @MessageMapping("/chat")
+    @SendTo("/topic/messages")
+    public OutputMessage send(final Message message) throws Exception {
+
+        final String time = new SimpleDateFormat("HH:mm").format(new Date());
+        return new OutputMessage(message.getFrom(), message.getText(), time);
+    }
+
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/CompanyController.java

@@ -0,0 +1,63 @@
+package com.baeldung.web.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.MatrixVariable;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baeldung.model.Company;
+
+@Controller
+public class CompanyController {
+
+    Map<Long, Company> companyMap = new HashMap<>();
+
+    @RequestMapping(value = "/company", method = RequestMethod.GET)
+    public ModelAndView showForm() {
+        return new ModelAndView("companyHome", "company", new Company());
+    }
+
+    @RequestMapping(value = "/company/{Id}", produces = { "application/json", "application/xml" }, method = RequestMethod.GET)
+    public @ResponseBody Company getCompanyById(@PathVariable final long Id) {
+        return companyMap.get(Id);
+    }
+
+    @RequestMapping(value = "/addCompany", method = RequestMethod.POST)
+    public String submit(@ModelAttribute("company") final Company company, final BindingResult result, final ModelMap model) {
+        if (result.hasErrors()) {
+            return "error";
+        }
+        model.addAttribute("name", company.getName());
+        model.addAttribute("id", company.getId());
+
+        companyMap.put(company.getId(), company);
+
+        return "companyView";
+    }
+
+    @RequestMapping(value = "/companyEmployee/{company}/employeeData/{employee}", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<Map<String, String>> getEmployeeDataFromCompany(@MatrixVariable(pathVar = "employee") final Map<String, String> matrixVars) {
+        return new ResponseEntity<>(matrixVars, HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/companyData/{company}/employeeData/{employee}", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<Map<String, String>> getCompanyName(@MatrixVariable(value = "name", pathVar = "company") final String name) {
+        final Map<String, String> result = new HashMap<String, String>();
+        result.put("name", name);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/EmployeeController.java

@@ -0,0 +1,112 @@
+package com.baeldung.web.controller;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.MatrixVariable;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.SessionAttributes;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baeldung.model.Employee;
+
+@SessionAttributes("employees")
+@Controller
+public class EmployeeController {
+
+    Map<Long, Employee> employeeMap = new HashMap<>();
+
+    @ModelAttribute("employees")
+    public void initEmployees() {
+        employeeMap.put(1L, new Employee(1L, "John", "223334411", "rh"));
+        employeeMap.put(2L, new Employee(2L, "Peter", "22001543", "informatics"));
+        employeeMap.put(3L, new Employee(3L, "Mike", "223334411", "admin"));
+    }
+
+    @RequestMapping(value = "/employee", method = RequestMethod.GET)
+    public ModelAndView showForm() {
+        return new ModelAndView("employeeHome", "employee", new Employee());
+    }
+
+    @RequestMapping(value = "/employee/{Id}", produces = { "application/json", "application/xml" }, method = RequestMethod.GET)
+    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()) {
+            return "error";
+        }
+        model.addAttribute("name", employee.getName());
+        model.addAttribute("contactNumber", employee.getContactNumber());
+        model.addAttribute("workingArea", employee.getWorkingArea());
+        model.addAttribute("id", employee.getId());
+
+        employeeMap.put(employee.getId(), employee);
+
+        return "employeeView";
+    }
+
+    @RequestMapping(value = "/employees/{name}", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<List<Employee>> getEmployeeByNameAndBeginContactNumber(@PathVariable final String name, @MatrixVariable final String beginContactNumber) {
+        final List<Employee> employeesList = new ArrayList<Employee>();
+        for (final Map.Entry<Long, Employee> employeeEntry : employeeMap.entrySet()) {
+            final Employee employee = employeeEntry.getValue();
+            if (employee.getName().equalsIgnoreCase(name) && employee.getContactNumber().startsWith(beginContactNumber)) {
+                employeesList.add(employee);
+            }
+        }
+        return new ResponseEntity<>(employeesList, HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/employeesContacts/{contactNumber}", method = RequestMethod.GET)
+    @ResponseBody
+    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();
+            if (employee.getContactNumber().equalsIgnoreCase(contactNumber)) {
+                employeesList.add(employee);
+            }
+        }
+        return new ResponseEntity<>(employeesList, HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "employeeData/{employee}", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<Map<String, String>> getEmployeeData(@MatrixVariable final Map<String, String> matrixVars) {
+        return new ResponseEntity<>(matrixVars, HttpStatus.OK);
+    }
+
+    @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");
+        for (final Map.Entry<Long, Employee> employeeEntry : employeeMap.entrySet()) {
+            final Employee employee = employeeEntry.getValue();
+            for (final String area : workingArea) {
+                if (employee.getWorkingArea().equalsIgnoreCase(area)) {
+                    employeesList.add(employee);
+                    break;
+                }
+            }
+        }
+        return new ResponseEntity<>(employeesList, HttpStatus.OK);
+    }
+
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/ExcelController.java

@@ -0,0 +1,63 @@
+package com.baeldung.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import com.baeldung.excel.*;
+import java.util.Map;
+import java.util.List;
+import javax.annotation.Resource;
+
+@Controller
+public class ExcelController {
+
+    private String fileLocation;
+
+    @Resource(name = "excelPOIHelper")
+    private ExcelPOIHelper excelPOIHelper;
+
+    @RequestMapping(method = RequestMethod.GET, value = "/excelProcessing")
+    public String getExcelProcessingPage() {
+        return "excel";
+    }
+
+    @RequestMapping(method = RequestMethod.POST, value = "/uploadExcelFile")
+    public String uploadFile(Model model, MultipartFile file) throws IOException {
+        InputStream in = file.getInputStream();
+        File currDir = new File(".");
+        String path = currDir.getAbsolutePath();
+        fileLocation = path.substring(0, path.length() - 1) + file.getOriginalFilename();
+        FileOutputStream f = new FileOutputStream(fileLocation);
+        int ch = 0;
+        while ((ch = in.read()) != -1) {
+            f.write(ch);
+        }
+        f.flush();
+        f.close();
+        model.addAttribute("message", "File: " + file.getOriginalFilename() + " has been uploaded successfully!");
+        return "excel";
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/readPOI")
+    public String readPOI(Model model) throws IOException {
+
+        if (fileLocation != null) {
+            if (fileLocation.endsWith(".xlsx") || fileLocation.endsWith(".xls")) {
+                Map<Integer, List<MyCell>> data = excelPOIHelper.readExcel(fileLocation);
+                model.addAttribute("data", data);
+            } else {
+                model.addAttribute("message", "Not a valid excel file!");
+            }
+        } else {
+            model.addAttribute("message", "File missing! Please upload an excel file.");
+        }
+        return "excel";
+    }
+
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/FileUploadController.java

@@ -0,0 +1,52 @@
+package com.baeldung.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baeldung.model.FormDataWithFile;
+
+@Controller
+public class FileUploadController {
+
+    @RequestMapping(value = "/fileUpload", method = RequestMethod.GET)
+    public String displayForm() {
+
+        return "fileUploadForm";
+    }
+
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+    public String submit(@RequestParam("file") final MultipartFile file, final ModelMap modelMap) {
+
+        modelMap.addAttribute("file", file);
+        return "fileUploadView";
+    }
+
+    @RequestMapping(value = "/uploadMultiFile", method = RequestMethod.POST)
+    public String submit(@RequestParam("files") final MultipartFile[] files, final ModelMap modelMap) {
+
+        modelMap.addAttribute("files", files);
+        return "fileUploadView";
+    }
+
+    @RequestMapping(value = "/uploadFileWithAddtionalData", method = RequestMethod.POST)
+    public String submit(@RequestParam final MultipartFile file, @RequestParam final String name, @RequestParam final String email, final ModelMap modelMap) {
+
+        modelMap.addAttribute("name", name);
+        modelMap.addAttribute("email", email);
+        modelMap.addAttribute("file", file);
+        return "fileUploadView";
+    }
+
+    @RequestMapping(value = "/uploadFileModelAttribute", method = RequestMethod.POST)
+    public String submit(@ModelAttribute final FormDataWithFile formDataWithFile, final ModelMap modelMap) {
+
+        modelMap.addAttribute("formDataWithFile", formDataWithFile);
+        return "fileUploadView";
+    }
+
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/GreetController.java

@@ -0,0 +1,59 @@
+package com.baeldung.web.controller;
+
+import com.baeldung.model.Greeting;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+@Controller
+public class GreetController {
+
+    @RequestMapping(value = "/homePage", method = RequestMethod.GET)
+    public String index() {
+        return "index";
+    }
+
+    @RequestMapping(value = "/greet", method = RequestMethod.GET, produces = "application/json")
+    @ResponseBody
+    public Greeting greet() {
+        Greeting greeting = new Greeting();
+        greeting.setId(1);
+        greeting.setMessage("Hello World!!!");
+        return greeting;
+    }
+
+    @RequestMapping(value = "/greetWithPathVariable/{name}", method = RequestMethod.GET, produces = "application/json")
+    @ResponseBody
+    public Greeting greetWithPathVariable(@PathVariable("name") String name) {
+        Greeting greeting = new Greeting();
+        greeting.setId(1);
+        greeting.setMessage("Hello World " + name + "!!!");
+        return greeting;
+    }
+
+    @RequestMapping(value = "/greetWithQueryVariable", method = RequestMethod.GET, produces = "application/json")
+    @ResponseBody
+    public Greeting greetWithQueryVariable(@RequestParam("name") String name) {
+        Greeting greeting = new Greeting();
+        greeting.setId(1);
+        greeting.setMessage("Hello World " + name + "!!!");
+        return greeting;
+    }
+
+    @RequestMapping(value = "/greetWithPost", method = RequestMethod.POST, produces = "application/json")
+    @ResponseBody
+    public Greeting greetWithPost() {
+        Greeting greeting = new Greeting();
+        greeting.setId(1);
+        greeting.setMessage("Hello World!!!");
+        return greeting;
+    }
+
+    @RequestMapping(value = "/greetWithPostAndFormData", method = RequestMethod.POST, produces = "application/json")
+    @ResponseBody
+    public Greeting greetWithPostAndFormData(@RequestParam("id") int id, @RequestParam("name") String name) {
+        Greeting greeting = new Greeting();
+        greeting.setId(id);
+        greeting.setMessage("Hello World " + name + "!!!");
+        return greeting;
+    }
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/ImageController.java

@@ -0,0 +1,27 @@
+package com.baeldung.web.controller;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class ImageController {
+
+    @Autowired
+    ServletContext servletContext;
+
+    @RequestMapping(value = "/image-byte-array", method = RequestMethod.GET, produces = MediaType.IMAGE_JPEG_VALUE)
+    public @ResponseBody byte[] getImageAsByteArray() throws IOException {
+        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
+        return IOUtils.toByteArray(in);
+    }
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/SampleController.java

@@ -0,0 +1,13 @@
+package com.baeldung.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class SampleController {
+	@GetMapping("/sample")
+    public String showForm() {
+        return "sample";
+    }
+
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/SiteController.java

@@ -0,0 +1,30 @@
+package com.baeldung.web.controller;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@RequestMapping("/site")
+public class SiteController {
+
+    @RequestMapping(value = "/{firstValue}/{secondValue}", method = RequestMethod.GET)
+    public String requestWithError(@PathVariable("firstValue") String firstValue,
+                          @PathVariable("secondValue") String secondValue) {
+
+        return firstValue + " - " + secondValue;
+    }
+
+    @RequestMapping(value = "/{firstValue}/{secondValue:.+}", method = RequestMethod.GET)
+    public String requestWithRegex(@PathVariable("firstValue") String firstValue,
+                                   @PathVariable("secondValue") String secondValue) {
+
+        return firstValue + " - " + secondValue;
+    }
+
+    @RequestMapping(value = "/{firstValue}/{secondValue}/", method = RequestMethod.GET)
+    public String requestWithSlash(@PathVariable("firstValue") String firstValue,
+                                   @PathVariable("secondValue") String secondValue) {
+
+        return firstValue + " - " + secondValue;
+    }
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/UserController.java

@@ -0,0 +1,32 @@
+package com.baeldung.web.controller;
+
+import com.baeldung.model.User;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/")
+public class UserController {
+
+    @GetMapping("/")
+    public String showForm(final Model model) {
+        final User user = new User();
+        user.setFirstname("John");
+        user.setLastname("Roy");
+        user.setEmailId("John.Roy@gmail.com");
+        model.addAttribute("user", user);
+        return "index";
+    }
+
+    @PostMapping("/processForm")
+    public String processForm(@ModelAttribute(value = "user") final User user, final Model model) {
+        // Insert User into DB
+        model.addAttribute("name", user.getFirstname() + " " + user.getLastname());
+        return "hello";
+    }
+
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/WebsocketSendToUserController.java

@@ -0,0 +1,30 @@
+package com.baeldung.web.controller;
+
+import java.security.Principal;
+import java.util.Map;
+
+import org.springframework.messaging.handler.annotation.MessageExceptionHandler;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.messaging.simp.annotation.SendToUser;
+import org.springframework.stereotype.Controller;
+
+import com.google.gson.Gson;
+
+@Controller
+public class WebsocketSendToUserController {
+
+    private Gson gson = new Gson();
+
+    @MessageMapping("/message")
+    @SendToUser("/queue/reply")
+    public String processMessageFromClient(@Payload String message, Principal principal) throws Exception {
+        return gson.fromJson(message, Map.class).get("name").toString();
+    }
+
+    @MessageExceptionHandler
+    @SendToUser("/queue/errors")
+    public String handleException(Throwable exception) {
+        return exception.getMessage();
+    }
+}

spring-mvc-java/src/main/java/com/baeldung/web/controller/message/MessageController.java

@@ -0,0 +1,24 @@
+package com.baeldung.web.controller.message;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Controller
+@RequestMapping("/message")
+public class MessageController {
+
+    @RequestMapping(value = "/showForm", method = RequestMethod.GET)
+    public String showForm() {
+        return "message";
+    }
+
+    @RequestMapping(value = "/processForm", method = RequestMethod.POST)
+    public String processForm(@RequestParam("message") final String message, final Model model) {
+        model.addAttribute("message", message);
+        return "message";
+    }
+
+}