jackson 2.16 changes some of its default settings so we consolidate our use of the ObjectMapper.

Unless special options are used, use a common instance, or create via factory metod.

1 files changed, 2 insertions, 4 deletions

diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/base/JsonSecurityRequestFilterBase.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/base/JsonSecurityRequestFilterBase.java
index 510a47e6dd9..f1bf748ae8b 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/base/JsonSecurityRequestFilterBase.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/base/JsonSecurityRequestFilterBase.java
@@ -1,9 +1,9 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http.filter.security.base;
 
+import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.jdisc.Response;
@@ -27,7 +27,6 @@ import java.util.logging.Logger;
 public abstract class JsonSecurityRequestFilterBase extends AbstractComponent implements SecurityRequestFilter {
 
     private static final Logger log = Logger.getLogger(JsonSecurityRequestFilterBase.class.getName());
-    private static final ObjectMapper mapper = new ObjectMapper();
 
     @Override
     public final void filter(DiscFilterRequest request, ResponseHandler handler) {
@@ -37,10 +36,9 @@ public abstract class JsonSecurityRequestFilterBase extends AbstractComponent im
 
     protected abstract Optional<ErrorResponse> filter(DiscFilterRequest request);
 
-    protected ObjectMapper jsonMapper() { return mapper; }
-
     private void writeResponse(DiscFilterRequest request, ErrorResponse error, ResponseHandler responseHandler) {
         JsonNode json;
+        var mapper = Jackson.mapper();
         if (error.customJson != null) {
             json = error.customJson;
         } else {