Browse Source

Polish

pull/21296/head
Phillip Webb 6 years ago
parent
commit
d52bf83ab2
  1. 1
      buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
  2. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ManagementErrorEndpoint.java
  3. 27
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorProperties.java
  4. 1
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/ConversionServiceArguments.java

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

@ -76,6 +76,7 @@ import org.springframework.util.FileCopyUtils; @@ -76,6 +76,7 @@ import org.springframework.util.FileCopyUtils;
* @author Andy Wilkinson
* @author Christoph Dreis
* @author Mike Smithson
* @author Scott Frederick
*/
class JavaConventions {

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

@ -62,6 +62,7 @@ public class ManagementErrorEndpoint { @@ -62,6 +62,7 @@ public class ManagementErrorEndpoint {
case ALWAYS:
return true;
case ON_PARAM:
case ON_TRACE_PARAM:
return getBooleanParameter(request, "trace");
default:
return false;

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

@ -90,11 +90,11 @@ public class ErrorProperties { @@ -90,11 +90,11 @@ public class ErrorProperties {
}
public IncludeAttribute getIncludeBindingErrors() {
return this.includeMessage;
return this.includeBindingErrors;
}
public void setIncludeBindingErrors(IncludeAttribute includeMessage) {
this.includeMessage = includeMessage;
public void setIncludeBindingErrors(IncludeAttribute includeBindingErrors) {
this.includeBindingErrors = includeBindingErrors;
}
public Whitelabel getWhitelabel() {
@ -109,34 +109,23 @@ public class ErrorProperties { @@ -109,34 +109,23 @@ public class ErrorProperties {
/**
* Never add stacktrace information.
*/
NEVER(IncludeAttribute.NEVER),
NEVER,
/**
* Always add stacktrace information.
*/
ALWAYS(IncludeAttribute.ALWAYS),
ALWAYS,
/**
* Add error attribute when the appropriate request parameter is "true".
*/
ON_PARAM(IncludeAttribute.ON_PARAM),
ON_PARAM,
/**
* Add stacktrace information when the "trace" request parameter is "true".
* @deprecated since 2.3.0 in favor of {@link #ON_PARAM}
*/
@Deprecated
ON_TRACE_PARAM(IncludeAttribute.ON_PARAM);
private final IncludeAttribute include;
IncludeStacktrace(IncludeAttribute include) {
this.include = include;
}
public IncludeAttribute getInclude() {
return this.include;
}
@Deprecated // since 2.3.0 in favor of {@link #ON_PARAM}
ON_TRACE_PARAM;
}

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

@ -38,7 +38,6 @@ import org.springframework.format.support.FormattingConversionService; @@ -38,7 +38,6 @@ import org.springframework.format.support.FormattingConversionService;
final class ConversionServiceArguments {
private ConversionServiceArguments() {
}
static Stream<? extends Arguments> with(Formatter<?> formatter) {

Loading…
Cancel
Save