From 6edb0d49e92394e8cf5ef88c321f5f19b41bd2ca Mon Sep 17 00:00:00 2001 From: Sergey Skrobotov Date: Thu, 23 Feb 2023 19:54:22 -0800 Subject: [PATCH] Adding a uniform configuration for all json/yaml mapper use cases: bugfix --- .../textsecuregcm/util/SystemMapper.java | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/util/SystemMapper.java b/service/src/main/java/org/whispersystems/textsecuregcm/util/SystemMapper.java index 52d61ced5..5578ba3b8 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/util/SystemMapper.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/util/SystemMapper.java @@ -7,18 +7,11 @@ package org.whispersystems.textsecuregcm.util; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.vdurmont.semver4j.Semver; -import java.io.IOException; import javax.annotation.Nonnull; public class SystemMapper { @@ -42,20 +35,9 @@ public class SystemMapper { return mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE) .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY) + .setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.PUBLIC_ONLY) .registerModules( - applicationModule(), new JavaTimeModule(), new Jdk8Module()); } - - private static Module applicationModule() { - return new SimpleModule() - .addDeserializer(Semver.class, new JsonDeserializer<>() { - @Override - public Semver deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException { - final String strValue = p.readValueAs(String.class); - return strValue != null ? new Semver(strValue) : null; - } - }); - } }