Skip to content

Commit 8fb14e4

Browse files
author
Michael Brewer
authored
fix(general): clean up typos and code (#62)
1 parent 028ee88 commit 8fb14e4

File tree

7 files changed

+24
-26
lines changed

7 files changed

+24
-26
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ assignees: ''
4141

4242
> [How to enable debug mode](https://awslabs.github.io/aws-lambda-powertools-java/#debug-mode)**
4343
44-
```java
44+
```text
4545
# paste logs here
4646
```

docs/content/core/tracing.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatew
138138
Entity traceEntity = AWSXRay.getTraceEntity();
139139
140140
Thread anotherThread = new Thread(() -> withEntitySubsegment("inlineLog", traceEntity, subsegment -> {
141-
// Business logic in sperate thread
141+
// Business logic in separate thread
142142
}));
143143
}
144144
}

powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessor.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,34 @@
1313
*/
1414
package software.amazon.lambda.powertools.core.internal;
1515

16-
import java.io.InputStream;
17-
import java.io.OutputStream;
18-
1916
import com.amazonaws.services.lambda.runtime.Context;
2017
import com.amazonaws.services.lambda.runtime.RequestHandler;
2118
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
2219
import org.aspectj.lang.ProceedingJoinPoint;
2320

21+
import java.io.InputStream;
22+
import java.io.OutputStream;
23+
2424
public final class LambdaHandlerProcessor {
2525
private static String SERVICE_NAME = null != System.getenv("POWERTOOLS_SERVICE_NAME")
2626
? System.getenv("POWERTOOLS_SERVICE_NAME") : "service_undefined";
2727
private static Boolean IS_COLD_START = null;
2828

29-
public static boolean isHandlerMethod(ProceedingJoinPoint pjp) {
29+
private LambdaHandlerProcessor() {
30+
// Hide default constructor
31+
}
32+
33+
public static boolean isHandlerMethod(final ProceedingJoinPoint pjp) {
3034
return "handleRequest".equals(pjp.getSignature().getName());
3135
}
3236

33-
public static boolean placedOnRequestHandler(ProceedingJoinPoint pjp) {
37+
public static boolean placedOnRequestHandler(final ProceedingJoinPoint pjp) {
3438
return RequestHandler.class.isAssignableFrom(pjp.getSignature().getDeclaringType())
3539
&& pjp.getArgs().length == 2
3640
&& pjp.getArgs()[1] instanceof Context;
3741
}
3842

39-
public static boolean placedOnStreamHandler(ProceedingJoinPoint pjp) {
43+
public static boolean placedOnStreamHandler(final ProceedingJoinPoint pjp) {
4044
return RequestStreamHandler.class.isAssignableFrom(pjp.getSignature().getDeclaringType())
4145
&& pjp.getArgs().length == 3
4246
&& pjp.getArgs()[0] instanceof InputStream

powertools-logging/src/main/java/org/apache/logging/log4j/core/layout/LambdaJsonLayout.java

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,10 @@
1313
*/
1414
package org.apache.logging.log4j.core.layout;
1515

16-
import java.io.IOException;
17-
import java.io.Writer;
18-
import java.nio.charset.Charset;
19-
import java.nio.charset.StandardCharsets;
20-
import java.time.ZoneId;
21-
import java.time.ZonedDateTime;
22-
import java.util.HashMap;
23-
import java.util.LinkedHashMap;
24-
import java.util.Map;
25-
2616
import com.fasterxml.jackson.annotation.JsonAnyGetter;
2717
import com.fasterxml.jackson.annotation.JsonGetter;
2818
import com.fasterxml.jackson.annotation.JsonRootName;
2919
import com.fasterxml.jackson.annotation.JsonUnwrapped;
30-
import com.fasterxml.jackson.databind.ObjectMapper;
3120
import org.apache.logging.log4j.core.Layout;
3221
import org.apache.logging.log4j.core.LogEvent;
3322
import org.apache.logging.log4j.core.config.Configuration;
@@ -36,11 +25,20 @@
3625
import org.apache.logging.log4j.core.config.plugins.Plugin;
3726
import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
3827
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
39-
import org.apache.logging.log4j.core.jackson.Log4jJsonObjectMapper;
4028
import org.apache.logging.log4j.core.jackson.XmlConstants;
4129
import org.apache.logging.log4j.core.util.KeyValuePair;
4230
import org.apache.logging.log4j.util.Strings;
4331

32+
import java.io.IOException;
33+
import java.io.Writer;
34+
import java.nio.charset.Charset;
35+
import java.nio.charset.StandardCharsets;
36+
import java.time.ZoneId;
37+
import java.time.ZonedDateTime;
38+
import java.util.HashMap;
39+
import java.util.LinkedHashMap;
40+
import java.util.Map;
41+
4442
import static java.time.Instant.ofEpochMilli;
4543
import static java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME;
4644

@@ -52,8 +50,6 @@ public class LambdaJsonLayout extends AbstractJacksonLayout {
5250

5351
static final String CONTENT_TYPE = "application/json";
5452

55-
private final ObjectMapper objectMapper;
56-
5753
public static class Builder<B extends Builder<B>> extends AbstractJacksonLayout.Builder<B>
5854
implements org.apache.logging.log4j.core.util.Builder<LambdaJsonLayout> {
5955

@@ -113,7 +109,6 @@ private LambdaJsonLayout(final Configuration config, final boolean locationInfo,
113109
PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(footerPattern).setDefaultPattern(DEFAULT_FOOTER).build(),
114110
includeNullDelimiter,
115111
additionalFields);
116-
this.objectMapper = new Log4jJsonObjectMapper(encodeThreadContextAsList, includeStacktrace, stacktraceAsString, objectMessageAsJsonObject);
117112
}
118113

119114
/**

powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/PowertoolsLogging.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
* <p>By default {@code PowertoolsLogging} will not log the event which has trigger the invoke of the Lambda function.
5656
* This can be enabled using {@code @PowertoolsLogging(logEvent = true)}.</p>
5757
*
58-
* <p>By default {@code PowertoolsLogging} all debug loggs will follow log4j2 configuration unless configured via
58+
* <p>By default {@code PowertoolsLogging} all debug logs will follow log4j2 configuration unless configured via
5959
* POWERTOOLS_LOGGER_SAMPLE_RATE environment variable {@code @PowertoolsLogging(samplingRate = <0.0-1.0>)}.</p>
6060
*
6161
* <p>To append additional keys to each log entry you can use {@link PowertoolsLogger#appendKey(String, String)}</p>

powertools-sqs/src/test/java/software/amazon/lambda/powertools/sqs/handlers/LambdaHandlerApiGateway.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.amazonaws.services.lambda.runtime.Context;
44
import com.amazonaws.services.lambda.runtime.RequestHandler;
55
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
6-
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
76
import software.amazon.lambda.powertools.sqs.LargeMessageHandler;
87

98
public class LambdaHandlerApiGateway implements RequestHandler<APIGatewayProxyRequestEvent, String> {

powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/PowertoolsTracing.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* <p>By default {@code PowertoolsTracing} will capture responses and add them
3434
* to a sub segment named after the method.</p>
3535
*
36-
* <p>To disable this functionality you can specify {@code @PowertoolsTracing( captureRespones = false)}</p>
36+
* <p>To disable this functionality you can specify {@code @PowertoolsTracing( captureResponse = false)}</p>
3737
*
3838
* <p>By default {@code PowertoolsTracing} will capture errors and add them
3939
* to a sub segment named after the method.</p>

0 commit comments

Comments
 (0)