Corrected method name

easierway · Jul 31, 2018 · 248bf38 · 248bf38
1 parent 645b861
commit 248bf38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/example_test.go b/example_test.go
@@ -57,7 +57,7 @@ func Example() {
 
 	// 2. decorate the encapsulted function with decorators
 	// be careful of the order of the decorators
-	decFn := circuitBreakDec.Decorate(metricDec.Decorate(retryDec.Decorator(encapsulatedFn)))
+	decFn := circuitBreakDec.Decorate(metricDec.Decorate(retryDec.Decorate(encapsulatedFn)))
 	ret, err := decFn(encapsulatedReq{1, 2})
 	fmt.Println(ret, err)
 	//Output: 3 <nil>

diff --git a/retry_decorator.go b/retry_decorator.go
@@ -35,7 +35,7 @@ func CreateRetryDecorator(maxRetryTimes int, retryInterval time.Duration,
 }
 
 // Decorator function is to add the retry logic to the decorated method
-func (dec *RetryDecorator) Decorator(innerFn ServiceFunc) ServiceFunc {
+func (dec *RetryDecorator) Decorate(innerFn ServiceFunc) ServiceFunc {
 	return func(req Request) (Response, error) {
 		var (
 			res Response

diff --git a/retry_decorator_test.go b/retry_decorator_test.go
@@ -23,7 +23,7 @@ func TestRetryWhenRetriableErrorOccurred(t *testing.T) {
 	}
 	retryDec, err := CreateRetryDecorator(maxRetryTimes, time.Second*1, time.Second*1, retriableChecker)
 	checkErr(err, t)
-	decFn := retryDec.Decorator(connectionErrFn)
+	decFn := retryDec.Decorate(connectionErrFn)
 	res, decErr := decFn(1)
 	if decErr != ErrorConnection {
 		t.Error("The connection exception is expected.")
@@ -45,7 +45,7 @@ func TestRetryWhenRetriableErrorOccurredAndRecovered(t *testing.T) {
 	}
 	retryDec, err := CreateRetryDecorator(maxRetryTimes, time.Second*1, time.Second*1, retriableChecker)
 	checkErr(err, t)
-	decFn := retryDec.Decorator(connectionErrFn)
+	decFn := retryDec.Decorate(connectionErrFn)
 	res, decErr := decFn(1)
 	checkErr(decErr, t)
 	if res.(int) != 2 {
@@ -62,7 +62,7 @@ func TestRetryWithoutError(t *testing.T) {
 	}
 	retryDec, err := CreateRetryDecorator(maxRetryTimes, time.Second*1, time.Second*1, retriableChecker)
 	checkErr(err, t)
-	decFn := retryDec.Decorator(connectionErrFn)
+	decFn := retryDec.Decorate(connectionErrFn)
 	res, decErr := decFn(1)
 	checkErr(decErr, t)
 	if res.(int) != 1 {
@@ -79,7 +79,7 @@ func TestRetryWhenUnretriableErrorOccurred(t *testing.T) {
 	}
 	retryDec, err := CreateRetryDecorator(maxRetryTimes, time.Second*1, time.Second*1, retriableChecker)
 	checkErr(err, t)
-	decFn := retryDec.Decorator(connectionErrFn)
+	decFn := retryDec.Decorate(connectionErrFn)
 	res, decErr := decFn(1)
 	if decErr == nil || decErr == ErrorConnection {
 		t.Error("The error is not expected.")
@@ -95,7 +95,6 @@ func TestCreateDecorateWithInvalidSettings(t *testing.T) {
 	if err1 == nil {
 		t.Error("Setting error is expected")
 	}
-
 	_, err2 = CreateRetryDecorator(3, 0, time.Second*1, retriableChecker)
 	if err2 == nil {
 		t.Error("Setting error is expected")