fix NPE in json replace filter

zalando · Dec 9, 2021 · cd7470a · cd7470a
1 parent 01c8a81
commit cd7470a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/logbook-json/src/main/java/org/zalando/logbook/json/JsonPathBodyFilters.java b/logbook-json/src/main/java/org/zalando/logbook/json/JsonPathBodyFilters.java
@@ -62,10 +62,12 @@ public BodyFilter replace(final UnaryOperator<String> replacementFunction) {
             return filter(context -> context.map(path, (node, config) -> node == null ? NullNode.getInstance() : new TextNode(replacementFunction.apply(node.toString()))));
         }
 
-        public BodyFilter replace(
-                final Pattern pattern, final String replacement) {
-
+        public BodyFilter replace(final Pattern pattern, final String replacement) {
             return filter(context -> context.map(path, (node, config) -> {
+                if (node == null) {
+                    return NullNode.getInstance();
+                }
+
                 final Matcher matcher = pattern.matcher(node.toString());
 
                 if (matcher.find()) {

diff --git a/logbook-json/src/test/java/org/zalando/logbook/json/JsonPathBodyFiltersTest.java b/logbook-json/src/test/java/org/zalando/logbook/json/JsonPathBodyFiltersTest.java
@@ -1,6 +1,5 @@
 package org.zalando.logbook.json;
 
-import com.fasterxml.jackson.databind.node.DoubleNode;
 import com.google.common.io.Resources;
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.Configuration.Defaults;
@@ -10,6 +9,7 @@
 import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
+import lombok.SneakyThrows;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.zalando.logbook.BodyFilter;
@@ -28,13 +28,14 @@
 import static org.zalando.logbook.json.JsonBodyFilters.accessToken;
 import static org.zalando.logbook.json.JsonPathBodyFilters.jsonPath;
 
+@SuppressWarnings("UnstableApiUsage")
 class JsonPathBodyFiltersTest {
 
     private final String type = "application/json";
     private final String student;
 
-    @SuppressWarnings("UnstableApiUsage")
-    JsonPathBodyFiltersTest() throws IOException {
+    @SneakyThrows
+    JsonPathBodyFiltersTest() {
         this.student = Resources.toString(getResource("student.json"), UTF_8);
     }
 
@@ -268,4 +269,14 @@ void shouldReturnSameBodyWhenBodyIsInvalidJson() {
 
         assertThat(actual).isEqualTo(invalidBody);
     }
+
+    @Test
+    void shouldNotFailWhenThereAreNullNodes() {
+        String invalidBody = "{\"name\":null}";
+        final BodyFilter unit = jsonPath("$.name").replace(compile("\\s+"), "XXX");
+
+        String actual = unit.filter(type, invalidBody);
+
+        assertThat(actual).isEqualTo(invalidBody);
+    }
 }