From 54d94f1acaf6ff60e5db769027ecd24a0fc188b6 Mon Sep 17 00:00:00 2001 From: Travis Turner Date: Mon, 4 Jun 2018 16:03:42 -0500 Subject: [PATCH] rename CreateField to createBSIGroup --- api.go | 2 +- frame.go | 12 ++++++------ server.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api.go b/api.go index 9a50a3542..0dc153380 100644 --- a/api.go +++ b/api.go @@ -501,7 +501,7 @@ func (api *API) CreateField(ctx context.Context, indexName string, frameName str } // Create new bsiGroup. - if err := f.CreateField(bsig); err != nil { + if err := f.createBSIGroup(bsig); err != nil { return errors.Wrap(err, "creating bsigroup") } diff --git a/frame.go b/frame.go index 26d1bdf3f..fc52bf3d2 100644 --- a/frame.go +++ b/frame.go @@ -333,10 +333,10 @@ func (f *Frame) applyOptions(opt FrameOptions) error { Max: opt.Max, } // Validate bsiGroup. - if err := ValidateField(bsig); err != nil { + if err := bsig.validate(); err != nil { return err } - if err := f.CreateField(bsig); err != nil { + if err := f.createBSIGroup(bsig); err != nil { return errors.Wrap(err, "creating bsigroup") } case FrameTypeTime: @@ -400,8 +400,8 @@ func (f *Frame) hasField(name string) bool { return false } -// CreateField creates a new field on the frame. -func (f *Frame) CreateField(bsig *bsiGroup) error { +// createBSIGroup creates a new field on the frame. +func (f *Frame) createBSIGroup(bsig *bsiGroup) error { f.mu.Lock() defer f.mu.Unlock() @@ -415,7 +415,7 @@ func (f *Frame) CreateField(bsig *bsiGroup) error { // addField adds a single field to fields. func (f *Frame) addField(bsig *bsiGroup) error { - if err := ValidateField(bsig); err != nil { + if err := bsig.validate(); err != nil { return errors.Wrap(err, "validating bsigroup") } else if f.hasField(bsig.Name) { return ErrFieldExists @@ -1156,7 +1156,7 @@ func (b *bsiGroup) BaseValueBetween(min, max int64) (baseValueMin, baseValueMax return baseValueMin, baseValueMax, false } -func ValidateField(b *bsiGroup) error { +func (b *bsiGroup) validate() error { if b.Name == "" { return ErrFieldNameRequired } else if !IsValidFieldType(b.Type) { diff --git a/server.go b/server.go index 320fd174c..e7c566cbf 100644 --- a/server.go +++ b/server.go @@ -473,7 +473,7 @@ func (s *Server) ReceiveMessage(pb proto.Message) error { case *internal.CreateFieldMessage: f := s.Holder.Frame(obj.Index, obj.Frame) field := decodeField(obj.Field) - if err := f.CreateField(field); err != nil { + if err := f.createBSIGroup(field); err != nil { return err } case *internal.DeleteFieldMessage: