Merge remote-tracking branch 'origin/develop' into develop

code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh

@@ -353,15 +353,25 @@ type ${type.name}Builder interface {
 	With<#if field.isOptionalField()>Optional</#if>${field.name?cap_first}Builder(func(${helper.getLanguageTypeNameForTypeReference(typeRef)}Builder)${helper.getLanguageTypeNameForTypeReference(typeRef)}Builder) ${type.name}Builder
 	</#if>
 </#list>
+<#if filteredParserArgumentsLocalToType?has_content>
+	<#list filteredParserArgumentsLocalToType as parserArgument>
+	// WithArg${parserArgument.name?cap_first} sets a parser argument
+	WithArg${parserArgument.name?cap_first}(${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}) ${type.name}Builder
+	</#list>
+</#if>
 <#if type.isAbstract()>
 	<#list type.switchField.orElseThrow().cases as case>
 	// As${case.name} converts this build to a subType of ${type.name}. It is always possible to return to current builder using Done()
-	As${case.name}() interface{${case.name}Builder;Done()${type.name}Builder}
+	As${case.name}() ${case.name}Builder
 	</#list>
 	// Build builds the ${type.name} or returns an error if something is wrong
 	PartialBuild() (${type.name}Contract,error)
 	// MustBuild does the same as Build but panics on error
 	PartialMustBuild() ${type.name}Contract
+</#if>
+<#if type.isDiscriminatedChildTypeDefinition()>
+	// Done is used to finish work on this child and return (or create one if none) to the parent builder
+	Done() (${type.parentType.orElseThrow().name}Builder)
 </#if>
 	// Build builds the ${type.name} or returns an error if something is wrong
 	Build() (${type.name},error)
@@ -402,6 +412,7 @@ var _ (${type.name}Builder) = (*_${type.name}Builder)(nil)
 	<#assign parentType=type.getParentType().orElseThrow()>
 func (b *_${type.name}Builder) setParent(contract ${parentType.name}Contract) {
 	b.${parentType.name}Contract = contract
+	contract.(*_${parentType.name})._SubType = b._${type.name}
 }
 </#if>
 
@@ -448,6 +459,15 @@ func (b *_${type.name}Builder) With<#if field.isOptionalField()>Optional</#if>${
 	</#if>
 </#list>
 
+<#if filteredParserArgumentsLocalToType?has_content>
+	<#list filteredParserArgumentsLocalToType as parserArgument>
+func (b *_${type.name}Builder) WithArg${parserArgument.name?cap_first}(${parserArgument.name} ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}) ${type.name}Builder {
+	b.${parserArgument.name?cap_first} = ${parserArgument.name}
+	return b
+}
+	</#list>
+</#if>
+
 func (b *_${type.name}Builder) <#if type.isAbstract()>Partial</#if>Build() (${type.name}<#if type.isAbstract()>Contract</#if>,error) {
 <#list type.propertyFields?filter(field->!field.isOptionalField()) as field>
 	<#if field.type.isComplexTypeReference() || helper.needsPointerAccess(field)>
@@ -475,8 +495,8 @@ func (b *_${type.name}Builder) <#if type.isAbstract()>Partial</#if>MustBuild() $
 
 <#if type.isAbstract()>
 	<#list type.switchField.orElseThrow().cases as case>
-func (b *_${type.name}Builder) As${case.name}() interface{${case.name}Builder;Done()${type.name}Builder} {
-	if cb, ok := b.childBuilder.(interface{${case.name}Builder;Done()${type.name}Builder}); ok {
+func (b *_${type.name}Builder) As${case.name}() ${case.name}Builder {
+	if cb, ok := b.childBuilder.(${case.name}Builder); ok {
 		return cb
 	}
 	cb := New${case.name}Builder().(*_${case.name}Builder)
@@ -491,8 +511,10 @@ func (b *_${type.name}Builder) As${case.name}() interface{${case.name}Builder;Do
 <#if type.isDiscriminatedChildTypeDefinition()>
 	<#assign parentType=type.getParentType().orElseThrow()>
 
-// Done is used to finish work on this child and return to the parent builder
 func (b *_${type.name}Builder) Done() ${parentType.name}Builder {
+	if b.parentBuilder == nil {
+		b.parentBuilder = New${parentType.name}Builder().(*_${parentType.name}Builder)
+	}
 	return b.parentBuilder
 }
 
@@ -1873,7 +1895,7 @@ func (m *_${type.name}) deepCopy() *_${type.name} {
 <#if type.propertyFields?has_content>
 	<#list type.propertyFields as field>
 		<#if field.type.isComplexTypeReference()>
-		m.${field.name?cap_first}.DeepCopy().(<#if helper.needsPointerAccess(field)>*</#if>${helper.getLanguageTypeNameForTypeReference(field.type)}),
+		utils.DeepCopy[<#if helper.needsPointerAccess(field)>*</#if>${helper.getLanguageTypeNameForTypeReference(field.type)}](m.${field.name?cap_first}),
 		<#elseif field.type.isArrayTypeReference()>
 			<#assign arrayElementTypeRef=field.type.asArrayTypeReference().orElseThrow().elementTypeReference/>
 		utils.DeepCopySlice[${helper.getLanguageTypeNameForTypeReference(arrayElementTypeRef)}, ${helper.getLanguageTypeNameForTypeReference(arrayElementTypeRef)}](m.${field.name?cap_first}),
@@ -1895,7 +1917,7 @@ func (m *_${type.name}) deepCopy() *_${type.name} {
 </#if>
 	}
 <#if type.isDiscriminatedChildTypeDefinition()>
-	m.${type.parentType.orElseThrow().name}Contract.(*_${type.parentType.orElseThrow().name})._SubType = m
+	_${type.name}Copy.${type.parentType.orElseThrow().name}Contract.(*_${type.parentType.orElseThrow().name})._SubType = m
 </#if>
 	return _${type.name}Copy
 }