fix(codegen): fixed usage of deprecated utils

apache · Feb 24, 2022 · e01cce8 · e01cce8
1 parent c874d78
commit e01cce8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
@@ -770,7 +770,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
                             <#else>
                                 <#assign complexTypeReference=arrayElementType.asComplexTypeReference().orElseThrow()>
                                 <#assign typeName=complexTypeReference.name>
-                                <#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
+                                <#assign typeDefinition=complexTypeReference.typeDefinition>
                                 <#if typeDefinition.isDiscriminatedChildTypeDefinition()>
                                 <#-- Usually you don't use child directly unless they are parameterized #-->
                                     <#assign typeName=typeDefinition.parentType.orElseThrow().name>
@@ -834,7 +834,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
 							<#else>
                                 <#assign complexTypeReference=arrayElementType.asComplexTypeReference().orElseThrow()>
                                 <#assign typeName=complexTypeReference.name>
-                                <#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
+                                <#assign typeDefinition=complexTypeReference.typeDefinition>
                                 <#if typeDefinition.isComplexTypeDefinition() && typeDefinition.asComplexTypeDefinition().orElseThrow().isDiscriminatedChildTypeDefinition()>
                                 <#-- Usually you don't use child directly unless they are parameterized #-->
                                     <#assign typeName=typeDefinition.asComplexTypeDefinition().orElseThrow().parentType.orElseThrow().name>
@@ -1086,7 +1086,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
 				<@compress single_line=true>
                 <#assign complexTypeReference=optionalField.type.asComplexTypeReference().orElseThrow()>
                 <#assign typeName=complexTypeReference.name>
-                <#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
+                <#assign typeDefinition=complexTypeReference.typeDefinition>
                 <#if typeDefinition.isDiscriminatedChildTypeDefinition()>
                 <#-- Usually you don't use child directly unless they are parameterized #-->
                     <#assign typeName=typeDefinition.parentType.orElseThrow().name>
@@ -1140,7 +1140,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
 				<@compress single_line=true>
                 <#assign complexTypeReference=assertField.type.asComplexTypeReference().orElseThrow()>
                 <#assign typeName=complexTypeReference.name>
-                <#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
+                <#assign typeDefinition=complexTypeReference.typeDefinition>
                 <#if typeDefinition.isDiscriminatedChildTypeDefinition()>
                 <#-- Usually you don't use child directly unless they are parameterized #-->
                     <#assign typeName=typeDefinition.parentType.orElseThrow().name>
@@ -1216,7 +1216,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
 	<#else>
         <#assign nonSimpleTypeReference=simpleField.type.asNonSimpleTypeReference().orElseThrow()>
         <#assign typeName=nonSimpleTypeReference.name>
-        <#assign typeDefinition=helper.getTypeDefinitionForTypeReference(nonSimpleTypeReference)>
+        <#assign typeDefinition=nonSimpleTypeReference.typeDefinition>
         <#if typeDefinition.isComplexTypeDefinition() && typeDefinition.asComplexTypeDefinition().orElseThrow().isDiscriminatedChildTypeDefinition()>
         <#-- Usually you don't use child directly unless they are parameterized #-->
             <#assign typeName=typeDefinition.asComplexTypeDefinition().orElseThrow().parentType.orElseThrow().name>
@@ -1367,7 +1367,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
                     <@compress single_line=true>
                         <#assign complexTypeReference=peekField.type.asComplexTypeReference().orElseThrow()>
                         <#assign typeName=complexTypeReference.name>
-                        <#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
+                        <#assign typeDefinition=complexTypeReference.typeDefinition>
                         <#if typeDefinition.isDiscriminatedChildTypeDefinition()>
                         <#-- Usually you don't use child directly unless they are parameterized #-->
                             <#assign typeName=typeDefinition.parentType.orElseThrow().name>

diff --git a/code-generation/language-java/src/main/resources/templates/java/model-template.java.ftlh b/code-generation/language-java/src/main/resources/templates/java/model-template.java.ftlh
@@ -638,7 +638,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
                 <#assign typedField = field.asTypedField().orElseThrow()>
                 <#assign namedField = field.asNamedField().orElseThrow()>
 
-                ${helper.getLanguageTypeNameForField(field)} ${namedField.name} = read${field.typeName?cap_first}Field("${namedField.name}", "${helper.getTypeDefinitionForTypeReference(enumField.type).name}", readEnum(${helper.getTypeDefinitionForTypeReference(enumField.type).name}::firstEnumForField${enumField.fieldName?cap_first}, ${helper.getDataReaderCall(helper.getEnumFieldTypeReference(enumField.type, enumField.fieldName))})${helper.getFieldOptions(typedField, parserArguments)});
+                ${helper.getLanguageTypeNameForField(field)} ${namedField.name} = read${field.typeName?cap_first}Field("${namedField.name}", "${enumField.type.asNonSimpleTypeReference().orElseThrow().typeDefinition.name}", readEnum(${enumField.type.asNonSimpleTypeReference().orElseThrow().typeDefinition.name}::firstEnumForField${enumField.fieldName?cap_first}, ${helper.getDataReaderCall(helper.getEnumFieldTypeReference(enumField.type, enumField.fieldName))})${helper.getFieldOptions(typedField, parserArguments)});
                 <#break>
             <#case "implicit">
                 <#assign implicitField = field.asImplicitField().orElseThrow()>