Skip to content

Commit

Permalink
refactor(codegen/plc4go): avoid duplicating arguments as fields when …
Browse files Browse the repository at this point in the history
…present in parent
  • Loading branch information
sruehl committed Jun 22, 2022
1 parent 3fc44f9 commit 67a1f6f
Show file tree
Hide file tree
Showing 986 changed files with 51 additions and 5,306 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,12 @@ type _${type.name} struct {
</#if>
<#if parserArguments?has_content>
<#assign filteredParserArguments=parserArguments?filter(arg -> !type.isDiscriminatorField(arg.name) && !type.getPropertyFieldFromThisOrParentByName(arg.name).isPresent())>
<#assign filteredParserArgumentsLocalToType=filteredParserArguments?filter(arg->type.getParentType().isEmpty()||(type.getParentType().orElseThrow().getAllParserArguments().isEmpty()||!type.getParentType().orElseThrow().isParserArgument(arg.name)))>
</#if>
<#if filteredParserArguments?has_content>
<#if filteredParserArgumentsLocalToType?has_content>

// Arguments.
<#list filteredParserArguments as parserArgument>
<#list filteredParserArgumentsLocalToType as parserArgument>
${parserArgument.name?cap_first} ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}
</#list>
</#if>
Expand Down Expand Up @@ -345,11 +346,6 @@ func New${type.name}(
<#list type.propertyFields as field>
${field.name?cap_first}: ${field.name},
</#list>
<#if filteredParserArguments?has_content>
<#list filteredParserArguments as parserArgument>
${parserArgument.name?cap_first}: ${parserArgument.name},
</#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>),
}
_result._${type.parentType.orElseThrow().name}._${type.parentType.orElseThrow().name}ChildRequirements = _result
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions plc4go/protocols/bacnetip/readwrite/model/APDUError.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions plc4go/protocols/bacnetip/readwrite/model/APDUReject.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions plc4go/protocols/bacnetip/readwrite/model/APDUUnknown.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 67a1f6f

Please sign in to comment.