Skip to content

Commit e4ab370

Browse files
author
RJ Lohan
authored
Refactored namespace from redundant AWS groupId (#198)
* Refactored namespace from redundant AWS groupId
1 parent 1dcc10e commit e4ab370

File tree

159 files changed

+472
-473
lines changed

Some content is hidden

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

159 files changed

+472
-473
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.amazonaws.cloudformation</groupId>
4+
<groupId>software.amazon.cloudformation</groupId>
55
<artifactId>aws-cloudformation-rpdk-java-plugin</artifactId>
66
<version>1.0</version>
77
<name>AWS CloudFormation RPDK Java Plugin</name>
@@ -44,7 +44,7 @@
4444
<dependencies>
4545
<!-- https://mvnrepository.com/artifact/com.github.everit-org.json-schema/org.everit.json.schema -->
4646
<dependency>
47-
<groupId>com.amazonaws.cloudformation</groupId>
47+
<groupId>software.amazon.cloudformation</groupId>
4848
<artifactId>aws-cloudformation-resource-schema</artifactId>
4949
<version>1.0.3</version>
5050
</dependency>

‎python/rpdk/java/codegen.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def _namespace_from_project(self, project):
5252

5353
def _prompt_for_namespace(self, project):
5454
if project.type_info[0] == "AWS":
55-
namespace = ("com", "amazonaws") + project.type_info[1:]
55+
namespace = ("software", "amazon") + project.type_info[1:]
5656
else:
5757
namespace = ("com",) + project.type_info
5858

‎python/rpdk/java/templates/BaseHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// This is a generated file. Modifications will be overwritten.
22
package {{ package_name }};
33

4-
import com.amazonaws.cloudformation.proxy.AmazonWebServicesClientProxy;
5-
import com.amazonaws.cloudformation.proxy.Logger;
6-
import com.amazonaws.cloudformation.proxy.ProgressEvent;
7-
import com.amazonaws.cloudformation.proxy.ResourceHandlerRequest;
4+
import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
5+
import software.amazon.cloudformation.proxy.Logger;
6+
import software.amazon.cloudformation.proxy.ProgressEvent;
7+
import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
88

99
public abstract class BaseHandler<CallbackT> {
1010

‎python/rpdk/java/templates/HandlerWrapper.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
package {{ package_name }};
33

44
import com.amazonaws.AmazonServiceException;
5-
import com.amazonaws.cloudformation.Action;
6-
import com.amazonaws.cloudformation.exceptions.BaseHandlerException;
7-
import com.amazonaws.cloudformation.LambdaWrapper;
8-
import com.amazonaws.cloudformation.loggers.LambdaLogPublisher;
9-
import com.amazonaws.cloudformation.metrics.MetricsPublisher;
10-
import com.amazonaws.cloudformation.proxy.AmazonWebServicesClientProxy;
11-
import com.amazonaws.cloudformation.proxy.CallbackAdapter;
12-
import com.amazonaws.cloudformation.proxy.HandlerErrorCode;
13-
import com.amazonaws.cloudformation.proxy.HandlerRequest;
14-
import com.amazonaws.cloudformation.proxy.LoggerProxy;
15-
import com.amazonaws.cloudformation.proxy.ProgressEvent;
16-
import com.amazonaws.cloudformation.proxy.RequestContext;
17-
import com.amazonaws.cloudformation.proxy.RequestData;
18-
import com.amazonaws.cloudformation.proxy.ResourceHandlerRequest;
19-
import com.amazonaws.cloudformation.proxy.ResourceHandlerTestPayload;
20-
import com.amazonaws.cloudformation.resource.SchemaValidator;
21-
import com.amazonaws.cloudformation.resource.Serializer;
22-
import com.amazonaws.cloudformation.scheduler.CloudWatchScheduler;
5+
import software.amazon.cloudformation.Action;
6+
import software.amazon.cloudformation.exceptions.BaseHandlerException;
7+
import software.amazon.cloudformation.LambdaWrapper;
8+
import software.amazon.cloudformation.loggers.LambdaLogPublisher;
9+
import software.amazon.cloudformation.metrics.MetricsPublisher;
10+
import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
11+
import software.amazon.cloudformation.proxy.CallbackAdapter;
12+
import software.amazon.cloudformation.proxy.HandlerErrorCode;
13+
import software.amazon.cloudformation.proxy.HandlerRequest;
14+
import software.amazon.cloudformation.proxy.LoggerProxy;
15+
import software.amazon.cloudformation.proxy.ProgressEvent;
16+
import software.amazon.cloudformation.proxy.RequestContext;
17+
import software.amazon.cloudformation.proxy.RequestData;
18+
import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
19+
import software.amazon.cloudformation.proxy.ResourceHandlerTestPayload;
20+
import software.amazon.cloudformation.resource.SchemaValidator;
21+
import software.amazon.cloudformation.resource.Serializer;
22+
import software.amazon.cloudformation.scheduler.CloudWatchScheduler;
2323
import com.amazonaws.services.lambda.runtime.Context;
2424
import com.fasterxml.jackson.core.type.TypeReference;
2525

‎python/rpdk/java/templates/StubHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package {{ package_name }};
22

3-
import com.amazonaws.cloudformation.proxy.AmazonWebServicesClientProxy;
4-
import com.amazonaws.cloudformation.proxy.Logger;
5-
import com.amazonaws.cloudformation.proxy.ProgressEvent;
6-
import com.amazonaws.cloudformation.proxy.OperationStatus;
7-
import com.amazonaws.cloudformation.proxy.ResourceHandlerRequest;
3+
import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
4+
import software.amazon.cloudformation.proxy.Logger;
5+
import software.amazon.cloudformation.proxy.ProgressEvent;
6+
import software.amazon.cloudformation.proxy.OperationStatus;
7+
import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
88

99
public class {{ operation }}Handler extends BaseHandler<CallbackContext> {
1010

‎python/rpdk/java/templates/StubHandlerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package {{ package_name }};
22

3-
import com.amazonaws.cloudformation.proxy.AmazonWebServicesClientProxy;
4-
import com.amazonaws.cloudformation.proxy.Logger;
5-
import com.amazonaws.cloudformation.proxy.OperationStatus;
6-
import com.amazonaws.cloudformation.proxy.ProgressEvent;
7-
import com.amazonaws.cloudformation.proxy.ResourceHandlerRequest;
3+
import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
4+
import software.amazon.cloudformation.proxy.Logger;
5+
import software.amazon.cloudformation.proxy.OperationStatus;
6+
import software.amazon.cloudformation.proxy.ProgressEvent;
7+
import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
88
import org.junit.jupiter.api.BeforeEach;
99
import org.junit.jupiter.api.Test;
1010
import org.junit.jupiter.api.extension.ExtendWith;

‎python/rpdk/java/templates/StubListHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package {{ package_name }};
22

3-
import com.amazonaws.cloudformation.proxy.AmazonWebServicesClientProxy;
4-
import com.amazonaws.cloudformation.proxy.Logger;
5-
import com.amazonaws.cloudformation.proxy.ProgressEvent;
6-
import com.amazonaws.cloudformation.proxy.OperationStatus;
7-
import com.amazonaws.cloudformation.proxy.ResourceHandlerRequest;
3+
import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
4+
import software.amazon.cloudformation.proxy.Logger;
5+
import software.amazon.cloudformation.proxy.ProgressEvent;
6+
import software.amazon.cloudformation.proxy.OperationStatus;
7+
import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
88

99
import java.util.ArrayList;
1010
import java.util.List;

‎python/rpdk/java/templates/StubListHandlerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package {{ package_name }};
22

3-
import com.amazonaws.cloudformation.proxy.AmazonWebServicesClientProxy;
4-
import com.amazonaws.cloudformation.proxy.Logger;
5-
import com.amazonaws.cloudformation.proxy.OperationStatus;
6-
import com.amazonaws.cloudformation.proxy.ProgressEvent;
7-
import com.amazonaws.cloudformation.proxy.ResourceHandlerRequest;
3+
import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
4+
import software.amazon.cloudformation.proxy.Logger;
5+
import software.amazon.cloudformation.proxy.OperationStatus;
6+
import software.amazon.cloudformation.proxy.ProgressEvent;
7+
import software.amazon.cloudformation.proxy.ResourceHandlerRequest;
88
import org.junit.jupiter.api.BeforeEach;
99
import org.junit.jupiter.api.Test;
1010
import org.junit.jupiter.api.extension.ExtendWith;

‎python/rpdk/java/templates/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependencies>
2929
<!-- https://github.com/awslabs/aws-cloudformation-rpdk-java-plugin/ -->
3030
<dependency>
31-
<groupId>com.amazonaws.cloudformation</groupId>
31+
<groupId>software.amazon.cloudformation</groupId>
3232
<artifactId>aws-cloudformation-rpdk-java-plugin</artifactId>
3333
<version>1.0</version>
3434
</dependency>

src/main/java/com/amazonaws/cloudformation/Action.java renamed to src/main/java/software/amazon/cloudformation/Action.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* express or implied. See the License for the specific language governing
1313
* permissions and limitations under the License.
1414
*/
15-
package com.amazonaws.cloudformation;
15+
package software.amazon.cloudformation;
1616

1717
public enum Action {
1818
CREATE,

0 commit comments

Comments
 (0)