From f3dc89699d4bb28da92fe355bdbe7ad2d465cbf4 Mon Sep 17 00:00:00 2001 From: Marty Schoch Date: Sun, 2 Oct 2016 10:47:40 -0400 Subject: [PATCH] address golint warnings --- analysis/datetime/flexible/flexible.go | 16 ++++++++-------- analysis/datetime/flexible/flexible_test.go | 2 +- analysis/datetime/optional/optional.go | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/analysis/datetime/flexible/flexible.go b/analysis/datetime/flexible/flexible.go index 71ec8439..cd549f55 100644 --- a/analysis/datetime/flexible/flexible.go +++ b/analysis/datetime/flexible/flexible.go @@ -24,17 +24,17 @@ import ( const Name = "flexiblego" -type FlexibleGoDateTimeParser struct { +type DateTimeParser struct { layouts []string } -func NewFlexibleGoDateTimeParser(layouts []string) *FlexibleGoDateTimeParser { - return &FlexibleGoDateTimeParser{ +func New(layouts []string) *DateTimeParser { + return &DateTimeParser{ layouts: layouts, } } -func (p *FlexibleGoDateTimeParser) ParseDateTime(input string) (time.Time, error) { +func (p *DateTimeParser) ParseDateTime(input string) (time.Time, error) { for _, layout := range p.layouts { rv, err := time.Parse(layout, input) if err == nil { @@ -44,21 +44,21 @@ func (p *FlexibleGoDateTimeParser) ParseDateTime(input string) (time.Time, error return time.Time{}, analysis.ErrInvalidDateTime } -func FlexibleGoDateTimeParserConstructor(config map[string]interface{}, cache *registry.Cache) (analysis.DateTimeParser, error) { +func DateTimeParserConstructor(config map[string]interface{}, cache *registry.Cache) (analysis.DateTimeParser, error) { layouts, ok := config["layouts"].([]interface{}) if !ok { return nil, fmt.Errorf("must specify layouts") } - layoutStrs := make([]string, 0) + var layoutStrs []string for _, layout := range layouts { layoutStr, ok := layout.(string) if ok { layoutStrs = append(layoutStrs, layoutStr) } } - return NewFlexibleGoDateTimeParser(layoutStrs), nil + return New(layoutStrs), nil } func init() { - registry.RegisterDateTimeParser(Name, FlexibleGoDateTimeParserConstructor) + registry.RegisterDateTimeParser(Name, DateTimeParserConstructor) } diff --git a/analysis/datetime/flexible/flexible_test.go b/analysis/datetime/flexible/flexible_test.go index 73745c9e..e97423b7 100644 --- a/analysis/datetime/flexible/flexible_test.go +++ b/analysis/datetime/flexible/flexible_test.go @@ -66,7 +66,7 @@ func TestFlexibleDateTimeParser(t *testing.T) { rfc3339NoTimezoneNoT := "2006-01-02 15:04:05" rfc3339NoTime := "2006-01-02" - dateOptionalTimeParser := NewFlexibleGoDateTimeParser( + dateOptionalTimeParser := New( []string{ time.RFC3339Nano, time.RFC3339, diff --git a/analysis/datetime/optional/optional.go b/analysis/datetime/optional/optional.go index eb1e5c79..4b98de66 100644 --- a/analysis/datetime/optional/optional.go +++ b/analysis/datetime/optional/optional.go @@ -37,7 +37,7 @@ var layouts = []string{ } func DateTimeParserConstructor(config map[string]interface{}, cache *registry.Cache) (analysis.DateTimeParser, error) { - return flexible.NewFlexibleGoDateTimeParser(layouts), nil + return flexible.New(layouts), nil } func init() {