From 62ce30fb38a024e90a099f069d873549a1873d66 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Thu, 11 Dec 2014 11:07:40 -0600
Subject: [PATCH] Remove @Override from interface method implementations

Issues: gh-71
---
 .../redis/RedisOperationsSessionRepository.java    | 14 --------------
 .../web/http/CookieHttpSessionStrategy.java        |  8 --------
 2 files changed, 22 deletions(-)

diff --git a/spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java b/spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java
index 8a6c032..223a3ae 100644
--- a/spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java
+++ b/spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java
@@ -186,7 +186,6 @@ public class RedisOperationsSessionRepository implements SessionRepository<Redis
         this.defaultMaxInactiveInterval = defaultMaxInactiveInterval;
     }
 
-    @Override
     public void save(RedisSession session) {
         session.saveDelta();
     }
@@ -196,7 +195,6 @@ public class RedisOperationsSessionRepository implements SessionRepository<Redis
         this.expirationPolicy.cleanExpiredSessions();
     }
 
-    @Override
     public RedisSession getSession(String id) {
         return getSession(id, false);
     }
@@ -238,7 +236,6 @@ public class RedisOperationsSessionRepository implements SessionRepository<Redis
         return result;
     }
 
-    @Override
     public void delete(String sessionId) {
         ExpiringSession session = getSession(sessionId, true);
         if(session == null) {
@@ -252,7 +249,6 @@ public class RedisOperationsSessionRepository implements SessionRepository<Redis
         this.sessionRedisOperations.delete(key);
     }
 
-    @Override
     public RedisSession createSession() {
         RedisSession redisSession = new RedisSession();
         if(defaultMaxInactiveInterval != null) {
@@ -341,54 +337,44 @@ public class RedisOperationsSessionRepository implements SessionRepository<Redis
             delta.put(LAST_ACCESSED_ATTR, getLastAccessedTime());
         }
 
-        @Override
         public boolean isExpired() {
             return cached.isExpired();
         }
 
-        @Override
         public long getCreationTime() {
             return cached.getCreationTime();
         }
 
-        @Override
         public String getId() {
             return cached.getId();
         }
 
-        @Override
         public long getLastAccessedTime() {
             return cached.getLastAccessedTime();
         }
 
-        @Override
         public void setMaxInactiveInterval(int interval) {
             cached.setMaxInactiveInterval(interval);
             delta.put(MAX_INACTIVE_ATTR, getMaxInactiveInterval());
         }
 
-        @Override
         public int getMaxInactiveInterval() {
             return cached.getMaxInactiveInterval();
         }
 
-        @Override
         public Object getAttribute(String attributeName) {
             return cached.getAttribute(attributeName);
         }
 
-        @Override
         public Set<String> getAttributeNames() {
             return cached.getAttributeNames();
         }
 
-        @Override
         public void setAttribute(String attributeName, Object attributeValue) {
             cached.setAttribute(attributeName, attributeValue);
             delta.put(getSessionAttrNameKey(attributeName), attributeValue);
         }
 
-        @Override
         public void removeAttribute(String attributeName) {
             cached.removeAttribute(attributeName);
             delta.put(getSessionAttrNameKey(attributeName), null);
diff --git a/spring-session/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java b/spring-session/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java
index b93f3e0..5abfe0b 100644
--- a/spring-session/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java
+++ b/spring-session/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java
@@ -155,14 +155,12 @@ public final class CookieHttpSessionStrategy implements MultiHttpSessionStrategy
 
     private String sessionParam = DEFAULT_SESSION_ALIAS_PARAM_NAME;
 
-    @Override
     public String getRequestedSessionId(HttpServletRequest request) {
         Map<String,String> sessionIds = getSessionIds(request);
         String sessionAlias = getCurrentSessionAlias(request);
         return sessionIds.get(sessionAlias);
     }
 
-    @Override
     public String getCurrentSessionAlias(HttpServletRequest request) {
         if(sessionParam == null) {
             return DEFAULT_ALIAS;
@@ -174,7 +172,6 @@ public final class CookieHttpSessionStrategy implements MultiHttpSessionStrategy
         return u;
     }
 
-    @Override
     public void onNewSession(Session session, HttpServletRequest request, HttpServletResponse response) {
         Map<String,String> sessionIds = getSessionIds(request);
         String sessionAlias = getCurrentSessionAlias(request);
@@ -217,7 +214,6 @@ public final class CookieHttpSessionStrategy implements MultiHttpSessionStrategy
         return sessionCookie;
     }
 
-    @Override
     public void onInvalidateSession(HttpServletRequest request, HttpServletResponse response) {
         Map<String,String> sessionIds = getSessionIds(request);
         String requestedAlias = getCurrentSessionAlias(request);
@@ -278,7 +274,6 @@ public final class CookieHttpSessionStrategy implements MultiHttpSessionStrategy
         return request.getContextPath() + "/";
     }
 
-    @Override
     public Map<String,String> getSessionIds(HttpServletRequest request) {
         Cookie session = getCookie(request, cookieName);
         String sessionCookieValue = session == null ? "" : session.getValue();
@@ -296,13 +291,11 @@ public final class CookieHttpSessionStrategy implements MultiHttpSessionStrategy
         return result;
     }
 
-    @Override
     public HttpServletRequest wrapRequest(HttpServletRequest request, HttpServletResponse response) {
         request.setAttribute(HttpSessionManager.class.getName(), this);
         return request;
     }
 
-    @Override
     public HttpServletResponse wrapResponse(HttpServletRequest request, HttpServletResponse response) {
         return new MultiSessionHttpServletResponse(response, request);
     }
@@ -330,7 +323,6 @@ public final class CookieHttpSessionStrategy implements MultiHttpSessionStrategy
         }
     }
 
-    @Override
     public String encodeURL(String url, String sessionAlias) {
         int queryStart = url.indexOf("?");
         boolean isDefaultAlias = DEFAULT_ALIAS.equals(sessionAlias);