You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/03/28 18:42:05 UTC
svn commit: r1789184 - in /tomcat/trunk: java/javax/servlet/http/
java/org/apache/catalina/connector/ java/org/apache/catalina/core/
java/org/apache/catalina/filters/ test/org/apache/catalina/filters/
webapps/docs/ webapps/examples/WEB-INF/classes/http2/
Author: markt
Date: Tue Mar 28 18:42:05 2017
New Revision: 1789184
URL: http://svn.apache.org/viewvc?rev=1789184&view=rev
Log:
Update the Servlet 4.0 API implementation to reflect the change in method name from getPushBuilder() to newPushBuilder()
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1789184&r1=1789183&r2=1789184&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Tue Mar 28 18:42:05 2017
@@ -253,7 +253,7 @@ public interface HttpServletRequest exte
*
* @since Servlet 4.0
*/
- public default PushBuilder getPushBuilder() {
+ public default PushBuilder newPushBuilder() {
return null;
}
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1789184&r1=1789183&r2=1789184&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Tue Mar 28 18:42:05 2017
@@ -388,12 +388,12 @@ public class HttpServletRequestWrapper e
* {@inheritDoc}
* <p>
* The default behavior of this method is to return
- * {@link HttpServletRequest#getPushBuilder()} on the wrapped request object.
+ * {@link HttpServletRequest#newPushBuilder()} on the wrapped request object.
*
* @since Servlet 4.0
*/
@Override
- public PushBuilder getPushBuilder() {
- return this._getHttpServletRequest().getPushBuilder();
+ public PushBuilder newPushBuilder() {
+ return this._getHttpServletRequest().newPushBuilder();
}
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1789184&r1=1789183&r2=1789184&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Mar 28 18:42:05 2017
@@ -1905,7 +1905,7 @@ public class Request implements HttpServ
* @since Servlet 4.0
*/
@Override
- public PushBuilder getPushBuilder() {
+ public PushBuilder newPushBuilder() {
AtomicBoolean result = new AtomicBoolean();
coyoteRequest.action(ActionCode.IS_PUSH_SUPPORTED, result);
if (result.get()) {
Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1789184&r1=1789183&r2=1789184&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Tue Mar 28 18:42:05 2017
@@ -1134,7 +1134,7 @@ public class RequestFacade implements Ht
* @since Servlet 4.0
*/
@Override
- public PushBuilder getPushBuilder() {
- return request.getPushBuilder();
+ public PushBuilder newPushBuilder() {
+ return request.newPushBuilder();
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1789184&r1=1789183&r2=1789184&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Tue Mar 28 18:42:05 2017
@@ -617,7 +617,7 @@ class ApplicationHttpRequest extends Htt
@Override
- public PushBuilder getPushBuilder() {
+ public PushBuilder newPushBuilder() {
return new ApplicationPushBuilder(this);
}
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1789184&r1=1789183&r2=1789184&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Tue Mar 28 18:42:05 2017
@@ -626,7 +626,7 @@ public class RemoteIpFilter extends Gene
}
@Override
- public PushBuilder getPushBuilder() {
+ public PushBuilder newPushBuilder() {
return new ApplicationPushBuilder(this);
}
}
Modified: tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java?rev=1789184&r1=1789183&r2=1789184&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java Tue Mar 28 18:42:05 2017
@@ -443,7 +443,7 @@ public class TesterHttpServletRequest im
}
@Override
- public PushBuilder getPushBuilder() {
+ public PushBuilder newPushBuilder() {
throw new RuntimeException("Not implemented");
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1789184&r1=1789183&r2=1789184&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 28 18:42:05 2017
@@ -45,6 +45,15 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.0.M20 (markt)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <update>
+ Update the Servlet 4.0 API implementation to reflect the change in
+ method name from <code>getPushBuilder()</code> to
+ <code>newPushBuilder()</code>. (markt)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.0.M19 (markt)" rtext="release in progress">
<subsection name="Catalina">
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java?rev=1789184&r1=1789183&r2=1789184&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java Tue Mar 28 18:42:05 2017
@@ -37,7 +37,7 @@ public class SimpleImagePush extends Htt
resp.setContentType("text/html");
PrintWriter pw = resp.getWriter();
- PushBuilder pb = req.getPushBuilder();
+ PushBuilder pb = req.newPushBuilder();
if (pb != null) {
pb.path("servlets/images/code.gif");
pb.push();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org