diff --git a/samples/boot/src/main/java/sample/config/EmbeddedRedisConfiguration.java b/samples/boot/src/main/java/sample/config/EmbeddedRedisConfiguration.java
index 1ac4c9c4..27166516 100644
--- a/samples/boot/src/main/java/sample/config/EmbeddedRedisConfiguration.java
+++ b/samples/boot/src/main/java/sample/config/EmbeddedRedisConfiguration.java
@@ -40,14 +40,11 @@ public class EmbeddedRedisConfiguration {
     class RedisServerBean implements InitializingBean, DisposableBean {
         private RedisServer redisServer;
 
-
-        @Override
         public void afterPropertiesSet() throws Exception {
             redisServer = new RedisServer(Protocol.DEFAULT_PORT);
             redisServer.start();
         }
 
-        @Override
         public void destroy() throws Exception {
             if(redisServer != null) {
                 redisServer.stop();
diff --git a/samples/security/src/main/java/sample/EmbeddedRedisConfiguration.java b/samples/security/src/main/java/sample/EmbeddedRedisConfiguration.java
index af01e83f..a9b695b0 100644
--- a/samples/security/src/main/java/sample/EmbeddedRedisConfiguration.java
+++ b/samples/security/src/main/java/sample/EmbeddedRedisConfiguration.java
@@ -40,14 +40,11 @@ public class EmbeddedRedisConfiguration {
     class RedisServerBean implements InitializingBean, DisposableBean {
         private RedisServer redisServer;
 
-
-        @Override
         public void afterPropertiesSet() throws Exception {
             redisServer = new RedisServer(Protocol.DEFAULT_PORT);
             redisServer.start();
         }
 
-        @Override
         public void destroy() throws Exception {
             if(redisServer != null) {
                 redisServer.stop();
diff --git a/samples/users/src/main/java/sample/EmbeddedRedisConfiguration.java b/samples/users/src/main/java/sample/EmbeddedRedisConfiguration.java
index af01e83f..ae263faa 100644
--- a/samples/users/src/main/java/sample/EmbeddedRedisConfiguration.java
+++ b/samples/users/src/main/java/sample/EmbeddedRedisConfiguration.java
@@ -41,13 +41,11 @@ public class EmbeddedRedisConfiguration {
         private RedisServer redisServer;
 
 
-        @Override
         public void afterPropertiesSet() throws Exception {
             redisServer = new RedisServer(Protocol.DEFAULT_PORT);
             redisServer.start();
         }
 
-        @Override
         public void destroy() throws Exception {
             if(redisServer != null) {
                 redisServer.stop();
diff --git a/samples/web/src/main/java/sample/EmbeddedRedisConfiguration.java b/samples/web/src/main/java/sample/EmbeddedRedisConfiguration.java
index af01e83f..ae263faa 100644
--- a/samples/web/src/main/java/sample/EmbeddedRedisConfiguration.java
+++ b/samples/web/src/main/java/sample/EmbeddedRedisConfiguration.java
@@ -41,13 +41,11 @@ public class EmbeddedRedisConfiguration {
         private RedisServer redisServer;
 
 
-        @Override
         public void afterPropertiesSet() throws Exception {
             redisServer = new RedisServer(Protocol.DEFAULT_PORT);
             redisServer.start();
         }
 
-        @Override
         public void destroy() throws Exception {
             if(redisServer != null) {
                 redisServer.stop();
diff --git a/samples/websocket/src/main/java/sample/config/EmbeddedRedisConfig.java b/samples/websocket/src/main/java/sample/config/EmbeddedRedisConfig.java
index c387d112..131b7030 100644
--- a/samples/websocket/src/main/java/sample/config/EmbeddedRedisConfig.java
+++ b/samples/websocket/src/main/java/sample/config/EmbeddedRedisConfig.java
@@ -38,13 +38,11 @@ public class EmbeddedRedisConfig {
         private RedisServer redisServer;
 
 
-        @Override
         public void afterPropertiesSet() throws Exception {
             redisServer = new RedisServer(Protocol.DEFAULT_PORT);
             redisServer.start();
         }
 
-        @Override
         public void destroy() throws Exception {
             if(redisServer != null) {
                 redisServer.stop();
diff --git a/samples/websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java b/samples/websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java
index cad92b07..dad93095 100644
--- a/samples/websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java
+++ b/samples/websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java
@@ -43,7 +43,6 @@ public class UserRepositoryUserDetailsService implements UserDetailsService {
     /* (non-Javadoc)
      * @see org.springframework.security.core.userdetails.UserDetailsService#loadUserByUsername(java.lang.String)
      */
-    @Override
     public UserDetails loadUserByUsername(String username)
             throws UsernameNotFoundException {
         User user = userRepository.findByEmail(username);
@@ -59,32 +58,26 @@ public class UserRepositoryUserDetailsService implements UserDetailsService {
             super(user);
         }
 
-        @Override
         public Collection<? extends GrantedAuthority> getAuthorities() {
             return AuthorityUtils.createAuthorityList("ROLE_USER");
         }
 
-        @Override
         public String getUsername() {
             return getEmail();
         }
 
-        @Override
         public boolean isAccountNonExpired() {
             return true;
         }
 
-        @Override
         public boolean isAccountNonLocked() {
             return true;
         }
 
-        @Override
         public boolean isCredentialsNonExpired() {
             return true;
         }
 
-        @Override
         public boolean isEnabled() {
             return true;
         }
diff --git a/samples/websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java b/samples/websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java
index 25055b4a..3163e441 100644
--- a/samples/websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java
+++ b/samples/websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java
@@ -38,7 +38,6 @@ public class WebSocketConnectHandler<S> implements ApplicationListener<SessionCo
         this.repository = repository;
     }
 
-    @Override
     public void onApplicationEvent(SessionConnectEvent event) {
         MessageHeaders headers = event.getMessage().getHeaders();
         Principal user = SimpMessageHeaderAccessor.getUser(headers);
diff --git a/samples/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java b/samples/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
index f1aa350d..ca624d10 100644
--- a/samples/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
+++ b/samples/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
@@ -34,7 +34,6 @@ public class WebSocketDisconnectHandler<S> implements ApplicationListener<Sessio
         this.repository = repository;
     }
 
-    @Override
     public void onApplicationEvent(SessionDisconnectEvent event) {
         String id = event.getSessionId();
         if(id == null) {
diff --git a/spring-session/src/main/java/org/springframework/session/MapSession.java b/spring-session/src/main/java/org/springframework/session/MapSession.java
index 2593895d..cdd43233 100644
--- a/spring-session/src/main/java/org/springframework/session/MapSession.java
+++ b/spring-session/src/main/java/org/springframework/session/MapSession.java
@@ -86,27 +86,22 @@ public final class MapSession implements ExpiringSession, Serializable {
         this.lastAccessedTime = lastAccessedTime;
     }
 
-    @Override
     public long getCreationTime() {
         return creationTime;
     }
 
-    @Override
     public String getId() {
         return id;
     }
 
-    @Override
     public long getLastAccessedTime() {
         return lastAccessedTime;
     }
 
-    @Override
     public void setMaxInactiveInterval(int interval) {
         this.maxInactiveInterval = interval;
     }
 
-    @Override
     public int getMaxInactiveInterval() {
         return maxInactiveInterval;
     }
@@ -122,17 +117,14 @@ public final class MapSession implements ExpiringSession, Serializable {
         return now - TimeUnit.SECONDS.toMillis(maxInactiveInterval) >= lastAccessedTime;
     }
 
-    @Override
     public Object getAttribute(String attributeName) {
         return sessionAttrs.get(attributeName);
     }
 
-    @Override
     public Set<String> getAttributeNames() {
         return sessionAttrs.keySet();
     }
 
-    @Override
     public void setAttribute(String attributeName, Object attributeValue) {
         if (attributeValue == null) {
             removeAttribute(attributeName);
@@ -141,7 +133,6 @@ public final class MapSession implements ExpiringSession, Serializable {
         }
     }
 
-    @Override
     public void removeAttribute(String attributeName) {
         sessionAttrs.remove(attributeName);
     }
diff --git a/spring-session/src/main/java/org/springframework/session/data/redis/SessionMessageListener.java b/spring-session/src/main/java/org/springframework/session/data/redis/SessionMessageListener.java
index 05877ff6..8cb1d632 100644
--- a/spring-session/src/main/java/org/springframework/session/data/redis/SessionMessageListener.java
+++ b/spring-session/src/main/java/org/springframework/session/data/redis/SessionMessageListener.java
@@ -46,7 +46,6 @@ public class SessionMessageListener implements MessageListener {
         this.eventPublisher = eventPublisher;
     }
 
-    @Override
     public void onMessage(Message message, byte[] pattern) {
         byte[] messageBody = message.getBody();
         if(messageBody == null) {
diff --git a/spring-session/src/main/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfiguration.java b/spring-session/src/main/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfiguration.java
index 5775f9b2..3948c12d 100644
--- a/spring-session/src/main/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfiguration.java
+++ b/spring-session/src/main/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfiguration.java
@@ -111,7 +111,6 @@ public class RedisHttpSessionConfiguration implements ImportAware, BeanClassLoad
         return sessionRepositoryFilter;
     }
 
-    @Override
     public void setImportMetadata(AnnotationMetadata importMetadata) {
 
         Map<String, Object> enableAttrMap = importMetadata.getAnnotationAttributes(EnableRedisHttpSession.class.getName());
diff --git a/spring-session/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java b/spring-session/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java
index 1f53ff14..106e8729 100644
--- a/spring-session/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java
+++ b/spring-session/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java
@@ -102,7 +102,6 @@ public abstract class AbstractHttpSessionApplicationInitializer implements WebAp
         this.configurationClasses = configurationClasses;
     }
 
-    @Override
     public void onStartup(ServletContext servletContext)
             throws ServletException {
         beforeSessionRepositoryFilter(servletContext);
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java b/spring-session/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java
index cd80c61c..7b676ef7 100644
--- a/spring-session/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java
+++ b/spring-session/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java
@@ -53,17 +53,14 @@ import javax.servlet.http.HttpServletResponse;
 public class HeaderHttpSessionStrategy implements HttpSessionStrategy {
     private String headerName = "x-auth-token";
 
-    @Override
     public String getRequestedSessionId(HttpServletRequest request) {
         return request.getHeader(headerName);
     }
 
-    @Override
     public void onNewSession(Session session, HttpServletRequest request, HttpServletResponse response) {
         response.setHeader(headerName, session.getId());
     }
 
-    @Override
     public void onInvalidateSession(HttpServletRequest request, HttpServletResponse response) {
         response.setHeader(headerName, "");
     }
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java b/spring-session/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java
index 498f54d2..ac25f99a 100644
--- a/spring-session/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java
+++ b/spring-session/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java
@@ -42,7 +42,6 @@ abstract class OncePerRequestFilter implements Filter {
      * "already filtered", proceeding without filtering again if the
      * attribute is already there.
      */
-    @Override
     public final void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
             throws ServletException, IOException {
 
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java b/spring-session/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
index 24fa90d9..5432a890 100644
--- a/spring-session/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
+++ b/spring-session/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
@@ -230,91 +230,75 @@ public class SessionRepositoryFilter<S extends ExpiringSession> extends OncePerR
                 this.servletContext = servletContext;
             }
 
-            @Override
             public long getCreationTime() {
                 checkState();
                 return session.getCreationTime();
             }
 
-            @Override
             public String getId() {
                 return session.getId();
             }
 
-            @Override
             public long getLastAccessedTime() {
                 checkState();
                 return session.getLastAccessedTime();
             }
 
-            @Override
             public ServletContext getServletContext() {
                 return servletContext;
             }
 
-            @Override
             public void setMaxInactiveInterval(int interval) {
                 session.setMaxInactiveInterval(interval);
             }
 
-            @Override
             public int getMaxInactiveInterval() {
                 return session.getMaxInactiveInterval();
             }
 
-            @Override
             @SuppressWarnings("deprecation")
             public HttpSessionContext getSessionContext() {
                 return NOOP_SESSION_CONTEXT;
             }
 
-            @Override
             public Object getAttribute(String name) {
                 checkState();
                 return session.getAttribute(name);
             }
 
-            @Override
             public Object getValue(String name) {
                 return getAttribute(name);
             }
 
-            @Override
             public Enumeration<String> getAttributeNames() {
                 checkState();
                 return Collections.enumeration(session.getAttributeNames());
             }
 
-            @Override
             public String[] getValueNames() {
                 checkState();
                 Set<String> attrs = session.getAttributeNames();
                 return attrs.toArray(new String[0]);
             }
 
-            @Override
             public void setAttribute(String name, Object value) {
                 checkState();
                 session.setAttribute(name, value);
             }
 
-            @Override
             public void putValue(String name, Object value) {
                 setAttribute(name, value);
             }
 
-            @Override
             public void removeAttribute(String name) {
                 checkState();
                 session.removeAttribute(name);
             }
 
-            @Override
             public void removeValue(String name) {
                 removeAttribute(name);
             }
 
-            @Override
             public void invalidate() {
                 checkState();
                 this.invalidated = true;
@@ -326,7 +310,6 @@ public class SessionRepositoryFilter<S extends ExpiringSession> extends OncePerR
                 this.old = !isNew;
             }
 
-            @Override
             public boolean isNew() {
                 checkState();
                 return !old;
@@ -342,24 +325,20 @@ public class SessionRepositoryFilter<S extends ExpiringSession> extends OncePerR
 
     @SuppressWarnings("deprecation")
     private static final HttpSessionContext NOOP_SESSION_CONTEXT = new HttpSessionContext() {
-        @Override
         public HttpSession getSession(String sessionId) {
             return null;
         }
 
-        @Override
         public Enumeration<String> getIds() {
             return EMPTY_ENUMERATION;
         }
     };
 
     private static final Enumeration<String> EMPTY_ENUMERATION = new Enumeration<String>() {
-        @Override
         public boolean hasMoreElements() {
             return false;
         }
 
-        @Override
         public String nextElement() {
             throw new NoSuchElementException("a");
         }
@@ -386,13 +365,11 @@ public class SessionRepositoryFilter<S extends ExpiringSession> extends OncePerR
             delegate.onInvalidateSession(request, response);
         }
 
-        @Override
         public HttpServletRequest wrapRequest(HttpServletRequest request,
                 HttpServletResponse response) {
             return request;
         }
 
-        @Override
         public HttpServletResponse wrapResponse(HttpServletRequest request,
                 HttpServletResponse response) {
             return response;
diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java b/spring-session/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java
index a1987868..4cd7b599 100644
--- a/spring-session/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java
+++ b/spring-session/src/main/java/org/springframework/session/web/socket/config/annotation/AbstractSessionWebSocketMessageBrokerConfigurer.java
@@ -86,7 +86,6 @@ public abstract class AbstractSessionWebSocketMessageBrokerConfigurer<S extends
         registration.setInterceptors(sessionRepositoryInterceptor());
     }
 
-    @Override
     public final void registerStompEndpoints(StompEndpointRegistry registry) {
         configureStompEndpoints(new SessionStompEndpointRegistry(registry, sessionRepositoryInterceptor()));
     }
diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java b/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java
index d9aa848b..476b92cc 100644
--- a/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java
+++ b/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactory.java
@@ -57,7 +57,6 @@ public final class WebSocketConnectHandlerDecoratorFactory implements WebSocketH
         this.eventPublisher = eventPublisher;
     }
 
-    @Override
     public WebSocketHandler decorate(WebSocketHandler handler) {
         return new SessionWebSocketHandler(handler);
     }
diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java b/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
index a2119399..f99ad8cf 100644
--- a/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
+++ b/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java
@@ -52,7 +52,6 @@ public final class WebSocketRegistryListener implements ApplicationListener<Appl
 
     private final ConcurrentHashMap<String,Map<String,WebSocketSession>> httpSessionIdToWsSessions = new ConcurrentHashMap<String,Map<String,WebSocketSession>>();
 
-    @Override
     public void onApplicationEvent(ApplicationEvent event) {
         if(event instanceof SessionDestroyedEvent) {
             SessionDestroyedEvent e = (SessionDestroyedEvent) event;
diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java b/spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
index b09e3095..5d04a698 100644
--- a/spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
+++ b/spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
@@ -130,7 +130,6 @@ public final class SessionRepositoryMessageInterceptor<S extends ExpiringSession
         return super.preSend(message, channel);
     }
 
-    @Override
     public boolean beforeHandshake(ServerHttpRequest request,
             ServerHttpResponse response, WebSocketHandler wsHandler,
             Map<String, Object> attributes) throws Exception {
@@ -144,7 +143,6 @@ public final class SessionRepositoryMessageInterceptor<S extends ExpiringSession
         return true;
     }
 
-    @Override
     public void afterHandshake(ServerHttpRequest request,
             ServerHttpResponse response, WebSocketHandler wsHandler,
             Exception exception) {
diff --git a/spring-session/src/test/java/org/springframework/session/MapSessionTests.java b/spring-session/src/test/java/org/springframework/session/MapSessionTests.java
index d94ee10c..7a666404 100644
--- a/spring-session/src/test/java/org/springframework/session/MapSessionTests.java
+++ b/spring-session/src/test/java/org/springframework/session/MapSessionTests.java
@@ -71,52 +71,42 @@ public class MapSessionTests {
 
     static class CustomSession implements ExpiringSession {
 
-        @Override
         public long getCreationTime() {
             return 0;
         }
 
-        @Override
         public String getId() {
             return "id";
         }
 
-        @Override
         public long getLastAccessedTime() {
             return 0;
         }
 
-        @Override
         public void setMaxInactiveInterval(int interval) {
 
         }
 
-        @Override
         public int getMaxInactiveInterval() {
             return 0;
         }
 
-        @Override
         public Object getAttribute(String attributeName) {
             return null;
         }
 
-        @Override
         public Set<String> getAttributeNames() {
             return null;
         }
 
-        @Override
         public void setAttribute(String attributeName, Object attributeValue) {
 
         }
 
-        @Override
         public void removeAttribute(String attributeName) {
 
         }
 
-        @Override
         public boolean isExpired() {
             return false;
         }