Update session to use new validator definition

michaelwilner · michaelwilner · commit 082679d02d92 · 2021-08-09T09:08:50.000-05:00
diff --git a/session.go b/session.go
@@ -30,7 +30,7 @@ type session struct {
 	sessionEvent chan internal.Event
 	messageEvent chan bool
 	application  Application
-	validator
+	Validator
 	stateMachine
 	stateTimer *internal.EventTimer
 	peerTimer  *internal.EventTimer
@@ -514,8 +514,8 @@ func (s *session) verifySelect(msg *Message, checkTooHigh bool, checkTooLow bool
 		}
 	}
 
-	if s.validator != nil {
-		if reject := s.validator.Validate(msg); reject != nil {
+	if s.Validator != nil {
+		if reject := s.Validator.Validate(msg); reject != nil {
 			return reject
 		}
 	}
diff --git a/session_factory.go b/session_factory.go
@@ -110,7 +110,7 @@ func (f sessionFactory) newSession(
 				return
 			}
 
-			s.validator = &fixtValidator{s.transportDataDictionary, s.appDataDictionary, validatorSettings}
+			s.Validator = NewValidator(validatorSettings, s.appDataDictionary, s.transportDataDictionary)
 		}
 	} else if settings.HasSetting(config.DataDictionary) {
 		var dataDictionaryPath string
@@ -122,7 +122,7 @@ func (f sessionFactory) newSession(
 			return
 		}
 
-		s.validator = &fixValidator{s.appDataDictionary, validatorSettings}
+		s.Validator = NewValidator(validatorSettings, s.appDataDictionary, nil)
 	}
 
 	if settings.HasSetting(config.ResetOnLogon) {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ type session struct {`
`30`	`30`	`sessionEvent chan internal.Event`
`31`	`31`	`messageEvent chan bool`
`32`	`32`	`application Application`
`33`		`- validator`
	`33`	`+ Validator`
`34`	`34`	`stateMachine`
`35`	`35`	`stateTimer *internal.EventTimer`
`36`	`36`	`peerTimer *internal.EventTimer`
`@@ -514,8 +514,8 @@ func (s session) verifySelect(msg Message, checkTooHigh bool, checkTooLow bool`
`514`	`514`	`}`
`515`	`515`	`}`
`516`	`516`
`517`		`- if s.validator != nil {`
`518`		`- if reject := s.validator.Validate(msg); reject != nil {`
	`517`	`+ if s.Validator != nil {`
	`518`	`+ if reject := s.Validator.Validate(msg); reject != nil {`
`519`	`519`	`return reject`
`520`	`520`	`}`
`521`	`521`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func (f sessionFactory) newSession(`
`110`	`110`	`return`
`111`	`111`	`}`
`112`	`112`
`113`		`- s.validator = &fixtValidator{s.transportDataDictionary, s.appDataDictionary, validatorSettings}`
	`113`	`+ s.Validator = NewValidator(validatorSettings, s.appDataDictionary, s.transportDataDictionary)`
`114`	`114`	`}`
`115`	`115`	`} else if settings.HasSetting(config.DataDictionary) {`
`116`	`116`	`var dataDictionaryPath string`
`@@ -122,7 +122,7 @@ func (f sessionFactory) newSession(`
`122`	`122`	`return`
`123`	`123`	`}`
`124`	`124`
`125`		`- s.validator = &fixValidator{s.appDataDictionary, validatorSettings}`
	`125`	`+ s.Validator = NewValidator(validatorSettings, s.appDataDictionary, nil)`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`if settings.HasSetting(config.ResetOnLogon) {`