You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2022/02/20 10:07:20 UTC
[felix-dev] 07/19: Update implementation to use jakarta packages
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch http/jakarta
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit c3ebac0274d24d4323a64fdc4598b4c7c1604fa3
Author: Carsten Ziegeler <cz...@adobe.com>
AuthorDate: Mon Jan 3 11:18:18 2022 +0100
Update implementation to use jakarta packages
---
.../http/base/internal/dispatch/RequestInfo.java | 4 +-
.../internal/dispatch/ServletRequestWrapper.java | 5 +-
.../internal/javaxwrappers/FilterChainWrapper.java | 7 +-
.../base/internal/service/DefaultHttpContext.java | 5 +-
.../base/internal/service/ServletContextImpl.java | 82 ----------------------
5 files changed, 9 insertions(+), 94 deletions(-)
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestInfo.java b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestInfo.java
index ce52453..9a01930 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestInfo.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestInfo.java
@@ -16,8 +16,8 @@
*/
package org.apache.felix.http.base.internal.dispatch;
-import javax.servlet.http.HttpServletMapping;
-import javax.servlet.http.MappingMatch;
+import jakarta.servlet.http.HttpServletMapping;
+import jakarta.servlet.http.MappingMatch;
/**
* Information about the request
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
index 62bc418..493ce08 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
@@ -17,11 +17,13 @@
package org.apache.felix.http.base.internal.dispatch;
import static jakarta.servlet.RequestDispatcher.FORWARD_CONTEXT_PATH;
+import static jakarta.servlet.RequestDispatcher.FORWARD_MAPPING;
import static jakarta.servlet.RequestDispatcher.FORWARD_PATH_INFO;
import static jakarta.servlet.RequestDispatcher.FORWARD_QUERY_STRING;
import static jakarta.servlet.RequestDispatcher.FORWARD_REQUEST_URI;
import static jakarta.servlet.RequestDispatcher.FORWARD_SERVLET_PATH;
import static jakarta.servlet.RequestDispatcher.INCLUDE_CONTEXT_PATH;
+import static jakarta.servlet.RequestDispatcher.INCLUDE_MAPPING;
import static jakarta.servlet.RequestDispatcher.INCLUDE_PATH_INFO;
import static jakarta.servlet.RequestDispatcher.INCLUDE_QUERY_STRING;
import static jakarta.servlet.RequestDispatcher.INCLUDE_REQUEST_URI;
@@ -60,6 +62,7 @@ import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletRequestAttributeEvent;
import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpSession;
@@ -71,7 +74,7 @@ final class ServletRequestWrapper extends HttpServletRequestWrapper
FORWARD_MAPPING, FORWARD_PATH_INFO, FORWARD_QUERY_STRING, FORWARD_REQUEST_URI, FORWARD_SERVLET_PATH,
INCLUDE_CONTEXT_PATH, INCLUDE_MAPPING, INCLUDE_PATH_INFO, INCLUDE_QUERY_STRING, INCLUDE_REQUEST_URI,
INCLUDE_SERVLET_PATH);
-
+
/**
* Constant for HTTP POST method.
*/
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterChainWrapper.java b/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterChainWrapper.java
index 2135bdf..6d7d5d0 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterChainWrapper.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/javaxwrappers/FilterChainWrapper.java
@@ -18,10 +18,6 @@ package org.apache.felix.http.base.internal.javaxwrappers;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
import org.apache.felix.http.base.internal.jakartawrappers.ServletResponseWrapper;
import org.jetbrains.annotations.NotNull;
@@ -43,7 +39,8 @@ public class FilterChainWrapper implements javax.servlet.FilterChain {
}
@Override
- public void doFilter(final ServletRequest request, final ServletResponse response) throws IOException, ServletException {
+ public void doFilter(final javax.servlet.ServletRequest request, final javax.servlet.ServletResponse response)
+ throws IOException, javax.servlet.ServletException {
try {
filterChain.doFilter(org.apache.felix.http.base.internal.jakartawrappers.ServletRequestWrapper.getWrapper(request),
ServletResponseWrapper.getWrapper(response));
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/service/DefaultHttpContext.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/DefaultHttpContext.java
index e85bb08..d5865e4 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/service/DefaultHttpContext.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/DefaultHttpContext.java
@@ -18,9 +18,6 @@ package org.apache.felix.http.base.internal.service;
import java.net.URL;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.framework.Bundle;
import org.osgi.service.http.HttpContext;
@@ -51,7 +48,7 @@ public final class DefaultHttpContext
}
@Override
- public boolean handleSecurity(HttpServletRequest req, HttpServletResponse res)
+ public boolean handleSecurity(final javax.servlet.http.HttpServletRequest req, final javax.servlet.http.HttpServletResponse res)
{
return true;
}
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
index a52bf1e..109defb 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
@@ -609,88 +609,6 @@ public class ServletContextImpl implements ExtServletContext
}
@Override
- public Dynamic addJspFile(final String servletName, final String jspFile) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int getSessionTimeout() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public void setSessionTimeout(final int sessionTimeout) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public String getRequestCharacterEncoding() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void setRequestCharacterEncoding(final String encoding) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public String getResponseCharacterEncoding() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void setResponseCharacterEncoding(final String encoding) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Dynamic addJspFile(final String servletName, final String jspFile) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int getSessionTimeout() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public void setSessionTimeout(final int sessionTimeout) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public String getRequestCharacterEncoding() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void setRequestCharacterEncoding(final String encoding) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public String getResponseCharacterEncoding() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void setResponseCharacterEncoding(final String encoding) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
public HttpConfig getConfig()
{
return this.handlerRegistry.getConfig();