fix(code-gen/go): add support for typeswitch in typeswitch

#1738
apache · Aug 24, 2024 · fdeb863 · fdeb863
1 parent aaf78d9
commit fdeb863
Show file tree

Hide file tree

Showing 31 changed files with 7,973 additions and 262 deletions.
diff --git a/...plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java b/...plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
@@ -361,7 +361,7 @@ public boolean isWildcard(Term term) {
     }
 
     /**
-     * can be used to throw a exception from the template
+     * can be used to throw an exception from the template
      *
      * @param message the message
      * @return the exception

diff --git a/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh
@@ -158,15 +158,13 @@ type _${type.name} struct {
 }
 
 <#if type.isDiscriminatedParentTypeDefinition()>
-<#assign complexTypeDefinition = type.asComplexTypeDefinition().orElseThrow()>
 type _${type.name}ChildRequirements interface {
 	utils.Serializable
 	GetLengthInBits(ctx context.Context) uint16
-    <#list complexTypeDefinition.getDiscriminatorNames() as discriminatorName>
+    <#list helper.discriminatorTypes as discriminatorName, discriminatorType>
     <#-- If the discriminator name matches that of another field, suppress the methods generation -->
         <#if type.isDiscriminatorField(discriminatorName)>
-            <#assign typeRef=helper.getDiscriminatorTypes()[discriminatorName]>
-	Get${discriminatorName?cap_first}() <#if typeRef.isNonSimpleTypeReference() && !typeRef.isEnumTypeReference()>I</#if>${helper.getLanguageTypeNameForTypeReference(typeRef)}
+	Get${discriminatorName?cap_first}() <#if discriminatorType.isNonSimpleTypeReference() && !discriminatorType.isEnumTypeReference()>I</#if>${helper.getLanguageTypeNameForTypeReference(discriminatorType)}
         </#if>
     </#list>
     <#list type.abstractFields as field>
@@ -188,7 +186,7 @@ type _${type.name}ChildRequirements interface {
 	<#list discriminatedChildType.getDiscriminatorMap() as discriminatorName, discriminatorTerm>
 		<#-- If the discriminator name matches that of another field, suppress the methods generation -->
 		<#if !type.isNonDiscriminatorField(discriminatorName)>
-			<#assign typeRef=helper.getDiscriminatorTypes()[discriminatorName]>
+			<#assign typeRef=helper.getDiscriminatorTypes(discriminatedChildType.parentType.orElseThrow())[discriminatorName]>
 func (m *_${type.name})  Get${discriminatorName?cap_first}() <#if typeRef.isNonSimpleTypeReference() && !typeRef.isEnumTypeReference()>I</#if>${helper.getLanguageTypeNameForTypeReference(typeRef)} {
 			<@compress single_line=true>
 				return

diff --git a/plc4go/internal/bacnetip/mock_APCI_test.go b/plc4go/internal/bacnetip/mock_APCI_test.go