Remove defaultMaxAge from BaseProvider intf

Author: scottgerring

examples/powertools-examples-parameters/src/main/java/org/demo/parameters/ParametersFunction.java

@@ -54,7 +54,7 @@ public class ParametersFunction implements RequestHandler<APIGatewayProxyRequest
             .builder()
             .build();
 
-    String simpleValue = ssmProvider.defaultMaxAge(30, SECONDS).get("/powertools-java/sample/simplekey");
+    String simpleValue = ssmProvider.withMaxAge(30, SECONDS).get("/powertools-java/sample/simplekey");
     String listValue = ssmProvider.withMaxAge(60, SECONDS).get("/powertools-java/sample/keylist");
     MyObject jsonObj = ssmProvider.withTransformation(json).get("/powertools-java/sample/keyjson", MyObject.class);
     Map<String, String> allValues = ssmProvider.getMultiple("/powertools-java/sample");

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

@@ -62,7 +62,6 @@ public void getValue() {
         String expectedValue = "Value1";
         GetSecretValueResponse response = GetSecretValueResponse.builder().secretString(expectedValue).build();
         Mockito.when(client.getSecretValue(paramCaptor.capture())).thenReturn(response);
-        provider.defaultMaxAge(1, ChronoUnit.DAYS);
         provider.withMaxAge(2, ChronoUnit.DAYS);
 
         String value = provider.getValue(key);

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

@@ -197,7 +197,6 @@ private void initMock(String expectedValue) {
         Parameter parameter = Parameter.builder().value(expectedValue).build();
         GetParameterResponse result = GetParameterResponse.builder().parameter(parameter).build();
         Mockito.when(client.getParameter(paramCaptor.capture())).thenReturn(result);
-        provider.defaultMaxAge(1, ChronoUnit.DAYS);
         provider.withMaxAge(2, ChronoUnit.DAYS);
         provider.recursive();
     }

powertools-parameters/powertools-parameters-tests/src/test/java/software/amazon/lambda/powertools/parameters/BaseProviderTest.java

@@ -25,6 +25,7 @@
 import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;
 
 import java.time.Clock;
+import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.Base64;
 import java.util.HashMap;
@@ -136,8 +137,10 @@ public void get_customTTL_expired_shouldGetValue() {
     }
 
     @Test
+    // TODO Scott - remove this, or change to mutating the CacheManager first?
     public void get_customDefaultTTL_cached_shouldGetFromCache() {
-        provider.defaultMaxAge(12, ChronoUnit.MINUTES).get("foobar");
+        provider.cacheManager.setDefaultExpirationTime(Duration.of(12, MINUTES));
+        provider.get("foobar");
         getFromStore = false;
 
         provider.setClock(offset(clock, of(10, MINUTES)));
@@ -148,7 +151,6 @@ public void get_customDefaultTTL_cached_shouldGetFromCache() {
 
     @Test
     public void get_customDefaultTTL_expired_shouldGetValue() {
-        provider.defaultMaxAge(2, ChronoUnit.MINUTES).get("barbaz");
         getFromStore = false;
 
         provider.setClock(offset(clock, of(3, MINUTES)));
@@ -159,9 +161,7 @@ public void get_customDefaultTTL_expired_shouldGetValue() {
 
     @Test
     public void get_customDefaultTTLAndTTL_cached_shouldGetFromCache() {
-        provider.defaultMaxAge(12, ChronoUnit.MINUTES)
-                .withMaxAge(5, SECONDS)
-                .get("foobaz");
+        provider.get("foobaz");
         getFromStore = false;
 
         provider.setClock(offset(clock, of(4, SECONDS)));
@@ -172,8 +172,7 @@ public void get_customDefaultTTLAndTTL_cached_shouldGetFromCache() {
 
     @Test
     public void get_customDefaultTTLAndTTL_expired_shouldGetValue() {
-        provider.defaultMaxAge(2, ChronoUnit.MINUTES)
-                .withMaxAge(5, SECONDS)
+        provider.withMaxAge(5, SECONDS)
                 .get("bariton");
         getFromStore = false;
 
@@ -274,8 +273,9 @@ public void getObject_customTTL_expired_shouldGetValue() {
     public void getObject_customDefaultTTL_cached_shouldGetFromCache() {
         provider.setValue("{\"foo\":\"Foo\", \"bar\":42, \"baz\":123456789}");
 
-        provider.defaultMaxAge(12, ChronoUnit.MINUTES)
-                .withTransformation(json)
+        provider.cacheManager.setDefaultExpirationTime(Duration.of(12, MINUTES));
+
+        provider.withTransformation(json)
                 .get("foo", ObjectToDeserialize.class);
         getFromStore = false;
 
@@ -286,11 +286,11 @@ public void getObject_customDefaultTTL_cached_shouldGetFromCache() {
     }
 
     @Test
+    // TODO Scott
     public void getObject_customDefaultTTL_expired_shouldGetValue() {
         provider.setValue("{\"foo\":\"Foo\", \"bar\":42, \"baz\":123456789}");
 
-        provider.defaultMaxAge(2, ChronoUnit.MINUTES)
-                .withTransformation(json)
+        provider.withTransformation(json)
                 .get("foo", ObjectToDeserialize.class);
         getFromStore = false;
 
@@ -301,10 +301,10 @@ public void getObject_customDefaultTTL_expired_shouldGetValue() {
     }
 
     @Test
+    // TODO Scott
     public void getObject_customDefaultTTLAndTTL_cached_shouldGetFromCache() {
         provider.setValue("{\"foo\":\"Foo\", \"bar\":42, \"baz\":123456789}");
-        provider.defaultMaxAge(12, ChronoUnit.MINUTES)
-                .withMaxAge(5, SECONDS)
+        provider.withMaxAge(5, SECONDS)
                 .withTransformation(json)
                 .get("foo", ObjectToDeserialize.class);
         getFromStore = false;
@@ -316,11 +316,11 @@ public void getObject_customDefaultTTLAndTTL_cached_shouldGetFromCache() {
     }
 
     @Test
+    // TODO Scott
     public void getObject_customDefaultTTLAndTTL_expired_shouldGetValue() {
         provider.setValue("{\"foo\":\"Foo\", \"bar\":42, \"baz\":123456789}");
 
-        provider.defaultMaxAge(2, ChronoUnit.MINUTES)
-                .withMaxAge(5, SECONDS)
+        provider.withMaxAge(5, SECONDS)
                 .withTransformation(json)
                 .get("foo", ObjectToDeserialize.class);
         getFromStore = false;

powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/BaseProvider.java

@@ -60,25 +60,10 @@ public BaseProvider(CacheManager cacheManager, TransformationManager transformat
      */
     protected abstract Map<String, String> getMultipleValues(String path);
 
-    /**
-     * (Optional) Set the default max age for the cache of all parameters. Override the default 5 seconds.<br/>
-     * If for some parameters, you need to set a different maxAge, use {@link #withMaxAge(int, ChronoUnit)}.<br />
-     * Use {@link #withMaxAge(int, ChronoUnit)} after {#defaultMaxAge(int, ChronoUnit)} in the chain.
-     *
-     * @param maxAge Maximum time to cache the parameter, before calling the underlying parameter store.
-     * @param unit   Unit of time
-     * @return the provider itself in order to chain calls (eg. <pre>provider.defaultMaxAge(10, SECONDS).get("key")</pre>).
-     */
-    public BaseProvider defaultMaxAge(int maxAge, ChronoUnit unit) {
-        Duration duration = Duration.of(maxAge, unit);
-        cacheManager.setDefaultExpirationTime(duration);
-        return this;
-    }
-
     /**
      * (Optional) Builder method to call before {@link #get(String)} or {@link #get(String, Class)}
      * to set cache max age for the parameter to get.<br/><br/>
-     * The max age is reset to default (either 5 or a custom value set with {@link #defaultMaxAge}) after each get,
+     * The max age is reset to default (either 5 or a custom value that may be set on the CacheManager) after each get,
      * so you need to use this method for each parameter to cache with non-default max age.<br/><br/>
      *
      * <b>Not Thread Safe</b>: calling this method simultaneously by several threads