diff --git a/samples/boot/gemfire-with-gfsh-servers/src/main/java/sample/client/Application.java b/samples/boot/gemfire-with-gfsh-servers/src/main/java/sample/client/Application.java index 89b581b..decdfa4 100644 --- a/samples/boot/gemfire-with-gfsh-servers/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire-with-gfsh-servers/src/main/java/sample/client/Application.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Optional; import java.util.stream.StreamSupport; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java index 7b29c13..7da2384 100644 --- a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java @@ -19,8 +19,8 @@ package sample.client; import java.io.PrintWriter; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; @@ -45,7 +45,7 @@ import sample.client.model.SessionScopedProxyBean; * A Spring Boot, Pivotal GemFire cache client, web application that reveals the current state of the HTTP Session. * * @author John Blum - * @see javax.servlet.http.HttpSession + * @see jakarta.servlet.http.HttpSession * @see org.springframework.boot.SpringApplication * @see org.springframework.boot.autoconfigure.SpringBootApplication * @see org.springframework.context.annotation.Bean diff --git a/samples/boot/gemfire/src/main/java/sample/client/Application.java b/samples/boot/gemfire/src/main/java/sample/client/Application.java index f23eed5..c357a46 100644 --- a/samples/boot/gemfire/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire/src/main/java/sample/client/Application.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; @@ -51,7 +51,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * A Spring Boot, Pivotal GemFire cache client, web application that reveals the current state of the HTTP Session. * * @author John Blum - * @see javax.servlet.http.HttpSession + * @see jakarta.servlet.http.HttpSession * @see org.springframework.boot.SpringApplication * @see org.springframework.boot.autoconfigure.SpringBootApplication * @see org.springframework.context.annotation.Bean diff --git a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java index 67b1a59..6f474e7 100644 --- a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java +++ b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java @@ -18,11 +18,11 @@ package sample.client; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; // tag::class[] @WebServlet("/session") diff --git a/samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java b/samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java index bceb669..780da15 100644 --- a/samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java +++ b/samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java @@ -18,11 +18,11 @@ package sample; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; // tag::class[] @WebServlet("/session") diff --git a/samples/xml/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java b/samples/xml/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java index b66335b..44f23fc 100644 --- a/samples/xml/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java +++ b/samples/xml/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java @@ -18,10 +18,10 @@ package sample.client; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; // tag::class[] public class SessionServlet extends HttpServlet { diff --git a/samples/xml/gemfire-p2p/src/main/java/sample/SessionServlet.java b/samples/xml/gemfire-p2p/src/main/java/sample/SessionServlet.java index e986c21..f49da3d 100644 --- a/samples/xml/gemfire-p2p/src/main/java/sample/SessionServlet.java +++ b/samples/xml/gemfire-p2p/src/main/java/sample/SessionServlet.java @@ -18,10 +18,10 @@ package sample; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; // tag::class[] public class SessionServlet extends HttpServlet { diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/AbstractGemFireHttpSessionConfiguration.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/AbstractGemFireHttpSessionConfiguration.java index 9fd66a4..ecdb113 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/AbstractGemFireHttpSessionConfiguration.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/AbstractGemFireHttpSessionConfiguration.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * The {@link AbstractGemFireHttpSessionConfiguration} class is an abstract base class containing configuration logic - * common to Apache Geode and Pivotal GemFire in order to manage {@link javax.servlet.http.HttpSession} state. + * common to Apache Geode and Pivotal GemFire in order to manage {@link jakarta.servlet.http.HttpSession} state. * * @author John Blum * @see java.lang.ClassLoader diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java index 5191963..e8f5c34 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.Properties; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; @@ -87,7 +87,7 @@ import org.springframework.session.web.http.SessionRepositoryFilter; * @author John Blum * @see java.lang.annotation.Annotation * @see java.util.Properties - * @see javax.servlet.http.HttpSession + * @see jakarta.servlet.http.HttpSession * @see org.apache.geode.cache.Cache * @see org.apache.geode.cache.Region * @see org.apache.geode.cache.client.ClientCache diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java index c3ebd67..77435c1 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java @@ -97,7 +97,7 @@ import org.springframework.util.StringUtils; /** * The {@link GemFireHttpSessionConfiguration} class is a Spring {@link Configuration @Configuration} class * used to configure and initialize Pivotal GemFire/Apache Geode as a clustered, distributed and replicated - * {@link javax.servlet.http.HttpSession} provider implementation in Spring {@link Session}. + * {@link jakarta.servlet.http.HttpSession} provider implementation in Spring {@link Session}. * * @author John Blum * @see java.time.Duration diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java index 5791079..18f451a 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java @@ -17,7 +17,7 @@ package org.springframework.session.data.gemfire.config.annotation.web.http.supp import java.util.Optional; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.query.Index; diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/web/http/AbstractCookieSerializer.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/web/http/AbstractCookieSerializer.java index 40a04ff..64b3ddd 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/web/http/AbstractCookieSerializer.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/web/http/AbstractCookieSerializer.java @@ -20,7 +20,7 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newU import java.util.Collections; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.session.web.http.CookieSerializer; @@ -30,7 +30,7 @@ import org.springframework.session.web.http.CookieSerializer; * {@link CookieSerializer} interface. * * @author John Blum - * @see javax.servlet.http.HttpServletRequest + * @see jakarta.servlet.http.HttpServletRequest * @see org.springframework.session.web.http.CookieSerializer * @since 2.5.0 */ diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/web/http/AbstractHttpSessionIdResolver.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/web/http/AbstractHttpSessionIdResolver.java index ec87e90..536d9c6 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/web/http/AbstractHttpSessionIdResolver.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/web/http/AbstractHttpSessionIdResolver.java @@ -20,8 +20,8 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newU import java.util.Collections; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.session.web.http.HttpSessionIdResolver; @@ -31,8 +31,8 @@ import org.springframework.session.web.http.HttpSessionIdResolver; * {@link HttpSessionIdResolver} interface. * * @author John Blum - * @see javax.servlet.http.HttpServletRequest - * @see javax.servlet.http.HttpServletResponse + * @see jakarta.servlet.http.HttpServletRequest + * @see jakarta.servlet.http.HttpServletResponse * @see org.springframework.session.web.http.HttpSessionIdResolver * @since 2.5.0 */