root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Support for new ServletContext methods in Servlet 4.0 b03 

Issue: SPR-12674
This commit is contained in:
Juergen Hoeller 2017-03-06 21:42:41 +01:00
parent e61e8d5062
commit eeb01db888
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
View File

@ -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

24
spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java
View File

@ -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