Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb
2019-07-23 15:35:31 +01:00
parent 0d92af7d55
commit 6c0dbacfce
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointConverter.java
View File

@@ -25,7 +25,8 @@ import java.lang.annotation.Target;
import org.springframework.beans.factory.annotation.Qualifier;
/**
* Qualifier for beans that are needed to convert {@link Endpoint} input parameters.
* Qualifier for beans that are needed to convert {@link Endpoint @Endpoint} input
* parameters.
*
* @author Chao Chang
* @since 2.2.0

12
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
View File

@@ -1101,7 +1101,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
void assertHasValue(Class<?> type, String expectedDescription) {
Object value = getValue(true);
if (value == null || isIndefiniteAndEmpty()) {
failWithMessage(getNoValueMessage());
failWithNoValueMessage();
}
if (type != null && !type.isInstance(value)) {
failWithMessage(getExpectedValueMessage(expectedDescription));
@@ -1133,21 +1133,21 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
}
catch (Exception ex) {
if (required) {
failWithMessage("%s. %s", getNoValueMessage(), ex.getMessage());
failWithNoValueMessage();
}
return null;
}
}
private void failWithNoValueMessage() {
failWithMessage("No value at JSON path \"%s\"", this.expression);
}
private Object read() {
CharSequence json = JsonContentAssert.this.actual;
return this.jsonPath.read((json != null) ? json.toString() : null, JsonContentAssert.this.configuration);
}
private String getNoValueMessage() {
return "No value at JSON path \"" + this.expression + "\"";
}
private String getExpectedValueMessage(String expectedDescription) {
return String.format("Expected %s at JSON path \"%s\" but found: %s", expectedDescription, this.expression,
ObjectUtils.nullSafeToString(StringUtils.quoteIfString(getValue(false))));