Browse Source

Polish

pull/2707/head
Phillip Webb 11 years ago
parent
commit
8a8b5d3aa7
  1. 2
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java
  2. 2
      spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java
  3. 14
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java
  4. 3
      spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
  5. 1
      spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java
  6. 2
      spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java

2
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

14
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; import org.springframework.security.config.annotation.authentication.configurers.GlobalAuthenticationConfigurerAdapter;
/** /**
* This works with the {@link AuthenticationConfiguration} to ensure that users are able * {@link GlobalAuthenticationConfigurerAdapter} to trigger early initialization of
* to use: * {@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:
* *
* <pre> * <pre class="code">
* &#064;Autowired
* public void configureGlobal(AuthenticationManagerBuilder auth) { * public void configureGlobal(AuthenticationManagerBuilder auth) {
* ... * ...
* } * }
* </pre> * </pre>
* *
* within their classes annotated with {@link EnableAutoConfiguration}.
*
* @author Rob Winch * @author Rob Winch
* @since 1.1.11 * @since 1.1.11
*/ */
@ -73,5 +75,7 @@ public class BootGlobalAuthenticationConfiguration {
logger.debug("Eagerly initializing " + beansWithAnnotation); logger.debug("Eagerly initializing " + beansWithAnnotation);
} }
} }
} }
} }

3
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) { public static void main(String[] args) {
SpringApplication.run(HelloWebSecurityApplication.class, args); SpringApplication.run(HelloWebSecurityApplication.class, args);
} }
}
}

1
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)); assertThat(this.response.getStatus(), equalTo(HttpServletResponse.SC_OK));
} }
} }

2
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

Loading…
Cancel
Save