diff --git a/spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ContentManagementWebConfig.java b/spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ContentManagementWebConfig.java
index 6fd68394ea..2c5b423029 100644
--- a/spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ContentManagementWebConfig.java
+++ b/spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ContentManagementWebConfig.java
@@ -23,14 +23,13 @@ public class ContentManagementWebConfig extends WebMvcConfigurerAdapter {
@Override
public void configureContentNegotiation(final ContentNegotiationConfigurer configurer) {
- configurer.favorPathExtension(true).
- favorParameter(false).
+ configurer.favorPathExtension(false).
+ favorParameter(true).
parameterName("mediaType").
ignoreAcceptHeader(true).
useJaf(false).
- defaultContentType(MediaType.TEXT_HTML).
+ defaultContentType(MediaType.APPLICATION_JSON).
mediaType("xml", MediaType.APPLICATION_XML).
- mediaType("html", MediaType.TEXT_HTML).
mediaType("json", MediaType.APPLICATION_JSON);
}
diff --git a/spring-mvc-java/src/main/java/org/baeldung/web/controller/EmployeeController.java b/spring-mvc-java/src/main/java/org/baeldung/web/controller/EmployeeController.java
index 8a41718b8c..e18bbdbf63 100644
--- a/spring-mvc-java/src/main/java/org/baeldung/web/controller/EmployeeController.java
+++ b/spring-mvc-java/src/main/java/org/baeldung/web/controller/EmployeeController.java
@@ -29,15 +29,6 @@ public class EmployeeController {
return employeeMap.get(Id);
}
- @RequestMapping(value = "/employee/{Id}", method = RequestMethod.GET)
- public String getEmployeeByIdHtmlView(@PathVariable final long Id, final ModelMap model) {
- model.addAttribute("name", employeeMap.get(Id).getName());
- model.addAttribute("contactNumber", employeeMap.get(Id).getContactNumber());
- model.addAttribute("id", employeeMap.get(Id).getId());
-
- return "employeeView";
- }
-
@RequestMapping(value = "/addEmployee", method = RequestMethod.POST)
public String submit(@ModelAttribute("employee") final Employee employee, final BindingResult result, final ModelMap model) {
if (result.hasErrors()) {
diff --git a/spring-mvc-xml/src/main/java/com/baeldung/spring/controller/EmployeeController.java b/spring-mvc-xml/src/main/java/com/baeldung/spring/controller/EmployeeController.java
index 753f243edb..aa25f47a2a 100644
--- a/spring-mvc-xml/src/main/java/com/baeldung/spring/controller/EmployeeController.java
+++ b/spring-mvc-xml/src/main/java/com/baeldung/spring/controller/EmployeeController.java
@@ -22,35 +22,24 @@ public class EmployeeController {
@RequestMapping(value = "/employee", method = RequestMethod.GET)
public ModelAndView showForm() {
- return new ModelAndView("employeeHome", "employee", new Employee());
+ 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 = "/employee/{Id}", method = RequestMethod.GET)
- public String getEmployeeByIdHtmlView(@PathVariable final long Id, final ModelMap model) {
- model.addAttribute("name", employeeMap.get(Id).getName());
- model.addAttribute("contactNumber", employeeMap.get(Id).getContactNumber());
- model.addAttribute("id", employeeMap.get(Id).getId());
-
- return "employeeView";
+ 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("id", employee.getId());
-
- employeeMap.put(employee.getId(), employee);
-
- return "employeeView";
+ if (result.hasErrors()) {
+ return "error";
+ }
+ model.addAttribute("name", employee.getName());
+ model.addAttribute("contactNumber", employee.getContactNumber());
+ model.addAttribute("id", employee.getId());
+ employeeMap.put(employee.getId(), employee);
+ return "employeeView";
}
}
diff --git a/spring-mvc-xml/src/main/resources/contentManagementWebMvcConfig.xml b/spring-mvc-xml/src/main/resources/contentManagementWebMvcConfig.xml
index 0fcd85e399..e68c88d19d 100644
--- a/spring-mvc-xml/src/main/resources/contentManagementWebMvcConfig.xml
+++ b/spring-mvc-xml/src/main/resources/contentManagementWebMvcConfig.xml
@@ -13,31 +13,30 @@
-
-
+ class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+
+
-
-
-
-
-
-
+ class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
+
+
+
+
+
+
-
-
-
+
+
+
-
\ No newline at end of file
+