Skip to content

Commit 2376f97

Browse files
philwebbphilwebb
committed
Merge branch '2.1.x'
2 parents 4e337f7 + 47c6bf7 commit 2376f97

File tree

174 files changed

+550
-326
lines changed

Some content is hidden

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

174 files changed

+550
-326
lines changed

‎CONTRIBUTING.adoc

+10-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ provision a new environment. To use the installer:
153153
* Select "`Eclipse IDE for Java Developers`" under "`Eclipse.org`" as the product to
154154
install and click "`next`".
155155
* For the "`Project`" click on "`+`" to add a new setup file. Select "`Github Projects`"
156-
and browser for `<checkout>/eclipse/spring-boot-project.setup` from your locally cloned
156+
and browse for `<checkout>/eclipse/spring-boot-project.setup` from your locally cloned
157157
copy of the source code. Click "`OK`" to add the setup file to the list.
158158
* Double-click on "`Spring Boot`" from the project list to add it to the list that will
159159
be provisioned then click "`Next`".
@@ -166,12 +166,20 @@ Once complete you should find that a local workspace has been provisioned comple
166166
all required Eclipse plugins. Projects will be grouped into working-sets to make the code
167167
easier to navigate.
168168

169+
If you want to work on the `spring-boot-gradle-plugin` you should remove the imported Maven
170+
project and reimport it as a Gradle project.
171+
172+
TIP: If you see import errors with `com.sun` packages make sure you have setup a valid
173+
`JavaSE-1.8` environment. From preferences select "`Java`", "`Installed JREs`",
174+
"`Execution Environments`" and make sure "`JavaSE-1.8`" points to a Java 1.8
175+
install (we use AdoptOpenJDK on our CI).
176+
169177

170178

171179
==== Manual Installation with M2Eclipse
172180
If you prefer to install Eclipse yourself you should use the
173181
https://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse
174-
installed it is available from the "Eclipse marketplace".
182+
installed it is available from the "`Eclipse marketplace`".
175183

176184
Spring Boot includes project specific source formatting settings, in order to have these
177185
work with m2eclipse, we provide an additional Eclipse plugin that you can install:

‎eclipse/spring-boot-project.setup

+12-22
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<setup:Project
33
xmi:version="2.0"
4-
xmlns:xmi="https://www.omg.org/XMI"
4+
xmlns:xmi="http://www.omg.org/XMI"
55
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xmlns:jdt="https://www.eclipse.org/oomph/setup/jdt/1.0"
7-
xmlns:maven="https://www.eclipse.org/oomph/setup/maven/1.0"
8-
xmlns:predicates="https://www.eclipse.org/oomph/predicates/1.0"
9-
xmlns:setup="https://www.eclipse.org/oomph/setup/1.0"
10-
xmlns:setup.p2="https://www.eclipse.org/oomph/setup/p2/1.0"
11-
xmlns:setup.workingsets="https://www.eclipse.org/oomph/setup/workingsets/1.0"
12-
xmlns:workingsets="https://www.eclipse.org/oomph/workingsets/1.0"
13-
xsi:schemaLocation="https://www.eclipse.org/oomph/setup/jdt/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore https://www.eclipse.org/oomph/setup/maven/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore https://www.eclipse.org/oomph/predicates/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore https://www.eclipse.org/oomph/setup/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore https://www.eclipse.org/oomph/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
14-
name="spring.boot"
15-
label="Spring Boot">
6+
xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
7+
xmlns:maven="http://www.eclipse.org/oomph/setup/maven/1.0"
8+
xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
9+
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
10+
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
11+
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
12+
xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
13+
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
14+
name="spring.boot.2.2.x"
15+
label="Spring Boot 2.2.x">
1616
<setupTask
1717
xsi:type="setup:VariableTask"
1818
type="FOLDER"
@@ -54,8 +54,6 @@
5454
</setupTask>
5555
<setupTask
5656
xsi:type="setup.p2:P2Task">
57-
<requirement
58-
name="epp.package.java"/>
5957
<requirement
6058
name="org.eclipse.platform.feature.group"/>
6159
<requirement
@@ -78,18 +76,10 @@
7876
name="org.sonatype.m2e.buildhelper.feature.feature.group"/>
7977
<requirement
8078
name="org.springframework.ide.eclipse.boot.feature.feature.group"/>
81-
<repository
82-
url="https://download.eclipse.org/technology/epp/packages/oxygen/R/"/>
83-
<repository
84-
url="https://download.eclipse.org/releases/oxygen/"/>
8579
<repository
8680
url="https://dl.bintray.com/spring/javaformat-eclipse/"/>
8781
<repository
88-
url="https://download.eclipse.org/egit/github/updates/"/>
89-
<repository
90-
url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201207090124/"/>
91-
<repository
92-
url="https://dist.springsource.com/release/TOOLS/update/e4.7"/>
82+
url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
9383
<description>
9484
Install the tools needed in the IDE to work with the
9585
source code for ${scope.project.label}

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</property>
2525
</activation>
2626
<properties>
27-
<spring-javaformat.version>0.0.7</spring-javaformat.version>
27+
<spring-javaformat.version>0.0.8</spring-javaformat.version>
2828
</properties>
2929
<build>
3030
<plugins>

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,16 @@ public AuditListener auditListener(
5050
}
5151

5252
@Bean
53-
@ConditionalOnClass(name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
53+
@ConditionalOnClass(
54+
name = "org.springframework.security.authentication.event.AbstractAuthenticationEvent")
5455
@ConditionalOnMissingBean(AbstractAuthenticationAuditListener.class)
5556
public AuthenticationAuditListener authenticationAuditListener() throws Exception {
5657
return new AuthenticationAuditListener();
5758
}
5859

5960
@Bean
60-
@ConditionalOnClass(name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
61+
@ConditionalOnClass(
62+
name = "org.springframework.security.access.event.AbstractAuthorizationEvent")
6163
@ConditionalOnMissingBean(AbstractAuthorizationAuditListener.class)
6264
public AuthorizationAuditListener authorizationAuditListener() throws Exception {
6365
return new AuthorizationAuditListener();

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
* @since 2.0.0
7777
*/
7878
@Configuration(proxyBeanMethods = false)
79-
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
79+
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled",
80+
matchIfMissing = true)
8081
@AutoConfigureAfter({ HealthEndpointAutoConfiguration.class,
8182
InfoEndpointAutoConfiguration.class })
8283
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
* @since 2.0.0
7777
*/
7878
@Configuration(proxyBeanMethods = false)
79-
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
79+
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled",
80+
matchIfMissing = true)
8081
@AutoConfigureAfter({ ServletManagementContextAutoConfiguration.class,
8182
HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class })
8283
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorProperties.java

+3-2
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.
@@ -30,7 +30,8 @@
3030
* @author Andy Wilkinson
3131
* @since 2.0.0
3232
*/
33-
@ConfigurationProperties(prefix = "management.health.elasticsearch", ignoreUnknownFields = false)
33+
@ConfigurationProperties(prefix = "management.health.elasticsearch",
34+
ignoreUnknownFields = false)
3435
public class ElasticsearchHealthIndicatorProperties {
3536

3637
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
*/
4343
@Configuration(proxyBeanMethods = false)
4444
@AutoConfigureAfter(MetricsAutoConfiguration.class)
45-
@ConditionalOnClass(value = { Log4j2Metrics.class,
46-
LogManager.class }, name = "org.apache.logging.log4j.core.LoggerContext")
45+
@ConditionalOnClass(value = { Log4j2Metrics.class, LogManager.class },
46+
name = "org.apache.logging.log4j.core.LoggerContext")
4747
@ConditionalOnBean(MeterRegistry.class)
4848
@Conditional(Log4JCoreLoggerContextCondition.class)
4949
public class Log4J2MetricsAutoConfiguration {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4949
@ConditionalOnBean(Clock.class)
5050
@ConditionalOnClass(AppOpticsMeterRegistry.class)
51-
@ConditionalOnProperty(prefix = "management.metrics.export.appoptics", name = "enabled", havingValue = "true", matchIfMissing = true)
51+
@ConditionalOnProperty(prefix = "management.metrics.export.appoptics", name = "enabled",
52+
havingValue = "true", matchIfMissing = true)
5253
@EnableConfigurationProperties(AppOpticsProperties.class)
5354
public class AppOpticsMetricsExportAutoConfiguration {
5455

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(AtlasMeterRegistry.class)
50-
@ConditionalOnProperty(prefix = "management.metrics.export.atlas", name = "enabled", havingValue = "true", matchIfMissing = true)
50+
@ConditionalOnProperty(prefix = "management.metrics.export.atlas", name = "enabled",
51+
havingValue = "true", matchIfMissing = true)
5152
@EnableConfigurationProperties(AtlasProperties.class)
5253
public class AtlasMetricsExportAutoConfiguration {
5354

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4949
@ConditionalOnBean(Clock.class)
5050
@ConditionalOnClass(DatadogMeterRegistry.class)
51-
@ConditionalOnProperty(prefix = "management.metrics.export.datadog", name = "enabled", havingValue = "true", matchIfMissing = true)
51+
@ConditionalOnProperty(prefix = "management.metrics.export.datadog", name = "enabled",
52+
havingValue = "true", matchIfMissing = true)
5253
@EnableConfigurationProperties(DatadogProperties.class)
5354
public class DatadogMetricsExportAutoConfiguration {
5455

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4949
@ConditionalOnBean(Clock.class)
5050
@ConditionalOnClass(DynatraceMeterRegistry.class)
51-
@ConditionalOnProperty(prefix = "management.metrics.export.dynatrace", name = "enabled", havingValue = "true", matchIfMissing = true)
51+
@ConditionalOnProperty(prefix = "management.metrics.export.dynatrace", name = "enabled",
52+
havingValue = "true", matchIfMissing = true)
5253
@EnableConfigurationProperties(DynatraceProperties.class)
5354
public class DynatraceMetricsExportAutoConfiguration {
5455

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4949
@ConditionalOnBean(Clock.class)
5050
@ConditionalOnClass(ElasticMeterRegistry.class)
51-
@ConditionalOnProperty(prefix = "management.metrics.export.elastic", name = "enabled", havingValue = "true", matchIfMissing = true)
51+
@ConditionalOnProperty(prefix = "management.metrics.export.elastic", name = "enabled",
52+
havingValue = "true", matchIfMissing = true)
5253
@EnableConfigurationProperties(ElasticProperties.class)
5354
public class ElasticMetricsExportAutoConfiguration {
5455

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4747
@ConditionalOnBean(Clock.class)
4848
@ConditionalOnClass(GangliaMeterRegistry.class)
49-
@ConditionalOnProperty(prefix = "management.metrics.export.ganglia", name = "enabled", havingValue = "true", matchIfMissing = true)
49+
@ConditionalOnProperty(prefix = "management.metrics.export.ganglia", name = "enabled",
50+
havingValue = "true", matchIfMissing = true)
5051
@EnableConfigurationProperties(GangliaProperties.class)
5152
public class GangliaMetricsExportAutoConfiguration {
5253

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4747
@ConditionalOnBean(Clock.class)
4848
@ConditionalOnClass(GraphiteMeterRegistry.class)
49-
@ConditionalOnProperty(prefix = "management.metrics.export.graphite", name = "enabled", havingValue = "true", matchIfMissing = true)
49+
@ConditionalOnProperty(prefix = "management.metrics.export.graphite", name = "enabled",
50+
havingValue = "true", matchIfMissing = true)
5051
@EnableConfigurationProperties(GraphiteProperties.class)
5152
public class GraphiteMetricsExportAutoConfiguration {
5253

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4949
@ConditionalOnBean(Clock.class)
5050
@ConditionalOnClass(HumioMeterRegistry.class)
51-
@ConditionalOnProperty(prefix = "management.metrics.export.humio", name = "enabled", havingValue = "true", matchIfMissing = true)
51+
@ConditionalOnProperty(prefix = "management.metrics.export.humio", name = "enabled",
52+
havingValue = "true", matchIfMissing = true)
5253
@EnableConfigurationProperties(HumioProperties.class)
5354
public class HumioMetricsExportAutoConfiguration {
5455

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4949
@ConditionalOnBean(Clock.class)
5050
@ConditionalOnClass(InfluxMeterRegistry.class)
51-
@ConditionalOnProperty(prefix = "management.metrics.export.influx", name = "enabled", havingValue = "true", matchIfMissing = true)
51+
@ConditionalOnProperty(prefix = "management.metrics.export.influx", name = "enabled",
52+
havingValue = "true", matchIfMissing = true)
5253
@EnableConfigurationProperties(InfluxProperties.class)
5354
public class InfluxMetricsExportAutoConfiguration {
5455

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4747
@ConditionalOnBean(Clock.class)
4848
@ConditionalOnClass(JmxMeterRegistry.class)
49-
@ConditionalOnProperty(prefix = "management.metrics.export.jmx", name = "enabled", havingValue = "true", matchIfMissing = true)
49+
@ConditionalOnProperty(prefix = "management.metrics.export.jmx", name = "enabled",
50+
havingValue = "true", matchIfMissing = true)
5051
@EnableConfigurationProperties(JmxProperties.class)
5152
public class JmxMetricsExportAutoConfiguration {
5253

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4949
@ConditionalOnBean(Clock.class)
5050
@ConditionalOnClass(KairosMeterRegistry.class)
51-
@ConditionalOnProperty(prefix = "management.metrics.export.kairos", name = "enabled", havingValue = "true", matchIfMissing = true)
51+
@ConditionalOnProperty(prefix = "management.metrics.export.kairos", name = "enabled",
52+
havingValue = "true", matchIfMissing = true)
5253
@EnableConfigurationProperties(KairosProperties.class)
5354
public class KairosMetricsExportAutoConfiguration {
5455

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
@AutoConfigureAfter(MetricsAutoConfiguration.class)
5050
@ConditionalOnBean(Clock.class)
5151
@ConditionalOnClass(NewRelicMeterRegistry.class)
52-
@ConditionalOnProperty(prefix = "management.metrics.export.newrelic", name = "enabled", havingValue = "true", matchIfMissing = true)
52+
@ConditionalOnProperty(prefix = "management.metrics.export.newrelic", name = "enabled",
53+
havingValue = "true", matchIfMissing = true)
5354
@EnableConfigurationProperties(NewRelicProperties.class)
5455
public class NewRelicMetricsExportAutoConfiguration {
5556

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
@AutoConfigureAfter(MetricsAutoConfiguration.class)
6363
@ConditionalOnBean(Clock.class)
6464
@ConditionalOnClass(PrometheusMeterRegistry.class)
65-
@ConditionalOnProperty(prefix = "management.metrics.export.prometheus", name = "enabled", havingValue = "true", matchIfMissing = true)
65+
@ConditionalOnProperty(prefix = "management.metrics.export.prometheus", name = "enabled",
66+
havingValue = "true", matchIfMissing = true)
6667
@EnableConfigurationProperties(PrometheusProperties.class)
6768
public class PrometheusMetricsExportAutoConfiguration {
6869

@@ -106,7 +107,8 @@ public PrometheusScrapeEndpoint prometheusEndpoint(
106107
*/
107108
@Configuration(proxyBeanMethods = false)
108109
@ConditionalOnClass(PushGateway.class)
109-
@ConditionalOnProperty(prefix = "management.metrics.export.prometheus.pushgateway", name = "enabled")
110+
@ConditionalOnProperty(prefix = "management.metrics.export.prometheus.pushgateway",
111+
name = "enabled")
110112
public static class PrometheusPushGatewayConfiguration {
111113

112114
private static final Log logger = LogFactory

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(SignalFxMeterRegistry.class)
50-
@ConditionalOnProperty(prefix = "management.metrics.export.signalfx", name = "enabled", havingValue = "true", matchIfMissing = true)
50+
@ConditionalOnProperty(prefix = "management.metrics.export.signalfx", name = "enabled",
51+
havingValue = "true", matchIfMissing = true)
5152
@EnableConfigurationProperties(SignalFxProperties.class)
5253
public class SignalFxMetricsExportAutoConfiguration {
5354

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
@ConditionalOnBean(Clock.class)
4848
@EnableConfigurationProperties(SimpleProperties.class)
4949
@ConditionalOnMissingBean(MeterRegistry.class)
50-
@ConditionalOnProperty(prefix = "management.metrics.export.simple", name = "enabled", havingValue = "true", matchIfMissing = true)
50+
@ConditionalOnProperty(prefix = "management.metrics.export.simple", name = "enabled",
51+
havingValue = "true", matchIfMissing = true)
5152
public class SimpleMetricsExportAutoConfiguration {
5253

5354
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(StatsdMeterRegistry.class)
50-
@ConditionalOnProperty(prefix = "management.metrics.export.statsd", name = "enabled", havingValue = "true", matchIfMissing = true)
50+
@ConditionalOnProperty(prefix = "management.metrics.export.statsd", name = "enabled",
51+
havingValue = "true", matchIfMissing = true)
5152
@EnableConfigurationProperties(StatsdProperties.class)
5253
public class StatsdMetricsExportAutoConfiguration {
5354

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4949
@ConditionalOnBean(Clock.class)
5050
@ConditionalOnClass(WavefrontMeterRegistry.class)
51-
@ConditionalOnProperty(prefix = "management.metrics.export.wavefront", name = "enabled", havingValue = "true", matchIfMissing = true)
51+
@ConditionalOnProperty(prefix = "management.metrics.export.wavefront", name = "enabled",
52+
havingValue = "true", matchIfMissing = true)
5253
@EnableConfigurationProperties(WavefrontProperties.class)
5354
public class WavefrontMetricsExportAutoConfiguration {
5455

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
*/
3939
@Configuration(proxyBeanMethods = false)
4040
@ConditionalOnWebApplication
41-
@ConditionalOnProperty(prefix = "management.trace.http", name = "enabled", matchIfMissing = true)
41+
@ConditionalOnProperty(prefix = "management.trace.http", name = "enabled",
42+
matchIfMissing = true)
4243
@EnableConfigurationProperties(HttpTraceProperties.class)
4344
public class HttpTraceAutoConfiguration {
4445

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ public JettyAccessLogCustomizer jettyManagementAccessLogCustomizer() {
9696

9797
@Configuration(proxyBeanMethods = false)
9898
@ConditionalOnClass({ EnableWebSecurity.class, Filter.class })
99-
@ConditionalOnBean(name = BeanIds.SPRING_SECURITY_FILTER_CHAIN, search = SearchStrategy.ANCESTORS)
99+
@ConditionalOnBean(name = BeanIds.SPRING_SECURITY_FILTER_CHAIN,
100+
search = SearchStrategy.ANCESTORS)
100101
static class ServletManagementContextSecurityConfiguration {
101102

102103
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public ManagementServletContext managementServletContext(
5555
// Put Servlets and Filters in their own nested class so they don't force early
5656
// instantiation of ManagementServerProperties.
5757
@Configuration(proxyBeanMethods = false)
58-
@ConditionalOnProperty(prefix = "management.server", name = "add-application-context-header", havingValue = "true")
58+
@ConditionalOnProperty(prefix = "management.server",
59+
name = "add-application-context-header", havingValue = "true")
5960
protected static class ApplicationContextFilterConfiguration {
6061

6162
@Bean

0 commit comments

Comments
 (0)