This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new ee88e7755a FELIX-6642 : Support Jakarta Servlet API 6
ee88e7755a is described below
commit ee88e7755a71e7fb79f76de2270a73ec23d0885b
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sat Sep 9 11:48:23 2023 +0200
FELIX-6642 : Support Jakarta Servlet API 6
---
http/wrappers/pom.xml | 3 +-
.../jakartawrappers/HttpServletRequestWrapper.java | 6 ---
.../HttpServletResponseWrapper.java | 18 -------
.../jakartawrappers/HttpSessionContextWrapper.java | 55 ----------------------
.../http/jakartawrappers/HttpSessionWrapper.java | 31 ------------
.../jakartawrappers/ServletContextWrapper.java | 23 ---------
.../jakartawrappers/ServletRequestWrapper.java | 22 ++++++---
.../SessionCookieConfigWrapper.java | 17 +++++++
.../felix/http/jakartawrappers/package-info.java | 2 +-
.../javaxwrappers/HttpServletRequestWrapper.java | 3 +-
.../javaxwrappers/HttpServletResponseWrapper.java | 9 ++--
.../javaxwrappers/HttpSessionContextWrapper.java | 55 ----------------------
.../http/javaxwrappers/HttpSessionWrapper.java | 15 +++---
.../http/javaxwrappers/ServletContextWrapper.java | 6 +--
.../http/javaxwrappers/ServletRequestWrapper.java | 3 +-
.../felix/http/javaxwrappers/package-info.java | 2 +-
16 files changed, 50 insertions(+), 220 deletions(-)
diff --git a/http/wrappers/pom.xml b/http/wrappers/pom.xml
index c3a49ce6a1..4f90e4d8ad 100644
--- a/http/wrappers/pom.xml
+++ b/http/wrappers/pom.xml
@@ -40,6 +40,7 @@
<properties>
<felix.java.version>11</felix.java.version>
+ <baseline.skip>true</baseline.skip>
</properties>
<build>
@@ -63,7 +64,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>5.0.0</version>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpServletRequestWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpServletRequestWrapper.java
index 2967dd3c63..f655bc7ef6 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpServletRequestWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpServletRequestWrapper.java
@@ -182,12 +182,6 @@ public class HttpServletRequestWrapper extends
ServletRequestWrapper
return this.request.isRequestedSessionIdFromURL();
}
- @SuppressWarnings("deprecation")
- @Override
- public boolean isRequestedSessionIdFromUrl() {
- return this.request.isRequestedSessionIdFromUrl();
- }
-
@Override
public boolean authenticate(final HttpServletResponse response) throws
IOException, ServletException {
try {
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpServletResponseWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpServletResponseWrapper.java
index cf8ac0b4b5..86d73e21c7 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpServletResponseWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpServletResponseWrapper.java
@@ -61,18 +61,6 @@ public class HttpServletResponseWrapper extends
ServletResponseWrapper
return this.response.encodeRedirectURL(url);
}
- @SuppressWarnings("deprecation")
- @Override
- public String encodeUrl(final String url) {
- return this.response.encodeUrl(url);
- }
-
- @SuppressWarnings("deprecation")
- @Override
- public String encodeRedirectUrl(final String url) {
- return this.response.encodeRedirectUrl(url);
- }
-
@Override
public void sendError(final int sc, final String msg) throws IOException {
this.response.sendError(sc, msg);
@@ -123,12 +111,6 @@ public class HttpServletResponseWrapper extends
ServletResponseWrapper
this.response.setStatus(sc);
}
- @SuppressWarnings("deprecation")
- @Override
- public void setStatus(final int sc, final String sm) {
- this.response.setStatus(sc, sm);
- }
-
@Override
public int getStatus() {
return this.response.getStatus();
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpSessionContextWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpSessionContextWrapper.java
deleted file mode 100644
index d5f01ad59c..0000000000
---
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpSessionContextWrapper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.http.jakartawrappers;
-
-import java.util.Enumeration;
-
-import org.jetbrains.annotations.NotNull;
-
-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionContext;
-
-/**
- * http session context wrapper
- */
-@SuppressWarnings("deprecation")
-public class HttpSessionContextWrapper implements HttpSessionContext {
-
- private final javax.servlet.http.HttpSessionContext context;
-
- /**
- * Create new context
- * @param c Wrapped context
- */
- public HttpSessionContextWrapper(@NotNull final
javax.servlet.http.HttpSessionContext c) {
- this.context = c;
- }
-
- @Override
- public HttpSession getSession(final String sessionId) {
- final javax.servlet.http.HttpSession session =
context.getSession(sessionId);
- if ( session != null ) {
- return new HttpSessionWrapper(session);
- }
- return null;
- }
-
- @Override
- public Enumeration<String> getIds() {
- return context.getIds();
- }
-}
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpSessionWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpSessionWrapper.java
index 4696be66c8..eb74e6c72c 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpSessionWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/HttpSessionWrapper.java
@@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionContext;
/**
* Http session wrapper
@@ -70,56 +69,26 @@ public class HttpSessionWrapper implements HttpSession {
return session.getMaxInactiveInterval();
}
- @SuppressWarnings("deprecation")
- @Override
- public HttpSessionContext getSessionContext() {
- return new HttpSessionContextWrapper(session.getSessionContext());
- }
-
@Override
public Object getAttribute(String name) {
return session.getAttribute(name);
}
- @SuppressWarnings("deprecation")
- @Override
- public Object getValue(String name) {
- return session.getValue(name);
- }
-
@Override
public Enumeration<String> getAttributeNames() {
return session.getAttributeNames();
}
- @SuppressWarnings("deprecation")
- @Override
- public String[] getValueNames() {
- return session.getValueNames();
- }
-
@Override
public void setAttribute(String name, Object value) {
session.setAttribute(name, value);
}
- @SuppressWarnings("deprecation")
- @Override
- public void putValue(String name, Object value) {
- session.putValue(name, value);
- }
-
@Override
public void removeAttribute(String name) {
session.removeAttribute(name);
}
- @SuppressWarnings("deprecation")
- @Override
- public void removeValue(String name) {
- session.removeValue(name);
- }
-
@Override
public void invalidate() {
session.invalidate();
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletContextWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletContextWrapper.java
index 4c4c2b95ce..2620c015a7 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletContextWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletContextWrapper.java
@@ -19,7 +19,6 @@ package org.apache.felix.http.jakartawrappers;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Collections;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.HashMap;
@@ -128,33 +127,11 @@ public class ServletContextWrapper implements
ServletContext {
return null;
}
- @Override
- public Servlet getServlet(final String name) throws ServletException {
- return null;
- }
-
- @Override
- public Enumeration<Servlet> getServlets() {
- return Collections.emptyEnumeration();
- }
-
- @SuppressWarnings("deprecation")
- @Override
- public Enumeration<String> getServletNames() {
- return this.context.getServletNames();
- }
-
@Override
public void log(final String msg) {
this.context.log(msg);
}
- @SuppressWarnings("deprecation")
- @Override
- public void log(final Exception exception, final String msg) {
- this.context.log(exception, msg);
- }
-
@Override
public void log(final String message, final Throwable throwable) {
this.context.log(message, throwable);
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
index 95357e43fc..d910f4a909 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
@@ -53,6 +53,7 @@ import org.jetbrains.annotations.NotNull;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.ServletRequest;
@@ -308,12 +309,6 @@ public class ServletRequestWrapper implements
ServletRequest {
return null;
}
- @SuppressWarnings("deprecation")
- @Override
- public String getRealPath(final String path) {
- return this.request.getRealPath(path);
- }
-
@Override
public int getRemotePort() {
return this.request.getRemotePort();
@@ -378,4 +373,19 @@ public class ServletRequestWrapper implements
ServletRequest {
}
return null;
}
+
+ @Override
+ public String getProtocolRequestId() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getRequestId() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ServletConnection getServletConnection() {
+ throw new UnsupportedOperationException();
+ }
}
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/SessionCookieConfigWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/SessionCookieConfigWrapper.java
index a2246ce9f1..af270617a9 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/SessionCookieConfigWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/SessionCookieConfigWrapper.java
@@ -16,6 +16,8 @@
*/
package org.apache.felix.http.jakartawrappers;
+import java.util.Map;
+
import org.jetbrains.annotations.NotNull;
import jakarta.servlet.SessionCookieConfig;
@@ -104,4 +106,19 @@ public class SessionCookieConfigWrapper implements
SessionCookieConfig {
public int getMaxAge() {
return config.getMaxAge();
}
+
+ @Override
+ public String getAttribute(final String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Map<String, String> getAttributes() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setAttribute(final String name, final String value) {
+ throw new UnsupportedOperationException();
+ }
}
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/package-info.java
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/package-info.java
index 90b6aecd03..0cb68ba414 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/package-info.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/package-info.java
@@ -16,6 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.versioning.Version("1.1.0")
package org.apache.felix.http.jakartawrappers;
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpServletRequestWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpServletRequestWrapper.java
index 7396e62db3..32a99e4cda 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpServletRequestWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpServletRequestWrapper.java
@@ -178,10 +178,9 @@ public class HttpServletRequestWrapper extends
ServletRequestWrapper
return this.request.isRequestedSessionIdFromURL();
}
- @SuppressWarnings("deprecation")
@Override
public boolean isRequestedSessionIdFromUrl() {
- return this.request.isRequestedSessionIdFromUrl();
+ return this.request.isRequestedSessionIdFromURL();
}
@Override
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpServletResponseWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpServletResponseWrapper.java
index d1f2475057..6f65c41b7a 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpServletResponseWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpServletResponseWrapper.java
@@ -61,16 +61,14 @@ public class HttpServletResponseWrapper extends
ServletResponseWrapper
return this.response.encodeRedirectURL(url);
}
- @SuppressWarnings("deprecation")
@Override
public String encodeUrl(final String url) {
- return this.response.encodeUrl(url);
+ return this.response.encodeURL(url);
}
- @SuppressWarnings("deprecation")
@Override
public String encodeRedirectUrl(final String url) {
- return this.response.encodeRedirectUrl(url);
+ return this.response.encodeRedirectURL(url);
}
@Override
@@ -123,10 +121,9 @@ public class HttpServletResponseWrapper extends
ServletResponseWrapper
this.response.setStatus(sc);
}
- @SuppressWarnings("deprecation")
@Override
public void setStatus(final int sc, final String sm) {
- this.response.setStatus(sc, sm);
+ this.response.setStatus(sc);
}
@Override
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpSessionContextWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpSessionContextWrapper.java
deleted file mode 100644
index 8ef38c7361..0000000000
---
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpSessionContextWrapper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.http.javaxwrappers;
-
-import java.util.Enumeration;
-
-import org.jetbrains.annotations.NotNull;
-
-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionContext;
-
-/**
- * http session context wrapper
- */
-@SuppressWarnings("deprecation")
-public class HttpSessionContextWrapper implements
javax.servlet.http.HttpSessionContext {
-
- private final HttpSessionContext context;
-
- /**
- * Create new context
- * @param c Wrapped context
- */
- public HttpSessionContextWrapper(@NotNull final HttpSessionContext c) {
- this.context = c;
- }
-
- @Override
- public javax.servlet.http.HttpSession getSession(final String sessionId) {
- final HttpSession session = context.getSession(sessionId);
- if ( session != null ) {
- return new HttpSessionWrapper(session);
- }
- return null;
- }
-
- @Override
- public Enumeration<String> getIds() {
- return context.getIds();
- }
-}
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpSessionWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpSessionWrapper.java
index bf15be31f9..9f19b73fed 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpSessionWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/HttpSessionWrapper.java
@@ -16,6 +16,7 @@
*/
package org.apache.felix.http.javaxwrappers;
+import java.util.Collections;
import java.util.Enumeration;
import org.jetbrains.annotations.NotNull;
@@ -71,7 +72,7 @@ public class HttpSessionWrapper implements
javax.servlet.http.HttpSession {
@SuppressWarnings("deprecation")
@Override
public javax.servlet.http.HttpSessionContext getSessionContext() {
- return new HttpSessionContextWrapper(session.getSessionContext());
+ throw new UnsupportedOperationException("Deprecated");
}
@Override
@@ -79,10 +80,9 @@ public class HttpSessionWrapper implements
javax.servlet.http.HttpSession {
return session.getAttribute(name);
}
- @SuppressWarnings("deprecation")
@Override
public Object getValue(String name) {
- return session.getValue(name);
+ return session.getAttribute(name);
}
@Override
@@ -90,10 +90,9 @@ public class HttpSessionWrapper implements
javax.servlet.http.HttpSession {
return session.getAttributeNames();
}
- @SuppressWarnings("deprecation")
@Override
public String[] getValueNames() {
- return session.getValueNames();
+ return Collections.list(session.getAttributeNames()).toArray(new
String[0]);
}
@Override
@@ -101,10 +100,9 @@ public class HttpSessionWrapper implements
javax.servlet.http.HttpSession {
session.setAttribute(name, value);
}
- @SuppressWarnings("deprecation")
@Override
public void putValue(String name, Object value) {
- session.putValue(name, value);
+ session.setAttribute(name, value);
}
@Override
@@ -112,10 +110,9 @@ public class HttpSessionWrapper implements
javax.servlet.http.HttpSession {
session.removeAttribute(name);
}
- @SuppressWarnings("deprecation")
@Override
public void removeValue(String name) {
- session.removeValue(name);
+ session.removeAttribute(name);
}
@Override
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletContextWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletContextWrapper.java
index 8ce5e9957b..9d3d45ee00 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletContextWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletContextWrapper.java
@@ -133,10 +133,9 @@ public class ServletContextWrapper implements
javax.servlet.ServletContext {
return Collections.emptyEnumeration();
}
- @SuppressWarnings("deprecation")
@Override
public Enumeration<String> getServletNames() {
- return this.context.getServletNames();
+ return Collections.emptyEnumeration();
}
@Override
@@ -144,10 +143,9 @@ public class ServletContextWrapper implements
javax.servlet.ServletContext {
this.context.log(msg);
}
- @SuppressWarnings("deprecation")
@Override
public void log(final Exception exception, final String msg) {
- this.context.log(exception, msg);
+ this.context.log(msg, exception);
}
@Override
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
index 8e9bdab978..6f96723a7c 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
@@ -305,10 +305,9 @@ public class ServletRequestWrapper implements
javax.servlet.ServletRequest {
return null;
}
- @SuppressWarnings("deprecation")
@Override
public String getRealPath(final String path) {
- return this.request.getRealPath(path);
+ return this.request.getServletContext().getRealPath(path);
}
@Override
diff --git
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/package-info.java
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/package-info.java
index ad7e49530c..a3fc415eac 100644
---
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/package-info.java
+++
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/package-info.java
@@ -16,6 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.versioning.Version("1.1.0")
package org.apache.felix.http.javaxwrappers;
