Skip to content

Commit 28b70ea

Browse files
scottgerringscottgerring
committed
Review feedback
1 parent 4b89862 commit 28b70ea

File tree

5 files changed

+64
-47
lines changed
  • powertools-large-messages/src/main/java/software/amazon/lambda/powertools/largemessages/internal
  • powertools-parameters

5 files changed

+64
-47
lines changed

‎powertools-large-messages/src/main/java/software/amazon/lambda/powertools/largemessages/internal/LargeMessageProcessor.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public Object process(ProceedingJoinPoint pjp, boolean deleteS3Object) throws Th
6565

6666
String s3ObjectContent = getS3ObjectContent(payloadPointer);
6767

68-
6968
if (LOG.isDebugEnabled()) {
7069
LOG.debug("Large message [{}] retrieved in S3 [{}]: {}KB", getMessageId(message), payloadPointer,
7170
s3ObjectContent.getBytes(StandardCharsets.UTF_8).length / 1024);

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,34 @@
2020
import java.lang.annotation.Target;
2121
import software.amazon.lambda.powertools.parameters.transform.Transformer;
2222

23+
/**
24+
* Use this annotation to inject AWS AppConfig parameters into fields in your application. You
25+
* can also use {@code AppConfigProviderBuilder} to obtain AppConfig values directly, rather than
26+
* injecting them implicitly.
27+
* Both {@code environment} and {@code application} fields are necessary.
28+
*
29+
* @see AppConfigProviderBuilder
30+
* @see <a href="https://docs.aws.amazon.com/appconfig>AWS AppConfig</a>
31+
* @see <a href="https://docs.powertools.aws.dev/lambda/java/utilities/parameters/">Powertools for AWS Lambda (Java) parameters documentation</a>
32+
*/
2333
@Retention(RetentionPolicy.RUNTIME)
2434
@Target(ElementType.FIELD)
2535
public @interface AppConfigParam {
2636
String key();
2737

38+
/**
39+
* <b>Mandatory</b>. Provide an environment to the {@link AppConfigProvider}
40+
*
41+
*/
2842
String environment();
2943

44+
/**
45+
* <b>Mandatory</b>. Provide an application to the {@link AppConfigProvider}
46+
*/
3047
String application();
3148

49+
/**
50+
* <b>Optional</b> Provide a Transformer to transform the returned parameter values.
51+
*/
3252
Class<? extends Transformer> transformer() default Transformer.class;
3353
}

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
package software.amazon.lambda.powertools.parameters.appconfig;
1616

17+
import static org.assertj.core.api.Assertions.assertThat;
18+
1719
import org.assertj.core.api.Assertions;
1820
import org.junit.jupiter.api.BeforeEach;
1921
import org.junit.jupiter.api.Test;
@@ -98,18 +100,18 @@ public void getValueRetrievesValue() {
98100
String returnedValue3 = provider.getValue(defaultTestKey);
99101

100102
// Assert
101-
Assertions.assertThat(returnedValue1).isEqualTo(firstResponse.configuration().asUtf8String());
102-
Assertions.assertThat(returnedValue2).isEqualTo(secondResponse.configuration().asUtf8String());
103-
Assertions.assertThat(returnedValue3).isEqualTo(secondResponse.configuration()
103+
assertThat(returnedValue1).isEqualTo(firstResponse.configuration().asUtf8String());
104+
assertThat(returnedValue2).isEqualTo(secondResponse.configuration().asUtf8String());
105+
assertThat(returnedValue3).isEqualTo(secondResponse.configuration()
104106
.asUtf8String()); // Third response is mocked to return null and should re-use previous value
105-
Assertions.assertThat(startSessionRequestCaptor.getValue().applicationIdentifier()).isEqualTo(applicationName);
106-
Assertions.assertThat(startSessionRequestCaptor.getValue().environmentIdentifier()).isEqualTo(environmentName);
107-
Assertions.assertThat(startSessionRequestCaptor.getValue().configurationProfileIdentifier()).isEqualTo(defaultTestKey);
108-
Assertions.assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(0).configurationToken()).isEqualTo(
107+
assertThat(startSessionRequestCaptor.getValue().applicationIdentifier()).isEqualTo(applicationName);
108+
assertThat(startSessionRequestCaptor.getValue().environmentIdentifier()).isEqualTo(environmentName);
109+
assertThat(startSessionRequestCaptor.getValue().configurationProfileIdentifier()).isEqualTo(defaultTestKey);
110+
assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(0).configurationToken()).isEqualTo(
109111
firstSession.initialConfigurationToken());
110-
Assertions.assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(1).configurationToken()).isEqualTo(
112+
assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(1).configurationToken()).isEqualTo(
111113
firstResponse.nextPollConfigurationToken());
112-
Assertions.assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(2).configurationToken()).isEqualTo(
114+
assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(2).configurationToken()).isEqualTo(
113115
secondResponse.nextPollConfigurationToken());
114116
}
115117

@@ -133,7 +135,7 @@ public void getValueNoValueExists() {
133135

134136

135137
// Assert
136-
Assertions.assertThat(returnedValue).isEqualTo(null);
138+
assertThat(returnedValue).isEqualTo(null);
137139
}
138140

139141
/**
@@ -169,15 +171,15 @@ public void multipleKeysRetrievalWorks() {
169171
String secondKeyValue = provider.getValue(param2Key);
170172

171173
// Assert
172-
Assertions.assertThat(firstKeyValue).isEqualTo(param1Response.configuration().asUtf8String());
173-
Assertions.assertThat(secondKeyValue).isEqualTo(param2Response.configuration().asUtf8String());
174-
Assertions.assertThat(startSessionRequestCaptor.getAllValues().get(0).configurationProfileIdentifier()).isEqualTo(
174+
assertThat(firstKeyValue).isEqualTo(param1Response.configuration().asUtf8String());
175+
assertThat(secondKeyValue).isEqualTo(param2Response.configuration().asUtf8String());
176+
assertThat(startSessionRequestCaptor.getAllValues().get(0).configurationProfileIdentifier()).isEqualTo(
175177
param1Key);
176-
Assertions.assertThat(startSessionRequestCaptor.getAllValues().get(1).configurationProfileIdentifier()).isEqualTo(
178+
assertThat(startSessionRequestCaptor.getAllValues().get(1).configurationProfileIdentifier()).isEqualTo(
177179
param2Key);
178-
Assertions.assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(0).configurationToken()).isEqualTo(
180+
assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(0).configurationToken()).isEqualTo(
179181
param1Session.initialConfigurationToken());
180-
Assertions.assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(1).configurationToken()).isEqualTo(
182+
assertThat(getLatestConfigurationRequestCaptor.getAllValues().get(1).configurationToken()).isEqualTo(
181183
param2Session.initialConfigurationToken());
182184

183185
}

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
package software.amazon.lambda.powertools.parameters.secrets;
1616

1717
import static org.assertj.core.api.Assertions.assertThat;
18-
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
1918
import static org.assertj.core.api.Assertions.assertThatRuntimeException;
2019
import static org.junit.jupiter.api.Assertions.assertNotNull;
21-
import static org.mockito.MockitoAnnotations.openMocks;
2220

2321
import java.time.temporal.ChronoUnit;
2422
import java.util.Base64;
25-
import org.assertj.core.api.Assertions;
2623
import org.junit.jupiter.api.BeforeEach;
2724
import org.junit.jupiter.api.Test;
2825
import org.mockito.ArgumentCaptor;
@@ -70,8 +67,8 @@ public void getValue() {
7067

7168
String value = provider.getValue(key);
7269

73-
Assertions.assertThat(value).isEqualTo(expectedValue);
74-
Assertions.assertThat(paramCaptor.getValue().secretId()).isEqualTo(key);
70+
assertThat(value).isEqualTo(expectedValue);
71+
assertThat(paramCaptor.getValue().secretId()).isEqualTo(key);
7572
}
7673

7774
@Test
@@ -85,15 +82,15 @@ public void getValueBase64() {
8582

8683
String value = provider.getValue(key);
8784

88-
Assertions.assertThat(value).isEqualTo(expectedValue);
89-
Assertions.assertThat(paramCaptor.getValue().secretId()).isEqualTo(key);
85+
assertThat(value).isEqualTo(expectedValue);
86+
assertThat(paramCaptor.getValue().secretId()).isEqualTo(key);
9087
}
9188

9289
@Test
9390
public void getMultipleValuesThrowsException() {
9491

9592
// Act & Assert
96-
Assertions.assertThatRuntimeException().isThrownBy(() -> provider.getMultipleValues("path"))
93+
assertThatRuntimeException().isThrownBy(() -> provider.getMultipleValues("path"))
9794
.withMessage("Impossible to get multiple values from AWS Secrets Manager");
9895

9996
}

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.ArrayList;
2222
import java.util.List;
2323
import java.util.Map;
24-
import org.assertj.core.api.Assertions;
2524
import org.assertj.core.data.MapEntry;
2625
import org.junit.jupiter.api.BeforeEach;
2726
import org.junit.jupiter.api.Test;
@@ -73,9 +72,9 @@ public void getValue() {
7372

7473
String value = provider.getValue(key);
7574

76-
Assertions.assertThat(value).isEqualTo(expectedValue);
77-
Assertions.assertThat(paramCaptor.getValue().name()).isEqualTo(key);
78-
Assertions.assertThat(paramCaptor.getValue().withDecryption()).isFalse();
75+
assertThat(value).isEqualTo(expectedValue);
76+
assertThat(paramCaptor.getValue().name()).isEqualTo(key);
77+
assertThat(paramCaptor.getValue().withDecryption()).isFalse();
7978
}
8079

8180
@Test
@@ -86,9 +85,9 @@ public void getValueDecrypted() {
8685

8786
String value = provider.withDecryption().getValue(key);
8887

89-
Assertions.assertThat(value).isEqualTo(expectedValue);
90-
Assertions.assertThat(paramCaptor.getValue().name()).isEqualTo(key);
91-
Assertions.assertThat(paramCaptor.getValue().withDecryption()).isTrue();
88+
assertThat(value).isEqualTo(expectedValue);
89+
assertThat(paramCaptor.getValue().name()).isEqualTo(key);
90+
assertThat(paramCaptor.getValue().withDecryption()).isTrue();
9291
}
9392

9493
@Test
@@ -101,17 +100,17 @@ public void getMultiple() {
101100
Mockito.when(client.getParametersByPath(paramByPathCaptor.capture())).thenReturn(response);
102101

103102
Map<String, String> params = provider.getMultiple("/prod/app1");
104-
Assertions.assertThat(params).contains(
103+
assertThat(params).contains(
105104
MapEntry.entry("key1", "foo1"),
106105
MapEntry.entry("key2", "foo2"),
107106
MapEntry.entry("key3", "foo3"));
108107
assertThat(provider.get("/prod/app1/key1")).isEqualTo("foo1");
109108
assertThat(provider.get("/prod/app1/key2")).isEqualTo("foo2");
110109
assertThat(provider.get("/prod/app1/key3")).isEqualTo("foo3");
111110

112-
Assertions.assertThat(paramByPathCaptor.getValue().path()).isEqualTo("/prod/app1");
113-
Assertions.assertThat(paramByPathCaptor.getValue().withDecryption()).isFalse();
114-
Assertions.assertThat(paramByPathCaptor.getValue().recursive()).isFalse();
111+
assertThat(paramByPathCaptor.getValue().path()).isEqualTo("/prod/app1");
112+
assertThat(paramByPathCaptor.getValue().withDecryption()).isFalse();
113+
assertThat(paramByPathCaptor.getValue().recursive()).isFalse();
115114
}
116115

117116
@Test
@@ -124,17 +123,17 @@ public void getMultipleWithTrailingSlash() {
124123
Mockito.when(client.getParametersByPath(paramByPathCaptor.capture())).thenReturn(response);
125124

126125
Map<String, String> params = provider.getMultiple("/prod/app1/");
127-
Assertions.assertThat(params).contains(
126+
assertThat(params).contains(
128127
MapEntry.entry("key1", "foo1"),
129128
MapEntry.entry("key2", "foo2"),
130129
MapEntry.entry("key3", "foo3"));
131130
assertThat(provider.get("/prod/app1/key1")).isEqualTo("foo1");
132131
assertThat(provider.get("/prod/app1/key2")).isEqualTo("foo2");
133132
assertThat(provider.get("/prod/app1/key3")).isEqualTo("foo3");
134133

135-
Assertions.assertThat(paramByPathCaptor.getValue().path()).isEqualTo("/prod/app1");
136-
Assertions.assertThat(paramByPathCaptor.getValue().withDecryption()).isFalse();
137-
Assertions.assertThat(paramByPathCaptor.getValue().recursive()).isFalse();
134+
assertThat(paramByPathCaptor.getValue().path()).isEqualTo("/prod/app1");
135+
assertThat(paramByPathCaptor.getValue().withDecryption()).isFalse();
136+
assertThat(paramByPathCaptor.getValue().recursive()).isFalse();
138137
}
139138

140139
@Test
@@ -174,7 +173,7 @@ public void getMultipleWithNextToken() {
174173

175174
Map<String, String> params = provider.getMultiple("/prod/app1");
176175

177-
Assertions.assertThat(params).contains(
176+
assertThat(params).contains(
178177
MapEntry.entry("key1", "foo1"),
179178
MapEntry.entry("key2", "foo2"),
180179
MapEntry.entry("key3", "foo3"));
@@ -183,15 +182,15 @@ public void getMultipleWithNextToken() {
183182
GetParametersByPathRequest request1 = requestParams.get(0);
184183
GetParametersByPathRequest request2 = requestParams.get(1);
185184

186-
Assertions.assertThat(asList(request1, request2)).allSatisfy(req ->
185+
assertThat(asList(request1, request2)).allSatisfy(req ->
187186
{
188-
Assertions.assertThat(req.path()).isEqualTo("/prod/app1");
189-
Assertions.assertThat(req.withDecryption()).isFalse();
190-
Assertions.assertThat(req.recursive()).isFalse();
187+
assertThat(req.path()).isEqualTo("/prod/app1");
188+
assertThat(req.withDecryption()).isFalse();
189+
assertThat(req.recursive()).isFalse();
191190
});
192191

193-
Assertions.assertThat(request1.nextToken()).isNull();
194-
Assertions.assertThat(request2.nextToken()).isEqualTo("123abc");
192+
assertThat(request1.nextToken()).isNull();
193+
assertThat(request2.nextToken()).isEqualTo("123abc");
195194
}
196195

197196
private void initMock(String expectedValue) {

0 commit comments

Comments
 (0)