Update based on feedback

Author: zoewangg

archetypes/README.md

@@ -5,5 +5,9 @@ This module contains maven archetypes for AWS Java SDK 2.x.
 
 ## Archetypes
 
-- [archetype-lambda](archetype-lambda/README.md) - a lambda function template using AWS Java SDK 2.x
+- [archetype-app](archetype-app/README.md) - a simple client application
+ template using the AWS SDK for Java 2.x
+- [archetype-lambda](archetype-lambda/README.md) - an AWS Lambda function
+ template using the AWS SDK for Java 2.x
+
 

archetypes/archetype-app/README.md

@@ -1,9 +1,16 @@
 # Maven Archetype for client applications using the AWS SDK for Java 2.x
 
 ## Description
-This is an Apache Maven Archetype to create a client application template using
- [AWS Java SDK 2.x][aws-java-sdk-v2]. You can use the archetype to generate
-  an application that has out-of-box [GraalVM Native Image][graalvm] support
+This is an Apache Maven Archetype to create a client application with
+a dependency of [AWS Java SDK 2.x][aws-java-sdk-v2].
+
+### Features
+
+The generated application has the following features:
+
+- Uses [Bill of Materials](BOM) to manage SDK dependencies
+- Contains the code to create the SDK client
+- Out-of-box support of GraalVM Native Image when `nativeImage` is enabled
 
 ## Usage
 
@@ -27,6 +34,7 @@ mvn archetype:generate \
     -DarchetypeVersion=2.x \
     -DgroupId=com.test \
     -DnativeImage=true \
+    -DhttpClient=apache-client \
     -DartifactId=sample-project \
     -Dservice=s3  \
     -DinteractiveMode=false
@@ -36,11 +44,11 @@ mvn archetype:generate \
       
 Parameter Name | Default Value | Description
 ---|---|---
-`service` (required) | n/a | Specifies the service client to be used in the lambda function, eg: s3, dynamodb. You can find available services [here][java-sdk-v2-services].
+`service` (required) | n/a | Specifies the service client to be used in the application, eg: s3, dynamodb. Only one service should be provided. You can find available services [here][java-sdk-v2-services]. 
 `groupId`(required) | n/a | Specifies the group ID of the project
 `artifactId`(required) | n/a | Specifies the artifact ID of the project
-`nativeImage` | n/a | Specifies whether GraalVM Native Image configuration should be included
-`httpClient` | apache-client | Specifies the http client to be used by the SDK client. Available options are `url-connection-client` (sync), `apache-client` (sync), `netty-nio-client` (async). See [http clients][sdk-http-clients]
+`nativeImage`(required)  | n/a | Specifies whether GraalVM Native Image configuration should be included
+`httpClient`(required) | n/a | Specifies the http client to be used by the SDK client. Available options are `url-connection-client` (sync), `apache-client` (sync), `netty-nio-client` (async). See [http clients][sdk-http-clients]
 `javaSdkVersion` | Same version as the archetype version | Specifies the version of the AWS Java SDK 2.x to be used
 `version` | 1.0-SNAPSHOT | Specifies the version of the project
 `package` | ${groupId} | Specifies the package name for the classes

archetypes/archetype-app/pom.xml

@@ -120,7 +120,7 @@
             </plugin>
 
             <!-- workaround to copy the global.vm and serviceMapping.vm to the sub folders
-                 because gloabl.vm is not so global any more
+                 because global.vm is not so global any more
                  see https://github.com/aws/aws-sdk-java-v2/issues/1981 -->
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>

archetypes/archetype-app/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -37,7 +37,6 @@
     <requiredProperty key="service">
     </requiredProperty>
     <requiredProperty key="httpClient">
-      <defaultValue>apache-client</defaultValue>
       <validationRegex>(url-connection-client|apache-client|netty-nio-client)</validationRegex>
     </requiredProperty>
     <requiredProperty key="nativeImage">

archetypes/archetype-app/src/main/resources/archetype-resources/README.md

@@ -15,20 +15,20 @@ Below is the structure of the generated project.
 ├── src
 │   ├── main
 │   │   ├── java
-│   │   │   └── pacakge
+│   │   │   └── package
 │   │   │       ├── App.java
 │   │   │       ├── DependencyFactory.java
 │   │   │       └── Handler.java
 │   │   └── resources
 │   │       └── simplelogger.properties
 │   └── test
 │       └── java
-│           └── pacakge
+│           └── package
 │               └── HandlerTest.java
 ```
 
 - `App.java`: main entry of the application
-- `DependencyFactory.java`: contains the SDK client
+- `DependencyFactory.java`: creates the SDK client
 - `Handler.java`: you can invoke the api calls using the SDK client here.
 
 #[[####]]# Building the project

archetypes/archetype-app/src/test/resources/projects/apachehttpclient/reference/README.md

@@ -15,20 +15,20 @@ Below is the structure of the generated project.
 ├── src
 │   ├── main
 │   │   ├── java
-│   │   │   └── pacakge
+│   │   │   └── package
 │   │   │       ├── App.java
 │   │   │       ├── DependencyFactory.java
 │   │   │       └── Handler.java
 │   │   └── resources
 │   │       └── simplelogger.properties
 │   └── test
 │       └── java
-│           └── pacakge
+│           └── package
 │               └── HandlerTest.java
 ```
 
 - `App.java`: main entry of the application
-- `DependencyFactory.java`: contains the SDK client
+- `DependencyFactory.java`: creates the SDK client
 - `Handler.java`: you can invoke the api calls using the SDK client here.
 
 #### Building the project

archetypes/archetype-app/src/test/resources/projects/apachehttpclientwithoutnativeimage/reference/README.md

@@ -15,20 +15,20 @@ Below is the structure of the generated project.
 ├── src
 │   ├── main
 │   │   ├── java
-│   │   │   └── pacakge
+│   │   │   └── package
 │   │   │       ├── App.java
 │   │   │       ├── DependencyFactory.java
 │   │   │       └── Handler.java
 │   │   └── resources
 │   │       └── simplelogger.properties
 │   └── test
 │       └── java
-│           └── pacakge
+│           └── package
 │               └── HandlerTest.java
 ```
 
 - `App.java`: main entry of the application
-- `DependencyFactory.java`: contains the SDK client
+- `DependencyFactory.java`: creates the SDK client
 - `Handler.java`: you can invoke the api calls using the SDK client here.
 
 #### Building the project

archetypes/archetype-app/src/test/resources/projects/nettyclient/reference/README.md

@@ -15,20 +15,20 @@ Below is the structure of the generated project.
 ├── src
 │   ├── main
 │   │   ├── java
-│   │   │   └── pacakge
+│   │   │   └── package
 │   │   │       ├── App.java
 │   │   │       ├── DependencyFactory.java
 │   │   │       └── Handler.java
 │   │   └── resources
 │   │       └── simplelogger.properties
 │   └── test
 │       └── java
-│           └── pacakge
+│           └── package
 │               └── HandlerTest.java
 ```
 
 - `App.java`: main entry of the application
-- `DependencyFactory.java`: contains the SDK client
+- `DependencyFactory.java`: creates the SDK client
 - `Handler.java`: you can invoke the api calls using the SDK client here.
 
 #### Building the project

archetypes/archetype-app/src/test/resources/projects/urlhttpclient/reference/README.md

@@ -15,20 +15,20 @@ Below is the structure of the generated project.
 ├── src
 │   ├── main
 │   │   ├── java
-│   │   │   └── pacakge
+│   │   │   └── package
 │   │   │       ├── App.java
 │   │   │       ├── DependencyFactory.java
 │   │   │       └── Handler.java
 │   │   └── resources
 │   │       └── simplelogger.properties
 │   └── test
 │       └── java
-│           └── pacakge
+│           └── package
 │               └── HandlerTest.java
 ```
 
 - `App.java`: main entry of the application
-- `DependencyFactory.java`: contains the SDK client
+- `DependencyFactory.java`: creates the SDK client
 - `Handler.java`: you can invoke the api calls using the SDK client here.
 
 #### Building the project

archetypes/archetype-lambda/pom.xml

@@ -119,7 +119,7 @@
             </plugin>
 
             <!-- workaround to copy the global.vm and serviceMapping.vm to the sub folders
-                 because gloabl.vm is not so global any more
+                 because global.vm is not so global any more
                  see https://github.com/aws/aws-sdk-java-v2/issues/1981 -->
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>

archetypes/archetype-tools/src/main/resources/global.vm

@@ -20,7 +20,7 @@
 #end
 #set ( $serviceClientVariable = $serviceClientPrefix.substring(0,1).toLowerCase() + $serviceClientPrefix.substring(1))
 #set( $regionEnum = $region.replace("-", "_").toUpperCase() )
-## map the client module name to the client class name and pacakge name
+## map the client module name to the client class name and package name
 #if( $httpClient == 'url-connection-client')
     #set ($httpClientClassName = 'UrlConnectionHttpClient')
     #set ($httpClientPackageName = 'urlconnection.' + $httpClientClassName)

buildspecs/archetype-native-image-test.yml

@@ -18,6 +18,7 @@ phases:
         -DgroupId=com.test \
         -DnativeImage=true \
         -DartifactId=apache-project \
+        -DhttpClient=apache-client \
         -Dservice=s3  \
         -DinteractiveMode=false
     - |

buildspecs/native-image-integ-test.yml

@@ -5,7 +5,7 @@ phases:
   build:
     commands:
     - mvn clean install -pl :sdk-native-image-test -P quick --am -T1C
-    - mvn clean install -pl :bom-internal
+    - mvn clean install -pl :bom-internal,:bom
     - cd test/sdk-native-image-test
     - mvn clean package -P native-image
     - target/sdk-native-image-test

codegen/src/test/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategyTest.java

@@ -223,7 +223,7 @@ public void sharedModel_notProvidingPackageName_shouldUseServiceName() {
 
 
     @Test
-    public void sharedModel_providingPackageName_shouldUseProvidedPacakgeName() {
+    public void sharedModel_providingPackageName_shouldUseProvidedpackageName() {
         CustomizationConfig config = CustomizationConfig.create();
         ShareModelConfig shareModelConfig = new ShareModelConfig();
         shareModelConfig.setShareModelWith("foo");

test/sdk-native-image-test/README.md

@@ -2,10 +2,14 @@
 
 ## Description
 This module contains a sample application using AWS SDK for Java 2.x, and it
- used to test GraalVM Native Image compilation.
+is used to test GraalVM Native Image compilation.
 
 ## How to run
 ```
+mvn clean install -pl :sdk-native-image-test -P quick --am
+
+mvn clean install -pl :bom-internal,:bom
+
 cd test/sdk-native-image-test
 
 # build the image