Merge branch 'develop' into bugfix/session-uuid

.travis.yml

@@ -1,9 +1,9 @@
 language: go
 
 go:
-  - "1.12.x"
   - "1.13.x"
   - "1.14.x"
+  - "1.15.x"
   - "tip"
 
 os:

README.md

@@ -6,7 +6,7 @@
 
 A high productivity, full-stack web framework for the [Go language](http://www.golang.org).
 
-Current Version: 1.0.0 (2020-07-11)
+Current Version: 1.1.0-dev (2020-07-11)
 
 **Supports go.mod package management**
 

before_after_filter.go

@@ -5,7 +5,7 @@ import (
 )
 
 // Autocalls any defined before and after methods on the target controller
-// If either calls returns a value then the result is returned
+// If either calls returns a value then the result is returned.
 func BeforeAfterFilter(c *Controller, fc []Filter) {
 	defer func() {
 		if resultValue := beforeAfterFilterInvoke(FINALLY, c); resultValue != nil && !resultValue.IsNil() {
@@ -31,7 +31,6 @@ func BeforeAfterFilter(c *Controller, fc []Filter) {
 }
 
 func beforeAfterFilterInvoke(method When, c *Controller) (r *reflect.Value) {
-
 	if c.Type == nil {
 		return
 	}

binder.go

@@ -57,16 +57,16 @@ func ValueBinder(f func(value string, typ reflect.Type) reflect.Value) func(*Par
 	}
 }
 
-// Revel's default date and time constants
+// Revel's default date and time constants.
 const (
 	DefaultDateFormat     = "2006-01-02"
 	DefaultDateTimeFormat = "2006-01-02 15:04"
 )
 
-// Binders type and kind definition
+// Binders type and kind definition.
 var (
 	// These are the lookups to find a Binder for any type of data.
-	// The most specific binder found will be used (Type before Kind)
+	// The most specific binder found will be used (Type before Kind).
 	TypeBinders = make(map[reflect.Type]Binder)
 	KindBinders = make(map[reflect.Kind]Binder)
 
@@ -284,7 +284,7 @@ func bindSlice(params *Params, name string, typ reflect.Type) reflect.Value {
 }
 
 // Break on dots and brackets.
-// e.g. bar => "bar", bar.baz => "bar", bar[0] => "bar"
+// e.g. bar => "bar", bar.baz => "bar", bar[0] => "bar".
 func nextKey(key string) string {
 	fieldLen := strings.IndexAny(key, ".[")
 	if fieldLen == -1 {

binder_test.go

@@ -7,7 +7,6 @@ package revel
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/revel/config"
 	"io"
 	"io/ioutil"
 	"os"
@@ -16,12 +15,15 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/revel/config"
 )
 
 type A struct {
-	ID      int
-	Name    string
-	B       B
+	ID   int
+	Name string
+	B    B
+	//nolint:unused
 	private int
 }
 
@@ -209,7 +211,6 @@ func TestJsonBinder(t *testing.T) {
 		if actualb["a"]["b"] != 45 {
 			t.Errorf("Failed to fetch map value %#v", actual["a"])
 		}
-
 	}
 }
 
@@ -250,7 +251,6 @@ func TestBinder(t *testing.T) {
 	}
 
 	for k, fhs := range expectedBoundFiles {
-
 		if len(fhs) == 1 {
 			// Test binding single files to: *os.File, []byte, io.Reader, io.ReadSeeker
 			for _, binding := range fileBindings {
@@ -263,7 +263,6 @@ func TestBinder(t *testing.T) {
 				returns := reflect.ValueOf(binding.f).Call([]reflect.Value{actual})
 				valEq(t, k, returns[0], reflect.ValueOf(fhs[0].content))
 			}
-
 		} else {
 			// Test binding multi to:
 			// []*os.File, [][]byte, []io.Reader, []io.ReadSeeker

cache/cache.go

@@ -137,9 +137,11 @@ func Flush() error                                                { return Insta
 func Set(key string, value interface{}, expires time.Duration) error {
 	return Instance.Set(key, value, expires)
 }
+
 func Add(key string, value interface{}, expires time.Duration) error {
 	return Instance.Add(key, value, expires)
 }
+
 func Replace(key string, value interface{}, expires time.Duration) error {
 	return Instance.Replace(key, value, expires)
 }

cache/cache_test.go

@@ -14,7 +14,7 @@ import (
 // They should pass for all implementations.
 type cacheFactory func(*testing.T, time.Duration) Cache
 
-// Test typical cache interactions
+// Test typical cache interactions.
 func typicalGetSet(t *testing.T, newCache cacheFactory) {
 	var err error
 	cache := newCache(t, time.Hour)
@@ -34,7 +34,7 @@ func typicalGetSet(t *testing.T, newCache cacheFactory) {
 	}
 }
 
-// Test the increment-decrement cases
+// Test the increment-decrement cases.
 func incrDecr(t *testing.T, newCache cacheFactory) {
 	var err error
 	cache := newCache(t, time.Hour)

cache/inmemory.go

@@ -7,10 +7,10 @@ package cache
 import (
 	"fmt"
 	"reflect"
+	"sync"
 	"time"
 
 	"github.com/patrickmn/go-cache"
-	"sync"
 )
 
 type InMemoryCache struct {
@@ -122,7 +122,7 @@ func (c InMemoryCache) Flush() error {
 	return nil
 }
 
-// Fetches and returns the converted type to a uint64
+// Fetches and returns the converted type to a uint64.
 func (c InMemoryCache) convertTypeToUint64(key string) (newValue uint64, err error) {
 	v, found := c.cache.Get(key)
 	if !found {
@@ -151,7 +151,7 @@ func (c InMemoryCache) convertTypeToUint64(key string) (newValue uint64, err err
 	case uint32:
 		newValue = uint64(v.(uint32))
 	case uint64:
-		newValue = uint64(v.(uint64))
+		newValue = v.(uint64)
 	case float32:
 		newValue = uint64(v.(float32))
 	case float64:

cache/inmemory_test.go

@@ -13,12 +13,12 @@ var newInMemoryCache = func(_ *testing.T, defaultExpiration time.Duration) Cache
 	return NewInMemoryCache(defaultExpiration)
 }
 
-// Test typical cache interactions
+// Test typical cache interactions.
 func TestInMemoryCache_TypicalGetSet(t *testing.T) {
 	typicalGetSet(t, newInMemoryCache)
 }
 
-// Test the increment-decrement cases
+// Test the increment-decrement cases.
 func TestInMemoryCache_IncrDecr(t *testing.T) {
 	incrDecr(t, newInMemoryCache)
 }

cache/memcached.go

@@ -72,7 +72,6 @@ func (c MemcachedCache) Flush() error {
 
 func (c MemcachedCache) invoke(f func(*memcache.Client, *memcache.Item) error,
 	key string, value interface{}, expires time.Duration) error {
-
 	switch expires {
 	case DefaultExpiryTime:
 		expires = c.defaultExpiration

cache/memcached_test.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-// These tests require memcached running on localhost:11211 (the default)
+// These tests require memcached running on localhost:11211 (the default).
 const testServer = "localhost:11211"
 
 var newMemcachedCache = func(t *testing.T, defaultExpiration time.Duration) Cache {

cache/redis.go

@@ -18,9 +18,9 @@ type RedisCache struct {
 }
 
 // NewRedisCache returns a new RedisCache with given parameters
-// until redigo supports sharding/clustering, only one host will be in hostList
+// until redigo supports sharding/clustering, only one host will be in hostList.
 func NewRedisCache(host string, password string, defaultExpiration time.Duration) RedisCache {
-	var pool = &redis.Pool{
+	pool := &redis.Pool{
 		MaxIdle:     revel.Config.IntDefault("cache.redis.maxidle", 5),
 		MaxActive:   revel.Config.IntDefault("cache.redis.maxactive", 0),
 		IdleTimeout: time.Duration(revel.Config.IntDefault("cache.redis.idletimeout", 240)) * time.Second,
@@ -237,7 +237,6 @@ func (c RedisCache) Flush() error {
 
 func (c RedisCache) invoke(f func(string, ...interface{}) (interface{}, error),
 	key string, value interface{}, expires time.Duration) error {
-
 	switch expires {
 	case DefaultExpiryTime:
 		expires = c.defaultExpiration

cache/redis_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/revel/revel"
 )
 
-// These tests require redis server running on localhost:6379 (the default)
+// These tests require redis server running on localhost:6379 (the default).
 const redisTestServer = "localhost:6379"
 
 var newRedisCache = func(t *testing.T, defaultExpiration time.Duration) Cache {

cache/serialization_test.go

@@ -77,11 +77,3 @@ func TestRoundTrip(t *testing.T) {
 		}
 	}
 }
-
-func zeroMap(arg map[string]interface{}) map[string]interface{} {
-	result := map[string]interface{}{}
-	for key, value := range arg {
-		result[key] = reflect.Zero(reflect.TypeOf(value)).Interface()
-	}
-	return result
-}