From eeb01db88821b988edbda405d6726149c12dc8bc Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 6 Mar 2017 21:42:41 +0100 Subject: [PATCH] Support for new ServletContext methods in Servlet 4.0 b03 Issue: SPR-12674 --- .../mock/web/MockServletContext.java | 24 +++++++++++++++++++ .../mock/web/test/MockServletContext.java | 24 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java index b0833b15a6..074ea5d6d7 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java @@ -132,6 +132,10 @@ public class MockServletContext implements ServletContext { private int sessionTimeout; + private String requestCharacterEncoding; + + private String responseCharacterEncoding; + /** * Create a new {@code MockServletContext}, using no base path and a @@ -563,6 +567,26 @@ public class MockServletContext implements ServletContext { return this.sessionTimeout; } + // @Override - but only against Servlet 4.0 + public void setRequestCharacterEncoding(String requestCharacterEncoding) { + this.requestCharacterEncoding = requestCharacterEncoding; + } + + // @Override - but only against Servlet 4.0 + public String getRequestCharacterEncoding() { + return this.requestCharacterEncoding; + } + + // @Override - but only against Servlet 4.0 + public void setResponseCharacterEncoding(String responseCharacterEncoding) { + this.responseCharacterEncoding = responseCharacterEncoding; + } + + // @Override - but only against Servlet 4.0 + public String getResponseCharacterEncoding() { + return this.responseCharacterEncoding; + } + //--------------------------------------------------------------------- // Unsupported Servlet 3.0 registration methods diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java index 853f34a727..86dcd8965e 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java @@ -132,6 +132,10 @@ public class MockServletContext implements ServletContext { private int sessionTimeout; + private String requestCharacterEncoding; + + private String responseCharacterEncoding; + /** * Create a new {@code MockServletContext}, using no base path and a @@ -563,6 +567,26 @@ public class MockServletContext implements ServletContext { return this.sessionTimeout; } + // @Override - but only against Servlet 4.0 + public void setRequestCharacterEncoding(String requestCharacterEncoding) { + this.requestCharacterEncoding = requestCharacterEncoding; + } + + // @Override - but only against Servlet 4.0 + public String getRequestCharacterEncoding() { + return this.requestCharacterEncoding; + } + + // @Override - but only against Servlet 4.0 + public void setResponseCharacterEncoding(String responseCharacterEncoding) { + this.responseCharacterEncoding = responseCharacterEncoding; + } + + // @Override - but only against Servlet 4.0 + public String getResponseCharacterEncoding() { + return this.responseCharacterEncoding; + } + //--------------------------------------------------------------------- // Unsupported Servlet 3.0 registration methods