From dd055ffcb907962a15c3bbca7cc32af66b08e150 Mon Sep 17 00:00:00 2001 From: TheoCaldas Date: Mon, 4 Jul 2022 22:16:05 -0300 Subject: [PATCH] Delimit output value in failure analysis --- .../boot/diagnostics/analyzer/BindFailureAnalyzer.java | 2 +- .../diagnostics/analyzer/BindValidationFailureAnalyzer.java | 2 +- .../analyzer/UnboundConfigurationPropertyFailureAnalyzer.java | 2 +- .../boot/diagnostics/analyzer/BindFailureAnalyzerTests.java | 2 +- .../analyzer/BindValidationFailureAnalyzerTests.java | 2 +- .../UnboundConfigurationPropertyFailureAnalyzerTests.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzer.java index 75f1b1c643a7..72e5d71cc1c6 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzer.java @@ -63,7 +63,7 @@ private FailureAnalysis analyzeGenericBindException(BindException cause) { 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())); } } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzer.java index 5c2d76a3100a..7a8a89031f06 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzer.java @@ -75,7 +75,7 @@ private FailureAnalysis analyzeBindValidationException(ExceptionDetails details) 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)); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzer.java index fbbcf9253deb..f574b1713607 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzer.java @@ -51,7 +51,7 @@ private FailureAnalysis analyzeUnboundConfigurationPropertiesException(BindExcep 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())); } } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzerTests.java index 51bfb5155135..5d5f09d03230 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzerTests.java @@ -100,7 +100,7 @@ void bindExceptionDueToMapConversionFailure() { } 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); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java index ea90d675bac1..237b3e5c8f8a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java @@ -91,7 +91,7 @@ void otherBindExceptionShouldReturnAnalysis() { } 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) { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzerTests.java index 0ea6eeb56204..fdaafaf97b15 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzerTests.java @@ -63,7 +63,7 @@ void bindExceptionDueToUnboundElements() { } 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); }