Fix generate command

Changed project property PackageNamePrefix to packageNamePrefix so that the generate command functions correctly.

Author: johnttompkins

examples/java_project.yaml

@@ -1,5 +1,5 @@
 # User-provided project settings override the default project settings
-PackageNamePrefix: org.my.package
+packageNamePrefix: org.my.package
 Client:
   Client: com.amazonaws.services.kinesis.AmazonKinesis
   Builder: com.amazonaws.services.kinesis.AmazonKinesisClientBuilder

uluru/languages/java/codegen.py

@@ -33,7 +33,7 @@ def generate(self, resource_def, project_settings):
         output_directory = Path(project_settings["output_directory"]).resolve(
             strict=True
         )
-        package_name_prefix = project_settings["PackageNamePrefix"]
+        package_name_prefix = project_settings["packageNamePrefix"]
 
         project_settings.setdefault("Client", {})
         java_client_keys = ["Client", "Builder", "ResourceModel"]

uluru/languages/java/data/project_defaults.yaml

@@ -1,4 +1,4 @@
 # User-provided project settings are merged with the default project settings
 # and override the defaults.
-packageNamePrefix: org.example
 packageName: ResourceProviderExample
+packageNamePrefix: com.example

uluru/languages/java/templates/handlers/BaseHandler.java

@@ -5,12 +5,12 @@
 #}
 {% set resource_name = Type|resource_type_resource -%}
 
-package {{ PackageNamePrefix }}.handlers;
+package {{ packageNamePrefix }}.handlers;
 
 import com.amazon.cloudformation.selfservice.messages.ResourceRequest;
 import com.amazon.cloudformation.selfservice.messages.ResourceResponse;
-import {{ PackageNamePrefix }}.models.{{ resource_name }}Model;
-import {{ PackageNamePrefix }}.utils.ResourceResponseReturner;
+import {{ packageNamePrefix }}.models.{{ resource_name }}Model;
+import {{ packageNamePrefix }}.utils.ResourceResponseReturner;
 import {{ Client.ResourceModel }}.*;
 import {{ Client.Client }};
 

uluru/languages/java/templates/integration/IntegrationTests.java

@@ -5,9 +5,9 @@
 package integration;
 
 import com.amazon.cloudformation.selfservice.messages.ResourceRequest;
-import {{ PackageNamePrefix }}.handlers.*;
-import {{ PackageNamePrefix }}.models.{{ resource_name }}Model;
-import {{ PackageNamePrefix }}.utils.{{ Type|resource_type_service }}ClientBuilder;
+import {{ packageNamePrefix }}.handlers.*;
+import {{ packageNamePrefix }}.models.{{ resource_name }}Model;
+import {{ packageNamePrefix }}.utils.{{ Type|resource_type_service }}ClientBuilder;
 
 import {{ Client.Client }};
 import {{ Client.ResourceModel }}.*;

uluru/languages/java/templates/models/ResourceModel.java

@@ -4,7 +4,7 @@
 	resource_properties (dictionary of properties for this subresource)
 #}
 {# {% set resource_name = Type|resource_type_resource %} #}
-package {{ PackageNamePrefix }}.models;
+package {{ packageNamePrefix }}.models;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

uluru/languages/java/templates/unit/BaseUnitTests.java

@@ -11,8 +11,8 @@
 import com.amazon.cloudformation.selfservice.messages.ResourceResponse;
 import com.amazon.cloudformation.selfservice.messages.Status;
 import com.amazonaws.services.kms.model.AlreadyExistsException;
-import {{ PackageNamePrefix }}.handlers.{{ resource_name }}{{ handler_type }}Handler;
-import {{ PackageNamePrefix }}.models.{{ resource_name }}Model;
+import {{ packageNamePrefix }}.handlers.{{ resource_name }}{{ handler_type }}Handler;
+import {{ packageNamePrefix }}.models.{{ resource_name }}Model;
 
 import org.junit.After;
 import org.junit.Test;

uluru/languages/java/templates/unit/TestBase.java

@@ -6,7 +6,7 @@
 import com.amazon.cloudformation.selfservice.messages.Status;
 import com.amazonaws.AmazonServiceException;
 
-import {{ PackageNamePrefix }}.models.{{ resource_name }}Model;
+import {{ packageNamePrefix }}.models.{{ resource_name }}Model;
 
 import {{ Client.ResourceModel }}.*;
 import {{ Client.Client }};

uluru/languages/java/templates/utils/ClientBuilder.java

@@ -1,4 +1,4 @@
-package {{ PackageNamePrefix }}.utils;
+package {{ packageNamePrefix }}.utils;
 
 import com.amazon.cloudformation.selfservice.messages.Credentials;
 import com.amazon.cloudformation.selfservice.messages.ResourceRequest;

uluru/languages/java/templates/utils/ResourceResponseReturner.java

@@ -1,4 +1,4 @@
-package {{ PackageNamePrefix }}.utils;
+package {{ packageNamePrefix }}.utils;
 
 import com.amazon.cloudformation.selfservice.exception.TerminalException;
 import com.amazon.cloudformation.selfservice.messages.*;