Merge branch '1.1.x'

Author: wilkinsona

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java

@@ -69,13 +69,14 @@ public class AuthenticationManagerConfiguration {
 
 	@Bean
 	@Primary
-	public AuthenticationManager authenticationManager(AuthenticationConfiguration auth) throws Exception {
+	public AuthenticationManager authenticationManager(AuthenticationConfiguration auth)
+			throws Exception {
 		return auth.getAuthenticationManager();
 	}
 
 	@Bean
-	public static BootDefaultingAuthenticationConfigurerAdapter bootDefaultingAuthenticationConfigurerAdapter(SecurityProperties security,
-			List<SecurityPrerequisite> dependencies) {
+	public static BootDefaultingAuthenticationConfigurerAdapter bootDefaultingAuthenticationConfigurerAdapter(
+			SecurityProperties security, List<SecurityPrerequisite> dependencies) {
 		return new BootDefaultingAuthenticationConfigurerAdapter(security);
 	}
 
@@ -126,14 +127,16 @@ public void afterSingletonsInstantiated() {
 	 * </ul>
 	 */
 	@Order(Ordered.LOWEST_PRECEDENCE - 100)
-	private static class BootDefaultingAuthenticationConfigurerAdapter extends GlobalAuthenticationConfigurerAdapter {
+	private static class BootDefaultingAuthenticationConfigurerAdapter extends
+			GlobalAuthenticationConfigurerAdapter {
 		private final SecurityProperties security;
 
 		@Autowired
 		public BootDefaultingAuthenticationConfigurerAdapter(SecurityProperties security) {
 			this.security = security;
 		}
 
+		@Override
 		public void init(AuthenticationManagerBuilder auth) throws Exception {
 			if (auth.isConfigured()) {
 				return;
@@ -144,12 +147,13 @@ public void init(AuthenticationManagerBuilder auth) throws Exception {
 				logger.info("\n\nUsing default security password: " + user.getPassword()
 						+ "\n");
 			}
+
 			Set<String> roles = new LinkedHashSet<String>(user.getRole());
-			auth
-				.inMemoryAuthentication()
-					.withUser(user.getName())
-						.password(user.getPassword())
-						.roles(roles.toArray(new String[roles.size()]));
+			auth.inMemoryAuthentication().withUser(user.getName())
+					.password(user.getPassword())
+					.roles(roles.toArray(new String[roles.size()]));
 		}
+
 	}
-}
+
+}