From 0a7e20a3f822563152a879d26bef93f6b829860c Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Wed, 13 Dec 2023 12:17:54 +0100 Subject: [PATCH] feat: Upgrade To Tomcat 10 - Meeds-io/MIPs#76 --- .../java/org/exoplatform/mfa/filter/MfaFilter.java | 14 +++++++------- .../exoplatform/mfa/rest/mfa/MfaRestService.java | 2 +- .../exoplatform/mfa/rest/otp/OtpRestService.java | 2 +- .../mfa/api/rest/OtpRestServiceTest.java | 4 ++-- .../org/exoplatform/mfa/filter/MfaFilterTest.java | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/services/src/main/java/org/exoplatform/mfa/filter/MfaFilter.java b/services/src/main/java/org/exoplatform/mfa/filter/MfaFilter.java index 44412def..ce145d6b 100644 --- a/services/src/main/java/org/exoplatform/mfa/filter/MfaFilter.java +++ b/services/src/main/java/org/exoplatform/mfa/filter/MfaFilter.java @@ -6,13 +6,13 @@ import java.util.Arrays; import java.util.List; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; import org.exoplatform.container.ExoContainer; diff --git a/services/src/main/java/org/exoplatform/mfa/rest/mfa/MfaRestService.java b/services/src/main/java/org/exoplatform/mfa/rest/mfa/MfaRestService.java index 60ab2145..66f7516b 100644 --- a/services/src/main/java/org/exoplatform/mfa/rest/mfa/MfaRestService.java +++ b/services/src/main/java/org/exoplatform/mfa/rest/mfa/MfaRestService.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import javax.annotation.security.RolesAllowed; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; diff --git a/services/src/main/java/org/exoplatform/mfa/rest/otp/OtpRestService.java b/services/src/main/java/org/exoplatform/mfa/rest/otp/OtpRestService.java index 0f49797f..895af1a2 100644 --- a/services/src/main/java/org/exoplatform/mfa/rest/otp/OtpRestService.java +++ b/services/src/main/java/org/exoplatform/mfa/rest/otp/OtpRestService.java @@ -13,7 +13,7 @@ import org.exoplatform.services.security.ConversationState; import javax.annotation.security.RolesAllowed; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/services/src/test/java/org/exoplatform/mfa/api/rest/OtpRestServiceTest.java b/services/src/test/java/org/exoplatform/mfa/api/rest/OtpRestServiceTest.java index 1f2a255c..9034c690 100644 --- a/services/src/test/java/org/exoplatform/mfa/api/rest/OtpRestServiceTest.java +++ b/services/src/test/java/org/exoplatform/mfa/api/rest/OtpRestServiceTest.java @@ -10,8 +10,8 @@ import org.junit.Test; import org.mockito.Mock; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import javax.ws.rs.core.Response; import static org.junit.Assert.assertEquals; diff --git a/services/src/test/java/org/exoplatform/mfa/filter/MfaFilterTest.java b/services/src/test/java/org/exoplatform/mfa/filter/MfaFilterTest.java index 786d299a..3e24e173 100644 --- a/services/src/test/java/org/exoplatform/mfa/filter/MfaFilterTest.java +++ b/services/src/test/java/org/exoplatform/mfa/filter/MfaFilterTest.java @@ -13,11 +13,11 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException;