From fdb73fac23123fff53d8cf41405c7ca56de45ef0 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Sun, 4 Aug 2013 11:46:47 -0500
Subject: [PATCH] Remove @Override from interface define methods

---
 .../authentication/AbstractAuthenticationProcessingFilter.java  | 1 -
 .../web/context/AbstractSecurityWebApplicationInitializer.java  | 1 -
 .../header/writers/DelegatingRequestMatcherHeaderWriter.java    | 1 -
 .../security/web/header/writers/HstsHeaderWriter.java           | 2 --
 .../security/web/header/writers/XXssProtectionHeaderWriter.java | 1 -
 .../security/web/util/MediaTypeRequestMatcher.java              | 1 -
 6 files changed, 7 deletions(-)

diff --git a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java
index 0eefd62225..8405736e98 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java
@@ -469,7 +469,6 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt
             this.filterProcessesUrl = filterProcessesUrl;
         }
 
-        @Override
         public boolean matches(HttpServletRequest request) {
             String uri = request.getRequestURI();
             int pathParamIndex = uri.indexOf(';');
diff --git a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java b/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
index 72c3cae117..01173b1a1d 100644
--- a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
+++ b/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
@@ -80,7 +80,6 @@ public abstract class AbstractSecurityWebApplicationInitializer implements WebAp
     /* (non-Javadoc)
      * @see org.springframework.web.WebApplicationInitializer#onStartup(javax.servlet.ServletContext)
      */
-    @Override
     public final void onStartup(ServletContext servletContext)
             throws ServletException {
         if(enableHttpSessionEventPublisher()) {
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java
index ef4699b21a..2cf42084f0 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java
@@ -55,7 +55,6 @@ public final class DelegatingRequestMatcherHeaderWriter implements HeaderWriter
     /* (non-Javadoc)
      * @see org.springframework.security.web.headers.HeaderWriter#writeHeaders(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
      */
-    @Override
     public void writeHeaders(HttpServletRequest request,
             HttpServletResponse response) {
         if(requestMatcher.matches(request)) {
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java
index f1df6419c6..d91478f12a 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java
@@ -121,7 +121,6 @@ public final class HstsHeaderWriter implements HeaderWriter {
      * org.springframework.security.web.headers.HeaderWriter#writeHeaders(javax
      * .servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
      */
-    @Override
     public void writeHeaders(HttpServletRequest request,
             HttpServletResponse response) {
         if (requestMatcher.matches(request)) {
@@ -205,7 +204,6 @@ public final class HstsHeaderWriter implements HeaderWriter {
     }
 
     private static final class SecureRequestMatcher implements RequestMatcher {
-        @Override
         public boolean matches(HttpServletRequest request) {
             return request.isSecure();
         }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
index 7b3b76f1e5..172f77e777 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
@@ -46,7 +46,6 @@ public final class XXssProtectionHeaderWriter implements HeaderWriter {
         updateHeaderValue();
     }
 
-    @Override
     public void writeHeaders(HttpServletRequest request,
             HttpServletResponse response) {
         response.setHeader(XSS_PROTECTION_HEADER, headerValue);
diff --git a/web/src/main/java/org/springframework/security/web/util/MediaTypeRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/MediaTypeRequestMatcher.java
index 7ba700989b..5b6bd1dfe5 100644
--- a/web/src/main/java/org/springframework/security/web/util/MediaTypeRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/MediaTypeRequestMatcher.java
@@ -166,7 +166,6 @@ public final class MediaTypeRequestMatcher implements RequestMatcher {
         this.matchingMediaTypes = matchingMediaTypes;
     }
 
-    @Override
     public boolean matches(HttpServletRequest request) {
         List<MediaType> httpRequestMediaTypes;
         try {