Skip to content

Commit 324a00f

Browse files
philwebbphilwebb
committed
Polish
1 parent 796d400 commit 324a00f

File tree

26 files changed

+189
-226
lines changed

26 files changed

+189
-226
lines changed

‎spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointEnablementProvider.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ private EndpointEnablement getGlobalEndpointEnablement(String endpointId,
100100
if (result != null) {
101101
return result;
102102
}
103-
boolean enablement = determineGlobalDefaultEnablement(defaultEnablement, exposure);
103+
boolean enablement = determineGlobalDefaultEnablement(defaultEnablement,
104+
exposure);
104105
String message = determineGlobalDefaultMessage(endpointId, enablement, exposure,
105106
defaultEnablement);
106107
return new EndpointEnablement(enablement, message);

‎spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpoint.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
* If any properties are set, they are evaluated from most to least specific, e.g.
4949
* considering a web endpoint with id {@code foo}:
5050
* <ol>
51-
* <li>endpoints.foo.web.enabled</li>
52-
* <li>endpoints.foo.enabled</li>
53-
* <li>endpoints.default.web.enabled</li>
54-
* <li>endpoints.default.enabled</li>
51+
* <li>endpoints.foo.web.enabled</li>
52+
* <li>endpoints.foo.enabled</li>
53+
* <li>endpoints.default.web.enabled</li>
54+
* <li>endpoints.default.enabled</li>
5555
* </ol>
5656
* For instance if {@code endpoints.default.enabled} is {@code false} but
5757
* {@code endpoints.<name>.enabled} is {@code true}, the condition will match.

‎spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,16 @@ public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean()
6161
@Test
6262
public void keysToSanitizeCanBeConfiguredViaTheEnvironment() throws Exception {
6363
this.contextRunner.withUserConfiguration(Config.class)
64-
.withPropertyValues("endpoints.configprops.keys-to-sanitize: .*pass.*, property")
64+
.withPropertyValues(
65+
"endpoints.configprops.keys-to-sanitize: .*pass.*, property")
6566
.run(validateTestProperties("******", "******"));
6667
}
6768

68-
private ContextConsumer<AssertableApplicationContext> validateTestProperties(String dbPassword,
69-
String myTestProperty) {
69+
private ContextConsumer<AssertableApplicationContext> validateTestProperties(
70+
String dbPassword, String myTestProperty) {
7071
return context -> {
71-
assertThat(context).hasSingleBean(
72-
ConfigurationPropertiesReportEndpoint.class);
72+
assertThat(context)
73+
.hasSingleBean(ConfigurationPropertiesReportEndpoint.class);
7374
ConfigurationPropertiesReportEndpoint endpoint = context
7475
.getBean(ConfigurationPropertiesReportEndpoint.class);
7576
ConfigurationPropertiesDescriptor properties = endpoint
@@ -94,7 +95,7 @@ public TestProperties testProperties() {
9495
}
9596

9697
@ConfigurationProperties("test")
97-
private static class TestProperties {
98+
static class TestProperties {
9899

99100
private String dbPassword = "123456";
100101

‎spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointEnablementProviderTests.java‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,14 @@ public void defaultEnablementEnabledWithIrrelevantTechOverride() {
127127
public void defaultEnablementNeutral() {
128128
EndpointEnablement enablement = getEndpointEnablement("biz",
129129
DefaultEnablement.NEUTRAL);
130-
validate(enablement, true,
131-
"endpoint 'biz' is enabled (default)");
130+
validate(enablement, true, "endpoint 'biz' is enabled (default)");
132131
}
133132

134133
@Test
135134
public void defaultEnablementNeutralWeb() {
136135
EndpointEnablement enablement = getEndpointEnablement("biz",
137136
DefaultEnablement.NEUTRAL, EndpointExposure.WEB);
138-
validate(enablement, false,
139-
"endpoint 'default' (web) is disabled by default");
137+
validate(enablement, false, "endpoint 'default' (web) is disabled by default");
140138
}
141139

142140
@Test
@@ -151,36 +149,31 @@ public void defaultEnablementNeutralJmx() {
151149
public void defaultEnablementNeutralWithGeneralDisablement() {
152150
EndpointEnablement enablement = getEndpointEnablement("biz",
153151
DefaultEnablement.NEUTRAL, "endpoints.default.enabled=false");
154-
validate(enablement, false,
155-
"found property endpoints.default.enabled");
152+
validate(enablement, false, "found property endpoints.default.enabled");
156153
}
157154

158155
@Test
159156
public void defaultEnablementNeutralWebWithTechDisablement() {
160157
EndpointEnablement enablement = getEndpointEnablement("biz",
161158
DefaultEnablement.NEUTRAL, EndpointExposure.JMX,
162159
"endpoints.default.jmx.enabled=false");
163-
validate(enablement, false,
164-
"found property endpoints.default.jmx.enabled");
160+
validate(enablement, false, "found property endpoints.default.jmx.enabled");
165161
}
166162

167163
@Test
168164
public void defaultEnablementNeutralTechTakesPrecedence() {
169165
EndpointEnablement enablement = getEndpointEnablement("biz",
170166
DefaultEnablement.NEUTRAL, EndpointExposure.JMX,
171-
"endpoints.default.enabled=true",
172-
"endpoints.default.jmx.enabled=false");
173-
validate(enablement, false,
174-
"found property endpoints.default.jmx.enabled");
167+
"endpoints.default.enabled=true", "endpoints.default.jmx.enabled=false");
168+
validate(enablement, false, "found property endpoints.default.jmx.enabled");
175169
}
176170

177171
@Test
178172
public void defaultEnablementNeutralWebWithTechEnablement() {
179173
EndpointEnablement enablement = getEndpointEnablement("biz",
180174
DefaultEnablement.NEUTRAL, EndpointExposure.WEB,
181175
"endpoints.default.web.enabled=true");
182-
validate(enablement, true,
183-
"found property endpoints.default.web.enabled");
176+
validate(enablement, true, "found property endpoints.default.web.enabled");
184177
}
185178

186179
@Test
@@ -196,59 +189,49 @@ public void defaultEnablementNeutralWebWithUnrelatedTechDisablement() {
196189
public void defaultEnablementNeutralWithOverride() {
197190
EndpointEnablement enablement = getEndpointEnablement("biz",
198191
DefaultEnablement.NEUTRAL, "endpoints.biz.enabled=false");
199-
validate(enablement, false,
200-
"found property endpoints.biz.enabled");
192+
validate(enablement, false, "found property endpoints.biz.enabled");
201193
}
202194

203195
@Test
204196
public void defaultEnablementNeutralWebWithOverride() {
205197
EndpointEnablement enablement = getEndpointEnablement("biz",
206198
DefaultEnablement.NEUTRAL, EndpointExposure.WEB,
207199
"endpoints.biz.web.enabled=true");
208-
validate(enablement, true,
209-
"found property endpoints.biz.web.enabled");
200+
validate(enablement, true, "found property endpoints.biz.web.enabled");
210201
}
211202

212203
@Test
213204
public void defaultEnablementNeutralJmxWithOverride() {
214205
EndpointEnablement enablement = getEndpointEnablement("biz",
215206
DefaultEnablement.NEUTRAL, EndpointExposure.JMX,
216207
"endpoints.biz.jmx.enabled=false");
217-
validate(enablement, false,
218-
"found property endpoints.biz.jmx.enabled");
208+
validate(enablement, false, "found property endpoints.biz.jmx.enabled");
219209
}
220210

221211
@Test
222212
public void defaultEnablementNeutralTechTakesPrecedenceOnEverything() {
223213
EndpointEnablement enablement = getEndpointEnablement("biz",
224214
DefaultEnablement.NEUTRAL, EndpointExposure.JMX,
225-
"endpoints.default.enabled=false",
226-
"endpoints.default.jmx.enabled=false",
227-
"endpoints.biz.enabled=false",
228-
"endpoints.biz.jmx.enabled=true");
229-
validate(enablement, true,
230-
"found property endpoints.biz.jmx.enabled");
215+
"endpoints.default.enabled=false", "endpoints.default.jmx.enabled=false",
216+
"endpoints.biz.enabled=false", "endpoints.biz.jmx.enabled=true");
217+
validate(enablement, true, "found property endpoints.biz.jmx.enabled");
231218
}
232219

233220
@Test
234221
public void defaultEnablementNeutralSpecificTakesPrecedenceOnDefaults() {
235222
EndpointEnablement enablement = getEndpointEnablement("biz",
236223
DefaultEnablement.NEUTRAL, EndpointExposure.JMX,
237-
"endpoints.default.enabled=false",
238-
"endpoints.default.jmx.enabled=false",
224+
"endpoints.default.enabled=false", "endpoints.default.jmx.enabled=false",
239225
"endpoints.biz.enabled=true");
240-
validate(enablement, true,
241-
"found property endpoints.biz.enabled");
226+
validate(enablement, true, "found property endpoints.biz.enabled");
242227
}
243228

244229
@Test
245230
public void defaultEnablementNeutralDefaultTechTakesPrecedenceOnGeneralDefault() {
246231
EndpointEnablement enablement = getEndpointEnablement("biz",
247232
DefaultEnablement.NEUTRAL, EndpointExposure.JMX,
248-
"endpoints.default.enabled=false",
249-
"endpoints.default.jmx.enabled=true");
250-
validate(enablement, true,
251-
"found property endpoints.default.jmx.enabled");
233+
"endpoints.default.enabled=false", "endpoints.default.jmx.enabled=true");
234+
validate(enablement, true, "found property endpoints.default.jmx.enabled");
252235
}
253236

254237
private EndpointEnablement getEndpointEnablement(String id,

‎spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfigurationTests.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean()
5656
.doesNotHaveBean(EnvironmentEndpoint.class));
5757
}
5858

59-
6059
@Test
6160
public void keysToSanitizeCanBeConfiguredViaTheEnvironment() throws Exception {
6261
this.contextRunner.withSystemProperties("dbPassword=123456", "apiKey=123456")
@@ -84,5 +83,4 @@ private PropertySourceDescriptor getSource(String name,
8483
.filter((source) -> name.equals(source.getName())).findFirst().get();
8584
}
8685

87-
8886
}

‎spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public void healthEndpointMergeRegularAndReactive() {
8484

8585
@Test
8686
public void runShouldHaveStatusEndpointBeanEvenIfDefaultIsDisabled() {
87-
this.contextRunner.withPropertyValues("endpoints.default.enabled:false")
88-
.run((context) -> assertThat(context).hasSingleBean(StatusEndpoint.class));
87+
this.contextRunner.withPropertyValues("endpoints.default.enabled:false").run(
88+
(context) -> assertThat(context).hasSingleBean(StatusEndpoint.class));
8989
}
9090

9191
@Test

‎spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public void jmxEndpointsAreExposed() {
5555
MBeanServer mBeanServer = context.getBean(MBeanServer.class);
5656
checkEndpointMBeans(mBeanServer,
5757
new String[] { "autoconfig", "beans", "configprops", "env", "health",
58-
"info", "mappings", "status", "threaddump",
59-
"trace" },
58+
"info", "mappings", "status", "threaddump", "trace" },
6059
new String[] { "shutdown" });
6160
});
6261
}
@@ -68,8 +67,8 @@ public void jmxEndpointsCanBeDisabled() {
6867
MBeanServer mBeanServer = context.getBean(MBeanServer.class);
6968
checkEndpointMBeans(mBeanServer, new String[0],
7069
new String[] { "autoconfig", "beans", "configprops", "env",
71-
"health", "mappings", "shutdown",
72-
"threaddump", "trace" });
70+
"health", "mappings", "shutdown", "threaddump",
71+
"trace" });
7372

7473
});
7574
}
@@ -81,8 +80,7 @@ public void singleJmxEndpointCanBeEnabled() {
8180
MBeanServer mBeanServer = context.getBean(MBeanServer.class);
8281
checkEndpointMBeans(mBeanServer, new String[] { "beans" },
8382
new String[] { "autoconfig", "configprops", "env", "health",
84-
"mappings", "shutdown",
85-
"threaddump", "trace" });
83+
"mappings", "shutdown", "threaddump", "trace" });
8684
});
8785
}
8886

‎spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointManagementContextConfigurationTests.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public class LogFileWebEndpointManagementContextConfigurationTests {
4444
@Rule
4545
public TemporaryFolder temp = new TemporaryFolder();
4646

47-
4847
private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
4948
.withUserConfiguration(
5049
LogFileWebEndpointManagementContextConfiguration.class);
@@ -81,18 +80,19 @@ public void logFileWebEndpointCanBeDisabled() {
8180
@Test
8281
public void logFileWebEndpointUsesConfiguredExternalFile() throws IOException {
8382
File file = this.temp.newFile("logfile");
84-
FileCopyUtils.copy("--TEST--" .getBytes(), file);
83+
FileCopyUtils.copy("--TEST--".getBytes(), file);
8584
this.contextRunner
86-
.withPropertyValues("endpoints.logfile.external-file:"
87-
+ file.getAbsolutePath()).run((context) -> {
88-
assertThat(context).hasSingleBean(LogFileWebEndpoint.class);
89-
LogFileWebEndpoint endpoint = context.getBean(LogFileWebEndpoint.class);
90-
Resource resource = endpoint.logFile();
91-
assertThat(resource).isNotNull();
92-
assertThat(StreamUtils.copyToString(resource.getInputStream(),
93-
StandardCharsets.UTF_8)).isEqualTo("--TEST--");
94-
});
95-
85+
.withPropertyValues(
86+
"endpoints.logfile.external-file:" + file.getAbsolutePath())
87+
.run((context) -> {
88+
assertThat(context).hasSingleBean(LogFileWebEndpoint.class);
89+
LogFileWebEndpoint endpoint = context
90+
.getBean(LogFileWebEndpoint.class);
91+
Resource resource = endpoint.logFile();
92+
assertThat(resource).isNotNull();
93+
assertThat(StreamUtils.copyToString(resource.getInputStream(),
94+
StandardCharsets.UTF_8)).isEqualTo("--TEST--");
95+
});
9696
}
9797

9898
}

‎spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/RequestMappingEndpointTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private WebMvcEndpointHandlerMapping createHandlerMapping() {
142142
WebMvcEndpointHandlerMapping mapping = new WebMvcEndpointHandlerMapping(
143143
new EndpointMapping("application"),
144144
Collections.singleton(new EndpointInfo<>("test",
145-
DefaultEnablement.ENABLED, Collections.singleton(operation))));
145+
DefaultEnablement.ENABLED, Collections.singleton(operation))));
146146
mapping.setApplicationContext(new StaticApplicationContext());
147147
mapping.afterPropertiesSet();
148148
return mapping;

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AnnotationEndpointDiscoverer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ private Map<Class<?>, EndpointInfo<T>> discoverEndpoints(EndpointExposure exposu
119119
private EndpointInfo<T> createEndpointInfo(String beanName, Class<?> beanType,
120120
AnnotationAttributes attributes) {
121121
String id = attributes.getString("id");
122-
DefaultEnablement defaultEnablement = (DefaultEnablement) attributes.get(
123-
"defaultEnablement");
122+
DefaultEnablement defaultEnablement = (DefaultEnablement) attributes
123+
.get("defaultEnablement");
124124
Map<Method, T> operations = discoverOperations(id, beanName, beanType);
125125
return new EndpointInfo<>(id, defaultEnablement, operations.values());
126126
}

0 commit comments

Comments
 (0)