From 8a8b5d3aa74298a056f839ed28f60944caaa7e54 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 23 Feb 2015 13:12:28 -0800 Subject: [PATCH] Polish --- .../audit/InMemoryAuditEventRepository.java | 2 +- .../audit/InMemoryAuditEventRepositoryTests.java | 2 +- .../BootGlobalAuthenticationConfiguration.java | 14 +++++++++----- .../java/sample/HelloWebSecurityApplication.java | 3 ++- .../sample/HelloWebSecurityApplicationTests.java | 1 + .../ConfigurableEmbeddedServletContainer.java | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java index b17c76aa742..73d7d3c63f6 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2015 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. diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java index 74dba50c3f8..0383e03051d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2015 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. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java index f27245b7f59..2f656d3dd6d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java @@ -29,17 +29,19 @@ import org.springframework.security.config.annotation.authentication.configurati import org.springframework.security.config.annotation.authentication.configurers.GlobalAuthenticationConfigurerAdapter; /** - * This works with the {@link AuthenticationConfiguration} to ensure that users are able - * to use: + * {@link GlobalAuthenticationConfigurerAdapter} to trigger early initialization of + * {@code @EnableAutoConfiguration} beans. This configuration is imported from + * {@link AuthenticationConfiguration} to ensure that users are able to configure the + * {@link AuthenticationManagerBuilder} from their {@code @EnableAutoConfiguration} or + * {@code @SpringBootApplication} configuration class: * - * 
+ * 
+ * @Autowired
  * public void configureGlobal(AuthenticationManagerBuilder auth) {
  *     ...
  * }
  * 

  *
- * within their classes annotated with {@link EnableAutoConfiguration}.
- *
  * @author Rob Winch
  * @since 1.1.11
  */
@@ -73,5 +75,7 @@ public class BootGlobalAuthenticationConfiguration {
 				logger.debug("Eagerly initializing " + beansWithAnnotation);
 			}
 		}
+
 	}
+
 }
diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java b/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
index d14af0eef1b..58bd7e80f43 100644
--- a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
+++ b/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
@@ -36,4 +36,5 @@ public class HelloWebSecurityApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(HelloWebSecurityApplication.class, args);
 	}
-}
\ No newline at end of file
+
+}
diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java b/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java
index c7a77f0c08a..a234b1ed33e 100644
--- a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java
+++ b/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java
@@ -74,4 +74,5 @@ public class HelloWebSecurityApplicationTests {
 
 		assertThat(this.response.getStatus(), equalTo(HttpServletResponse.SC_OK));
 	}
+
 }
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
index 49c7088340b..380df42f9a8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 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.