Skip to content

Commit 09fd6eb

Browse files
jeromevdljeromevdl
committed
jdk8 compatible
1 parent 7b81e22 commit 09fd6eb

File tree

7 files changed

+31
-29
lines changed

7 files changed

+31
-29
lines changed

‎powertools-e2e-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
<properties>
1717
<!-- we can use Java 11 for integration tests, not forced to stick to Java 8 -->
18-
<maven.compiler.source>11</maven.compiler.source>
19-
<maven.compiler.target>11</maven.compiler.target>
18+
<maven.compiler.source>8</maven.compiler.source>
19+
<maven.compiler.target>8</maven.compiler.target>
2020
<constructs.version>10.1.138</constructs.version>
2121
<cdk.version>2.47.0</cdk.version>
2222
</properties>

‎powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/IdempotencyE2ET.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import software.amazon.lambda.powertools.testutils.lambda.InvocationResult;
1010

1111
import java.time.Year;
12-
import java.util.HashMap;
12+
import java.util.Collections;
1313
import java.util.concurrent.TimeUnit;
1414

1515
import static software.amazon.lambda.powertools.testutils.lambda.LambdaInvoker.invokeFunction;
@@ -25,10 +25,7 @@ public static void setup() {
2525
.testName(IdempotencyE2ET.class.getSimpleName())
2626
.pathToFunction("idempotency")
2727
.idempotencyTable("idempo")
28-
.environmentVariables(new HashMap<>() {{
29-
put("IDEMPOTENCY_TABLE", "idempo");
30-
}}
31-
)
28+
.environmentVariables(Collections.singletonMap("IDEMPOTENCY_TABLE", "idempo"))
3229
.build();
3330
functionName = infrastructure.deploy();
3431
}

‎powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/LoggingE2ET.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
import software.amazon.lambda.powertools.testutils.Infrastructure;
1111
import software.amazon.lambda.powertools.testutils.lambda.InvocationResult;
1212

13-
import java.util.HashMap;
1413
import java.util.UUID;
1514
import java.util.concurrent.TimeUnit;
15+
import java.util.stream.Collectors;
16+
import java.util.stream.Stream;
1617

1718
import static org.assertj.core.api.Assertions.assertThat;
1819
import static software.amazon.lambda.powertools.testutils.lambda.LambdaInvoker.invokeFunction;
@@ -31,11 +32,12 @@ public static void setup() {
3132
infrastructure = Infrastructure.builder()
3233
.testName(LoggingE2ET.class.getSimpleName())
3334
.pathToFunction("logging")
34-
.environmentVariables(new HashMap<>() {{
35-
put("POWERTOOLS_LOG_LEVEL", "INFO");
36-
put("POWERTOOLS_SERVICE_NAME", LoggingE2ET.class.getSimpleName());
37-
}}
38-
)
35+
.environmentVariables(
36+
Stream.of(new String[][]{
37+
{"POWERTOOLS_LOG_LEVEL", "INFO"},
38+
{"POWERTOOLS_SERVICE_NAME", LoggingE2ET.class.getSimpleName()}
39+
})
40+
.collect(Collectors.toMap(data -> data[0], data -> data[1])))
3941
.build();
4042
functionName = infrastructure.deploy();
4143
}

‎powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/MetricsE2ET.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
import software.amazon.lambda.powertools.testutils.metrics.MetricsFetcher;
1010

1111
import java.util.Collections;
12-
import java.util.HashMap;
1312
import java.util.List;
1413
import java.util.UUID;
1514
import java.util.concurrent.TimeUnit;
15+
import java.util.stream.Collectors;
16+
import java.util.stream.Stream;
1617

1718
import static org.assertj.core.api.Assertions.assertThat;
1819
import static software.amazon.lambda.powertools.testutils.lambda.LambdaInvoker.invokeFunction;
@@ -29,11 +30,12 @@ public static void setup() {
2930
infrastructure = Infrastructure.builder()
3031
.testName(MetricsE2ET.class.getSimpleName())
3132
.pathToFunction("metrics")
32-
.environmentVariables(new HashMap<>() {{
33-
put("POWERTOOLS_METRICS_NAMESPACE", namespace);
34-
put("POWERTOOLS_SERVICE_NAME", service);
35-
}}
36-
)
33+
.environmentVariables(
34+
Stream.of(new String[][]{
35+
{"POWERTOOLS_METRICS_NAMESPACE", namespace},
36+
{"POWERTOOLS_SERVICE_NAME", service}
37+
})
38+
.collect(Collectors.toMap(data -> data[0], data -> data[1])))
3739
.build();
3840
functionName = infrastructure.deploy();
3941
}
@@ -54,7 +56,10 @@ public void test_recordMetrics() {
5456

5557
// THEN
5658
MetricsFetcher metricsFetcher = new MetricsFetcher();
57-
List<Double> coldStart = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60, namespace, "ColdStart", new HashMap<>() {{ put("FunctionName", functionName); put("Service", service); }});
59+
List<Double> coldStart = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60, namespace, "ColdStart", Stream.of(new String[][]{
60+
{"FunctionName", functionName},
61+
{"Service", service}}
62+
).collect(Collectors.toMap(data -> data[0], data -> data[1])));
5863
assertThat(coldStart.get(0)).isEqualTo(1);
5964
List<Double> orderMetrics = metricsFetcher.fetchMetrics(invocationResult.getStart(), invocationResult.getEnd(), 60, namespace, "orders", Collections.singletonMap("Environment", "test"));
6065
assertThat(orderMetrics.get(0)).isEqualTo(1);

‎powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/TracingE2ET.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import software.amazon.lambda.powertools.testutils.tracing.Trace;
1111
import software.amazon.lambda.powertools.testutils.tracing.TraceFetcher;
1212

13-
import java.util.HashMap;
13+
import java.util.Collections;
1414
import java.util.Map;
1515
import java.util.UUID;
1616
import java.util.concurrent.TimeUnit;
@@ -19,7 +19,7 @@
1919
import static software.amazon.lambda.powertools.testutils.lambda.LambdaInvoker.invokeFunction;
2020

2121
public class TracingE2ET {
22-
private static final String service = "TracingE2EService_"+UUID.randomUUID(); // "TracingE2EService_e479fb27-422b-4107-9f8c-086c62e1cd12";
22+
private static final String service = "TracingE2EService_" + UUID.randomUUID(); // "TracingE2EService_e479fb27-422b-4107-9f8c-086c62e1cd12";
2323

2424
private static Infrastructure infrastructure;
2525
private static String functionName;
@@ -31,10 +31,7 @@ public static void setup() {
3131
.testName(TracingE2ET.class.getSimpleName())
3232
.pathToFunction("tracing")
3333
.tracing(true)
34-
.environmentVariables(new HashMap<>() {{
35-
put("POWERTOOLS_SERVICE_NAME", service);
36-
}}
37-
)
34+
.environmentVariables(Collections.singletonMap("POWERTOOLS_SERVICE_NAME", service))
3835
.build();
3936
functionName = infrastructure.deploy();
4037
}

‎powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
import java.io.File;
3535
import java.io.IOException;
36-
import java.nio.file.Path;
36+
import java.nio.file.Paths;
3737
import java.util.*;
3838
import java.util.stream.Collectors;
3939

@@ -305,7 +305,7 @@ private void uploadAssets() {
305305
return;
306306
}
307307
LOG.info("Uploading asset " + objectKey + " to " + asset.bucketName);
308-
s3.putObject(PutObjectRequest.builder().bucket(asset.bucketName).key(objectKey).build(), Path.of(cfnAssetDirectory, asset.assetPath));
308+
s3.putObject(PutObjectRequest.builder().bucket(asset.bucketName).key(objectKey).build(), Paths.get(cfnAssetDirectory, asset.assetPath));
309309
});
310310
}
311311

‎powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/tracing/TraceFetcher.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import java.time.Instant;
2121
import java.time.temporal.ChronoUnit;
22+
import java.util.Arrays;
2223
import java.util.Collections;
2324
import java.util.List;
2425
import java.util.concurrent.Callable;
@@ -163,7 +164,7 @@ public static class Builder {
163164
private Instant start;
164165
private Instant end;
165166
private String filterExpression;
166-
private List<String> excludedSegments = List.of("Initialization", "Invocation", "Overhead");
167+
private List<String> excludedSegments = Arrays.asList("Initialization", "Invocation", "Overhead");
167168

168169
public TraceFetcher build() {
169170
if (filterExpression == null)

0 commit comments

Comments
 (0)