Skip to content

Commit 41bc3b3

Browse files
committed
Rename ManagementSecurityAutoConfiguration
Since `ManagementSecurityAutoConfiguration` is cnfiguring web-related things, it has been renamed to `ManagementWebSecurityAutoConfiguration`. Closes spring-projectsgh-2163
1 parent 96fc107 commit 41bc3b3

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2015 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@
116116
@ConditionalOnClass({ PluginLifeCycle.class })
117117
@EnableConfigurationProperties({ ShellProperties.class })
118118
@AutoConfigureAfter({ SecurityAutoConfiguration.class,
119-
ManagementSecurityAutoConfiguration.class })
119+
ManagementWebSecurityAutoConfiguration.class })
120120
public class CrshAutoConfiguration {
121121

122122
@Autowired

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.springframework.beans.factory.ListableBeanFactory;
3333
import org.springframework.beans.factory.annotation.Autowired;
3434
import org.springframework.beans.factory.annotation.Value;
35-
import org.springframework.boot.actuate.autoconfigure.ManagementSecurityAutoConfiguration.ManagementWebSecurityConfigurerAdapter;
35+
import org.springframework.boot.actuate.autoconfigure.ManagementWebSecurityAutoConfiguration.ManagementWebSecurityConfigurerAdapter;
3636
import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping;
3737
import org.springframework.boot.actuate.endpoint.mvc.ManagementErrorEndpoint;
3838
import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2015 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@
6262
@ConditionalOnWebApplication
6363
@ConditionalOnClass({ AgentServlet.class })
6464
@Conditional(JolokiaCondition.class)
65-
@AutoConfigureBefore(ManagementSecurityAutoConfiguration.class)
65+
@AutoConfigureBefore(ManagementWebSecurityAutoConfiguration.class)
6666
@AutoConfigureAfter(EmbeddedServletContainerAutoConfiguration.class)
6767
@EnableConfigurationProperties(JolokiaProperties.class)
6868
public class JolokiaAutoConfiguration {
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
@AutoConfigureAfter(SecurityAutoConfiguration.class)
9191
@AutoConfigureBefore(FallbackWebSecurityAutoConfiguration.class)
9292
@EnableConfigurationProperties
93-
public class ManagementSecurityAutoConfiguration {
93+
public class ManagementWebSecurityAutoConfiguration {
9494

9595
private static final String[] NO_PATHS = new String[0];
9696

spring-boot-actuator/src/main/resources/META-INF/spring.factories

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ org.springframework.boot.actuate.autoconfigure.EndpointMBeanExportAutoConfigurat
77
org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\
88
org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration,\
99
org.springframework.boot.actuate.autoconfigure.JolokiaAutoConfiguration,\
10-
org.springframework.boot.actuate.autoconfigure.ManagementSecurityAutoConfiguration,\
1110
org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\
11+
org.springframework.boot.actuate.autoconfigure.ManagementWebSecurityAutoConfiguration,\
1212
org.springframework.boot.actuate.autoconfigure.MetricFilterAutoConfiguration,\
1313
org.springframework.boot.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\
1414
org.springframework.boot.actuate.autoconfigure.MetricsDropwizardAutoConfiguration,\
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@
6161
import static org.junit.Assert.assertTrue;
6262

6363
/**
64-
* Tests for {@link ManagementSecurityAutoConfiguration}.
64+
* Tests for {@link ManagementWebSecurityAutoConfiguration}.
6565
*
6666
* @author Dave Syer
6767
* @author Andy Wilkinson
6868
*/
69-
public class ManagementSecurityAutoConfigurationTests {
69+
public class ManagementWebSecurityAutoConfigurationTests {
7070

7171
private AnnotationConfigWebApplicationContext context;
7272

@@ -82,7 +82,7 @@ public void testWebConfiguration() throws Exception {
8282
this.context = new AnnotationConfigWebApplicationContext();
8383
this.context.setServletContext(new MockServletContext());
8484
this.context.register(SecurityAutoConfiguration.class,
85-
ManagementSecurityAutoConfiguration.class,
85+
ManagementWebSecurityAutoConfiguration.class,
8686
JacksonAutoConfiguration.class,
8787
HttpMessageConvertersAutoConfiguration.class,
8888
EndpointAutoConfiguration.class, EndpointWebMvcAutoConfiguration.class,
@@ -115,7 +115,7 @@ public void testWebConfigurationWithExtraRole() throws Exception {
115115
HttpMessageConvertersAutoConfiguration.class,
116116
ManagementServerPropertiesAutoConfiguration.class,
117117
SecurityAutoConfiguration.class,
118-
ManagementSecurityAutoConfiguration.class,
118+
ManagementWebSecurityAutoConfiguration.class,
119119
PropertyPlaceholderAutoConfiguration.class);
120120
this.context.refresh();
121121
UserDetails user = getUser();
@@ -140,7 +140,7 @@ public void testDisableIgnoredStaticApplicationPaths() throws Exception {
140140
this.context = new AnnotationConfigWebApplicationContext();
141141
this.context.setServletContext(new MockServletContext());
142142
this.context.register(SecurityAutoConfiguration.class,
143-
ManagementSecurityAutoConfiguration.class,
143+
ManagementWebSecurityAutoConfiguration.class,
144144
EndpointAutoConfiguration.class,
145145
ManagementServerPropertiesAutoConfiguration.class,
146146
PropertyPlaceholderAutoConfiguration.class);
@@ -160,7 +160,7 @@ public void testDisableBasicAuthOnApplicationPaths() throws Exception {
160160
EndpointWebMvcAutoConfiguration.class,
161161
ManagementServerPropertiesAutoConfiguration.class,
162162
SecurityAutoConfiguration.class,
163-
ManagementSecurityAutoConfiguration.class,
163+
ManagementWebSecurityAutoConfiguration.class,
164164
FallbackWebSecurityAutoConfiguration.class,
165165
PropertyPlaceholderAutoConfiguration.class);
166166
EnvironmentTestUtils.addEnvironment(this.context, "security.basic.enabled:false");
@@ -176,7 +176,7 @@ public void testOverrideAuthenticationManager() throws Exception {
176176
this.context = new AnnotationConfigWebApplicationContext();
177177
this.context.setServletContext(new MockServletContext());
178178
this.context.register(TestConfiguration.class, SecurityAutoConfiguration.class,
179-
ManagementSecurityAutoConfiguration.class,
179+
ManagementWebSecurityAutoConfiguration.class,
180180
EndpointAutoConfiguration.class,
181181
ManagementServerPropertiesAutoConfiguration.class,
182182
PropertyPlaceholderAutoConfiguration.class);
@@ -190,7 +190,7 @@ public void testSecurityPropertiesNotAvailable() throws Exception {
190190
this.context = new AnnotationConfigWebApplicationContext();
191191
this.context.setServletContext(new MockServletContext());
192192
this.context.register(TestConfiguration.class, SecurityAutoConfiguration.class,
193-
ManagementSecurityAutoConfiguration.class,
193+
ManagementWebSecurityAutoConfiguration.class,
194194
EndpointAutoConfiguration.class,
195195
ManagementServerPropertiesAutoConfiguration.class,
196196
PropertyPlaceholderAutoConfiguration.class);
@@ -206,7 +206,7 @@ public void realmSameForManagement() throws Exception {
206206
this.context.setServletContext(new MockServletContext());
207207
this.context
208208
.register(AuthenticationConfig.class, SecurityAutoConfiguration.class,
209-
ManagementSecurityAutoConfiguration.class,
209+
ManagementWebSecurityAutoConfiguration.class,
210210
JacksonAutoConfiguration.class,
211211
HttpMessageConvertersAutoConfiguration.class,
212212
EndpointAutoConfiguration.class,

0 commit comments

Comments
 (0)