Skip to content

Commit d52bf83

Browse files
committed
Polish
1 parent aa63070 commit d52bf83

File tree

4 files changed

+10
-20
lines changed

4 files changed

+10
-20
lines changed

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
* @author Andy Wilkinson
7777
* @author Christoph Dreis
7878
* @author Mike Smithson
79+
* @author Scott Frederick
7980
*/
8081
class JavaConventions {
8182

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ private boolean includeStackTrace(ServletWebRequest request) {
6262
case ALWAYS:
6363
return true;
6464
case ON_PARAM:
65+
case ON_TRACE_PARAM:
6566
return getBooleanParameter(request, "trace");
6667
default:
6768
return false;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorProperties.java

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ public void setIncludeMessage(IncludeAttribute includeMessage) {
9090
}
9191

9292
public IncludeAttribute getIncludeBindingErrors() {
93-
return this.includeMessage;
93+
return this.includeBindingErrors;
9494
}
9595

96-
public void setIncludeBindingErrors(IncludeAttribute includeMessage) {
97-
this.includeMessage = includeMessage;
96+
public void setIncludeBindingErrors(IncludeAttribute includeBindingErrors) {
97+
this.includeBindingErrors = includeBindingErrors;
9898
}
9999

100100
public Whitelabel getWhitelabel() {
@@ -109,34 +109,23 @@ public enum IncludeStacktrace {
109109
/**
110110
* Never add stacktrace information.
111111
*/
112-
NEVER(IncludeAttribute.NEVER),
112+
NEVER,
113113

114114
/**
115115
* Always add stacktrace information.
116116
*/
117-
ALWAYS(IncludeAttribute.ALWAYS),
117+
ALWAYS,
118118

119119
/**
120120
* Add error attribute when the appropriate request parameter is "true".
121121
*/
122-
ON_PARAM(IncludeAttribute.ON_PARAM),
122+
ON_PARAM,
123123

124124
/**
125125
* Add stacktrace information when the "trace" request parameter is "true".
126-
* @deprecated since 2.3.0 in favor of {@link #ON_PARAM}
127126
*/
128-
@Deprecated
129-
ON_TRACE_PARAM(IncludeAttribute.ON_PARAM);
130-
131-
private final IncludeAttribute include;
132-
133-
IncludeStacktrace(IncludeAttribute include) {
134-
this.include = include;
135-
}
136-
137-
public IncludeAttribute getInclude() {
138-
return this.include;
139-
}
127+
@Deprecated // since 2.3.0 in favor of {@link #ON_PARAM}
128+
ON_TRACE_PARAM;
140129

141130
}
142131

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/ConversionServiceArguments.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
final class ConversionServiceArguments {
3939

4040
private ConversionServiceArguments() {
41-
4241
}
4342

4443
static Stream<? extends Arguments> with(Formatter<?> formatter) {

0 commit comments

Comments
 (0)