[plc4x] branch develop updated: feat(codegen/plc4j): fixed issue with name collision

[sr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new ed60521db feat(codegen/plc4j): fixed issue with name collision
ed60521db is described below

commit ed60521dbab6be8f5aec727cde9371e25ffeb496
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Aug 4 16:34:56 2022 +0200

    feat(codegen/plc4j): fixed issue with name collision
---
 .../templates/java/complex-type-template.java.ftlh         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code-generation/language-java/src/main/resources/templates/java/complex-type-template.java.ftlh b/code-generation/language-java/src/main/resources/templates/java/complex-type-template.java.ftlh
index 4f2a872f1..c712b9772 100644
--- a/code-generation/language-java/src/main/resources/templates/java/complex-type-template.java.ftlh
+++ b/code-generation/language-java/src/main/resources/templates/java/complex-type-template.java.ftlh
@@ -803,7 +803,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
         </#list>
         );
     <#elseif type.isDiscriminatedParentTypeDefinition()>
-        ${type.name} ${type.name?uncap_first} = builder.build(
+        ${type.name} _${type.name?uncap_first} = builder.build(
         <#list type.propertyFields as field>
             ${field.name}<#sep>, </#sep>
         </#list>
@@ -815,12 +815,12 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
         </#if>
         );
         <#list reservedFields as reservedField>
-        ${type.name?uncap_first}.reservedField${reservedField?index} = reservedField${reservedField?index};
+        _${type.name?uncap_first}.reservedField${reservedField?index} = reservedField${reservedField?index};
         </#list>
-        return ${type.name?uncap_first};
+        return _${type.name?uncap_first};
     <#else>
-        ${type.name} ${type.name?uncap_first};
-        ${type.name?uncap_first} = new ${type.name}(
+        ${type.name} _${type.name?uncap_first};
+        _${type.name?uncap_first} = new ${type.name}(
         <#list type.propertyFields as field>
             ${field.name}<#sep>, </#sep>
         </#list>
@@ -832,9 +832,9 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
         </#if>
         );
         <#list reservedFields as reservedField>
-            ${type.name?uncap_first}.reservedField${reservedField?index} = reservedField${reservedField?index};
+            _${type.name?uncap_first}.reservedField${reservedField?index} = reservedField${reservedField?index};
         </#list>
-        return ${type.name?uncap_first};
+        return _${type.name?uncap_first};
     </#if>
     }