[java-support] 02/02: Adopt Spring Framework 6, Jakarta Servlet 5
Ian Young
ian at iay.org.uk
Tue Mar 22 11:32:53 UTC 2022
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch dev/JPAR-186
in repository java-support.
View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=9e1f998e8d298f7184738d111238248dba24c94d
commit 9e1f998e8d298f7184738d111238248dba24c94d
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Dec 21 17:16:28 2021 +0000
Adopt Spring Framework 6, Jakarta Servlet 5
---
pom.xml | 4 +--
.../java/support/net/CookieBufferingFilter.java | 24 +++++++++---------
.../utilities/java/support/net/CookieManager.java | 8 +++---
.../support/net/DynamicResponseHeaderFilter.java | 22 ++++++++--------
.../net/HttpServletRequestResponseContext.java | 4 +--
.../java/support/net/HttpServletSupport.java | 8 +++---
.../support/net/RequestResponseContextFilter.java | 17 +++++++------
.../support/net/SameSiteCookieHeaderFilter.java | 20 +++++++--------
.../net/ThreadLocalHttpServletRequestProxy.java | 29 +++++++++++-----------
.../net/ThreadLocalHttpServletResponseProxy.java | 7 +++---
.../java/support/security/AccessControl.java | 5 ++--
.../security/impl/BasicAccessControlService.java | 4 +--
.../impl/DelegatingAccessControlService.java | 4 +--
.../security/impl/IPRangeAccessControl.java | 5 ++--
.../java/support/net/CookieManagerTest.java | 6 ++---
.../net/HttpServletRequestResponseContextTest.java | 6 ++---
.../net/RequestResponseContextFilterTest.java | 18 +++++++-------
.../net/SameSiteCookieHeaderFilterTest.java | 17 ++++++-------
.../ThreadLocalHttpServletRequestProxyTest.java | 6 ++---
.../ThreadLocalHttpServletResponseProxyTest.java | 6 ++---
20 files changed, 110 insertions(+), 110 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1675500..787fd32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,8 +126,8 @@
<!-- Provided Dependencies -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java b/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
index bb9a63d..0d42e46 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
@@ -23,18 +23,18 @@ import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nonnull;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -149,4 +149,4 @@ public class CookieBufferingFilter implements Filter {
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java b/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
index 6ee7927..f9fa9a7 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
@@ -19,10 +19,10 @@ package net.shibboleth.utilities.java.support.net;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
@@ -258,4 +258,4 @@ public final class CookieManager extends AbstractInitializableComponent {
return "".equals(httpRequest.getContextPath()) ? "/" : httpRequest.getContextPath();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java b/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
index 10bc9da..22bd508 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
@@ -28,17 +28,17 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -196,4 +196,4 @@ public class DynamicResponseHeaderFilter implements Filter {
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java
index dac7f7f..eadb537 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java
@@ -19,9 +19,9 @@ package net.shibboleth.utilities.java.support.net;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
index 543dfa0..6698486 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
@@ -25,15 +25,15 @@ import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.net.MediaType;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -189,4 +189,4 @@ public final class HttpServletSupport {
return addr;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java b/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
index e2d91da..650853c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
@@ -19,14 +19,15 @@ package net.shibboleth.utilities.java.support.net;
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* Implementation of an HTTP servlet {@link Filter} which stores the current {@link HttpServletRequest} and
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilter.java b/src/main/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilter.java
index 57cecc7..2786ff4 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilter.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilter.java
@@ -29,15 +29,6 @@ import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,6 +36,15 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Predicates;
import com.google.common.net.HttpHeaders;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -354,4 +354,4 @@ public class SameSiteCookieHeaderFilter implements Filter {
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
index 700f2a2..175f4b7 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
@@ -26,21 +26,20 @@ import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
index 5577e45..4a336a8 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
@@ -22,10 +22,9 @@ import java.io.PrintWriter;
import java.util.Collection;
import java.util.Locale;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java b/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java
index a7ac9ad..45aaed1 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java
@@ -19,7 +19,8 @@ package net.shibboleth.utilities.java.support.security;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.ServletRequest;
+
+import jakarta.servlet.ServletRequest;
/**
* A policy that evaluates a {@link ServletRequest} and determines whether access to a named resource
@@ -39,4 +40,4 @@ public interface AccessControl {
boolean checkAccess(@Nonnull final ServletRequest request, @Nullable final String operation,
@Nullable final String resource);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java
index 15b0704..288a577 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java
@@ -23,11 +23,11 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.ServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.servlet.ServletRequest;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -90,4 +90,4 @@ public class BasicAccessControlService extends AbstractIdentifiableInitializable
};
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/DelegatingAccessControlService.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/DelegatingAccessControlService.java
index be86e5b..6201144 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/DelegatingAccessControlService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/DelegatingAccessControlService.java
@@ -19,11 +19,11 @@ package net.shibboleth.utilities.java.support.security.impl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.ServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.servlet.ServletRequest;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -84,4 +84,4 @@ public class DelegatingAccessControlService extends AbstractIdentifiableInitiali
};
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
index 6bbc00d..4f1be6c 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
@@ -23,7 +23,6 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.ServletRequest;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
@@ -38,6 +37,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.net.InetAddresses;
+import jakarta.servlet.ServletRequest;
+
/**
* Simple access control implementation based on IP address checking.
*/
@@ -113,4 +114,4 @@ public class IPRangeAccessControl extends AbstractIdentifiableInitializableCompo
return "Policy " + getId() + ":";
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
index 5215f3b..7c8256d 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
@@ -17,8 +17,6 @@
package net.shibboleth.utilities.java.support.net;
-import javax.servlet.http.Cookie;
-
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -26,6 +24,8 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
import org.testng.annotations.Test;
+import jakarta.servlet.http.Cookie;
+
/** {@link CookieManager} unit test. */
public class CookieManagerTest {
@@ -112,4 +112,4 @@ public class CookieManagerTest {
Assert.assertTrue(cookie.getSecure());
Assert.assertEquals(cookie.getMaxAge(), 0);
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
index d16ac16..c8d0059 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
@@ -17,9 +17,6 @@
package net.shibboleth.utilities.java.support.net;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
@@ -27,6 +24,9 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* Tests for {@link HttpServletRequestResponseContext}.
*/
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
index 0ca6802..01a793b 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
@@ -19,15 +19,6 @@ package net.shibboleth.utilities.java.support.net;
import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -38,6 +29,15 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* Tests for {@link RequestResponseContextFilter}.
*/
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java
index bd1b2be..979006d 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java
@@ -29,15 +29,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
import org.springframework.mock.web.MockCookie;
import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -50,6 +41,14 @@ import org.testng.annotations.Test;
import com.google.common.net.HttpHeaders;
+import jakarta.servlet.Filter;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.net.SameSiteCookieHeaderFilter.SameSiteValue;
/**
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
index 12c5b6a..15e8c02 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
@@ -17,9 +17,6 @@
package net.shibboleth.utilities.java.support.net;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -29,6 +26,9 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* Tests for {@link ThreadLocalHttpServletRequestProxy}.
*/
diff --git a/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java b/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
index fd4bb94..e2ff20d 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
@@ -17,9 +17,6 @@
package net.shibboleth.utilities.java.support.net;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -29,6 +26,9 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* Tests for {@link ThreadLocalHttpServletResponseProxy}.
*/
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list