From 3c5e04f07d69eebca8eb332b185e365d3f490afe Mon Sep 17 00:00:00 2001 From: liuxinyu Date: Mon, 11 Oct 2021 07:32:03 -0500 Subject: [PATCH 1/4] avoid repeated get() --- .../amazon/lambda/powertools/parameters/cache/DataStore.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java b/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java index 351ba054d..6e403c93e 100644 --- a/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java +++ b/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java @@ -46,7 +46,8 @@ public void remove(String Key){ } public Object get(String key) { - return store.containsKey(key)?store.get(key).value:null; + ValueNode node = store.get(key); + return node ? node.value : null; } public boolean hasExpired(String key, Instant now) { From 1352d166e09f4c6e73ff3f86604a60f3099e2847 Mon Sep 17 00:00:00 2001 From: liuxinyu Date: Mon, 11 Oct 2021 07:32:42 -0500 Subject: [PATCH 2/4] %s to %d for integer --- .../amazon/lambda/powertools/sqs/internal/BatchContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java b/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java index 04903da6c..c2d1babf7 100644 --- a/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java +++ b/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java @@ -111,7 +111,7 @@ private void processFailedMessages(List successReturns, map(SQSMessage::getMessageId) .collect(toList()); - LOG.debug(format("[%s] records failed processing, but exceptions are suppressed. " + + LOG.debug(format("[%d] records failed processing, but exceptions are suppressed. " + "Failed messages %s", failedMessages.size(), messageIds)); } else { throw new SQSBatchProcessingException(exceptions, failedMessages, successReturns); From 9f879ad25bdc121e2822515cc6d6788f129cde48 Mon Sep 17 00:00:00 2001 From: liuxinyu Date: Mon, 11 Oct 2021 07:33:22 -0500 Subject: [PATCH 3/4] change put() to putIfAbsent() --- .../lambda/powertools/validation/ValidationUtils.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/ValidationUtils.java b/powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/ValidationUtils.java index 83f34ebfd..db89a1bbc 100644 --- a/powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/ValidationUtils.java +++ b/powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/ValidationUtils.java @@ -229,12 +229,6 @@ public static JsonSchema getJsonSchema(String schema) { * @return the loaded json schema */ public static JsonSchema getJsonSchema(String schema, boolean validateSchema) { - JsonSchema jsonSchema = schemas.get(schema); - - if (jsonSchema != null) { - return jsonSchema; - } - if (schema.startsWith(CLASSPATH)) { String filePath = schema.substring(CLASSPATH.length()); try (InputStream schemaStream = ValidationAspect.class.getResourceAsStream(filePath)) { @@ -260,7 +254,7 @@ public static JsonSchema getJsonSchema(String schema, boolean validateSchema) { } } - schemas.put(schema, jsonSchema); + schemas.putIfAbsent(schema, jsonSchema); return jsonSchema; } From c2178052f99b7de0dfa4502ef57cd1b19ba1323c Mon Sep 17 00:00:00 2001 From: Pankaj Agrawal Date: Wed, 15 Dec 2021 15:24:53 +0100 Subject: [PATCH 4/4] Update powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java Co-authored-by: Michael Brewer --- .../amazon/lambda/powertools/parameters/cache/DataStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java b/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java index 6e403c93e..9ad8df12c 100644 --- a/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java +++ b/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java @@ -47,7 +47,7 @@ public void remove(String Key){ public Object get(String key) { ValueNode node = store.get(key); - return node ? node.value : null; + return node != null ? node.value : null; } public boolean hasExpired(String key, Instant now) {