You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:14:10 UTC
[sling-org-apache-sling-servlet-helpers] 03/06: SLING-5971
servlet-helpers: Update to Servlet API 3.1
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.servlet-helpers-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git
commit 6de375bfa08b6870ba3bdf715fbae4ed7b8ca9b8
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Aug 16 15:13:38 2016 +0000
SLING-5971 servlet-helpers: Update to Servlet API 3.1
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/servlet-helpers@1756522 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 3 +--
.../sling/servlethelpers/MockServletContext.java | 5 ++++
.../MockSlingHttpServletRequest.java | 29 ++++++++++++++++++++++
.../MockSlingHttpServletResponse.java | 5 ++++
.../sling/servlethelpers/ResponseBodySupport.java | 9 +++++++
.../apache/sling/servlethelpers/package-info.java | 2 +-
6 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 161e43b..4449f62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>28</version>
<relativePath />
</parent>
@@ -61,7 +61,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java b/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
index 4741738..783585d 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockServletContext.java
@@ -301,4 +301,9 @@ public class MockServletContext implements ServletContext {
throw new UnsupportedOperationException();
}
+ @Override
+ public String getVirtualServerName() {
+ throw new UnsupportedOperationException();
+ }
+
}
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
index b995e9e..30362fc 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
@@ -42,6 +42,7 @@ import java.util.ResourceBundle;
import javax.servlet.AsyncContext;
import javax.servlet.DispatcherType;
+import javax.servlet.ReadListener;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -51,6 +52,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.Part;
import org.apache.commons.collections.IteratorUtils;
@@ -547,6 +549,18 @@ public class MockSlingHttpServletRequest extends SlingAdaptable implements Sling
public int read() throws IOException {
return is.read();
}
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+ @Override
+ public boolean isFinished() {
+ throw new UnsupportedOperationException();
+ }
+ @Override
+ public void setReadListener(ReadListener readListener) {
+ throw new UnsupportedOperationException();
+ }
};
}
@@ -869,4 +883,19 @@ public class MockSlingHttpServletRequest extends SlingAdaptable implements Sling
throw new UnsupportedOperationException();
}
+ @Override
+ public String changeSessionId() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long getContentLengthLong() {
+ throw new UnsupportedOperationException();
+ }
+
}
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
index 7a3dc91..a1d6609 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
@@ -281,4 +281,9 @@ public class MockSlingHttpServletResponse extends SlingAdaptable implements Slin
throw new UnsupportedOperationException();
}
+ @Override
+ public void setContentLengthLong(long len) {
+ throw new UnsupportedOperationException();
+ }
+
}
diff --git a/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java b/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
index c19f2c2..2a0aaac 100644
--- a/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
+++ b/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
@@ -25,6 +25,7 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
import org.apache.commons.lang3.CharEncoding;
import org.apache.commons.lang3.StringUtils;
@@ -55,6 +56,14 @@ class ResponseBodySupport {
public void write(int b) throws IOException {
outputStream.write(b);
}
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+ @Override
+ public void setWriteListener(WriteListener writeListener) {
+ throw new UnsupportedOperationException();
+ }
};
}
return servletOutputStream;
diff --git a/src/main/java/org/apache/sling/servlethelpers/package-info.java b/src/main/java/org/apache/sling/servlethelpers/package-info.java
index 0bfb804..7e1c68d 100644
--- a/src/main/java/org/apache/sling/servlethelpers/package-info.java
+++ b/src/main/java/org/apache/sling/servlethelpers/package-info.java
@@ -19,5 +19,5 @@
/**
* Mock implementation of selected Servlet-related Sling APIs.
*/
-@aQute.bnd.annotation.Version("1.1")
+@org.osgi.annotation.versioning.Version("1.1")
package org.apache.sling.servlethelpers;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.