Browse Source

Delimit output value in failure analysis

See gh-31571
pull/32521/head
TheoCaldas 4 years ago committed by Stephane Nicoll
parent
commit
869ed4f71a
  1. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzer.java
  2. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzer.java
  3. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzer.java
  4. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzerTests.java
  5. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java
  6. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzerTests.java

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzer.java

@ -63,7 +63,7 @@ class BindFailureAnalyzer extends AbstractFailureAnalyzer<BindException> { @@ -63,7 +63,7 @@ class BindFailureAnalyzer extends AbstractFailureAnalyzer<BindException> {
private void buildDescription(StringBuilder description, ConfigurationProperty property) {
if (property != null) {
description.append(String.format("%n Property: %s", property.getName()));
description.append(String.format("%n Value: %s", property.getValue()));
description.append(String.format("%n Value: \"%s\"", property.getValue()));
description.append(String.format("%n Origin: %s", property.getOrigin()));
}
}

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzer.java

@ -75,7 +75,7 @@ class BindValidationFailureAnalyzer extends AbstractFailureAnalyzer<Throwable> { @@ -75,7 +75,7 @@ class BindValidationFailureAnalyzer extends AbstractFailureAnalyzer<Throwable> {
private void appendFieldError(StringBuilder description, FieldError error) {
Origin origin = Origin.from(error);
description.append(String.format("%n Property: %s", error.getObjectName() + "." + error.getField()));
description.append(String.format("%n Value: %s", error.getRejectedValue()));
description.append(String.format("%n Value: \"%s\"", error.getRejectedValue()));
if (origin != null) {
description.append(String.format("%n Origin: %s", origin));
}

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzer.java

@ -51,7 +51,7 @@ class UnboundConfigurationPropertyFailureAnalyzer @@ -51,7 +51,7 @@ class UnboundConfigurationPropertyFailureAnalyzer
private void buildDescription(StringBuilder description, ConfigurationProperty property) {
if (property != null) {
description.append(String.format("%n Property: %s", property.getName()));
description.append(String.format("%n Value: %s", property.getValue()));
description.append(String.format("%n Value: \"%s\"", property.getValue()));
description.append(String.format("%n Origin: %s", property.getOrigin()));
}
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzerTests.java

@ -101,7 +101,7 @@ class BindFailureAnalyzerTests { @@ -101,7 +101,7 @@ class BindFailureAnalyzerTests {
}
private static String failure(String property, String value, String origin, String reason) {
return String.format("Property: %s%n Value: %s%n Origin: %s%n Reason: %s", property, value, origin,
return String.format("Property: %s%n Value: \"%s\"%n Origin: %s%n Reason: %s", property, value, origin,
reason);
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java

@ -92,7 +92,7 @@ class BindValidationFailureAnalyzerTests { @@ -92,7 +92,7 @@ class BindValidationFailureAnalyzerTests {
}
private static String failure(String property, String value, String reason) {
return String.format("Property: %s%n Value: %s%n Reason: %s", property, value, reason);
return String.format("Property: %s%n Value: \"%s\"%n Reason: %s", property, value, reason);
}
private FailureAnalysis performAnalysis(Class<?> configuration, String... environment) {

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzerTests.java

@ -63,7 +63,7 @@ class UnboundConfigurationPropertyFailureAnalyzerTests { @@ -63,7 +63,7 @@ class UnboundConfigurationPropertyFailureAnalyzerTests {
}
private static String failure(String property, String value, String origin, String reason) {
return String.format("Property: %s%n Value: %s%n Origin: %s%n Reason: %s", property, value, origin,
return String.format("Property: %s%n Value: \"%s\"%n Origin: %s%n Reason: %s", property, value, origin,
reason);
}

Loading…
Cancel
Save