Use new utility module for JSON config

Author: jeromevdl

powertools-validation/pom.xml

@@ -46,6 +46,10 @@
             <groupId>software.amazon.lambda</groupId>
             <artifactId>powertools-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.lambda</groupId>
+            <artifactId>powertools-utilities</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>

powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/ValidationConfig.java

@@ -18,18 +18,17 @@
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.SpecVersion;
 import io.burt.jmespath.JmesPath;
-import io.burt.jmespath.RuntimeConfiguration;
 import io.burt.jmespath.function.BaseFunction;
-import io.burt.jmespath.function.FunctionRegistry;
-import io.burt.jmespath.jackson.JacksonRuntime;
-import software.amazon.lambda.powertools.validation.jmespath.Base64Function;
-import software.amazon.lambda.powertools.validation.jmespath.Base64GZipFunction;
-
-import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
+import software.amazon.lambda.powertools.utilities.JsonConfig;
+import software.amazon.lambda.powertools.utilities.jmespath.Base64Function;
+import software.amazon.lambda.powertools.utilities.jmespath.Base64GZipFunction;
 
 /**
  * Use this if you need to customize some part of the JSON Schema validation
- * (eg. specification version, Jackson ObjectMapper, or adding functions to JMESPath)
+ * (eg. specification version, Jackson ObjectMapper, or adding functions to JMESPath).
+ *
+ * For everything but the validation features (factory, schemaVersion), {@link ValidationConfig}
+ * is just a wrapper of {@link JsonConfig}.
  */
 public class ValidationConfig {
     private ValidationConfig() {
@@ -43,24 +42,9 @@ public static ValidationConfig get() {
         return ConfigHolder.instance;
     }
 
-    private static final ThreadLocal<ObjectMapper> om = ThreadLocal.withInitial(() -> {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
-        return objectMapper;
-    });
-
     private SpecVersion.VersionFlag jsonSchemaVersion = SpecVersion.VersionFlag.V7;
     private JsonSchemaFactory factory = JsonSchemaFactory.getInstance(jsonSchemaVersion);
 
-    private final FunctionRegistry defaultFunctions = FunctionRegistry.defaultRegistry();
-    private final FunctionRegistry customFunctions = defaultFunctions.extend(
-            new Base64Function(),
-            new Base64GZipFunction());
-    private final RuntimeConfiguration configuration = new RuntimeConfiguration.Builder()
-            .withFunctionRegistry(customFunctions)
-            .build();
-    private JmesPath<JsonNode> jmesPath = new JacksonRuntime(configuration, getObjectMapper());
-
     /**
      * Set the version of the json schema specifications (default is V7)
      *
@@ -85,13 +69,7 @@ public SpecVersion.VersionFlag getSchemaVersion() {
      * @param <T> Must extends {@link BaseFunction}
      */
     public <T extends BaseFunction> void addFunction(T function) {
-        FunctionRegistry functionRegistryWithExtendedFunctions = configuration.functionRegistry().extend(function);
-
-        RuntimeConfiguration updatedConfig = new RuntimeConfiguration.Builder()
-                .withFunctionRegistry(functionRegistryWithExtendedFunctions)
-                .build();
-
-        jmesPath = new JacksonRuntime(updatedConfig, getObjectMapper());
+        JsonConfig.get().addFunction(function);
     }
 
     /**
@@ -109,7 +87,7 @@ public JsonSchemaFactory getFactory() {
      * @return the {@link JmesPath}
      */
     public JmesPath<JsonNode> getJmesPath() {
-        return jmesPath;
+        return JsonConfig.get().getJmesPath();
     }
 
     /**
@@ -118,6 +96,6 @@ public JmesPath<JsonNode> getJmesPath() {
      * @return the {@link ObjectMapper} to serialize / deserialize JSON
      */
     public ObjectMapper getObjectMapper() {
-        return om.get();
+        return JsonConfig.get().getObjectMapper();
     }
 }

powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/internal/ValidationAspect.java

@@ -26,10 +26,10 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.isHandlerMethod;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnRequestHandler;
+import static software.amazon.lambda.powertools.utilities.jmespath.Base64Function.decode;
+import static software.amazon.lambda.powertools.utilities.jmespath.Base64GZipFunction.decompress;
 import static software.amazon.lambda.powertools.validation.ValidationUtils.getJsonSchema;
 import static software.amazon.lambda.powertools.validation.ValidationUtils.validate;
-import static software.amazon.lambda.powertools.validation.jmespath.Base64Function.decode;
-import static software.amazon.lambda.powertools.validation.jmespath.Base64GZipFunction.decompress;
 
 /**
  * Aspect for {@link Validation} annotation