Skip to content

Commit e473364

Browse files
committed
Merge branch '1.2.x'
2 parents 4757635 + 6ab376e commit e473364

507 files changed

Lines changed: 2657 additions & 2476 deletions

File tree

Some content is hidden

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

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ public Map<String, Object> getData() {
135135

136136
@Override
137137
public String toString() {
138-
return "AuditEvent [timestamp=" + this.timestamp + ", principal="
139-
+ this.principal + ", type=" + this.type + ", data=" + this.data + "]";
138+
return "AuditEvent [timestamp=" + this.timestamp + ", principal=" + this.principal
139+
+ ", type=" + this.type + ", data=" + this.data + "]";
140140
}
141141

142142
}

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditApplicationEvent.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public class AuditApplicationEvent extends ApplicationEvent {
4040
* @param data the event data
4141
* @see AuditEvent#AuditEvent(String, String, Map)
4242
*/
43-
public AuditApplicationEvent(String principal, String type, Map<String, Object> data) {
43+
public AuditApplicationEvent(String principal, String type,
44+
Map<String, Object> data) {
4445
this(new AuditEvent(principal, type, data));
4546
}
4647

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ public static class Commit {
266266
private String time;
267267

268268
public String getId() {
269-
return this.id == null ? "" : (this.id.length() > 7 ? this.id.substring(
270-
0, 7) : this.id);
269+
return this.id == null ? ""
270+
: (this.id.length() > 7 ? this.id.substring(0, 7) : this.id);
271271
}
272272

273273
public void setId(String id) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public class ManagementServerProperties implements SecurityPrerequisite {
5353
* management endpoints. This is a useful place to put user-defined access rules if
5454
* you want to override the default access rules.
5555
*/
56-
public static final int ACCESS_OVERRIDE_ORDER = ManagementServerProperties.BASIC_AUTH_ORDER - 1;
56+
public static final int ACCESS_OVERRIDE_ORDER = ManagementServerProperties.BASIC_AUTH_ORDER
57+
- 1;
5758

5859
/**
5960
* Management endpoint HTTP port. Use the same port as the application by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ protected boolean shouldNotFilterAsyncDispatch() {
9191

9292
@Override
9393
protected void doFilterInternal(HttpServletRequest request,
94-
HttpServletResponse response, FilterChain chain) throws ServletException,
95-
IOException {
94+
HttpServletResponse response, FilterChain chain)
95+
throws ServletException, IOException {
9696
StopWatch stopWatch = createStopWatchIfNecessary(request);
9797
String path = new UrlPathHelper().getPathWithinApplication(request);
9898
int status = HttpStatus.INTERNAL_SERVER_ERROR.value();

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ public class ShellProperties {
5050
private boolean defaultAuth = true;
5151

5252
@Autowired(required = false)
53-
private CrshShellProperties[] additionalProperties = new CrshShellProperties[] { new SimpleAuthenticationProperties() };
53+
private CrshShellProperties[] additionalProperties = new CrshShellProperties[] {
54+
new SimpleAuthenticationProperties() };
5455

5556
/**
5657
* Scan for changes and update the command if necessary (in seconds).
@@ -215,8 +216,8 @@ public static abstract class CrshShellProperties {
215216
/**
216217
* Base class for Auth specific properties.
217218
*/
218-
public static abstract class CrshShellAuthenticationProperties extends
219-
CrshShellProperties {
219+
public static abstract class CrshShellAuthenticationProperties
220+
extends CrshShellProperties {
220221

221222
}
222223

@@ -325,8 +326,8 @@ public Integer getPort() {
325326
* Auth specific properties for JAAS authentication.
326327
*/
327328
@ConfigurationProperties(prefix = "shell.auth.jaas", ignoreUnknownFields = false)
328-
public static class JaasAuthenticationProperties extends
329-
CrshShellAuthenticationProperties {
329+
public static class JaasAuthenticationProperties
330+
extends CrshShellAuthenticationProperties {
330331

331332
/**
332333
* JAAS domain.
@@ -354,8 +355,8 @@ public String getDomain() {
354355
* Auth specific properties for key authentication.
355356
*/
356357
@ConfigurationProperties(prefix = "shell.auth.key", ignoreUnknownFields = false)
357-
public static class KeyAuthenticationProperties extends
358-
CrshShellAuthenticationProperties {
358+
public static class KeyAuthenticationProperties
359+
extends CrshShellAuthenticationProperties {
359360

360361
/**
361362
* Path to the authentication key. This should point to a valid ".pem" file.
@@ -385,8 +386,8 @@ public String getPath() {
385386
* Auth specific properties for simple authentication.
386387
*/
387388
@ConfigurationProperties(prefix = "shell.auth.simple", ignoreUnknownFields = false)
388-
public static class SimpleAuthenticationProperties extends
389-
CrshShellAuthenticationProperties {
389+
public static class SimpleAuthenticationProperties
390+
extends CrshShellAuthenticationProperties {
390391

391392
private static Log logger = LogFactory
392393
.getLog(SimpleAuthenticationProperties.class);
@@ -460,8 +461,8 @@ public void setPassword(String password) {
460461
* Auth specific properties for Spring authentication.
461462
*/
462463
@ConfigurationProperties(prefix = "shell.auth.spring", ignoreUnknownFields = false)
463-
public static class SpringAuthenticationProperties extends
464-
CrshShellAuthenticationProperties {
464+
public static class SpringAuthenticationProperties
465+
extends CrshShellAuthenticationProperties {
465466

466467
/**
467468
* Comma-separated list of required roles to login to the CRaSH console.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ public boolean isEnabled() {
109109
return this.enabled;
110110
}
111111
if (this.environment != null) {
112-
return this.environment.getProperty(ENDPOINTS_ENABLED_PROPERTY,
113-
Boolean.class, true);
112+
return this.environment.getProperty(ENDPOINTS_ENABLED_PROPERTY, Boolean.class,
113+
true);
114114
}
115115
return true;
116116
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
* @author Dave Syer
3737
*/
3838
@ConfigurationProperties(prefix = "endpoints.beans", ignoreUnknownFields = false)
39-
public class BeansEndpoint extends AbstractEndpoint<List<Object>> implements
40-
ApplicationContextAware {
39+
public class BeansEndpoint extends AbstractEndpoint<List<Object>>
40+
implements ApplicationContextAware {
4141

4242
private final LiveBeansView liveBeansView = new LiveBeansView();
4343

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ public Collection<Metric<?>> metrics() {
8484
return metrics;
8585
}
8686

87-
private <T extends Number> void addMetric(Set<Metric<?>> metrics, String name, T value) {
87+
private <T extends Number> void addMetric(Set<Metric<?>> metrics, String name,
88+
T value) {
8889
if (value != null) {
8990
metrics.add(new Metric<T>(name, value));
9091
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public DumpEndpoint() {
4040

4141
@Override
4242
public List<ThreadInfo> invoke() {
43-
return Arrays.asList(ManagementFactory.getThreadMXBean().dumpAllThreads(true,
44-
true));
43+
return Arrays
44+
.asList(ManagementFactory.getThreadMXBean().dumpAllThreads(true, true));
4545
}
4646

4747
}

0 commit comments

Comments
 (0)