Author: markt
Date: Tue Mar 28 19:12:32 2017
New Revision: 1789197
URL: http://svn.apache.org/viewvc?rev=1789197&view=rev
Log:
Update the early access Servlet 4.0 API implementation to reflect the change in
method name from getPushBuilder() to newPushBuilder()
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1789197&r1=1789196&r2=1789197&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java Tue
Mar 28 19:12:32 2017
@@ -1932,7 +1932,7 @@ public class Request implements org.apac
* @return A builder to use to construct the push request
*/
@Override
- public PushBuilder getPushBuilder() {
+ public PushBuilder newPushBuilder() {
AtomicBoolean result = new AtomicBoolean();
coyoteRequest.action(ActionCode.IS_PUSH_SUPPORTED, result);
if (result.get()) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1789197&r1=1789196&r2=1789197&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
Tue Mar 28 19:12:32 2017
@@ -1135,7 +1135,7 @@ public class RequestFacade implements Ht
* removed or replaced at any time until Servlet 4.0 becomes final.
*/
@Override
- public PushBuilder getPushBuilder() {
- return request.getPushBuilder();
+ public PushBuilder newPushBuilder() {
+ return request.newPushBuilder();
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1789197&r1=1789196&r2=1789197&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Tue Mar 28 19:12:32 2017
@@ -634,7 +634,7 @@ class ApplicationHttpRequest
@Override
- public PushBuilder getPushBuilder() {
+ public PushBuilder newPushBuilder() {
return new ApplicationPushBuilder(this);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java?rev=1789197&r1=1789196&r2=1789197&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
Tue Mar 28 19:12:32 2017
@@ -37,5 +37,5 @@ public interface HttpServletRequest exte
*
* @since Servlet 4.0
*/
- public PushBuilder getPushBuilder();
+ public PushBuilder newPushBuilder();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java?rev=1789197&r1=1789196&r2=1789197&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java
Tue Mar 28 19:12:32 2017
@@ -56,12 +56,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/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1789197&r1=1789196&r2=1789197&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Mar 28 19:12:32 2017
@@ -53,6 +53,11 @@
invoke the correct method when running Tomcat with security manager.
(markt)
</fix>
+ <update>
+ Update the early access 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>
Modified:
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java?rev=1789197&r1=1789196&r2=1789197&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
(original)
+++
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
Tue Mar 28 19:12:32 2017
@@ -39,7 +39,7 @@ public class SimpleImagePush extends Htt
PrintWriter pw = resp.getWriter();
PushBuilder pb =
((org.apache.catalina.servlet4preview.http.HttpServletRequest)
- req).getPushBuilder();
+ req).newPushBuilder();
if (pb != null) {
pb.path("servlets/images/code.gif");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
