refact(sl20): switch to one single JSONMapper instsance

1 files changed, 6 insertions, 9 deletions

diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtils.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtils.java
index 690a07dd..4e939d55 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtils.java
+++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtils.java
@@ -23,8 +23,6 @@ import org.jose4j.jws.AlgorithmIdentifiers;
 import org.jose4j.jwx.HeaderParameterNames;
 import org.jose4j.keys.X509Util;
 import org.jose4j.lang.JoseException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
@@ -43,18 +41,19 @@ import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration;
 import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration.KeyStoreType;
 import at.gv.egiz.eaaf.core.impl.data.Pair;
 import at.gv.egiz.eaaf.core.impl.utils.JoseUtils;
-import at.gv.egiz.eaaf.core.impl.utils.X509Utils;
 import at.gv.egiz.eaaf.core.impl.utils.JoseUtils.JwsResult;
+import at.gv.egiz.eaaf.core.impl.utils.X509Utils;
 import at.gv.egiz.eaaf.modules.auth.sl20.Constants;
 import at.gv.egiz.eaaf.modules.auth.sl20.data.VerificationResult;
 import at.gv.egiz.eaaf.modules.auth.sl20.exceptions.SL20Exception;
 import at.gv.egiz.eaaf.modules.auth.sl20.exceptions.SL20SecurityException;
 import at.gv.egiz.eaaf.modules.auth.sl20.exceptions.SlCommandoBuildException;
 import at.gv.egiz.eaaf.modules.auth.sl20.exceptions.SlCommandoParserException;
+import lombok.extern.slf4j.Slf4j;
 
 @Service
+@Slf4j
 public class JsonSecurityUtils implements IJoseTools {
-  private static final Logger log = LoggerFactory.getLogger(JsonSecurityUtils.class);
 
   private static final String FRIENDLYNAME_KEYSTORE = "SL2.0 KeyStore";
   private static final String FRIENDLYNAME_TRUSTSTORE = "SL2.0 TrustStore";
@@ -67,8 +66,6 @@ public class JsonSecurityUtils implements IJoseTools {
   private Pair<KeyStore, Provider> keyStore;
   private Pair<KeyStore, Provider> trustStore;
 
-  private static JsonMapper mapper = new JsonMapper();
-
   @PostConstruct
   protected void initalize() throws SL20Exception {
     log.info("Initialize SL2.0 authentication security constrains ... ");
@@ -160,8 +157,8 @@ public class JsonSecurityUtils implements IJoseTools {
 
     final JwsResult result = JoseUtils.validateSignature(serializedContent, trustedCerts, constraints);
     return new VerificationResult(
-        mapper.getMapper().readTree(result.getFullJoseHeader().getFullHeaderAsJsonString()),
-        mapper.getMapper().readTree(result.getPayLoad()),
+        JsonMapper.getMapper().readTree(result.getFullJoseHeader().getFullHeaderAsJsonString()),
+        JsonMapper.getMapper().readTree(result.getPayLoad()),
         result.getX5cCerts(), result.isValid());
 
   }
@@ -279,7 +276,7 @@ public class JsonSecurityUtils implements IJoseTools {
       receiverJwe.setKey(JoseUtils.convertToBcKeyIfRequired(encryptionCred.getFirst()));
 
       // decrypt payload
-      return mapper.getMapper().readTree(receiverJwe.getPlaintextString());
+      return JsonMapper.getMapper().readTree(receiverJwe.getPlaintextString());
 
     } catch (final JoseException | EaafKeyAccessException e) {
       log.warn("SL2.0 result decryption FAILED", e);