diff --git a/src/main/java/org/springframework/mvc/extensions/ajax/AjaxUtils.java b/src/main/java/org/springframework/mvc/extensions/ajax/AjaxUtils.java index 347a8ffd6..ee79d51b2 100644 --- a/src/main/java/org/springframework/mvc/extensions/ajax/AjaxUtils.java +++ b/src/main/java/org/springframework/mvc/extensions/ajax/AjaxUtils.java @@ -2,7 +2,7 @@ import org.springframework.web.context.request.WebRequest; -public class AjaxUtils { +public final class AjaxUtils { public static boolean isAjaxRequest(WebRequest webRequest) { String requestedWith = webRequest.getHeader("X-Requested-With"); diff --git a/src/main/java/org/springframework/samples/mvc/convert/JavaBean.java b/src/main/java/org/springframework/samples/mvc/convert/JavaBean.java index 42dab04da..e21de421d 100644 --- a/src/main/java/org/springframework/samples/mvc/convert/JavaBean.java +++ b/src/main/java/org/springframework/samples/mvc/convert/JavaBean.java @@ -86,6 +86,7 @@ public void setNested(NestedBean nested) { this.nested = nested; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("JavaBean"); diff --git a/src/main/java/org/springframework/samples/mvc/convert/NestedBean.java b/src/main/java/org/springframework/samples/mvc/convert/NestedBean.java index 0a2c727f2..b28b43781 100644 --- a/src/main/java/org/springframework/samples/mvc/convert/NestedBean.java +++ b/src/main/java/org/springframework/samples/mvc/convert/NestedBean.java @@ -35,6 +35,7 @@ public void setMap(Map map) { this.map = map; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("NestedBean"); diff --git a/src/main/java/org/springframework/samples/mvc/exceptions/BusinessException.java b/src/main/java/org/springframework/samples/mvc/exceptions/BusinessException.java index d370d7c31..83a046091 100644 --- a/src/main/java/org/springframework/samples/mvc/exceptions/BusinessException.java +++ b/src/main/java/org/springframework/samples/mvc/exceptions/BusinessException.java @@ -3,4 +3,8 @@ @SuppressWarnings("serial") public class BusinessException extends Exception { + public BusinessException(String message) { + super(message); + } + } diff --git a/src/main/java/org/springframework/samples/mvc/exceptions/ExceptionController.java b/src/main/java/org/springframework/samples/mvc/exceptions/ExceptionController.java index 8db32b5b0..d79670ef2 100644 --- a/src/main/java/org/springframework/samples/mvc/exceptions/ExceptionController.java +++ b/src/main/java/org/springframework/samples/mvc/exceptions/ExceptionController.java @@ -15,7 +15,7 @@ public class ExceptionController { @RequestMapping("/global-exception") public @ResponseBody String businessException() throws BusinessException { - throw new BusinessException(); + throw new BusinessException("Business Exception occurred"); } @ExceptionHandler diff --git a/src/main/java/org/springframework/samples/mvc/form/FormBean.java b/src/main/java/org/springframework/samples/mvc/form/FormBean.java index fe4c6ba5b..e8979a041 100644 --- a/src/main/java/org/springframework/samples/mvc/form/FormBean.java +++ b/src/main/java/org/springframework/samples/mvc/form/FormBean.java @@ -123,6 +123,7 @@ public void setAdditionalInfo(Map additionalInfo) { this.additionalInfo = additionalInfo; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("properties name="); diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp index 8e0fe94f2..9f010fa26 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp +++ b/src/main/webapp/WEB-INF/views/home.jsp @@ -84,7 +84,7 @@ ">By produces via Accept=application/json
  • - ">By produces via Accept=appilcation/xml + ">By produces via Accept=application/xml
  • ">By produces via ".json" diff --git a/src/test/java/org/springframework/samples/mvc/form/FormControllerTests.java b/src/test/java/org/springframework/samples/mvc/form/FormControllerTests.java index c919e7159..3ddbfe1ca 100644 --- a/src/test/java/org/springframework/samples/mvc/form/FormControllerTests.java +++ b/src/test/java/org/springframework/samples/mvc/form/FormControllerTests.java @@ -15,7 +15,6 @@ import org.junit.Before; import org.junit.Test; -import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.web.servlet.view.InternalResourceViewResolver; @@ -52,7 +51,7 @@ public void submitSuccess() throws Exception { .param("_additionalInfo[java]", "on") .param("subscribeNewsletter", "false")) .andDo(print()) - .andExpect(status().isMovedTemporarily()) + .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/form")) .andExpect(flash().attribute("message", "Form submitted successfully. Bound properties name='Joe', age=56, " + @@ -100,8 +99,7 @@ public void submitError() throws Exception { .andExpect(model().attributeHasFieldErrors("formBean", "name", "age")); } - private String getTimezone(int year, int month, int day) - { + private String getTimezone(int year, int month, int day) { Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.YEAR, year); calendar.set(Calendar.MONTH, month);