Skip to content

Commit 5ae3565

Browse files
jeromevdljeromevdl
committed
apply checkstyle to java files
1 parent f0e1ce4 commit 5ae3565

File tree

229 files changed

+4570
-3593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+4570
-3593
lines changed

‎examples/powertools-examples-core/src/main/java/helloworld/App.java

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
11
package helloworld;
22

3-
import java.io.BufferedReader;
4-
import java.io.IOException;
5-
import java.io.InputStreamReader;
6-
import java.net.URL;
7-
import java.util.HashMap;
8-
import java.util.Map;
9-
import java.util.stream.Collectors;
3+
import static software.amazon.lambda.powertools.metrics.MetricsUtils.metricsLogger;
4+
import static software.amazon.lambda.powertools.metrics.MetricsUtils.withSingleMetric;
5+
import static software.amazon.lambda.powertools.tracing.TracingUtils.putMetadata;
6+
import static software.amazon.lambda.powertools.tracing.TracingUtils.withEntitySubsegment;
107

118
import com.amazonaws.services.lambda.runtime.Context;
129
import com.amazonaws.services.lambda.runtime.RequestHandler;
1310
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
1411
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
1512
import com.amazonaws.xray.AWSXRay;
1613
import com.amazonaws.xray.entities.Entity;
14+
import java.io.BufferedReader;
15+
import java.io.IOException;
16+
import java.io.InputStreamReader;
17+
import java.net.URL;
18+
import java.util.HashMap;
19+
import java.util.Map;
20+
import java.util.stream.Collectors;
1721
import org.apache.logging.log4j.LogManager;
1822
import org.apache.logging.log4j.Logger;
1923
import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
2024
import software.amazon.cloudwatchlogs.emf.model.Unit;
21-
import software.amazon.lambda.powertools.logging.LoggingUtils;
2225
import software.amazon.lambda.powertools.logging.Logging;
26+
import software.amazon.lambda.powertools.logging.LoggingUtils;
2327
import software.amazon.lambda.powertools.metrics.Metrics;
2428
import software.amazon.lambda.powertools.tracing.CaptureMode;
25-
import software.amazon.lambda.powertools.tracing.TracingUtils;
2629
import software.amazon.lambda.powertools.tracing.Tracing;
27-
28-
import static software.amazon.lambda.powertools.metrics.MetricsUtils.metricsLogger;
29-
import static software.amazon.lambda.powertools.metrics.MetricsUtils.withSingleMetric;
30-
import static software.amazon.lambda.powertools.tracing.TracingUtils.putMetadata;
31-
import static software.amazon.lambda.powertools.tracing.TracingUtils.withEntitySubsegment;
30+
import software.amazon.lambda.powertools.tracing.TracingUtils;
3231

3332
/**
3433
* Handler for requests to Lambda function.
@@ -47,10 +46,11 @@ public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEv
4746

4847
metricsLogger().putMetric("CustomMetric1", 1, Unit.COUNT);
4948

50-
withSingleMetric("CustomMetrics2", 1, Unit.COUNT, "Another", (metric) -> {
51-
metric.setDimensions(DimensionSet.of("AnotherService", "CustomService"));
52-
metric.setDimensions(DimensionSet.of("AnotherService1", "CustomService1"));
53-
});
49+
withSingleMetric("CustomMetrics2", 1, Unit.COUNT, "Another", (metric) ->
50+
{
51+
metric.setDimensions(DimensionSet.of("AnotherService", "CustomService"));
52+
metric.setDimensions(DimensionSet.of("AnotherService1", "CustomService1"));
53+
});
5454

5555
LoggingUtils.appendKey("test", "willBeLogged");
5656

@@ -62,11 +62,12 @@ public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEv
6262
TracingUtils.putAnnotation("Test", "New");
6363
String output = String.format("{ \"message\": \"hello world\", \"location\": \"%s\" }", pageContents);
6464

65-
TracingUtils.withSubsegment("loggingResponse", subsegment -> {
66-
String sampled = "log something out";
67-
log.info(sampled);
68-
log.info(output);
69-
});
65+
TracingUtils.withSubsegment("loggingResponse", subsegment ->
66+
{
67+
String sampled = "log something out";
68+
log.info(sampled);
69+
log.info(output);
70+
});
7071

7172
threadOption1();
7273

@@ -91,10 +92,11 @@ private void threadOption1() throws InterruptedException {
9192

9293
private void threadOption2() throws InterruptedException {
9394
Entity traceEntity = AWSXRay.getTraceEntity();
94-
Thread anotherThread = new Thread(() -> withEntitySubsegment("inlineLog", traceEntity, subsegment -> {
95-
String var = "somethingToProcess";
96-
log.info("inside threaded logging inline {}", var);
97-
}));
95+
Thread anotherThread = new Thread(() -> withEntitySubsegment("inlineLog", traceEntity, subsegment ->
96+
{
97+
String var = "somethingToProcess";
98+
log.info("inside threaded logging inline {}", var);
99+
}));
98100
anotherThread.start();
99101
anotherThread.join();
100102
}

‎examples/powertools-examples-core/src/main/java/helloworld/AppStream.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package helloworld;
22

3+
import com.amazonaws.services.lambda.runtime.Context;
4+
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
5+
import com.fasterxml.jackson.databind.ObjectMapper;
36
import java.io.IOException;
47
import java.io.InputStream;
58
import java.io.OutputStream;
69
import java.util.Map;
7-
8-
import com.amazonaws.services.lambda.runtime.Context;
9-
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
10-
import com.fasterxml.jackson.databind.ObjectMapper;
1110
import software.amazon.lambda.powertools.logging.Logging;
1211
import software.amazon.lambda.powertools.metrics.Metrics;
1312

‎examples/powertools-examples-core/src/test/java/helloworld/AppTest.java

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
11
package helloworld;
22

3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertNotNull;
5+
import static org.junit.Assert.assertTrue;
6+
37
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
48
import com.amazonaws.xray.AWSXRay;
59
import org.junit.After;
610
import org.junit.Before;
711
import org.junit.Test;
812

9-
import static org.junit.Assert.*;
10-
1113
public class AppTest {
1214

13-
@Before
14-
public void setup() {
15-
if(null == System.getenv("LAMBDA_TASK_ROOT")) {
16-
AWSXRay.beginSegment("test");
15+
@Before
16+
public void setup() {
17+
if (null == System.getenv("LAMBDA_TASK_ROOT")) {
18+
AWSXRay.beginSegment("test");
19+
}
1720
}
18-
}
1921

20-
@After
21-
public void tearDown() {
22-
if (AWSXRay.getCurrentSubsegmentOptional().isPresent()) {
23-
AWSXRay.endSubsegment();
24-
}
22+
@After
23+
public void tearDown() {
24+
if (AWSXRay.getCurrentSubsegmentOptional().isPresent()) {
25+
AWSXRay.endSubsegment();
26+
}
2527

26-
if(null == System.getenv("LAMBDA_TASK_ROOT")) {
27-
AWSXRay.endSegment();
28+
if (null == System.getenv("LAMBDA_TASK_ROOT")) {
29+
AWSXRay.endSegment();
30+
}
2831
}
29-
}
3032

31-
@Test
32-
public void successfulResponse() {
33-
App app = new App();
34-
APIGatewayProxyResponseEvent result = app.handleRequest(null, null);
35-
assertEquals(result.getStatusCode().intValue(), 200);
36-
assertEquals(result.getHeaders().get("Content-Type"), "application/json");
37-
String content = result.getBody();
38-
assertNotNull(content);
39-
assertTrue(content.contains("\"message\""));
40-
assertTrue(content.contains("\"hello world\""));
41-
assertTrue(content.contains("\"location\""));
42-
}
33+
@Test
34+
public void successfulResponse() {
35+
App app = new App();
36+
APIGatewayProxyResponseEvent result = app.handleRequest(null, null);
37+
assertEquals(result.getStatusCode().intValue(), 200);
38+
assertEquals(result.getHeaders().get("Content-Type"), "application/json");
39+
String content = result.getBody();
40+
assertNotNull(content);
41+
assertTrue(content.contains("\"message\""));
42+
assertTrue(content.contains("\"hello world\""));
43+
assertTrue(content.contains("\"location\""));
44+
}
4345
}

‎examples/powertools-examples-idempotency/src/main/java/helloworld/App.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
import com.amazonaws.services.lambda.runtime.RequestHandler;
55
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
66
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
7+
import java.io.BufferedReader;
8+
import java.io.IOException;
9+
import java.io.InputStreamReader;
10+
import java.net.URL;
11+
import java.util.HashMap;
12+
import java.util.Map;
13+
import java.util.stream.Collectors;
714
import org.apache.logging.log4j.LogManager;
815
import org.apache.logging.log4j.Logger;
916
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
@@ -14,14 +21,6 @@
1421
import software.amazon.lambda.powertools.logging.Logging;
1522
import software.amazon.lambda.powertools.utilities.JsonConfig;
1623

17-
import java.io.BufferedReader;
18-
import java.io.IOException;
19-
import java.io.InputStreamReader;
20-
import java.net.URL;
21-
import java.util.HashMap;
22-
import java.util.Map;
23-
import java.util.stream.Collectors;
24-
2524
public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
2625
private final static Logger log = LogManager.getLogger(App.class);
2726

@@ -32,7 +31,8 @@ public App() {
3231
public App(DynamoDbClient client) {
3332
Idempotency.config().withConfig(
3433
IdempotencyConfig.builder()
35-
.withEventKeyJMESPath("powertools_json(body).address") // will retrieve the address field in the body which is a string transformed to json with `powertools_json`
34+
.withEventKeyJMESPath(
35+
"powertools_json(body).address") // will retrieve the address field in the body which is a string transformed to json with `powertools_json`
3636
.build())
3737
.withPersistenceStore(
3838
DynamoDBPersistenceStore.builder()

‎examples/powertools-examples-idempotency/src/test/java/helloworld/AppTest.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import com.amazonaws.services.lambda.runtime.Context;
66
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
77
import com.amazonaws.services.lambda.runtime.tests.EventLoader;
8+
import java.io.IOException;
9+
import java.net.ServerSocket;
10+
import java.net.URI;
811
import org.junit.jupiter.api.Assertions;
912
import org.junit.jupiter.api.BeforeAll;
1013
import org.junit.jupiter.api.BeforeEach;
@@ -16,23 +19,24 @@
1619
import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
1720
import software.amazon.awssdk.regions.Region;
1821
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
19-
import software.amazon.awssdk.services.dynamodb.model.*;
20-
21-
import java.io.IOException;
22-
import java.net.ServerSocket;
23-
import java.net.URI;
22+
import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
23+
import software.amazon.awssdk.services.dynamodb.model.BillingMode;
24+
import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
25+
import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
26+
import software.amazon.awssdk.services.dynamodb.model.KeyType;
27+
import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
2428

2529
public class AppTest {
30+
private static DynamoDbClient client;
2631
@Mock
2732
private Context context;
2833
private App app;
29-
private static DynamoDbClient client;
3034

3135
@BeforeAll
3236
public static void setupDynamoLocal() {
3337
int port = getFreePort();
3438
try {
35-
DynamoDBProxyServer dynamoProxy = ServerRunner.createServerFromCommandLineArgs(new String[]{
39+
DynamoDBProxyServer dynamoProxy = ServerRunner.createServerFromCommandLineArgs(new String[] {
3640
"-inMemory",
3741
"-port",
3842
Integer.toString(port)
@@ -79,7 +83,8 @@ void setUp() {
7983

8084
@Test
8185
public void testApp() {
82-
APIGatewayProxyResponseEvent response = app.handleRequest(EventLoader.loadApiGatewayRestEvent("event.json"), context);
86+
APIGatewayProxyResponseEvent response =
87+
app.handleRequest(EventLoader.loadApiGatewayRestEvent("event.json"), context);
8388
Assertions.assertNotNull(response);
8489
Assertions.assertTrue(response.getBody().contains("hello world"));
8590
}

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
package org.demo.parameters;
22

3+
import static java.time.temporal.ChronoUnit.SECONDS;
4+
import static software.amazon.lambda.powertools.parameters.transform.Transformer.base64;
5+
import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;
6+
37
import com.amazonaws.services.lambda.runtime.Context;
48
import com.amazonaws.services.lambda.runtime.RequestHandler;
59
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
610
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
7-
import org.apache.logging.log4j.LogManager;
8-
import org.apache.logging.log4j.Logger;
9-
import software.amazon.lambda.powertools.parameters.ParamManager;
10-
import software.amazon.lambda.powertools.parameters.SSMProvider;
11-
import software.amazon.lambda.powertools.parameters.SecretsProvider;
12-
1311
import java.io.BufferedReader;
1412
import java.io.IOException;
1513
import java.io.InputStreamReader;
1614
import java.net.URL;
1715
import java.util.HashMap;
1816
import java.util.Map;
1917
import java.util.stream.Collectors;
20-
21-
import static java.time.temporal.ChronoUnit.SECONDS;
22-
import static software.amazon.lambda.powertools.parameters.transform.Transformer.base64;
23-
import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;
18+
import org.apache.logging.log4j.LogManager;
19+
import org.apache.logging.log4j.Logger;
20+
import software.amazon.lambda.powertools.parameters.ParamManager;
21+
import software.amazon.lambda.powertools.parameters.SSMProvider;
22+
import software.amazon.lambda.powertools.parameters.SecretsProvider;
2423

2524
public class ParametersFunction implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
2625
private final static Logger log = LogManager.getLogger();
@@ -34,8 +33,10 @@ public class ParametersFunction implements RequestHandler<APIGatewayProxyRequest
3433
Map<String, String> allValues = ssmProvider.getMultiple("/powertools-java/sample");
3534
String b64value = ssmProvider.withTransformation(base64).get("/powertools-java/sample/keybase64");
3635

37-
Map<String, String> secretJson = secretsProvider.withTransformation(json).get("/powertools-java/userpwd", Map.class);
38-
MyObject secretJsonObj = secretsProvider.withMaxAge(42, SECONDS).withTransformation(json).get("/powertools-java/secretcode", MyObject.class);
36+
Map<String, String> secretJson =
37+
secretsProvider.withTransformation(json).get("/powertools-java/userpwd", Map.class);
38+
MyObject secretJsonObj = secretsProvider.withMaxAge(42, SECONDS).withTransformation(json)
39+
.get("/powertools-java/secretcode", MyObject.class);
3940

4041
@Override
4142
public APIGatewayProxyResponseEvent handleRequest(APIGatewayProxyRequestEvent input, Context context) {
@@ -72,9 +73,9 @@ public APIGatewayProxyResponseEvent handleRequest(APIGatewayProxyRequestEvent in
7273
}
7374
}
7475

75-
private String getPageContents(String address) throws IOException{
76+
private String getPageContents(String address) throws IOException {
7677
URL url = new URL(address);
77-
try(BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8"))) {
78+
try (BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8"))) {
7879
return br.lines().collect(Collectors.joining(System.lineSeparator()));
7980
}
8081
}

‎examples/powertools-examples-serialization/src/main/java/org/demo/serialization/APIGatewayRequestDeserializationFunction.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package org.demo.serialization;
22

3+
import static software.amazon.lambda.powertools.utilities.EventDeserializer.extractDataFrom;
4+
35
import com.amazonaws.services.lambda.runtime.Context;
46
import com.amazonaws.services.lambda.runtime.RequestHandler;
57
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
68
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
7-
import org.apache.logging.log4j.LogManager;
8-
import org.apache.logging.log4j.Logger;
9-
109
import java.util.HashMap;
1110
import java.util.Map;
12-
13-
import static software.amazon.lambda.powertools.utilities.EventDeserializer.extractDataFrom;
11+
import org.apache.logging.log4j.LogManager;
12+
import org.apache.logging.log4j.Logger;
1413

1514

16-
public class APIGatewayRequestDeserializationFunction implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
15+
public class APIGatewayRequestDeserializationFunction
16+
implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
1717

1818
private final static Logger LOGGER = LogManager.getLogger(APIGatewayRequestDeserializationFunction.class);
1919
private static final Map<String, String> HEADERS = new HashMap<String, String>() {{
@@ -28,9 +28,9 @@ public APIGatewayProxyResponseEvent handleRequest(APIGatewayProxyRequestEvent ev
2828
LOGGER.info("product={}\n", product);
2929

3030
return new APIGatewayProxyResponseEvent()
31-
.withHeaders(HEADERS)
32-
.withStatusCode(200)
33-
.withBody("Received request for productId: " + product.getId());
31+
.withHeaders(HEADERS)
32+
.withStatusCode(200)
33+
.withBody("Received request for productId: " + product.getId());
3434
}
3535
}
3636

‎examples/powertools-examples-serialization/src/main/java/org/demo/serialization/SQSEventDeserializationFunction.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package org.demo.serialization;
22

3+
import static software.amazon.lambda.powertools.utilities.EventDeserializer.extractDataFrom;
4+
35
import com.amazonaws.services.lambda.runtime.Context;
46
import com.amazonaws.services.lambda.runtime.RequestHandler;
57
import com.amazonaws.services.lambda.runtime.events.SQSEvent;
8+
import java.util.List;
69
import org.apache.logging.log4j.LogManager;
710
import org.apache.logging.log4j.Logger;
811

9-
import java.util.List;
10-
11-
import static software.amazon.lambda.powertools.utilities.EventDeserializer.extractDataFrom;
12-
1312

1413
public class SQSEventDeserializationFunction implements RequestHandler<SQSEvent, String> {
1514

0 commit comments

Comments
 (0)