From 02c3565e226571923ab02269de13d8ff214d7b37 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 16 Sep 2014 09:54:45 -0500 Subject: [PATCH] Fix compiling in Eclipse --- .../authentication/ServiceAuthenticationDetailsSource.java | 7 +++---- ...uthenticationProviderBuilderSecurityBuilderTests.groovy | 2 +- .../messaging/MessageSecurityMetadataSourceRegistry.java | 4 +--- .../AbstractSecurityWebSocketMessageBrokerConfigurer.java | 1 - .../access/intercept/AbstractSecurityInterceptor.java | 1 - .../query/SecurityEvaluationContextExtension.java | 1 - gradle/javaprojects.gradle | 6 ++++++ .../security/ldap/userdetails/LdapAuthority.java | 1 - .../access/intercept/ChannelSecurityInterceptor.java | 7 ------- .../intercept/DefaultMessageSecurityMetadataSource.java | 3 --- .../context/SecurityContextChannelInterceptor.java | 2 -- .../util/matcher/SimpDestinationMessageMatcher.java | 1 - .../main/java/samples/data/SecurityMessageRepository.java | 1 - .../request/SecurityMockMvcRequestPostProcessors.java | 5 ----- .../security/test/context/showcase/CustomUserDetails.java | 7 ------- .../showcase/WithMockCustomUserSecurityContextFactory.java | 1 - .../test/context/showcase/WithUserDetailsTests.java | 1 - .../SecurityMockMvcRequestPostProcessorsDigestTests.java | 1 - 18 files changed, 11 insertions(+), 41 deletions(-) diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java index f40686cfb7..d144a34b49 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -108,7 +108,6 @@ public class ServiceAuthenticationDetailsSource implements AuthenticationDetails } } - @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { if(serviceProperties == null) { serviceProperties = applicationContext.getBean(ServiceProperties.class); diff --git a/config/src/integration-test/groovy/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.groovy b/config/src/integration-test/groovy/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.groovy index 46d7b37f46..0498e70b97 100644 --- a/config/src/integration-test/groovy/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.groovy +++ b/config/src/integration-test/groovy/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.groovy @@ -204,7 +204,7 @@ class LdapAuthenticationProviderBuilderSecurityBuilderTests extends BaseSpringSp auth.build() } - abstract protected void configure(AuthenticationManagerBuilder auth) + abstract protected void configure(AuthenticationManagerBuilder auth) throws Exception } static Integer port; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java index a004b13d5e..1845d840f6 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java @@ -62,7 +62,7 @@ public class MessageSecurityMetadataSourceRegistry { * from. Uses {@link MessageSecurityMetadataSourceRegistry#pathMatcher(PathMatcher)}. * * @return the {@link Constraint} that is associated to the {@link MessageMatcher} - * @see {@link MessageSecurityMetadataSourceRegistry#pathMatcher(PathMatcher)} + * @see {@link MessageSecurityMetadataSourceRegistry#pathMatcher(PathMatcher)} */ public Constraint destinationMatchers(String... patterns) { List matchers = new ArrayList(patterns.length); @@ -278,7 +278,6 @@ public class MessageSecurityMetadataSourceRegistry { this.matcher = matcher; } - @Override public MessageMatcher build() { return matcher; } @@ -291,7 +290,6 @@ public class MessageSecurityMetadataSourceRegistry { this.pattern = pattern; } - @Override public MessageMatcher build() { return new SimpDestinationMessageMatcher(pattern, pathMatcher); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java index 9d6ee92412..c47a4c82c8 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java @@ -62,7 +62,6 @@ import java.util.List; @Order(Ordered.HIGHEST_PRECEDENCE + 100) public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends AbstractWebSocketMessageBrokerConfigurer { - @Override public void registerStompEndpoints(StompEndpointRegistry registry) {} @Override diff --git a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java index 5452317278..51365ec993 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java @@ -465,7 +465,6 @@ public abstract class AbstractSecurityInterceptor implements InitializingBean, A private static class NoOpAuthenticationManager implements AuthenticationManager { - @Override public Authentication authenticate(Authentication authentication) throws AuthenticationException { throw new AuthenticationServiceException("Cannot authenticate " + authentication); } diff --git a/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java b/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java index 3af6556aa9..0199dc5f9d 100644 --- a/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java +++ b/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java @@ -95,7 +95,6 @@ public class SecurityEvaluationContextExtension extends EvaluationContextExtensi this.authentication = authentication; } - @Override public String getExtensionId() { return "security"; } diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 1e7d32cdf8..7b60c9ac69 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -102,6 +102,12 @@ task integrationTest(type: Test, dependsOn: jar) { junitXml.destination = project.file("$project.buildDir/integration-test-results/") } } + +eclipse { + classpath { + plusConfigurations += [ configurations.integrationTestCompile ] + } +} project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 1, project.configurations.getByName("integrationTestCompile"), Conf2ScopeMappingContainer.TEST) project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 2, project.configurations.getByName("integrationTestRuntime"), Conf2ScopeMappingContainer.TEST) check.dependsOn integrationTest diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java index b3e4fb742d..0e578a1a38 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java @@ -114,7 +114,6 @@ public class LdapAuthority implements GrantedAuthority { /** * {@inheritDoc} */ - @Override public String getAuthority() { return role; } diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java index c0dd5eacdf..dc1456d78a 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java @@ -65,13 +65,11 @@ public final class ChannelSecurityInterceptor extends AbstractSecurityIntercepto return metadataSource; } - @Override public Message preSend(Message message, MessageChannel channel) { InterceptorStatusToken token = beforeInvocation(message); return token == null ? message : new TokenMessage(message,token); } - @Override public void postSend(Message message, MessageChannel channel, boolean sent) { if(!(message instanceof TokenMessage)) { // TODO What if other classes return another instance too? @@ -81,7 +79,6 @@ public final class ChannelSecurityInterceptor extends AbstractSecurityIntercepto afterInvocation(token, null); } - @Override public void afterSendCompletion(Message message, MessageChannel channel, boolean sent, Exception ex) { if(!(message instanceof TokenMessage)) { // TODO What if other classes return another instance too? @@ -95,12 +92,10 @@ public final class ChannelSecurityInterceptor extends AbstractSecurityIntercepto return true; } - @Override public Message postReceive(Message message, MessageChannel channel) { return message; } - @Override public void afterReceiveCompletion(Message message, MessageChannel channel, Exception ex) { } @@ -117,12 +112,10 @@ public final class ChannelSecurityInterceptor extends AbstractSecurityIntercepto return token; } - @Override public MessageHeaders getHeaders() { return delegate.getHeaders(); } - @Override public Object getPayload() { return delegate.getPayload(); } diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java index fa0b3f0a88..60066ff475 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java @@ -44,7 +44,6 @@ public final class DefaultMessageSecurityMetadataSource implements MessageSecuri this.messageMap = messageMap; } - @Override public Collection getAttributes(Object object) throws IllegalArgumentException { final Message message = (Message) object; for (Map.Entry, Collection> entry : messageMap.entrySet()) { @@ -55,7 +54,6 @@ public final class DefaultMessageSecurityMetadataSource implements MessageSecuri return null; } - @Override public Collection getAllConfigAttributes() { Set allAttributes = new HashSet(); @@ -66,7 +64,6 @@ public final class DefaultMessageSecurityMetadataSource implements MessageSecuri return allAttributes; } - @Override public boolean supports(Class clazz) { return Message.class.isAssignableFrom(clazz); } diff --git a/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java index f53fd56e48..cb5e913a74 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java +++ b/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java @@ -65,13 +65,11 @@ public final class SecurityContextChannelInterceptor extends ChannelInterceptorA cleanup(); } - @Override public Message beforeHandle(Message message, MessageChannel channel, MessageHandler handler) { setup(message); return message; } - @Override public void afterMessageHandled(Message message, MessageChannel channel, MessageHandler handler, Exception ex) { cleanup(); } diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java index 9263ebb6b9..fb6027e4ef 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java @@ -78,7 +78,6 @@ public final class SimpDestinationMessageMatcher implements MessageMatcher message) { String destination = SimpMessageHeaderAccessor.getDestination(message.getHeaders()); return destination != null && matcher.match(pattern, destination); diff --git a/samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java b/samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java index e44f993417..478ab25cbc 100644 --- a/samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java +++ b/samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java @@ -26,7 +26,6 @@ import java.util.List; */ @Repository public interface SecurityMessageRepository extends MessageRepository { - @Override @Query("select m from Message m where m.to.id = ?#{ principal?.id }") List findAll(); } \ No newline at end of file diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java index 434570fc2a..915c5f3b38 100644 --- a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java +++ b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java @@ -207,7 +207,6 @@ public final class SecurityMockMvcRequestPostProcessors { this.certificates = certificates; } - @Override public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { request.setAttribute("javax.servlet.request.X509Certificate", certificates); return request; @@ -340,7 +339,6 @@ public final class SecurityMockMvcRequestPostProcessors { + "\", response=\"" + responseDigest + "\", qop=" + qop + ", nc=" + nc + ", cnonce=\"" + cnonce + "\""; } - @Override public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { request.addHeader("Authorization", @@ -465,7 +463,6 @@ public final class SecurityMockMvcRequestPostProcessors { this.delegate = delegate; } - @Override public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) { SecurityContext result = getContext(requestResponseHolder.getRequest()); // always load from the delegate to ensure the request/response in the holder are updated @@ -474,13 +471,11 @@ public final class SecurityMockMvcRequestPostProcessors { return result == null ? delegateResult : result; } - @Override public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { request.setAttribute(ATTR_NAME, context); delegate.saveContext(context, request, response); } - @Override public boolean containsContext(HttpServletRequest request) { return getContext(request) != null || delegate.containsContext(request); } diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java b/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java index 9e386e3854..076ea95d1e 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java @@ -35,37 +35,30 @@ public class CustomUserDetails implements UserDetails { this.authorities = AuthorityUtils.createAuthorityList("ROLE_USER"); } - @Override public Collection getAuthorities() { return authorities; } - @Override public String getPassword() { return null; } - @Override public String getUsername() { return username; } - @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/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUserSecurityContextFactory.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUserSecurityContextFactory.java index 4b6f82eaae..22c4e5ed9f 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUserSecurityContextFactory.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUserSecurityContextFactory.java @@ -31,7 +31,6 @@ import java.util.List; * @author Rob Winch */ public class WithMockCustomUserSecurityContextFactory implements WithSecurityContextFactory { - @Override public SecurityContext createSecurityContext(WithMockCustomUser customUser) { SecurityContext context = SecurityContextHolder.createEmptyContext(); diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java index 2a6b4a502b..a9f93113b9 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java @@ -89,7 +89,6 @@ public class WithUserDetailsTests { static class CustomUserDetailsService implements UserDetailsService { - @Override public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException { return new CustomUserDetails("name", username); } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java index 96809be670..c8352f826c 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java @@ -60,7 +60,6 @@ public class SecurityMockMvcRequestPostProcessorsDigestTests { entryPoint.setRealmName("Spring Security"); filter = new DigestAuthenticationFilter(); filter.setUserDetailsService(new UserDetailsService() { - @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { return new User(username,password, AuthorityUtils.createAuthorityList("ROLE_USER")); }