Skip to content

refactor: move groupId from software.aws.lambda to softwarte.amazon.lambda #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 14, 2020
Merged

refactor: move groupId from software.aws.lambda to softwarte.amazon.lambda #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c76da6
fix: Fixing security issues on package.json dependencies
stevehouel Aug 11, 2020
43ca6a2
Merge branch 'master' of https://github.com/awslabs/aws-lambda-powert…
stevehouel Aug 14, 2020
4bb8eb1
fix: moving groupId and package from software.aws.lambda to software.…
stevehouel Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Powertools is available in Maven Central. You can use your favourite dependency
<dependencies>
...
<dependency>
<groupId>software.aws.lambda</groupId>
<groupId>software.amazon.lambda</groupId>
<artifactId>aws-lambda-powertools-java</artifactId>
<version>YOUR_REQUIRED_VERSION</version>
</dependency>
Expand All @@ -37,7 +37,7 @@ And configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lambd
<complianceLevel>1.8</complianceLevel>
<aspectLibraries>
<aspectLibrary>
<groupId>software.aws.lambda</groupId>
<groupId>software.amazon.lambda</groupId>
<artifactId>aws-lambda-powertools-java</artifactId>
</aspectLibrary>
</aspectLibraries>
Expand All @@ -59,7 +59,7 @@ repositories {
}

dependencies {
powertools 'software.aws.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION'
powertools 'software.amazon.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION'
}
```

Expand Down
4 changes: 2 additions & 2 deletions docs/content/index.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Powertools is available in Maven Central. You can use your favourite dependency
<dependencies>
...
<dependency>
<groupId>software.aws.lambda</groupId>
<groupId>software.amazon.lambda</groupId>
<artifactId>aws-lambda-powertools-java</artifactId>
<version>YOUR_REQUIRED_VERSION</version>
</dependency>
Expand All @@ -28,7 +28,7 @@ repositories {
}

dependencies {
powertools 'software.aws.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION'
powertools 'software.amazon.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION'
}
```

Expand Down
4 changes: 2 additions & 2 deletions example/HelloWorldFunction/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<dependencies>
<dependency>
<groupId>software.aws.lambda</groupId>
<groupId>software.amazon.lambda</groupId>
<artifactId>aws-lambda-powertools-java</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
Expand Down Expand Up @@ -65,7 +65,7 @@
<complianceLevel>${maven.compiler.target}</complianceLevel>
<aspectLibraries>
<aspectLibrary>
<groupId>software.aws.lambda</groupId>
<groupId>software.amazon.lambda</groupId>
<artifactId>aws-lambda-powertools-java</artifactId>
</aspectLibrary>
</aspectLibraries>
Expand Down
12 changes: 6 additions & 6 deletions example/HelloWorldFunction/src/main/java/helloworld/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
import com.amazonaws.xray.entities.Entity;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import software.aws.lambda.logging.PowerLogger;
import software.aws.lambda.logging.PowerToolsLogging;
import software.aws.lambda.tracing.PowerToolTracing;
import software.aws.lambda.tracing.PowerTracer;
import software.amazon.lambda.logging.PowerLogger;
import software.amazon.lambda.logging.PowerToolsLogging;
import software.amazon.lambda.tracing.PowerToolTracing;
import software.amazon.lambda.tracing.PowerTracer;

import static software.aws.lambda.tracing.PowerTracer.putMetadata;
import static software.aws.lambda.tracing.PowerTracer.withEntitySubsegment;
import static software.amazon.lambda.tracing.PowerTracer.putMetadata;
import static software.amazon.lambda.tracing.PowerTracer.withEntitySubsegment;

/**
* Handler for requests to Lambda function.
Expand Down
2 changes: 1 addition & 1 deletion example/HelloWorldFunction/src/main/java/helloworld/AppStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
import com.fasterxml.jackson.databind.ObjectMapper;
import software.aws.lambda.logging.PowerToolsLogging;
import software.amazon.lambda.logging.PowerToolsLogging;

public class AppStream implements RequestStreamHandler {
private static final ObjectMapper mapper = new ObjectMapper();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>software.aws.lambda</groupId>
<groupId>software.amazon.lambda</groupId>
<artifactId>aws-lambda-powertools-java</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ...mbda/internal/LambdaHandlerProcessor.java → ...mbda/internal/LambdaHandlerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.internal;
package software.amazon.lambda.internal;

import java.io.InputStream;
import java.io.OutputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...tware/aws/lambda/logging/PowerLogger.java → ...re/amazon/lambda/logging/PowerLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.logging;
package software.amazon.lambda.logging;

import org.apache.logging.log4j.ThreadContext;

Expand Down
2 changes: 1 addition & 1 deletion ...aws/lambda/logging/PowerToolsLogging.java → ...zon/lambda/logging/PowerToolsLogging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.logging;
package software.amazon.lambda.logging;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
2 changes: 1 addition & 1 deletion ...logging/internal/DefaultLambdaFields.java → ...logging/internal/DefaultLambdaFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.logging.internal;
package software.amazon.lambda.logging.internal;

import com.amazonaws.services.lambda.runtime.Context;

Expand Down
12 changes: 6 additions & 6 deletions ...logging/internal/LambdaLoggingAspect.java → ...logging/internal/LambdaLoggingAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.logging.internal;
package software.amazon.lambda.logging.internal;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand All @@ -19,14 +19,14 @@
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import software.aws.lambda.logging.PowerToolsLogging;
import software.amazon.lambda.logging.PowerToolsLogging;

import static java.util.Optional.empty;
import static java.util.Optional.of;
import static software.aws.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
import static software.aws.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;
import static software.amazon.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
import static software.amazon.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;

@Aspect
public final class LambdaLoggingAspect {
Expand Down
2 changes: 1 addition & 1 deletion .../aws/lambda/tracing/PowerToolTracing.java → ...azon/lambda/tracing/PowerToolTracing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.tracing;
package software.amazon.lambda.tracing;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
2 changes: 1 addition & 1 deletion ...tware/aws/lambda/tracing/PowerTracer.java → ...re/amazon/lambda/tracing/PowerTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.tracing;
package software.amazon.lambda.tracing;

import java.util.function.Consumer;

Expand Down
16 changes: 8 additions & 8 deletions ...tracing/internal/LambdaTracingAspect.java → ...tracing/internal/LambdaTracingAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.tracing.internal;
package software.amazon.lambda.tracing.internal;

import com.amazonaws.xray.AWSXRay;
import com.amazonaws.xray.entities.Subsegment;
Expand All @@ -7,13 +7,13 @@
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import software.aws.lambda.tracing.PowerToolTracing;
import software.amazon.lambda.tracing.PowerToolTracing;
import software.amazon.lambda.tracing.PowerTracer;

import static software.aws.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
import static software.aws.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;
import static software.aws.lambda.tracing.PowerTracer.SERVICE_NAME;
import static software.amazon.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
import static software.amazon.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;

@Aspect
public final class LambdaTracingAspect {
Expand Down Expand Up @@ -59,7 +59,7 @@ public Object around(ProceedingJoinPoint pjp,
}

private String namespace(PowerToolTracing powerToolsTracing) {
return powerToolsTracing.namespace().isEmpty() ? SERVICE_NAME : powerToolsTracing.namespace();
return powerToolsTracing.namespace().isEmpty() ? PowerTracer.SERVICE_NAME : powerToolsTracing.namespace();
}

private boolean placedOnHandlerMethod(ProceedingJoinPoint pjp) {
Expand Down
4 changes: 2 additions & 2 deletions .../lambda/handlers/PowerLogToolEnabled.java → .../lambda/handlers/PowerLogToolEnabled.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
import software.aws.lambda.logging.PowerToolsLogging;
import software.amazon.lambda.logging.PowerToolsLogging;

public class PowerLogToolEnabled implements RequestHandler<Object, Object> {

Expand Down
4 changes: 2 additions & 2 deletions ...andlers/PowerLogToolEnabledForStream.java → ...andlers/PowerLogToolEnabledForStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import java.io.InputStream;
import java.io.OutputStream;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
import software.aws.lambda.logging.PowerToolsLogging;
import software.amazon.lambda.logging.PowerToolsLogging;

public class PowerLogToolEnabledForStream implements RequestStreamHandler {

Expand Down
2 changes: 1 addition & 1 deletion ...ws/lambda/handlers/PowerToolDisabled.java → ...on/lambda/handlers/PowerToolDisabled.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
Expand Down
2 changes: 1 addition & 1 deletion .../handlers/PowerToolDisabledForStream.java → .../handlers/PowerToolDisabledForStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import java.io.InputStream;
import java.io.OutputStream;
Expand Down
4 changes: 2 additions & 2 deletions ...da/handlers/PowerToolLogEventEnabled.java → ...da/handlers/PowerToolLogEventEnabled.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
import software.aws.lambda.logging.PowerToolsLogging;
import software.amazon.lambda.logging.PowerToolsLogging;

public class PowerToolLogEventEnabled implements RequestHandler<Object, Object> {

Expand Down
4 changes: 2 additions & 2 deletions ...rs/PowerToolLogEventEnabledForStream.java → ...rs/PowerToolLogEventEnabledForStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -8,7 +8,7 @@
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
import com.fasterxml.jackson.databind.ObjectMapper;
import software.aws.lambda.logging.PowerToolsLogging;
import software.amazon.lambda.logging.PowerToolsLogging;

public class PowerToolLogEventEnabledForStream implements RequestStreamHandler {

Expand Down
4 changes: 2 additions & 2 deletions ...mbda/handlers/PowerTracerToolEnabled.java → ...mbda/handlers/PowerTracerToolEnabled.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
import software.aws.lambda.tracing.PowerToolTracing;
import software.amazon.lambda.tracing.PowerToolTracing;

public class PowerTracerToolEnabled implements RequestHandler<Object, Object> {

Expand Down
4 changes: 2 additions & 2 deletions ...lers/PowerTracerToolEnabledForStream.java → ...lers/PowerTracerToolEnabledForStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import java.io.InputStream;
import java.io.OutputStream;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
import software.aws.lambda.tracing.PowerToolTracing;
import software.amazon.lambda.tracing.PowerToolTracing;

public class PowerTracerToolEnabledForStream implements RequestStreamHandler {

Expand Down
4 changes: 2 additions & 2 deletions ...erToolEnabledForStreamWithNoMetaData.java → ...erToolEnabledForStreamWithNoMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import java.io.InputStream;
import java.io.OutputStream;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
import software.aws.lambda.tracing.PowerToolTracing;
import software.amazon.lambda.tracing.PowerToolTracing;

public class PowerTracerToolEnabledForStreamWithNoMetaData implements RequestStreamHandler {

Expand Down
4 changes: 2 additions & 2 deletions .../PowerTracerToolEnabledWithException.java → .../PowerTracerToolEnabledWithException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
import software.aws.lambda.tracing.PowerToolTracing;
import software.amazon.lambda.tracing.PowerToolTracing;

public class PowerTracerToolEnabledWithException implements RequestHandler<Object, Object> {

Expand Down
4 changes: 2 additions & 2 deletions ...PowerTracerToolEnabledWithNoMetaData.java → ...PowerTracerToolEnabledWithNoMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package software.aws.lambda.handlers;
package software.amazon.lambda.handlers;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
import software.aws.lambda.tracing.PowerToolTracing;
import software.amazon.lambda.tracing.PowerToolTracing;

public class PowerTracerToolEnabledWithNoMetaData implements RequestHandler<Object, Object> {

Expand Down
3 changes: 1 addition & 2 deletions ...e/aws/lambda/logging/PowerLoggerTest.java → ...mazon/lambda/logging/PowerLoggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package software.aws.lambda.logging;
package software.amazon.lambda.logging;

import org.apache.logging.log4j.ThreadContext;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import software.aws.lambda.logging.PowerLogger;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
16 changes: 8 additions & 8 deletions ...ing/internal/LambdaLoggingAspectTest.java → ...ing/internal/LambdaLoggingAspectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.logging.internal;
package software.amazon.lambda.logging.internal;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand All @@ -15,13 +15,13 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import software.aws.lambda.handlers.PowerToolDisabled;
import software.aws.lambda.handlers.PowerToolDisabledForStream;
import software.aws.lambda.handlers.PowerLogToolEnabled;
import software.aws.lambda.handlers.PowerLogToolEnabledForStream;
import software.aws.lambda.handlers.PowerToolLogEventEnabled;
import software.aws.lambda.handlers.PowerToolLogEventEnabledForStream;
import software.aws.lambda.internal.LambdaHandlerProcessor;
import software.amazon.lambda.internal.LambdaHandlerProcessor;
import software.amazon.lambda.handlers.PowerToolDisabled;
import software.amazon.lambda.handlers.PowerToolDisabledForStream;
import software.amazon.lambda.handlers.PowerLogToolEnabled;
import software.amazon.lambda.handlers.PowerLogToolEnabledForStream;
import software.amazon.lambda.handlers.PowerToolLogEventEnabled;
import software.amazon.lambda.handlers.PowerToolLogEventEnabledForStream;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
Expand Down
4 changes: 2 additions & 2 deletions ...e/aws/lambda/tracing/PowerTracerTest.java → ...mazon/lambda/tracing/PowerTracerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package software.aws.lambda.tracing;
package software.amazon.lambda.tracing;

import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.xray.AWSXRay;
Expand All @@ -10,7 +10,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static software.aws.lambda.tracing.PowerTracer.withEntitySubsegment;
import static software.amazon.lambda.tracing.PowerTracer.withEntitySubsegment;

class PowerTracerTest {

Expand Down
Loading