Polish GrantedAuthorityDefaults

* Move GrantedAuthorityDefaults to config module
* Move setting of default role into config module vs
  ApplicationContextAware

Issue gh-3701

ldap/src/test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java

@@ -1,60 +0,0 @@
-/*
- * Copyright 2002-2016 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.security.ldap.userdetails;
-
-import org.junit.Test;
-
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.ldap.core.ContextSource;
-import org.springframework.security.config.GrantedAuthorityDefaults;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-/**
- * @author Eddú Meléndez
- */
-public class DefaultLdapAuthoritiesPopulatorTests {
-
-	@Test
-	public void testDefaultRolePrefix() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.register(LdapAuthoritiesPopulatorConfiguration.class);
-		context.refresh();
-
-		DefaultLdapAuthoritiesPopulator ldapPopulator = context.getBean(DefaultLdapAuthoritiesPopulator.class);
-		assertThat(ldapPopulator.getRolePrefix()).isEqualTo("ROL_");
-	}
-
-	@Configuration
-	static class LdapAuthoritiesPopulatorConfiguration {
-
-		@Bean
-		public GrantedAuthorityDefaults authorityDefaults() {
-			return new GrantedAuthorityDefaults("ROL_");
-		}
-
-		@Bean
-		public DefaultLdapAuthoritiesPopulator ldapAuthoritiesPopulator() {
-			ContextSource contextSource = mock(ContextSource.class);
-			return new DefaultLdapAuthoritiesPopulator(contextSource, "ou=groups");
-		}
-
-	}
-
-}

ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java

@@ -21,14 +21,9 @@ import javax.naming.directory.BasicAttributes;
 
 import org.junit.Test;
 
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;
-import org.springframework.security.config.GrantedAuthorityDefaults;
 import org.springframework.security.core.authority.AuthorityUtils;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -100,31 +95,4 @@ public class LdapUserDetailsMapperTests {
 		assertThat(user.getPassword()).isEqualTo("mypassword");
 	}
 
-	@Test
-	public void testDefaultRolePrefix() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.register(LdapUserDetailsMapperConfiguration.class);
-		context.refresh();
-
-		LdapUserDetailsMapper ldapUserDetailsMapper = context.getBean(LdapUserDetailsMapper.class);
-
-		GrantedAuthorityDefaults rolePrefix = (GrantedAuthorityDefaults) ReflectionTestUtils.getField(ldapUserDetailsMapper, "rolePrefix");
-		assertThat(rolePrefix.getRolePrefix()).isEqualTo("ROL_");
-	}
-
-	@Configuration
-	static class LdapUserDetailsMapperConfiguration {
-
-		@Bean
-		public GrantedAuthorityDefaults authorityDefaults() {
-			return new GrantedAuthorityDefaults("ROL_");
-		}
-
-		@Bean
-		public LdapUserDetailsMapper ldapUserDetailsMapper() {
-			return new LdapUserDetailsMapper();
-		}
-
-	}
-
 }