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

* fix: Fixing security issues on package.json dependencies

* fix: moving groupId and package from software.aws.lambda to software.amazon.lambda

Author: stevehouel

README.md

@@ -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>
@@ -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>
@@ -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'
 }
 ```
 

docs/content/index.mdx

@@ -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>
@@ -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'
 }
 ```
 

example/HelloWorldFunction/pom.xml

@@ -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>
@@ -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>

example/HelloWorldFunction/src/main/java/helloworld/App.java

@@ -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.

example/HelloWorldFunction/src/main/java/helloworld/AppStream.java

@@ -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();

pom.xml

@@ -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>

src/main/java/software/aws/lambda/internal/LambdaHandlerProcessor.java renamed to src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.internal;
+package software.amazon.lambda.internal;
 
 import java.io.InputStream;
 import java.io.OutputStream;

src/main/java/software/aws/lambda/logging/PowerLogger.java renamed to src/main/java/software/amazon/lambda/logging/PowerLogger.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.logging;
+package software.amazon.lambda.logging;
 
 import org.apache.logging.log4j.ThreadContext;
 

src/main/java/software/aws/lambda/logging/PowerToolsLogging.java renamed to src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.logging;
+package software.amazon.lambda.logging;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/software/aws/lambda/logging/internal/DefaultLambdaFields.java renamed to src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.amazon.lambda.logging.internal;
 
 import com.amazonaws.services.lambda.runtime.Context;
 

src/main/java/software/aws/lambda/logging/internal/LambdaLoggingAspect.java renamed to src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.amazon.lambda.logging.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -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 {

src/main/java/software/aws/lambda/tracing/PowerToolTracing.java renamed to src/main/java/software/amazon/lambda/tracing/PowerToolTracing.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.tracing;
+package software.amazon.lambda.tracing;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/software/aws/lambda/tracing/PowerTracer.java renamed to src/main/java/software/amazon/lambda/tracing/PowerTracer.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.tracing;
+package software.amazon.lambda.tracing;
 
 import java.util.function.Consumer;
 

src/main/java/software/aws/lambda/tracing/internal/LambdaTracingAspect.java renamed to src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java

@@ -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;
@@ -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 {
@@ -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) {

src/test/java/software/aws/lambda/handlers/PowerLogToolEnabled.java renamed to src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java

@@ -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> {
 

src/test/java/software/aws/lambda/handlers/PowerLogToolEnabledForStream.java renamed to src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java

@@ -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 {
 

src/test/java/software/aws/lambda/handlers/PowerToolDisabled.java renamed to src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java

@@ -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;

src/test/java/software/aws/lambda/handlers/PowerToolDisabledForStream.java renamed to src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import java.io.InputStream;
 import java.io.OutputStream;

src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabled.java renamed to src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java

@@ -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> {
 

src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabledForStream.java renamed to src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -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 {
 

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabled.java renamed to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java

@@ -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> {
 

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStream.java renamed to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java

@@ -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 {
 

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java renamed to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java

@@ -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 {
 

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithException.java renamed to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java

@@ -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> {
 

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java renamed to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java

@@ -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> {
 

src/test/java/software/aws/lambda/logging/PowerLoggerTest.java renamed to src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java

@@ -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;
 

src/test/java/software/aws/lambda/logging/internal/LambdaLoggingAspectTest.java renamed to src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.amazon.lambda.logging.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -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;

src/test/java/software/aws/lambda/tracing/PowerTracerTest.java renamed to src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java

@@ -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;
@@ -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 {