removed message builder

_gen/generate-messages/main.go

@@ -81,19 +81,15 @@ func genMessage(msg *datadictionary.MessageDef, requiredFields []*datadictionary
 }
 
 func genMessageBuilder(msg *datadictionary.MessageDef, requiredFields []*datadictionary.FieldDef) string {
-	fileOut := fmt.Sprintf("//MessageBuilder builds %v messages.\n", msg.Name)
-	fileOut += "type MessageBuilder struct {\n quickfix.MessageBuilder}\n"
-
-	fileOut += fmt.Sprintf("//Builder returns an initialized MessageBuilder with specified required fields for %v.\n", msg.Name)
-	fileOut += "func Builder(\n"
+	fileOut := fmt.Sprintf("//New returns an initialized Message with specified required fields for %v.\n", msg.Name)
+	fileOut += "func New(\n"
 	builderArgs := make([]string, len(requiredFields))
 	for i, field := range requiredFields {
 		builderArgs[i] = fmt.Sprintf("%v *field.%vField", strings.ToLower(field.Name), field.Name)
 	}
 	fileOut += strings.Join(builderArgs, ",\n")
-	fileOut += ") MessageBuilder {\n"
-	fileOut += "var builder MessageBuilder\n"
-	fileOut += "builder.MessageBuilder = *quickfix.NewMessageBuilder()\n"
+	fileOut += ") Message {\n"
+	fileOut += "builder := Message{Message: quickfix.NewMessage()}\n"
 
 	if fixSpec.FIXType == "FIXT" {
 		fileOut += fmt.Sprintf("builder.Header.Set(field.NewBeginString(fix.BeginString_FIXT11))\n")

_test/echo_server.go

@@ -42,10 +42,10 @@ func (e *EchoApplication) OnLogon(sessionID quickfix.SessionID) {
 func (e *EchoApplication) OnLogout(sessionID quickfix.SessionID) {
 	e.log.Printf("OnLogout %v\n", sessionID.String())
 }
-func (e EchoApplication) ToAdmin(msgBuilder quickfix.MessageBuilder, sessionID quickfix.SessionID) {
+func (e EchoApplication) ToAdmin(msgBuilder quickfix.Message, sessionID quickfix.SessionID) {
 }
 
-func (e EchoApplication) ToApp(msgBuilder quickfix.MessageBuilder, sessionID quickfix.SessionID) (err error) {
+func (e EchoApplication) ToApp(msgBuilder quickfix.Message, sessionID quickfix.SessionID) (err error) {
 	return
 }
 
@@ -83,8 +83,8 @@ func (e *EchoApplication) processMsg(msg quickfix.Message, sessionID quickfix.Se
 	return nil
 }
 
-func copyMessageToBuilder(msg quickfix.Message) quickfix.MessageBuilder {
-	reply := quickfix.NewMessageBuilder()
+func copyMessageToBuilder(msg quickfix.Message) quickfix.Message {
+	reply := quickfix.NewMessage()
 
 	msgType := new(field.MsgTypeField)
 	msg.Header.Get(msgType)
@@ -97,7 +97,7 @@ func copyMessageToBuilder(msg quickfix.Message) quickfix.MessageBuilder {
 		}
 	}
 
-	return *reply
+	return reply
 }
 
 func (e *EchoApplication) OnFIX40NewOrderSingle(msg fix40nos.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {

application.go

@@ -13,10 +13,10 @@ type Application interface {
 	OnLogout(sessionID SessionID)
 
 	//Notification of admin message being sent to target.
-	ToAdmin(msgBuilder MessageBuilder, sessionID SessionID)
+	ToAdmin(msgBuilder Message, sessionID SessionID)
 
 	//Notification of app message being sent to target.
-	ToApp(msgBuilder MessageBuilder, sessionID SessionID) error
+	ToApp(msgBuilder Message, sessionID SessionID) error
 
 	//Notification of admin message being received from target.
 	FromAdmin(msg Message, sessionID SessionID) MessageRejectError

fix40/advertisement/Advertisement.go

@@ -192,20 +192,14 @@ func (m Message) GetText(f *field.TextField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds Advertisement messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for Advertisement.
-func Builder(
+//New returns an initialized MessageBuilder with specified required fields for Advertisement.
+func New(
 	advid *field.AdvIdField,
 	advtranstype *field.AdvTransTypeField,
 	symbol *field.SymbolField,
 	advside *field.AdvSideField,
-	shares *field.SharesField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+	shares *field.SharesField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("7"))
 	builder.Body.Set(advid)

fix40/allocation/Allocation.go

@@ -336,13 +336,8 @@ func (m Message) GetNoAllocs(f *field.NoAllocsField) quickfix.MessageRejectError
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds Allocation messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for Allocation.
-func Builder(
+//New returns an initialized MessageBuilder with specified required fields for Allocation.
+func New(
 	allocid *field.AllocIDField,
 	alloctranstype *field.AllocTransTypeField,
 	noorders *field.NoOrdersField,
@@ -351,9 +346,8 @@ func Builder(
 	shares *field.SharesField,
 	avgpx *field.AvgPxField,
 	tradedate *field.TradeDateField,
-	noallocs *field.NoAllocsField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+	noallocs *field.NoAllocsField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("J"))
 	builder.Body.Set(allocid)

fix40/allocationack/AllocationACK.go

@@ -108,18 +108,12 @@ func (m Message) GetText(f *field.TextField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds AllocationACK messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for AllocationACK.
-func Builder(
+//New returns an initialized MessageBuilder with specified required fields for AllocationACK.
+func New(
 	allocid *field.AllocIDField,
 	tradedate *field.TradeDateField,
-	allocstatus *field.AllocStatusField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+	allocstatus *field.AllocStatusField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("P"))
 	builder.Body.Set(allocid)

fix40/dontknowtrade/DontKnowTrade.go

@@ -120,21 +120,15 @@ func (m Message) GetText(f *field.TextField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds DontKnowTrade messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for DontKnowTrade.
-func Builder(
+//New returns an initialized MessageBuilder with specified required fields for DontKnowTrade.
+func New(
 	dkreason *field.DKReasonField,
 	symbol *field.SymbolField,
 	side *field.SideField,
 	orderqty *field.OrderQtyField,
 	lastshares *field.LastSharesField,
-	lastpx *field.LastPxField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+	lastpx *field.LastPxField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("Q"))
 	builder.Body.Set(dkreason)

fix40/email/Email.go

@@ -120,18 +120,12 @@ func (m Message) GetRawData(f *field.RawDataField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds Email messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for Email.
-func Builder(
+//New returns an initialized MessageBuilder with specified required fields for Email.
+func New(
 	emailtype *field.EmailTypeField,
 	linesoftext *field.LinesOfTextField,
-	text *field.TextField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+	text *field.TextField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("C"))
 	builder.Body.Set(emailtype)

fix40/executionreport/ExecutionReport.go

@@ -552,13 +552,8 @@ func (m Message) GetText(f *field.TextField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds ExecutionReport messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for ExecutionReport.
-func Builder(
+//New returns an initialized MessageBuilder with specified required fields for ExecutionReport.
+func New(
 	orderid *field.OrderIDField,
 	execid *field.ExecIDField,
 	exectranstype *field.ExecTransTypeField,
@@ -569,9 +564,8 @@ func Builder(
 	lastshares *field.LastSharesField,
 	lastpx *field.LastPxField,
 	cumqty *field.CumQtyField,
-	avgpx *field.AvgPxField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+	avgpx *field.AvgPxField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("8"))
 	builder.Body.Set(orderid)

fix40/heartbeat/Heartbeat.go

@@ -24,15 +24,9 @@ func (m Message) GetTestReqID(f *field.TestReqIDField) quickfix.MessageRejectErr
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds Heartbeat messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for Heartbeat.
-func Builder() MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+//New returns an initialized MessageBuilder with specified required fields for Heartbeat.
+func New() Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("0"))
 	return builder

fix40/indicationofinterest/IndicationofInterest.go

@@ -240,20 +240,14 @@ func (m Message) GetText(f *field.TextField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds IndicationofInterest messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for IndicationofInterest.
-func Builder(
+//New returns an initialized MessageBuilder with specified required fields for IndicationofInterest.
+func New(
 	ioiid *field.IOIidField,
 	ioitranstype *field.IOITransTypeField,
 	symbol *field.SymbolField,
 	side *field.SideField,
-	ioishares *field.IOISharesField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+	ioishares *field.IOISharesField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("6"))
 	builder.Body.Set(ioiid)

fix40/listcancelrequest/ListCancelRequest.go

@@ -48,16 +48,10 @@ func (m Message) GetText(f *field.TextField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds ListCancelRequest messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for ListCancelRequest.
-func Builder(
-	listid *field.ListIDField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+//New returns an initialized MessageBuilder with specified required fields for ListCancelRequest.
+func New(
+	listid *field.ListIDField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("K"))
 	builder.Body.Set(listid)

fix40/listexecute/ListExecute.go

@@ -48,16 +48,10 @@ func (m Message) GetText(f *field.TextField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds ListExecute messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for ListExecute.
-func Builder(
-	listid *field.ListIDField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+//New returns an initialized MessageBuilder with specified required fields for ListExecute.
+func New(
+	listid *field.ListIDField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("L"))
 	builder.Body.Set(listid)

fix40/liststatus/ListStatus.go

@@ -72,19 +72,13 @@ func (m Message) GetNoOrders(f *field.NoOrdersField) quickfix.MessageRejectError
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds ListStatus messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for ListStatus.
-func Builder(
+//New returns an initialized MessageBuilder with specified required fields for ListStatus.
+func New(
 	listid *field.ListIDField,
 	norpts *field.NoRptsField,
 	rptseq *field.RptSeqField,
-	noorders *field.NoOrdersField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+	noorders *field.NoOrdersField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("N"))
 	builder.Body.Set(listid)

fix40/liststatusrequest/ListStatusRequest.go

@@ -48,16 +48,10 @@ func (m Message) GetText(f *field.TextField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds ListStatusRequest messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for ListStatusRequest.
-func Builder(
-	listid *field.ListIDField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+//New returns an initialized MessageBuilder with specified required fields for ListStatusRequest.
+func New(
+	listid *field.ListIDField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("M"))
 	builder.Body.Set(listid)

fix40/logon/Logon.go

@@ -60,17 +60,11 @@ func (m Message) GetRawData(f *field.RawDataField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds Logon messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for Logon.
-func Builder(
+//New returns an initialized MessageBuilder with specified required fields for Logon.
+func New(
 	encryptmethod *field.EncryptMethodField,
-	heartbtint *field.HeartBtIntField) MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+	heartbtint *field.HeartBtIntField) Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("A"))
 	builder.Body.Set(encryptmethod)

fix40/logout/Logout.go

@@ -24,15 +24,9 @@ func (m Message) GetText(f *field.TextField) quickfix.MessageRejectError {
 	return m.Body.Get(f)
 }
 
-//MessageBuilder builds Logout messages.
-type MessageBuilder struct {
-	quickfix.MessageBuilder
-}
-
-//Builder returns an initialized MessageBuilder with specified required fields for Logout.
-func Builder() MessageBuilder {
-	var builder MessageBuilder
-	builder.MessageBuilder = *quickfix.NewMessageBuilder()
+//New returns an initialized MessageBuilder with specified required fields for Logout.
+func New() Message {
+	builder := Message{Message: quickfix.NewMessage()}
 	builder.Header.Set(field.NewBeginString(fix.BeginString_FIX40))
 	builder.Header.Set(field.NewMsgType("5"))
 	return builder