Merge branch 'v2' into feature/high-res-metrics

Author: scottgerring

pom.xml

@@ -89,9 +89,9 @@
         <log4j.version>2.20.0</log4j.version>
         <log4j.version>2.22.0</log4j.version>
         <slf4j.version>2.0.7</slf4j.version>
-        <jackson.version>2.15.3</jackson.version>
+        <jackson.version>2.16.0</jackson.version>
         <aws.sdk.version>2.21.0</aws.sdk.version>
-        <aws.xray.recorder.version>2.14.0</aws.xray.recorder.version>
+        <aws.xray.recorder.version>2.15.0</aws.xray.recorder.version>
         <payloadoffloading-common.version>2.1.3</payloadoffloading-common.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <lambda.core.version>1.2.3</lambda.core.version>

powertools-parameters/powertools-parameters-appconfig/src/main/java/software/amazon/lambda/powertools/parameters/appconfig/AppConfigProviderBuilder.java

@@ -51,7 +51,9 @@ public AppConfigProvider build() {
         if (application == null) {
             throw new IllegalStateException("No application provided; please provide one");
         }
-
+        if (transformationManager == null) {
+            transformationManager = new TransformationManager();
+        }
         // Create a AppConfigDataClient if we haven't been given one
         if (client == null) {
             client = AppConfigDataClient.builder()

powertools-parameters/powertools-parameters-appconfig/src/test/java/software/amazon/lambda/powertools/parameters/appconfig/AppConfigProviderTest.java

@@ -17,7 +17,9 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.assertj.core.api.Assertions.assertThatRuntimeException;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.MockitoAnnotations.openMocks;
+import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -216,4 +218,15 @@ public void testAppConfigProviderBuilderMissingApplication_throwsException() {
                         .build())
                 .withMessage("No application provided; please provide one");
     }
+    @Test
+    public void testAppConfigProvider_withoutParameter_shouldHaveDefaultTransformationManager() {
+
+        // Act
+        AppConfigProvider appConfigProvider = AppConfigProvider.builder()
+                .withEnvironment("test")
+                .withApplication("app")
+                .build();
+        // Assert
+        assertDoesNotThrow(()->appConfigProvider.withTransformation(json));
+    }
 }

powertools-parameters/powertools-parameters-dynamodb/src/main/java/software/amazon/lambda/powertools/parameters/dynamodb/DynamoDbProviderBuilder.java

@@ -61,6 +61,9 @@ public DynamoDbProvider build() {
         if (client == null) {
             client = createClient();
         }
+        if (transformationManager == null) {
+            transformationManager = new TransformationManager();
+        }
         provider = new DynamoDbProvider(cacheManager, transformationManager, client, table);
 
         return provider;

powertools-parameters/powertools-parameters-dynamodb/src/test/java/software/amazon/lambda/powertools/parameters/dynamodb/DynamoDbProviderTest.java

@@ -16,7 +16,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.MockitoAnnotations.openMocks;
+import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -225,5 +227,14 @@ public void testDynamoDBBuilderMissingTable_throwsException() {
                 .withCacheManager(new CacheManager())
                 .build());
     }
+    @Test
+    public void testDynamoDBBuilder_withoutParameter_shouldHaveDefaultTransformationManager() {
+
+        // Act
+        DynamoDbProvider dynamoDbProvider = DynamoDbProvider.builder().withTable("test-table")
+                .build();
+        // Assert
+        assertDoesNotThrow(()->dynamoDbProvider.withTransformation(json));
+    }
 
 }

powertools-parameters/powertools-parameters-secrets/src/main/java/software/amazon/lambda/powertools/parameters/secrets/SecretsProviderBuilder.java

@@ -59,7 +59,9 @@ public SecretsProvider build() {
         if (client == null) {
             client = createClient();
         }
-
+        if(transformationManager == null){
+            transformationManager = new TransformationManager();
+        }
         provider = new SecretsProvider(cacheManager, transformationManager, client);
 
         return provider;

powertools-parameters/powertools-parameters-secrets/src/test/java/software/amazon/lambda/powertools/parameters/secrets/SecretsProviderTest.java

@@ -16,10 +16,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatRuntimeException;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;
 
 import java.time.temporal.ChronoUnit;
 import java.util.Base64;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -105,4 +108,14 @@ public void testGetSecretsProvider_withoutParameter_shouldCreateDefaultClient()
         assertNotNull(secretsProvider);
         assertNotNull(secretsProvider.getClient());
     }
+
+    @Test
+    public void testGetSecretsProvider_withoutParameter_shouldHaveDefaultTransformationManager() {
+
+        // Act
+        SecretsProvider secretsProvider = SecretsProvider.builder()
+                .build();
+        // Assert
+        assertDoesNotThrow(()->secretsProvider.withTransformation(json));
+    }
 }

powertools-parameters/powertools-parameters-ssm/src/main/java/software/amazon/lambda/powertools/parameters/ssm/SSMProviderBuilder.java

@@ -57,6 +57,9 @@ public SSMProvider build() {
             client = createClient();
         }
 
+        if(transformationManager == null){
+            transformationManager = new TransformationManager();
+        }
         provider = new SSMProvider(cacheManager, transformationManager, client);
 
         return provider;

powertools-parameters/powertools-parameters-ssm/src/test/java/software/amazon/lambda/powertools/parameters/ssm/SSMProviderTest.java

@@ -16,6 +16,8 @@
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;
 
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -194,6 +196,16 @@ public void getMultipleWithNextToken() {
         assertThat(request2.nextToken()).isEqualTo("123abc");
     }
 
+    @Test
+    public void testSSMProvider_withoutParameter_shouldHaveDefaultTransformationManager() {
+
+        // Act
+        SSMProvider ssmProvider = SSMProvider.builder()
+                .build();
+        // Assert
+        assertDoesNotThrow(()->ssmProvider.withTransformation(json));
+    }
+
     private void initMock(String expectedValue) {
         Parameter parameter = Parameter.builder().value(expectedValue).build();
         GetParameterResponse result = GetParameterResponse.builder().parameter(parameter).build();