diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java b/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java
index 13471204..522c0c28 100644
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java
@@ -88,8 +88,6 @@ public class DefaultCookieSerializer implements CookieSerializer {
 	private String sameSite = "Lax";
 
 	/*
-	 * (non-Javadoc)
-	 *
 	 * @see org.springframework.session.web.http.CookieSerializer#readCookieValues(javax.
 	 * servlet.http.HttpServletRequest)
 	 */
@@ -115,8 +113,6 @@ public class DefaultCookieSerializer implements CookieSerializer {
 	}
 
 	/*
-	 * (non-Javadoc)
-	 *
 	 * @see org.springframework.session.web.http.CookieWriter#writeCookieValue(org.
 	 * springframework.session.web.http.CookieWriter.CookieValue)
 	 */
diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java
index df271a68..d0282c6a 100644
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,8 +51,6 @@ public class SessionEventHttpSessionListenerAdapter
 	}
 
 	/*
-	 * (non-Javadoc)
-	 *
 	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.
 	 * springframework.context.ApplicationEvent)
 	 */
@@ -81,8 +79,6 @@ public class SessionEventHttpSessionListenerAdapter
 	}
 
 	/*
-	 * (non-Javadoc)
-	 *
 	 * @see
 	 * org.springframework.web.context.ServletContextAware#setServletContext(javax.servlet
 	 * .ServletContext)
diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/ConfigureNotifyKeyspaceEventsAction.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/ConfigureNotifyKeyspaceEventsAction.java
index 2d3fc275..2927d535 100644
--- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/ConfigureNotifyKeyspaceEventsAction.java
+++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/ConfigureNotifyKeyspaceEventsAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,8 +46,6 @@ public class ConfigureNotifyKeyspaceEventsAction implements ConfigureRedisAction
 	static final String CONFIG_NOTIFY_KEYSPACE_EVENTS = "notify-keyspace-events";
 
 	/*
-	 * (non-Javadoc)
-	 *
 	 * @see
 	 * org.springframework.session.data.redis.config.ConfigureRedisAction#configure(org.
 	 * springframework.data.redis.connection.RedisConnection)
diff --git a/spring-session-docs/modules/ROOT/examples/java/docs/http/AbstractHttpSessionListenerTests.java b/spring-session-docs/modules/ROOT/examples/java/docs/http/AbstractHttpSessionListenerTests.java
index 4b5047f8..81e1161c 100644
--- a/spring-session-docs/modules/ROOT/examples/java/docs/http/AbstractHttpSessionListenerTests.java
+++ b/spring-session-docs/modules/ROOT/examples/java/docs/http/AbstractHttpSessionListenerTests.java
@@ -75,8 +75,6 @@ public abstract class AbstractHttpSessionListenerTests {
 		private SessionDestroyedEvent event;
 
 		/*
-		 * (non-Javadoc)
-		 *
 		 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.
 		 * springframework.context.ApplicationEvent)
 		 */
diff --git a/spring-session-docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java b/spring-session-docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java
index 4b5047f8..ea6b6171 100644
--- a/spring-session-docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java
+++ b/spring-session-docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,8 +75,6 @@ public abstract class AbstractHttpSessionListenerTests {
 		private SessionDestroyedEvent event;
 
 		/*
-		 * (non-Javadoc)
-		 *
 		 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.
 		 * springframework.context.ApplicationEvent)
 		 */
diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SessionConfig.java b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SessionConfig.java
index f3c307d6..16a1f989 100644
--- a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SessionConfig.java
+++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SessionConfig.java
@@ -49,8 +49,6 @@ public class SessionConfig implements BeanClassLoaderAware {
 	}
 
 	/*
-	 * (non-Javadoc)
-	 *
 	 * @see
 	 * org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang
 	 * .ClassLoader)
diff --git a/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java b/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java
index a829e45a..47461cbf 100644
--- a/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java
+++ b/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java
@@ -44,8 +44,6 @@ public class UserRepositoryUserDetailsService implements UserDetailsService {
 	}
 
 	/*
-	 * (non-Javadoc)
-	 *
 	 * @see
 	 * org.springframework.security.core.userdetails.UserDetailsService#loadUserByUsername
 	 * (java.lang.String)