Skip to content

Commit

Permalink
fix(codegen): fixed parent access issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@sruehl
sruehl committed Feb 23, 2022
1 parent da3889f commit b8c0c7b
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions ...tion/language-cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,10 @@ public String getDataReaderCall(TypeReference typeReference, String resolverMeth
} else if (typeReference.isComplexTypeReference()) {
StringBuilder paramsString = new StringBuilder();
ComplexTypeReference complexTypeReference = typeReference.asComplexTypeReference().orElseThrow(IllegalStateException::new);
TypeDefinition typeDefinition = getTypeDefinitionForTypeReference(typeReference);
ComplexTypeDefinition typeDefinition = getTypeDefinitionForTypeReference(typeReference).asComplexTypeDefinition().orElseThrow();
String parserCallString = getLanguageTypeNameForTypeReference(typeReference);
if (typeDefinition.isDiscriminatedChildTypeDefinition()) {
parserCallString = "(" + getLanguageTypeNameForTypeReference(typeReference) + ") " + typeDefinition.getParentType().getName();
parserCallString = "(" + getLanguageTypeNameForTypeReference(typeReference) + ") " + typeDefinition.getParentType().orElseThrow().getName();
}
List<Term> paramTerms = complexTypeReference.getParams().orElse(Collections.emptyList());
for (int i = 0; i < paramTerms.size(); i++) {
Expand Down
6 changes: 3 additions & 3 deletions code-generation/language-cs/src/main/resources/templates/cs/io-template.cs.ftlh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class ${type.name}IO implements MessageInput<${type.name}> {
<#else>
@Override
public ${type.name} parse(ReadBuffer readBuffer, Object... args) throws ParseException {
return (${type.name}) new ${type.parentType.name}IO().parse(readBuffer, args);
return (${type.name}) new ${type.parentType.orElseThrow().name}IO().parse(readBuffer, args);
}

</#if>
Expand Down Expand Up @@ -276,7 +276,7 @@ public class ${type.name}IO implements MessageInput<${type.name}> {

</#if>
<#if type.isDiscriminatedChildTypeDefinition()>
public static class ${type.name}Builder implements ${type.parentType.name}IO.${type.parentType.name}Builder {
public static class ${type.name}Builder implements ${type.parentType.orElseThrow().name}IO.${type.parentType.orElseThrow().name}Builder {
<#if type.propertyFields?has_content>
<#list type.propertyFields as field>
private final <#if field.loopType?? && field.type.isByteBased()>byte[]<#elseif field.loopType??>List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}><#else>${helper.getLanguageTypeNameForField(field)}</#if> ${field.name};
Expand All @@ -289,7 +289,7 @@ public class ${type.name}IO implements MessageInput<${type.name}> {
</#list>
}

public ${type.name} build(<#list type.parentType.asComplexTypeDefinition().orElseThrow().propertyFields as field><#if field.loopType?? && field.type.isByteBased()>byte[]<#elseif field.loopType??>List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}><#else>${helper.getLanguageTypeNameForField(field)}</#if> ${field.name}<#sep>, </#sep></#list>) {
public ${type.name} build(<#list type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().propertyFields as field><#if field.loopType?? && field.type.isByteBased()>byte[]<#elseif field.loopType??>List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}><#else>${helper.getLanguageTypeNameForField(field)}</#if> ${field.name}<#sep>, </#sep></#list>) {
return new ${type.name}(<#list type.allPropertyFields as field>${field.name}<#sep>, </#sep></#list>);
}
}
Expand Down
6 changes: 3 additions & 3 deletions code-generation/language-cs/src/main/resources/templates/cs/model-template.cs.ftlh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ using org.apache.plc4net.spi.model.values;
namespace org.apache.plc4net.drivers.${protocolName?replace("-", "")}.${outputFlavor?replace("-", "")}.model
{

public<#if helper.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${type.name}<#if type.parentType??> : ${type.parentType.name}</#if>
public<#if helper.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${type.name}<#if type.parentType.isPresent()> : ${type.parentType.orElseThrow().name}</#if>
{

<#--
Expand Down Expand Up @@ -149,7 +149,7 @@ namespace org.apache.plc4net.drivers.${protocolName?replace("-", "")}.${outputFl
<#if outputFlavor != "passive">
<#if type.isDiscriminatedChildTypeDefinition()>
@Override
protected void serialize${type.parentType.name}Child(WriteBuffer writeBuffer) throws SerializationException {
protected void serialize${type.parentType.orElseThrow().name}Child(WriteBuffer writeBuffer) throws SerializationException {
<#else>
<#if type.isDiscriminatedParentTypeDefinition()>
abstract protected void serialize${type.name?cap_first}Child(WriteBuffer writeBuffer) throws SerializationException;
Expand Down Expand Up @@ -296,7 +296,7 @@ namespace org.apache.plc4net.drivers.${protocolName?replace("-", "")}.${outputFl

@Override
public int getLengthInBits() {
int lengthInBits = <#if type.parentType??>super.getLengthInBits()<#else>0</#if>;
int lengthInBits = <#if type.parentType.isPresent()>super.getLengthInBits()<#else>0</#if>;
${type.name} _value = this;
<#list type.fields as field>
<#switch field.typeName>
Expand Down
2 changes: 1 addition & 1 deletion ...tion/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public String getLanguageTypeNameForTypeReference(TypeReference typeReference) {
return "";
}
if (!(typeReference instanceof SimpleTypeReference)) {
return ((ComplexTypeReference) typeReference).getName();
return ((NonSimpleTypeReference) typeReference).getName();
}
SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference;
switch (simpleTypeReference.getBaseType()) {
Expand Down
68 changes: 34 additions & 34 deletions code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ const ${type.name}_${field.name?upper_case} ${helper.getLanguageTypeNameForField

// The data-structure of this message
type ${type.name} struct {
<#if type.parentType??>
*${type.parentType.name}
<#if type.parentType.isPresent()>
*${type.parentType.orElseThrow().name}
</#if>
<#-- Property fields are fields that require a property in the pojo -->
<#if type.propertyFields?has_content>
Expand Down Expand Up @@ -230,11 +230,11 @@ func ${type.name}${discriminatorName?cap_first}(m I${type.name}) ${helper.getLan
}
</#if>
</#list-->
<#elseif type.parentType??>
<#elseif type.parentType.isPresent()>

<@compress single_line=true>
func (m *${type.name}) InitializeParent(parent *${type.parentType.name}
<#assign parentTypeHasPropertyFields=type.parentType.asComplexTypeDefinition().orElseThrow().allPropertyFields?has_content>
func (m *${type.name}) InitializeParent(parent *${type.parentType.orElseThrow().name}
<#assign parentTypeHasPropertyFields=type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().allPropertyFields?has_content>
<#if parentTypeHasPropertyFields>, </#if>
<#list type.parentPropertyFields as parentField>
${parentField.name}
Expand All @@ -246,8 +246,8 @@ func (m *${type.name}) InitializeParent(parent *${type.parentType.name}
)
{
</@compress>
<#list type.parentType.asComplexTypeDefinition().orElseThrow().allPropertyFields as field>
m.${type.parentType.name}.${field.name?cap_first} = ${field.name}
<#list type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().allPropertyFields as field>
m.${type.parentType.orElseThrow().name}.${field.name?cap_first} = ${field.name}
</#list>
}
</#if>
Expand Down Expand Up @@ -277,8 +277,8 @@ func (m *${type.name}) Get${field.name?cap_first}() <#if field.loopType??>[]</#i

</#list>

<#if type.parentType?has_content && type.parentType.allParserArguments.isPresent()>
<#assign filteredParentParserArguments = type.parentType.allParserArguments.orElseThrow()?filter(arg -> !type.parentType.asComplexTypeDefinition().orElseThrow().isDiscriminatorField(arg.name))>
<#if type.parentType.isPresent() && type.parentType.orElseThrow().allParserArguments.isPresent()>
<#assign filteredParentParserArguments = type.parentType.orElseThrow().allParserArguments.orElseThrow()?filter(arg -> !type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().isDiscriminatorField(arg.name))>
</#if>

// New${type.name} factory function for ${type.name}
Expand All @@ -288,7 +288,7 @@ func New${type.name}(
${field.name} <#if field.loopType??>[]</#if><#if helper.needsPointerAccess(field)>*</#if>${helper.getLanguageTypeNameForField(field)}
<#sep>, </#sep>
</#list>
<#if type.parentType?has_content>
<#if type.parentType.isPresent()>
<#if type.propertyFields?has_content && type.parentPropertyFields?has_content>, </#if>
<#list type.parentPropertyFields as parentField>
${parentField.name} <#if parentField.loopType??>[]</#if><#if helper.needsPointerAccess(parentField)>*</#if>${helper.getLanguageTypeNameForField(parentField)}
Expand All @@ -302,18 +302,18 @@ func New${type.name}(
<#sep>, </#sep>
</#list>
</#if>
) *<#if type.parentType?has_content>${type.parentType.name}<#else>${type.name}</#if> {
) *<#if type.parentType.isPresent()>${type.parentType.orElseThrow().name}<#else>${type.name}</#if> {
</@compress>

<#if type.parentType?has_content>
<#if type.parentType.isPresent()>
child := &${type.name}{
<#list type.propertyFields as field>
${field.name?cap_first}: ${field.name},
</#list>
${type.parentType.name}: New${type.parentType.name}(<#list type.parentPropertyFields as parentField>${parentField.name}<#sep>, </#list><#if filteredParentParserArguments?has_content><#if type.parentPropertyFields?has_content>, </#if><#list filteredParentParserArguments as arg>${arg.name}<#sep>, </#sep></#list></#if>),
${type.parentType.orElseThrow().name}: New${type.parentType.orElseThrow().name}(<#list type.parentPropertyFields as parentField>${parentField.name}<#sep>, </#list><#if filteredParentParserArguments?has_content><#if type.parentPropertyFields?has_content>, </#if><#list filteredParentParserArguments as arg>${arg.name}<#sep>, </#sep></#list></#if>),
}
child.Child = child
return child.${type.parentType.name}
return child.${type.parentType.orElseThrow().name}
<#else>
<@compress single_line=true>
return &${type.name}{
Expand Down Expand Up @@ -342,11 +342,11 @@ func Cast${type.name}(structType interface{}) *${type.name} {
if casted, ok := typ.(*${type.name}); ok {
return casted
}
<#if type.parentType?has_content>
if casted, ok := typ.(${type.parentType.name}); ok {
<#if type.parentType.isPresent()>
if casted, ok := typ.(${type.parentType.orElseThrow().name}); ok {
return Cast${type.name}(casted.Child)
}
if casted, ok := typ.(*${type.parentType.name}); ok {
if casted, ok := typ.(*${type.parentType.orElseThrow().name}); ok {
return Cast${type.name}(casted.Child)
}
</#if>
Expand Down Expand Up @@ -705,7 +705,7 @@ func (m *${type.name}) GetLengthInBytes() uint16 {

<#assign hasParserArguments=parserArguments?has_content/>
<#assign parserArgumentList><#if hasParserArguments><#list parserArguments as parserArgument>${parserArgument.name} <#if parserArgument.type.isComplexTypeReference() && !helper.isEnumTypeReference(parserArgument.type)>*</#if>${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}<#sep>, </#sep></#list></#if></#assign>
func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${parserArgumentList}</#if>) (*<#if type.parentType?has_content>${type.parentType.name}<#else>${type.name}</#if>, error) {
func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${parserArgumentList}</#if>) (*<#if type.parentType.isPresent()>${type.parentType.orElseThrow().name}<#else>${type.name}</#if>, error) {
if pullErr := readBuffer.PullContext("${type.name}"); pullErr != nil {
return nil, pullErr
}
Expand Down Expand Up @@ -768,8 +768,8 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
<#if typeDefinition.isDiscriminatedChildTypeDefinition()>
<#-- Usually you don't use child directly unless they are parameterized #-->
<#assign typeName=typeDefinition.parentType.name>
<#assign typeDefinition=typeDefinition.parentType>
<#assign typeName=typeDefinition.parentType.orElseThrow().name>
<#assign typeDefinition=typeDefinition.parentType.orElseThrow()>
</#if>
<#assign hasRefParams=complexTypeReference.params.isPresent()>
<#assign refParams>
Expand Down Expand Up @@ -832,8 +832,8 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
<#if typeDefinition.isDiscriminatedChildTypeDefinition()>
<#-- Usually you don't use child directly unless they are parameterized #-->
<#assign typeName=typeDefinition.parentType.name>
<#assign typeDefinition=typeDefinition.parentType>
<#assign typeName=typeDefinition.parentType.orElseThrow().name>
<#assign typeDefinition=typeDefinition.parentType.orElseThrow()>
</#if>
<#assign hasRefParams=complexTypeReference.params.isPresent()>
<#assign refParams>
Expand Down Expand Up @@ -1083,8 +1083,8 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
<#if typeDefinition.isDiscriminatedChildTypeDefinition()>
<#-- Usually you don't use child directly unless they are parameterized #-->
<#assign typeName=typeDefinition.parentType.name>
<#assign typeDefinition=typeDefinition.parentType>
<#assign typeName=typeDefinition.parentType.orElseThrow().name>
<#assign typeDefinition=typeDefinition.parentType.orElseThrow()>
</#if>
<#assign hasRefParams=complexTypeReference.params.isPresent()>
<#assign refParams>
Expand Down Expand Up @@ -1137,8 +1137,8 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
<#if typeDefinition.isDiscriminatedChildTypeDefinition()>
<#-- Usually you don't use child directly unless they are parameterized #-->
<#assign typeName=typeDefinition.parentType.name>
<#assign typeDefinition=typeDefinition.parentType>
<#assign typeName=typeDefinition.parentType.orElseThrow().name>
<#assign typeDefinition=typeDefinition.parentType.orElseThrow()>
</#if>
<#assign hasRefParams=complexTypeReference.params.isPresent() && typeDefinition.parserArguments.isPresent()>
<#assign refParams> <#if hasRefParams>, <#list complexTypeReference.params.orElseThrow() as typeParam>${helper.toTypedParseExpression(assertField, null, typeParam, null)}<#sep>, </#sep></#list> </#if> </#assign>
Expand Down Expand Up @@ -1213,8 +1213,8 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
<#if typeDefinition.isDiscriminatedChildTypeDefinition()>
<#-- Usually you don't use child directly unless they are parameterized #-->
<#assign typeName=typeDefinition.parentType.name>
<#assign typeDefinition=typeDefinition.parentType>
<#assign typeName=typeDefinition.parentType.orElseThrow().name>
<#assign typeDefinition=typeDefinition.parentType.orElseThrow()>
</#if>
<#assign hasRefParams=complexTypeReference.params.isPresent()>
<#assign refParams>
Expand Down Expand Up @@ -1367,8 +1367,8 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
<#if typeDefinition.isDiscriminatedChildTypeDefinition()>
<#-- Usually you don't use child directly unless they are parameterized #-->
<#assign typeName=typeDefinition.parentType.name>
<#assign typeDefinition=typeDefinition.parentType>
<#assign typeName=typeDefinition.parentType.orElseThrow().name>
<#assign typeDefinition=typeDefinition.parentType.orElseThrow()>
</#if>
<#assign hasRefParams=complexTypeReference.params.isPresent()>
<#assign refParams>
Expand Down Expand Up @@ -1406,16 +1406,16 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
</@compress>

return _parent, nil
<#elseif type.parentType?has_content>
<#elseif type.parentType.isPresent()>
// Create a partially initialized instance
_child := &${type.name}{
<#list type.propertyFields as field>
${field.name?cap_first}: <#if helper.isComplex(field) && !helper.isEnumField(field) && !field.isArrayField() && !field.isManualArrayField()>Cast${helper.getLanguageTypeNameForField(field)}(</#if>${field.name}<#if helper.isComplex(field) && !helper.isEnumField(field) && !field.isArrayField() && !field.isManualArrayField()>)</#if>,
</#list>
${type.parentType.name}: &${type.parentType.name}{},
${type.parentType.orElseThrow().name}: &${type.parentType.orElseThrow().name}{},
}
_child.${type.parentType.name}.Child = _child
return _child.${type.parentType.name}, nil
_child.${type.parentType.orElseThrow().name}.Child = _child
return _child.${type.parentType.orElseThrow().name}, nil
<#else>
// Create the instance
return New${type.name}(<#list type.propertyFields as field>${field.name}<#sep>, </#sep></#list><#if filteredParserArguments?has_content><#if type.propertyFields?has_content>, </#if><#list filteredParserArguments as arg><#if arg.type.isComplexTypeReference() && !helper.isEnumTypeReference(arg.type)>*</#if>${arg.name}<#sep>, </#sep></#list></#if>), nil
Expand Down

0 comments on commit b8c0c7b

Please sign in to comment.