From 6c0960d30454aeabdc333e009c4fe636883a1eb6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 14 Jun 2021 21:12:02 +0100 Subject: [PATCH] Polish "Improve exception message when subsection is empty array" See gh-732 --- .../payload/FieldPathPayloadSubsectionExtractor.java | 2 +- .../payload/FieldPathPayloadSubsectionExtractorTests.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractor.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractor.java index e91fd126..299fab77 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractor.java +++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractor.java @@ -93,7 +93,7 @@ public class FieldPathPayloadSubsectionExtractor if (value instanceof List) { List extractedList = (List) value; if (extractedList.isEmpty()) { - throw new PayloadHandlingException(this.fieldPath + " identifies a section of payload, but the section is empty"); + throw new PayloadHandlingException(this.fieldPath + " identifies an empty section of the payload"); } JsonContentHandler contentHandler = new JsonContentHandler(payload, descriptorsByPath.values()); Set uncommonPaths = JsonFieldPaths.from(extractedList).getUncommon().stream() diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractorTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractorTests.java index d8275d31..2d6febba 100644 --- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractorTests.java +++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/FieldPathPayloadSubsectionExtractorTests.java @@ -184,11 +184,11 @@ public class FieldPathPayloadSubsectionExtractorTests { } @Test - public void extractEmptySubsection() throws JsonParseException, JsonMappingException, IOException { + public void extractEmptyArraySubsection() throws JsonParseException, JsonMappingException, IOException { assertThatThrownBy(() -> new FieldPathPayloadSubsectionExtractor("a") .extractSubsection("{\"a\":[]}}".getBytes(), MediaType.APPLICATION_JSON)) - .isInstanceOf(PayloadHandlingException.class) - .hasMessage("a identifies a section of payload, but the section is empty"); + .isInstanceOf(PayloadHandlingException.class) + .hasMessage("a identifies an empty section of the payload"); } }