Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move security.* to spring.security.*

Browse Source 
This commit also removes `security.basic.enabled` as this property is
no longer required.

Closes gh-10296
This commit is contained in:
Stephane Nicoll
2017-09-14 16:44:22 +02:00
parent 033939e3c0
commit e05e04014b
13 changed files with 70 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java
View File

@@ -136,7 +136,7 @@ public class SecurityAutoConfigurationTests {
@Test
public void testCustomFilterOrder() throws Exception {
this.context = new AnnotationConfigWebApplicationContext();
TestPropertyValues.of("security.filter-order:12345").applyTo(this.context);
TestPropertyValues.of("spring.security.filter.order:12345").applyTo(this.context);
this.context.setServletContext(new MockServletContext());
this.context.register(SecurityAutoConfiguration.class,
SecurityFilterAutoConfiguration.class,
@@ -159,19 +159,6 @@ public class SecurityAutoConfigurationTests {
.hasSize(1);
}
@Test
public void testDisableDefaultSecurity() throws Exception {
this.context = new AnnotationConfigWebApplicationContext();
this.context.setServletContext(new MockServletContext());
this.context.register(SecurityAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
TestPropertyValues.of("security.basic.enabled:false").applyTo(this.context);
this.context.refresh();
// Ignores and the "matches-none" filter only
assertThat(this.context.getBeanNamesForType(FilterChainProxy.class).length)
.isEqualTo(0);
}
@Test
public void testAuthenticationManagerCreated() throws Exception {
this.context = new AnnotationConfigWebApplicationContext();
@@ -357,7 +344,7 @@ public class SecurityAutoConfigurationTests {
this.context.register(SecurityAutoConfiguration.class,
SecurityFilterAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
TestPropertyValues.of("security.filter-dispatcher-types:INCLUDE,ERROR")
TestPropertyValues.of("spring.security.filter.dispatcher-types:INCLUDE,ERROR")
.applyTo(this.context);
this.context.refresh();
DelegatingFilterProxyRegistrationBean bean = this.context.getBean(

6
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java
View File

@@ -38,8 +38,8 @@ public class SecurityPropertiesTests {
@Test
public void testBinding() {
bind("security.basic.enabled", "false");
assertThat(this.security.getBasic().isEnabled()).isFalse();
bind("spring.security.filter.order", "55");
assertThat(this.security.getFilter().getOrder()).isEqualTo(55);
}
private void bind(String name, String value) {
@@ -47,7 +47,7 @@ public class SecurityPropertiesTests {
}
private void bind(ConfigurationPropertySource source) {
new Binder(source).bind("security", Bindable.ofInstance(this.security));
new Binder(source).bind("spring.security", Bindable.ofInstance(this.security));
}
}

9
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java
View File

@@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.security.oauth2.client;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.boot.WebApplicationType;
@@ -122,15 +121,11 @@ public class OAuth2RestOperationsConfigurationTests {
}
@Configuration
@Import({ OAuth2ClientConfiguration.class, OAuth2RestOperationsConfiguration.class })
@Import({ SecurityProperties.class,
OAuth2ClientConfiguration.class, OAuth2RestOperationsConfiguration.class })
protected static class ConfigForSessionScopedConfiguration
extends WebApplicationConfiguration {
@Bean
public SecurityProperties securityProperties() {
return Mockito.mock(SecurityProperties.class);
}
}
@Configuration