fixing defect if provided app name has capital letter in it

Change-Id: I304f15aa6563162b8a873bbc6ace6d7cc55c973c
Signed-off-by: Harman Singh <harmasin@cisco.com>

diff --git a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/java/generate/ProviderTemplateProcessor.java b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/java/generate/ProviderTemplateProcessor.java
index f7ec5f5d1eae4829c6a412d30af9fa6f4f84126e..4e94bdca98cc9152333c4d9768db7edb320b2a79 100644 (file)
--- a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/java/generate/ProviderTemplateProcessor.java
+++ b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/java/generate/ProviderTemplateProcessor.java
@@ -34,6 +34,8 @@ public class ProviderTemplateProcessor {
     Template template = ve.getTemplate( "provider/provider.vm" );
     /*  create a context and add data */
     VelocityContext context = CodeGeneratorUtil.createBasicVelocityContext(appName);
+    String lowerApp = appName.toLowerCase();
+    context.put("lowerApp", lowerApp);
     List<ProviderField> fields = new ArrayList<>();
     for(Object fieldKey : fieldKeys) {
       String name = (String)fieldKey;

diff --git a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/template/provider/provider.vm b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/template/provider/provider.vm
index b9dc30bfb20922d7bb36e1625a9ff1591b660242..79f9ee9e9e9f6d334fbd119c51f807b8cd202432 100644 (file)
--- a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/template/provider/provider.vm
+++ b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/template/provider/provider.vm
@@ -15,9 +15,9 @@ import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.SaveEntryInput
 import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.${capitalApp};
 import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.${capitalApp}Service;
 import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.saveentry.input.EntryField;
-import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.${app}.Entry;
-import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.${app}.EntryBuilder;
-import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.${app}.EntryKey;
+import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.${lowerApp}.Entry;
+import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.${lowerApp}.EntryBuilder;
+import org.opendaylight.yang.gen.v1.opendaylight.sample.rev140407.${lowerApp}.EntryKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;

diff --git a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/template/provider/yang-gen-sal/config/ProviderImpl.vm b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/template/provider/yang-gen-sal/config/providerImpl.vm
similarity index 100%
rename from main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/template/provider/yang-gen-sal/config/ProviderImpl.vm
rename to main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/src/main/template/provider/yang-gen-sal/config/providerImpl.vm