From bed20db90582bf28cb98f4e7ff6ac07f636600cd Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Fri, 27 Feb 2015 16:18:31 -0600
Subject: [PATCH] Remove Unnecessary @Override

---
 .../AbstractSecurityWebSocketMessageBrokerConfigurerTests.java  | 2 --
 .../socket/SyncExecutorSubscribableChannelPostProcessor.java    | 2 --
 .../security/messaging/util/matcher/AndMessageMatcher.java      | 1 -
 .../security/messaging/util/matcher/OrMessageMatcher.java       | 1 -
 4 files changed, 6 deletions(-)

diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java
index 00070de16d..399e617d41 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java
@@ -300,12 +300,10 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests {
 
     static class MyCustomArgumentResolver implements HandlerMethodArgumentResolver {
 
-        @Override
         public boolean supportsParameter(MethodParameter parameter) {
             return parameter.getParameterType().isAssignableFrom(MyCustomArgument.class);
         }
 
-        @Override
         public Object resolveArgument(MethodParameter parameter, Message<?> message) throws Exception {
             return new MyCustomArgument("");
         }
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/SyncExecutorSubscribableChannelPostProcessor.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/SyncExecutorSubscribableChannelPostProcessor.java
index 958874e245..f3582ebc89 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/SyncExecutorSubscribableChannelPostProcessor.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/SyncExecutorSubscribableChannelPostProcessor.java
@@ -24,7 +24,6 @@ import org.springframework.messaging.support.ExecutorSubscribableChannel;
  */
 public class SyncExecutorSubscribableChannelPostProcessor implements BeanPostProcessor {
 
-    @Override
     public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
         if(bean instanceof ExecutorSubscribableChannel) {
             ExecutorSubscribableChannel original = (ExecutorSubscribableChannel) bean;
@@ -35,7 +34,6 @@ public class SyncExecutorSubscribableChannelPostProcessor implements BeanPostPro
         return bean;
     }
 
-    @Override
     public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
         return bean;
     }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java
index d786eacc07..78f54e2fcc 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java
@@ -45,7 +45,6 @@ public final class AndMessageMatcher<T> extends AbstractMessageMatcherComposite<
 
     }
 
-    @Override
     public boolean matches(Message<? extends T> message) {
         for (MessageMatcher<T> matcher : getMessageMatchers()) {
             if (LOGGER.isDebugEnabled()) {
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java
index 8675eb9999..42fdc9982c 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java
@@ -45,7 +45,6 @@ public final class OrMessageMatcher<T> extends AbstractMessageMatcherComposite<T
 
     }
 
-    @Override
     public boolean matches(Message<? extends T> message) {
         for (MessageMatcher<T> matcher : getMessageMatchers()) {
             if (LOGGER.isDebugEnabled()) {