[resteasy] 09/10: Fixed the compilation errors with the Servlet API 3.1

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository resteasy.

commit 9e7463c61659a7e7bf90694ab0528c1f27fd47ff
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 18 17:23:46 2016 +0200

    Fixed the compilation errors with the Servlet API 3.1
---
 debian/changelog                                  |   1 +
 debian/patches/02-servlet-api-compatibility.patch | 180 ++++++++++++++++++++++
 debian/patches/series                             |   1 +
 3 files changed, 182 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2b7e65b..5bc7de6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ resteasy (3.0.18-1) UNRELEASED; urgency=medium
     - Ignore the now enabled arquillian module
     - New dependencies on libjboss-logging-java and libjboss-logging-tools-java
   * No longer build the unused tjws module (Closes: #830819)
+  * Fixed the compilation errors with the Servlet API 3.1
   * Updated debian/watch to track the releases >= 3.0.18
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 17 Jul 2016 23:16:22 +0200
diff --git a/debian/patches/02-servlet-api-compatibility.patch b/debian/patches/02-servlet-api-compatibility.patch
new file mode 100644
index 0000000..28113c1
--- /dev/null
+++ b/debian/patches/02-servlet-api-compatibility.patch
@@ -0,0 +1,180 @@
+Description: Fixes the compatibility with the latest version of the Servlet API
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResteasyHttpServletResponseWrapper.java
++++ b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResteasyHttpServletResponseWrapper.java
+@@ -260,4 +260,28 @@
+    {
+       proxy.setStatus(sc, sm);
+    }
++
++   @Override
++   public int getStatus()
++   {
++      return proxy.getStatus();
++   }
++
++   @Override
++   public String getHeader(String name)
++   {
++      return proxy.getHeader(name);
++   }
++
++   @Override
++   public java.util.Collection<String> getHeaders(String name)
++   {
++      return proxy.getHeaders(name);
++   }
++
++   @Override
++   public java.util.Collection<String> getHeaderNames()
++   {
++      return proxy.getHeaderNames();
++   }
+ }
+--- a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/util/HttpServletRequestDelegate.java
++++ b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/util/HttpServletRequestDelegate.java
+@@ -300,4 +300,94 @@
+    {
+       return delegate.getLocalAddr();
+    }
++
++   @Override
++   public String changeSessionId()
++   {
++      return delegate.changeSessionId();
++   }
++
++   @Override
++   public boolean authenticate(javax.servlet.http.HttpServletResponse response) throws IOException, javax.servlet.ServletException
++   {
++      return delegate.authenticate(response);
++   }
++
++   @Override
++   public void login(String username, String password) throws javax.servlet.ServletException
++   {
++      delegate.login(username, password);
++   }
++
++   @Override
++   public void logout() throws javax.servlet.ServletException
++   {
++      delegate.logout();
++   }
++
++   @Override
++   public java.util.Collection<javax.servlet.http.Part> getParts() throws IOException, javax.servlet.ServletException
++   {
++      return delegate.getParts();
++   }
++
++   @Override
++   public javax.servlet.http.Part getPart(String name) throws IOException, javax.servlet.ServletException
++   {
++      return delegate.getPart(name);
++   }
++
++   @Override
++   public <T extends javax.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, javax.servlet.ServletException
++   {
++      return delegate.upgrade(handlerClass);
++   }
++
++   @Override
++   public long getContentLengthLong()
++   {
++      return delegate.getContentLengthLong();
++   }
++
++   @Override
++   public javax.servlet.ServletContext getServletContext()
++   {
++      return delegate.getServletContext();
++   }
++
++   @Override
++   public javax.servlet.AsyncContext startAsync() throws IllegalStateException
++   {
++      return delegate.startAsync();
++   }
++
++   @Override
++   public javax.servlet.AsyncContext startAsync(javax.servlet.ServletRequest request, javax.servlet.ServletResponse response) throws IllegalStateException
++   {
++      return delegate.startAsync(request, response);
++   }
++
++   @Override
++   public boolean isAsyncStarted()
++   {
++      return delegate.isAsyncStarted();
++   }
++
++   @Override
++   public boolean isAsyncSupported()
++   {
++      return delegate.isAsyncSupported();
++   }
++
++   @Override
++   public javax.servlet.AsyncContext getAsyncContext()
++   {
++      return delegate.getAsyncContext();
++   }
++
++   @Override
++   public javax.servlet.DispatcherType getDispatcherType()
++   {
++      return delegate.getDispatcherType();
++   }
+ }
+--- a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResteasyHttpServletRequestWrapper.java
++++ b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResteasyHttpServletRequestWrapper.java
+@@ -200,4 +200,46 @@
+    {
+       return proxy.isRequestedSessionIdFromUrl();
+    }
++
++   @Override
++   public String changeSessionId()
++   {
++      return proxy.changeSessionId();
++   }
++
++   @Override
++   public boolean authenticate(javax.servlet.http.HttpServletResponse response) throws java.io.IOException, javax.servlet.ServletException
++   {
++      return proxy.authenticate(response);
++   }
++
++   @Override
++   public void login(String username, String password) throws javax.servlet.ServletException
++   {
++      proxy.login(username, password);
++   }
++
++   @Override
++   public void logout() throws javax.servlet.ServletException
++   {
++      proxy.logout();
++   }
++
++   @Override
++   public java.util.Collection<javax.servlet.http.Part> getParts() throws java.io.IOException, javax.servlet.ServletException
++   {
++      return proxy.getParts();
++   }
++
++   @Override
++   public javax.servlet.http.Part getPart(String name) throws java.io.IOException, javax.servlet.ServletException
++   {
++      return proxy.getPart(name);
++   }
++
++   @Override
++   public <T extends javax.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws java.io.IOException, javax.servlet.ServletException
++   {
++      return proxy.upgrade(handlerClass);
++   }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 5b62eb9..42e096c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-ignore-tjws.patch
+02-servlet-api-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/resteasy.git