From 5ace000c751b5b1fe02c02ff63ce35a2c749268e Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 3 Jul 2018 18:41:51 +0900 Subject: [PATCH] Remove unnecessary FieldDoesNotExistException handling Previously, FieldDoesNotExistException was caught when extracting a field to determine whether or not it is missing (absent or an empty collection). The handling is redundant due to an earlier call to hasField so this commit removes it. Closes gh-525 --- .../restdocs/payload/JsonContentHandler.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonContentHandler.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonContentHandler.java index 2978dd56..4187b514 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonContentHandler.java +++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonContentHandler.java @@ -84,15 +84,10 @@ class JsonContentHandler implements ContentHandler { if (!this.fieldProcessor.hasField(candidate.getPath(), payload)) { return true; } - try { - ExtractedField extracted = this.fieldProcessor.extract(candidate.getPath(), - payload); - return extracted.getValue() instanceof Collection - && ((Collection) extracted.getValue()).isEmpty(); - } - catch (FieldDoesNotExistException ex) { - return true; - } + ExtractedField extracted = this.fieldProcessor.extract(candidate.getPath(), + payload); + return extracted.getValue() instanceof Collection + && ((Collection) extracted.getValue()).isEmpty(); } @Override