From b13b87a1e7e60a72a1ed5a10e3de9f59c82620d9 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Sun, 4 Aug 2013 11:45:44 -0500 Subject: [PATCH] Remove @Override from methods that override interfaces Ensure JDK5 compatibility --- .../config/annotation/AbstractSecurityBuilder.java | 3 +-- .../security/config/annotation/ObjectPostProcessor.java | 1 - .../config/annotation/SecurityConfigurerAdapter.java | 3 --- .../AutowireBeanFactoryObjectPostProcessor.java | 2 -- .../GlobalMethodSecurityAspectJAutoProxyRegistrar.java | 1 - .../configuration/GlobalMethodSecurityConfiguration.java | 2 -- .../method/configuration/GlobalMethodSecuritySelector.java | 1 - .../config/annotation/web/builders/FilterComparator.java | 1 - .../config/annotation/web/builders/HttpSecurity.java | 7 ------- .../web/configuration/WebSecurityConfiguration.java | 2 -- .../web/configuration/WebSecurityConfigurerAdapter.java | 6 ------ .../config/annotation/ObjectPostProcessorTests.java | 1 - 12 files changed, 1 insertion(+), 29 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java index bb4f5a3a8f..1c7fcc1947 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * A base {@link SecurityBuilder} that ensures the object being built is only * built one time. - * + * * @param the type of Object that is being built * * @author Rob Winch @@ -34,7 +34,6 @@ public abstract class AbstractSecurityBuilder implements SecurityBuilder { /* (non-Javadoc) * @see org.springframework.security.config.annotation.SecurityBuilder#build() */ - @Override public final O build() throws Exception { if(building.compareAndSet(false, true)) { object = doBuild(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/ObjectPostProcessor.java b/config/src/main/java/org/springframework/security/config/annotation/ObjectPostProcessor.java index 05e110b292..be2c7283e6 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/ObjectPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/annotation/ObjectPostProcessor.java @@ -44,7 +44,6 @@ public interface ObjectPostProcessor { * A do nothing implementation of the {@link ObjectPostProcessor} */ ObjectPostProcessor QUIESCENT_POSTPROCESSOR = new ObjectPostProcessor() { - @Override public T postProcess(T object) { return object; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java index 3a948856c1..610b66927e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java @@ -38,10 +38,8 @@ public abstract class SecurityConfigurerAdapter> private CompositeObjectPostProcessor objectPostProcessor = new CompositeObjectPostProcessor(); - @Override public void init(B builder) throws Exception {} - @Override public void configure(B builder) throws Exception {} /** @@ -110,7 +108,6 @@ public abstract class SecurityConfigurerAdapter> private static final class CompositeObjectPostProcessor implements ObjectPostProcessor { private List> postProcessors = new ArrayList>(); - @Override @SuppressWarnings({ "rawtypes", "unchecked" }) public Object postProcess(Object object) { for(ObjectPostProcessor opp : postProcessors) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java index 11e7f4c941..5edb615c0d 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java @@ -51,7 +51,6 @@ final class AutowireBeanFactoryObjectPostProcessor implements ObjectPostProcesso * @see org.springframework.security.config.annotation.web.Initializer#initialize(java.lang.Object) */ @SuppressWarnings("unchecked") - @Override public T postProcess(T object) { T result = (T) autowireBeanFactory.initializeBean(object, null); if(result instanceof DisposableBean) { @@ -63,7 +62,6 @@ final class AutowireBeanFactoryObjectPostProcessor implements ObjectPostProcesso /* (non-Javadoc) * @see org.springframework.beans.factory.DisposableBean#destroy() */ - @Override public void destroy() throws Exception { for(DisposableBean disposable : disposableBeans) { try { diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityAspectJAutoProxyRegistrar.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityAspectJAutoProxyRegistrar.java index 9efb6ba9fc..2504fcb625 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityAspectJAutoProxyRegistrar.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityAspectJAutoProxyRegistrar.java @@ -46,7 +46,6 @@ class GlobalMethodSecurityAspectJAutoProxyRegistrar implements * the value of the @{@link EnableGlobalMethodSecurity#proxyTargetClass()} * attribute on the importing {@code @Configuration} class. */ - @Override public void registerBeanDefinitions( AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java index 9880f67ad2..f7507b84f6 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java @@ -80,7 +80,6 @@ public class GlobalMethodSecurityConfiguration implements ImportAware { private static final Log logger = LogFactory.getLog(GlobalMethodSecurityConfiguration.class); private ApplicationContext context; private ObjectPostProcessor objectPostProcessor = new ObjectPostProcessor() { - @Override public T postProcess(T object) { throw new IllegalStateException(ObjectPostProcessor.class.getName()+ " is a required bean. Ensure you have used @"+EnableGlobalMethodSecurity.class.getName()); } @@ -337,7 +336,6 @@ public class GlobalMethodSecurityConfiguration implements ImportAware { /** * Obtains the attributes from {@link EnableGlobalMethodSecurity} if this class was imported using the {@link EnableGlobalMethodSecurity} annotation. */ - @Override public final void setImportMetadata(AnnotationMetadata importMetadata) { Map annotationAttributes = importMetadata .getAnnotationAttributes(EnableGlobalMethodSecurity.class diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java index 25de549ca6..8af89c51ca 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java @@ -34,7 +34,6 @@ import org.springframework.util.ClassUtils; */ final class GlobalMethodSecuritySelector implements ImportSelector { - @Override public final String[] selectImports(AnnotationMetadata importingClassMetadata) { Class annoType = EnableGlobalMethodSecurity.class; Map annotationAttributes = importingClassMetadata.getAnnotationAttributes(annoType.getName(), false); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java index 11bd9026b1..6b500111a3 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java @@ -110,7 +110,6 @@ final class FilterComparator implements Comparator, Serializable { put(SwitchUserFilter.class, order); } - @Override public int compare(Filter lhs, Filter rhs) { Integer left = getOrder(lhs.getClass()); Integer right = getOrder(rhs.getClass()); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index 3e236fc034..8a295a464c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -984,7 +984,6 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder afterFilter) { comparitor.registerAfter(filter.getClass(), afterFilter); return addFilter(filter); @@ -1015,7 +1012,6 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder beforeFilter) { comparitor.registerBefore(filter.getClass(), beforeFilter); return addFilter(filter); @@ -1024,7 +1020,6 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder filterClass = filter.getClass(); if(!comparitor.isRegistered(filterClass)) { @@ -1219,7 +1214,6 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder enableWebSecurityAttrMap = importMetadata.getAnnotationAttributes(EnableWebSecurity.class.getName()); AnnotationAttributes enableWebSecurityAttrs = AnnotationAttributes.fromMap(enableWebSecurityAttrMap); @@ -182,7 +181,6 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa /* (non-Javadoc) * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader) */ - @Override public void setBeanClassLoader(ClassLoader classLoader) { this.beanClassLoader = classLoader; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java index 2af2ab5c22..398b76db0c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java @@ -59,7 +59,6 @@ public abstract class WebSecurityConfigurerAdapter implements SecurityConfigurer private ContentNegotiationStrategy contentNegotiationStrategy = new HeaderContentNegotiationStrategy(); private ObjectPostProcessor objectPostProcessor = new ObjectPostProcessor() { - @Override public T postProcess(T object) { throw new IllegalStateException(ObjectPostProcessor.class.getName()+ " is a required bean. Ensure you have used @EnableWebSecurity and @Configuration"); } @@ -258,13 +257,11 @@ public abstract class WebSecurityConfigurerAdapter implements SecurityConfigurer return parentAuthenticationBuilder.getDefaultUserDetailsService(); } - @Override public void init(final WebSecurity web) throws Exception { final HttpSecurity http = getHttp(); web .addSecurityFilterChainBuilder(http) .postBuildAction(new Runnable() { - @Override public void run() { FilterSecurityInterceptor securityInterceptor = http.getSharedObject(FilterSecurityInterceptor.class); web.securityInterceptor(securityInterceptor); @@ -276,7 +273,6 @@ public abstract class WebSecurityConfigurerAdapter implements SecurityConfigurer * Override this method to configure {@link WebSecurity}. For * example, if you wish to ignore certain requests. */ - @Override public void configure(WebSecurity web) throws Exception { } @@ -342,7 +338,6 @@ public abstract class WebSecurityConfigurerAdapter implements SecurityConfigurer this.delegateBuilder = authentication; } - @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { if(delegate != null) { return delegate.loadUserByUsername(username); @@ -377,7 +372,6 @@ public abstract class WebSecurityConfigurerAdapter implements SecurityConfigurer this.delegateBuilder = authentication; } - @Override public Authentication authenticate(Authentication authentication) throws AuthenticationException { if(delegate != null) { return delegate.authenticate(authentication); diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java b/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java index 04cb2d1258..4218514261 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java +++ b/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java @@ -37,7 +37,6 @@ public class ObjectPostProcessorTests { class ListToLinkedListObjectPostProcessor implements ObjectPostProcessor>{ - @Override public > O postProcess(O l) { return (O) new LinkedList(l); }