Merge pull request #184 from cbusbey/gen_header_beginstring

Gen header beginstring

Author: cbusbey

cmd/generate-fix/generate-fix.go

@@ -59,6 +59,7 @@ func genHeader(pkg string, spec *datadictionary.DataDictionary) {
 		Package:    pkg,
 		Name:       "Header",
 		MessageDef: spec.Header,
+		FIXSpec:    spec,
 	}
 	if err := internal.HeaderTemplate.Execute(writer, c); err != nil {
 		errors <- err

cmd/generate-fix/internal/template_helpers.go

@@ -171,6 +171,14 @@ func requiredFields(m *datadictionary.MessageDef) (required []*datadictionary.Fi
 	return
 }
 
+func beginString(spec *datadictionary.DataDictionary) string {
+	if spec.FIXType == "FIXT" || spec.Major == 5 {
+		return "FIXT.1.1"
+	}
+
+	return fmt.Sprintf("FIX.%v.%v", spec.Major, spec.Minor)
+}
+
 func routerBeginString(spec *datadictionary.DataDictionary) (routerBeginString string) {
 	switch {
 	case spec.FIXType == "FIXT":

cmd/generate-fix/internal/templates.go

@@ -18,6 +18,7 @@ func init() {
 	tmplFuncs := template.FuncMap{
 		"toLower":             strings.ToLower,
 		"requiredFields":      requiredFields,
+		"beginString":         beginString,
 		"routerBeginString":   routerBeginString,
 		"importRootPath":      getImportPathRoot,
 		"quickfixType":        quickfixType,
@@ -146,6 +147,13 @@ type Header struct {
 	quickfix.Header
 }
 
+//NewHeader returns a new, initialized Header instance
+func NewHeader() (h Header) {
+	h.Init()
+	h.SetBeginString("{{ beginString .FIXSpec }}")
+	return
+}
+
 {{ template "setters" .}}
 {{ template "getters" . }}
 {{ template "hasers" . }}
@@ -222,7 +230,7 @@ func (m {{ .Name }}) ToMessage() quickfix.Message {
 {{ $required_fields := requiredFields .MessageDef -}}
 //New returns a {{ .Name }} initialized with the required fields for {{ .Name }} 
 func New({{template "field_args" $required_fields }}) (m {{ .Name }}) {
-	m.Header.Init()
+	m.Header = {{ .TransportPackage }}.NewHeader()
 	m.Init()
 	m.Trailer.Init()
 

fix40/advertisement/Advertisement.go

@@ -40,7 +40,7 @@ func (m Advertisement) ToMessage() quickfix.Message {
 
 //New returns a Advertisement initialized with the required fields for Advertisement
 func New(advid field.AdvIdField, advtranstype field.AdvTransTypeField, symbol field.SymbolField, advside field.AdvSideField, shares field.SharesField) (m Advertisement) {
-	m.Header.Init()
+	m.Header = fix40.NewHeader()
 	m.Init()
 	m.Trailer.Init()
 

fix40/allocation/Allocation.go

@@ -40,7 +40,7 @@ func (m Allocation) ToMessage() quickfix.Message {
 
 //New returns a Allocation initialized with the required fields for Allocation
 func New(allocid field.AllocIDField, alloctranstype field.AllocTransTypeField, side field.SideField, symbol field.SymbolField, shares field.SharesField, avgpx field.AvgPxField, tradedate field.TradeDateField) (m Allocation) {
-	m.Header.Init()
+	m.Header = fix40.NewHeader()
 	m.Init()
 	m.Trailer.Init()
 

fix40/allocationack/AllocationACK.go

@@ -40,7 +40,7 @@ func (m AllocationACK) ToMessage() quickfix.Message {
 
 //New returns a AllocationACK initialized with the required fields for AllocationACK
 func New(allocid field.AllocIDField, tradedate field.TradeDateField, allocstatus field.AllocStatusField) (m AllocationACK) {
-	m.Header.Init()
+	m.Header = fix40.NewHeader()
 	m.Init()
 	m.Trailer.Init()
 

fix40/dontknowtrade/DontKnowTrade.go

@@ -40,7 +40,7 @@ func (m DontKnowTrade) ToMessage() quickfix.Message {
 
 //New returns a DontKnowTrade initialized with the required fields for DontKnowTrade
 func New(dkreason field.DKReasonField, symbol field.SymbolField, side field.SideField, orderqty field.OrderQtyField, lastshares field.LastSharesField, lastpx field.LastPxField) (m DontKnowTrade) {
-	m.Header.Init()
+	m.Header = fix40.NewHeader()
 	m.Init()
 	m.Trailer.Init()
 

fix40/email/Email.go

@@ -40,7 +40,7 @@ func (m Email) ToMessage() quickfix.Message {
 
 //New returns a Email initialized with the required fields for Email
 func New(emailtype field.EmailTypeField, linesoftext field.LinesOfTextField, text field.TextField) (m Email) {
-	m.Header.Init()
+	m.Header = fix40.NewHeader()
 	m.Init()
 	m.Trailer.Init()
 

fix40/executionreport/ExecutionReport.go

@@ -40,7 +40,7 @@ func (m ExecutionReport) ToMessage() quickfix.Message {
 
 //New returns a ExecutionReport initialized with the required fields for ExecutionReport
 func New(orderid field.OrderIDField, execid field.ExecIDField, exectranstype field.ExecTransTypeField, ordstatus field.OrdStatusField, symbol field.SymbolField, side field.SideField, orderqty field.OrderQtyField, lastshares field.LastSharesField, lastpx field.LastPxField, cumqty field.CumQtyField, avgpx field.AvgPxField) (m ExecutionReport) {
-	m.Header.Init()
+	m.Header = fix40.NewHeader()
 	m.Init()
 	m.Trailer.Init()
 

fix40/header.go

@@ -13,6 +13,13 @@ type Header struct {
 	quickfix.Header
 }
 
+//NewHeader returns a new, initialized Header instance
+func NewHeader() (h Header) {
+	h.Init()
+	h.SetBeginString("FIX.4.0")
+	return
+}
+
 //SetBeginString sets BeginString, Tag 8
 func (h Header) SetBeginString(v string) {
 	h.Set(field.NewBeginString(v))