From 0b962e643daf9ebe75512631f3cef5fac8ebaa54 Mon Sep 17 00:00:00 2001
From: Rob Skillington <r@uber.com>
Date: Tue, 7 Feb 2017 18:47:00 -0500
Subject: [PATCH] Address PR feedback

---
 pool/object.go      |  6 +++---
 pool/object_test.go |  6 +++---
 pool/options.go     | 18 +++++++++---------
 pool/types.go       | 12 ++++++------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pool/object.go b/pool/object.go
index b52a95b..0d3abeb 100644
--- a/pool/object.go
+++ b/pool/object.go
@@ -90,7 +90,7 @@ func NewObjectPool(opts ObjectPoolOptions) ObjectPool {
 
 func (p *objectPool) Init(alloc Allocator) {
 	if !atomic.CompareAndSwapInt32(&p.initialized, 0, 1) {
-		fn := p.opts.OnPoolAccessError()
+		fn := p.opts.OnPoolAccessErrorFn()
 		fn(errPoolAlreadyInitialized)
 		return
 	}
@@ -104,7 +104,7 @@ func (p *objectPool) Init(alloc Allocator) {
 
 func (p *objectPool) Get() interface{} {
 	if atomic.LoadInt32(&p.initialized) != 1 {
-		fn := p.opts.OnPoolAccessError()
+		fn := p.opts.OnPoolAccessErrorFn()
 		fn(errPoolGetBeforeInitialized)
 		return p.alloc()
 	}
@@ -128,7 +128,7 @@ func (p *objectPool) Get() interface{} {
 
 func (p *objectPool) Put(obj interface{}) {
 	if atomic.LoadInt32(&p.initialized) != 1 {
-		fn := p.opts.OnPoolAccessError()
+		fn := p.opts.OnPoolAccessErrorFn()
 		fn(errPoolPutBeforeInitialized)
 		return
 	}
diff --git a/pool/object_test.go b/pool/object_test.go
index cb9b8c7..72858f0 100644
--- a/pool/object_test.go
+++ b/pool/object_test.go
@@ -64,7 +64,7 @@ func TestObjectPoolRefillOnLowWaterMark(t *testing.T) {
 
 func TestObjectPoolInitTwiceError(t *testing.T) {
 	var accessErr error
-	opts := NewObjectPoolOptions().SetOnPoolAccessError(func(err error) {
+	opts := NewObjectPoolOptions().SetOnPoolAccessErrorFn(func(err error) {
 		accessErr = err
 	})
 
@@ -85,7 +85,7 @@ func TestObjectPoolInitTwiceError(t *testing.T) {
 
 func TestObjectPoolGetBeforeInitError(t *testing.T) {
 	var accessErr error
-	opts := NewObjectPoolOptions().SetOnPoolAccessError(func(err error) {
+	opts := NewObjectPoolOptions().SetOnPoolAccessErrorFn(func(err error) {
 		accessErr = err
 	})
 
@@ -103,7 +103,7 @@ func TestObjectPoolGetBeforeInitError(t *testing.T) {
 
 func TestObjectPoolPutBeforeInitError(t *testing.T) {
 	var accessErr error
-	opts := NewObjectPoolOptions().SetOnPoolAccessError(func(err error) {
+	opts := NewObjectPoolOptions().SetOnPoolAccessErrorFn(func(err error) {
 		accessErr = err
 	})
 
diff --git a/pool/options.go b/pool/options.go
index 39938ad..c5aff99 100644
--- a/pool/options.go
+++ b/pool/options.go
@@ -32,16 +32,16 @@ type objectPoolOptions struct {
 	refillLowWatermark  float64
 	refillHighWatermark float64
 	instrumentOpts      instrument.Options
-	onPoolAccessError   OnPoolAccessError
+	onPoolAccessErrorFn OnPoolAccessErrorFn
 }
 
 // NewObjectPoolOptions creates a new set of object pool options
 func NewObjectPoolOptions() ObjectPoolOptions {
 	return &objectPoolOptions{
-		size:               defaultSize,
-		refillLowWatermark: defaultRefillLowWatermark,
-		instrumentOpts:     instrument.NewOptions(),
-		onPoolAccessError:  func(err error) { panic(err) },
+		size:                defaultSize,
+		refillLowWatermark:  defaultRefillLowWatermark,
+		instrumentOpts:      instrument.NewOptions(),
+		onPoolAccessErrorFn: func(err error) { panic(err) },
 	}
 }
 
@@ -85,12 +85,12 @@ func (o *objectPoolOptions) InstrumentOptions() instrument.Options {
 	return o.instrumentOpts
 }
 
-func (o *objectPoolOptions) SetOnPoolAccessError(value OnPoolAccessError) ObjectPoolOptions {
+func (o *objectPoolOptions) SetOnPoolAccessErrorFn(value OnPoolAccessErrorFn) ObjectPoolOptions {
 	opts := *o
-	opts.onPoolAccessError = value
+	opts.onPoolAccessErrorFn = value
 	return &opts
 }
 
-func (o *objectPoolOptions) OnPoolAccessError() OnPoolAccessError {
-	return o.onPoolAccessError
+func (o *objectPoolOptions) OnPoolAccessErrorFn() OnPoolAccessErrorFn {
+	return o.onPoolAccessErrorFn
 }
diff --git a/pool/types.go b/pool/types.go
index 1c01d3c..8e23aa2 100644
--- a/pool/types.go
+++ b/pool/types.go
@@ -56,9 +56,9 @@ type CheckedObjectPool interface {
 	Get() checked.ReadWriteRef
 }
 
-// OnPoolAccessError is a function to call when a pool access error occurs,
+// OnPoolAccessErrorFn is a function to call when a pool access error occurs,
 // such as get or put before the pool is initialized.
-type OnPoolAccessError func(err error)
+type OnPoolAccessErrorFn func(err error)
 
 // ObjectPoolOptions provides options for an object pool.
 type ObjectPoolOptions interface {
@@ -90,13 +90,13 @@ type ObjectPoolOptions interface {
 	// InstrumentOptions returns the instrument options.
 	InstrumentOptions() instrument.Options
 
-	// SetOnPoolAccessError sets the on pool access error callback, by
+	// SetOnPoolAccessErrorFn sets the on pool access error callback, by
 	// default this is a panic.
-	SetOnPoolAccessError(value OnPoolAccessError) ObjectPoolOptions
+	SetOnPoolAccessErrorFn(value OnPoolAccessErrorFn) ObjectPoolOptions
 
-	// OnPoolAccessError returns the on pool access error callback, by
+	// OnPoolAccessErrorFn returns the on pool access error callback, by
 	// default this is a panic.
-	OnPoolAccessError() OnPoolAccessError
+	OnPoolAccessErrorFn() OnPoolAccessErrorFn
 }
 
 // Bucket specifies a pool bucket.