Skip to content

Commit 2ff74b1

Browse files
philwebbphilwebb
committed
Reformat code with spring-javaformat 0.0.8
See gh-16418
1 parent 0d8613f commit 2ff74b1

File tree

142 files changed

+590
-386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+590
-386
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -55,14 +55,16 @@ public AuditListener auditListener() throws Exception {
5555
}
5656

5757
@Bean
58-
@ConditionalOnClass(name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
58+
@ConditionalOnClass(
59+
name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
5960
@ConditionalOnMissingBean(AbstractAuthenticationAuditListener.class)
6061
public AuthenticationAuditListener authenticationAuditListener() throws Exception {
6162
return new AuthenticationAuditListener();
6263
}
6364

6465
@Bean
65-
@ConditionalOnClass(name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
66+
@ConditionalOnClass(
67+
name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
6668
@ConditionalOnMissingBean(AbstractAuthorizationAuditListener.class)
6769
public AuthorizationAuditListener authorizationAuditListener() throws Exception {
6870
return new AuthorizationAuditListener();

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -160,7 +160,8 @@ public KeyAuthenticationProperties keyAuthenticationProperties() {
160160
}
161161

162162
@Bean
163-
@ConditionalOnProperty(prefix = AUTH_PREFIX, name = "type", havingValue = "simple", matchIfMissing = true)
163+
@ConditionalOnProperty(prefix = AUTH_PREFIX, name = "type",
164+
havingValue = "simple", matchIfMissing = true)
164165
@ConditionalOnMissingBean(CrshShellAuthenticationProperties.class)
165166
public SimpleAuthenticationProperties simpleAuthenticationProperties() {
166167
return new SimpleAuthenticationProperties();
@@ -172,7 +173,8 @@ public SimpleAuthenticationProperties simpleAuthenticationProperties() {
172173
* Class to configure CRaSH to authenticate against Spring Security.
173174
*/
174175
@Configuration
175-
@ConditionalOnProperty(prefix = AUTH_PREFIX, name = "type", havingValue = "spring", matchIfMissing = true)
176+
@ConditionalOnProperty(prefix = AUTH_PREFIX, name = "type", havingValue = "spring",
177+
matchIfMissing = true)
176178
@ConditionalOnBean(AuthenticationManager.class)
177179
@Deprecated
178180
public static class AuthenticationManagerAdapterConfiguration {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -251,7 +251,8 @@ public Object getProperty(String name) {
251251
// Put Servlets and Filters in their own nested class so they don't force early
252252
// instantiation of ManagementServerProperties.
253253
@Configuration
254-
@ConditionalOnProperty(prefix = "management", name = "add-application-context-header", matchIfMissing = true, havingValue = "true")
254+
@ConditionalOnProperty(prefix = "management", name = "add-application-context-header",
255+
matchIfMissing = true, havingValue = "true")
255256
protected static class ApplicationContextFilterConfiguration {
256257

257258
@Bean

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -152,7 +152,8 @@ public void handlerMapping(MvcEndpoints endpoints,
152152

153153
@Configuration
154154
@ConditionalOnClass({ EnableWebSecurity.class, Filter.class })
155-
@ConditionalOnBean(name = "springSecurityFilterChain", search = SearchStrategy.ANCESTORS)
155+
@ConditionalOnBean(name = "springSecurityFilterChain",
156+
search = SearchStrategy.ANCESTORS)
156157
public static class EndpointWebMvcChildContextSecurityConfiguration {
157158

158159
@Bean

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -126,7 +126,8 @@ public HalJsonMvcEndpoint halJsonMvcEndpoint(
126126
@Bean
127127
@ConditionalOnBean(DocsMvcEndpoint.class)
128128
@ConditionalOnMissingBean(CurieProvider.class)
129-
@ConditionalOnProperty(prefix = "endpoints.docs.curies", name = "enabled", matchIfMissing = false)
129+
@ConditionalOnProperty(prefix = "endpoints.docs.curies", name = "enabled",
130+
matchIfMissing = false)
130131
public DefaultCurieProvider curieProvider(ServerProperties server,
131132
ManagementServerProperties management, DocsMvcEndpoint endpoint) {
132133
String path = management.getContextPath() + endpoint.getPath()
@@ -140,7 +141,8 @@ static class DocsMvcEndpointConfiguration {
140141
@Bean
141142
@ConditionalOnMissingBean
142143
@ConditionalOnEnabledEndpoint("docs")
143-
@ConditionalOnResource(resources = "classpath:/META-INF/resources/spring-boot-actuator/docs/index.html")
144+
@ConditionalOnResource(
145+
resources = "classpath:/META-INF/resources/spring-boot-actuator/docs/index.html")
144146
public DocsMvcEndpoint docsMvcEndpoint(
145147
ManagementServletContext managementServletContext) {
146148
return new DocsMvcEndpoint(managementServletContext);
@@ -225,7 +227,8 @@ private boolean isActuatorEndpointPath(String path) {
225227
* could not be enhanced (e.g. "/env/{name}") because their values are "primitive" are
226228
* ignored.
227229
*/
228-
@ConditionalOnProperty(prefix = "endpoints.hypermedia", name = "enabled", matchIfMissing = false)
230+
@ConditionalOnProperty(prefix = "endpoints.hypermedia", name = "enabled",
231+
matchIfMissing = false)
229232
@ControllerAdvice(assignableTypes = MvcEndpoint.class)
230233
static class MvcEndpointAdvice implements ResponseBodyAdvice<Object> {
231234

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2014 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -48,7 +48,8 @@ public ManagementServerProperties managementServerProperties() {
4848
// In case security auto configuration hasn't been included
4949
@Bean
5050
@ConditionalOnMissingBean
51-
@ConditionalOnClass(name = "org.springframework.security.config.annotation.web.configuration.EnableWebSecurity")
51+
@ConditionalOnClass(
52+
name = "org.springframework.security.config.annotation.web.configuration.EnableWebSecurity")
5253
public SecurityProperties securityProperties() {
5354
return new SecurityProperties();
5455
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -188,7 +188,8 @@ public ConditionOutcome getMatchOutcome(ConditionContext context,
188188

189189
@Configuration
190190
@ConditionalOnMissingBean({ ManagementWebSecurityConfigurerAdapter.class })
191-
@ConditionalOnProperty(prefix = "management.security", name = "enabled", matchIfMissing = true)
191+
@ConditionalOnProperty(prefix = "management.security", name = "enabled",
192+
matchIfMissing = true)
192193
@Order(ManagementServerProperties.BASIC_AUTH_ORDER)
193194
protected static class ManagementWebSecurityConfigurerAdapter
194195
extends WebSecurityConfigurerAdapter {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -46,7 +46,8 @@
4646
@ConditionalOnClass({ Servlet.class, ServletRegistration.class,
4747
OncePerRequestFilter.class, HandlerMapping.class })
4848
@AutoConfigureAfter(MetricRepositoryAutoConfiguration.class)
49-
@ConditionalOnProperty(prefix = "endpoints.metrics.filter", name = "enabled", matchIfMissing = true)
49+
@ConditionalOnProperty(prefix = "endpoints.metrics.filter", name = "enabled",
50+
matchIfMissing = true)
5051
@EnableConfigurationProperties({ MetricFilterProperties.class })
5152
public class MetricFilterAutoConfiguration {
5253

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -152,7 +152,9 @@ public CachePublicMetrics cachePublicMetrics(
152152
static class IntegrationMetricsConfiguration {
153153

154154
@Bean(name = IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME)
155-
@ConditionalOnMissingBean(value = IntegrationManagementConfigurer.class, name = IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME, search = SearchStrategy.CURRENT)
155+
@ConditionalOnMissingBean(value = IntegrationManagementConfigurer.class,
156+
name = IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME,
157+
search = SearchStrategy.CURRENT)
156158
public IntegrationManagementConfigurer managementConfigurer() {
157159
IntegrationManagementConfigurer configurer = new IntegrationManagementConfigurer();
158160
configurer.setDefaultCountsEnabled(true);

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 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.
@@ -40,7 +40,8 @@
4040
* @author Stephane Nicoll
4141
* @deprecated as of 1.5 since CRaSH is not actively maintained
4242
*/
43-
@ConfigurationProperties(prefix = ShellProperties.SHELL_PREFIX, ignoreUnknownFields = true)
43+
@ConfigurationProperties(prefix = ShellProperties.SHELL_PREFIX,
44+
ignoreUnknownFields = true)
4445
@Deprecated
4546
public class ShellProperties {
4647

@@ -378,8 +379,8 @@ public Integer getPort() {
378379
/**
379380
* Auth specific properties for JAAS authentication.
380381
*/
381-
@ConfigurationProperties(prefix = SHELL_PREFIX
382-
+ ".auth.jaas", ignoreUnknownFields = false)
382+
@ConfigurationProperties(prefix = SHELL_PREFIX + ".auth.jaas",
383+
ignoreUnknownFields = false)
383384
public static class JaasAuthenticationProperties
384385
extends CrshShellAuthenticationProperties {
385386

@@ -408,8 +409,8 @@ public String getDomain() {
408409
/**
409410
* Auth specific properties for key authentication.
410411
*/
411-
@ConfigurationProperties(prefix = SHELL_PREFIX
412-
+ ".auth.key", ignoreUnknownFields = false)
412+
@ConfigurationProperties(prefix = SHELL_PREFIX + ".auth.key",
413+
ignoreUnknownFields = false)
413414
public static class KeyAuthenticationProperties
414415
extends CrshShellAuthenticationProperties {
415416

@@ -440,8 +441,8 @@ public String getPath() {
440441
/**
441442
* Auth specific properties for simple authentication.
442443
*/
443-
@ConfigurationProperties(prefix = SHELL_PREFIX
444-
+ ".auth.simple", ignoreUnknownFields = false)
444+
@ConfigurationProperties(prefix = SHELL_PREFIX + ".auth.simple",
445+
ignoreUnknownFields = false)
445446
public static class SimpleAuthenticationProperties
446447
extends CrshShellAuthenticationProperties {
447448

@@ -517,8 +518,8 @@ public void setPassword(String password) {
517518
/**
518519
* Auth specific properties for Spring authentication.
519520
*/
520-
@ConfigurationProperties(prefix = SHELL_PREFIX
521-
+ ".auth.spring", ignoreUnknownFields = false)
521+
@ConfigurationProperties(prefix = SHELL_PREFIX + ".auth.spring",
522+
ignoreUnknownFields = false)
522523
public static class SpringAuthenticationProperties
523524
extends CrshShellAuthenticationProperties {
524525

0 commit comments

Comments
 (0)