From 20467db01ad3ce9695d8a15b6a0a3f5219fa1f23 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 24 Nov 2023 22:25:54 +0100 Subject: Add back methods accidentally removed. --- .../http/filter/security/base/JsonSecurityRequestFilterBase.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 85af1bf70e5..90e5eeb99ba 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,6 +1,7 @@ // 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 com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.json.Jackson; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -28,6 +29,8 @@ public abstract class JsonSecurityRequestFilterBase extends AbstractComponent im private static final Logger log = Logger.getLogger(JsonSecurityRequestFilterBase.class.getName()); + protected ObjectMapper jsonMapper() { return Jackson.mapper(); } + @Override public final void filter(DiscFilterRequest request, ResponseHandler handler) { filter(request) @@ -38,7 +41,7 @@ public abstract class JsonSecurityRequestFilterBase extends AbstractComponent im private void writeResponse(DiscFilterRequest request, ErrorResponse error, ResponseHandler responseHandler) { JsonNode json; - var mapper = Jackson.mapper(); + var mapper = jsonMapper(); if (error.customJson != null) { json = error.customJson; } else { -- cgit v1.2.3