Skip to content

Pretty printing and beneathPath change how JSON numbers are documented #1078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chuuminggg wants to merge 1 commit into
base: 4.0.x
Choose a base branch
from
Open

Pretty printing and beneathPath change how JSON numbers are documented #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...java/org/springframework/restdocs/operation/preprocess/PrettyPrintingContentModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import tools.jackson.databind.DeserializationFeature;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.SerializationFeature;
import tools.jackson.databind.json.JsonMapper;
Expand Down Expand Up @@ -139,6 +140,7 @@ private static final class JsonPrettyPrinter implements PrettyPrinter {

private final ObjectMapper objectMapper = JsonMapper.builder()
.enable(SerializationFeature.INDENT_OUTPUT)
.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
.build();

@Override
Expand Down
5 changes: 4 additions & 1 deletion ...c/main/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import org.jspecify.annotations.Nullable;
import tools.jackson.core.JacksonException;
import tools.jackson.databind.DeserializationFeature;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.SerializationFeature;
import tools.jackson.databind.json.JsonMapper;
Expand All @@ -31,7 +32,9 @@
public class FieldPathPayloadSubsectionExtractor
implements PayloadSubsectionExtractor<FieldPathPayloadSubsectionExtractor> {

private static final ObjectMapper objectMapper = new ObjectMapper();
private static final ObjectMapper objectMapper = JsonMapper.builder()
.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
.build();

private static final ObjectMapper prettyPrintingOjectMapper = JsonMapper.builder()
.enable(SerializationFeature.INDENT_OUTPUT)
Expand Down
8 changes: 8 additions & 0 deletions ...org/springframework/restdocs/operation/preprocess/PrettyPrintingContentModifierTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ void prettyPrintJson() {
.isEqualTo(String.format("{%n \"a\" : 5%n}").getBytes());
}

@Test
void prettyPrintJsonPreservesNumbers() {
String content = "{\"a\":10.50,\"b\":0.1000000000000000055511151231257827,\"c\":12345678901234567890.123}";
assertThat(new String(new PrettyPrintingContentModifier().modifyContent(content.getBytes(), null)))
.isEqualTo(String.format("{%n \"a\" : 10.50,%n \"b\" : 0.1000000000000000055511151231257827,%n"
+ " \"c\" : 12345678901234567890.123%n}"));
}

@Test
void prettyPrintXml() {
assertThat(new PrettyPrintingContentModifier()
Expand Down
10 changes: 10 additions & 0 deletions ...t/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,16 @@ void extractedSubsectionIsNotPrettyPrintedWhenInputIsNotPrettyPrinted() throws J
assertThat(new String(extractedSubsection)).isEqualTo(new String(subsection));
}

@Test
void extractedSubsectionPreservesNumbers() {
byte[] extractedSubsection = new FieldPathPayloadSubsectionExtractor("a").extractSubsection(
"{\"a\":{\"b\":10.50,\"c\":0.1000000000000000055511151231257827,\"d\":12345678901234567890.123}}"
.getBytes(),
MediaType.APPLICATION_JSON);
assertThat(new String(extractedSubsection))
.isEqualTo("{\"b\":10.50,\"c\":0.1000000000000000055511151231257827,\"d\":12345678901234567890.123}");
}

@Test
void extractNonExistentSubsection() {
assertThatThrownBy(() -> new FieldPathPayloadSubsectionExtractor("a.c")
Expand Down
Loading