From 5c47e83bd636c7ee94a150c58dfbdf03903cee9b Mon Sep 17 00:00:00 2001
From: clouderati <35942204+clouderati@users.noreply.github.com>
Date: Thu, 25 Oct 2018 21:29:46 +0000
Subject: [PATCH] Fix mispelling

* s/convertor/converter
* s/Convertor/Converter

Signed-off-by: clouderati <35942204+clouderati@users.noreply.github.com>
---
 src/replication/source/convertor.go                |  8 ++++----
 src/replication/source/default_filter_chain.go     |  6 +++---
 .../source/default_filter_chain_test.go            |  6 +++---
 src/replication/source/filter.go                   |  4 ++--
 src/replication/source/label_filter.go             |  4 ++--
 src/replication/source/label_filter_test.go        |  4 ++--
 src/replication/source/pattern_filter.go           | 14 +++++++-------
 src/replication/source/pattern_filter_test.go      |  4 ++--
 src/replication/source/repository_convertor.go     | 12 ++++++------
 .../source/repository_convertor_test.go            |  4 ++--
 src/replication/source/repository_filter.go        | 10 +++++-----
 src/replication/source/repository_filter_test.go   |  4 ++--
 src/replication/source/tag_combination_filter.go   |  4 ++--
 .../source/tag_combination_filter_test.go          |  4 ++--
 src/replication/source/tag_convertor.go            | 12 ++++++------
 src/replication/source/tag_convertor_test.go       |  4 ++--
 src/replication/source/tag_filter.go               | 10 +++++-----
 src/replication/source/tag_filter_test.go          |  4 ++--
 18 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/replication/source/convertor.go b/src/replication/source/convertor.go
index 1cf6bbee5..0bc4cc34f 100644
--- a/src/replication/source/convertor.go
+++ b/src/replication/source/convertor.go
@@ -4,13 +4,13 @@ import (
 	"github.com/goharbor/harbor/src/replication/models"
 )
 
-// Convertor is designed to covert the format of output from upstream filter to the input format
+// Converter is designed to covert the format of output from upstream filter to the input format
 // required by the downstream filter if needed.
-// Each convertor covers only one specified conversion process between the two filters.
+// Each converter covers only one specified conversion process between the two filters.
 // E.g:
-// If project filter connects to repository filter, then one convertor should be defined for this connection;
+// If project filter connects to repository filter, then one converter should be defined for this connection;
 // If project filter connects to tag filter, then another one should be defined. The above one can not be reused.
-type Convertor interface {
+type Converter interface {
 	// Accept the items from upstream filter as input and then covert them to the required format and returned.
 	Convert(itemsOfUpstream []models.FilterItem) (itemsOfDownstream []models.FilterItem)
 }
diff --git a/src/replication/source/default_filter_chain.go b/src/replication/source/default_filter_chain.go
index 747276306..adfa5e858 100644
--- a/src/replication/source/default_filter_chain.go
+++ b/src/replication/source/default_filter_chain.go
@@ -47,9 +47,9 @@ func (d *DefaultFilterChain) DoFilter(filterItems []models.FilterItem) []models.
 	}
 
 	for _, filter := range d.filters {
-		convertor := filter.GetConvertor()
-		if convertor != nil {
-			filterItems = convertor.Convert(filterItems)
+		converter := filter.GetConverter()
+		if converter != nil {
+			filterItems = converter.Convert(filterItems)
 		}
 		filterItems = filter.DoFilter(filterItems)
 	}
diff --git a/src/replication/source/default_filter_chain_test.go b/src/replication/source/default_filter_chain_test.go
index c7fab553e..85a760790 100644
--- a/src/replication/source/default_filter_chain_test.go
+++ b/src/replication/source/default_filter_chain_test.go
@@ -37,7 +37,7 @@ func TestFilters(t *testing.T) {
 func TestDoFilter(t *testing.T) {
 	projectFilter := NewPatternFilter(replication.FilterItemKindProject, "library*")
 	repositoryFilter := NewPatternFilter(replication.FilterItemKindRepository,
-		"library/ubuntu*", &fakeRepositoryConvertor{})
+		"library/ubuntu*", &fakeRepositoryConverter{})
 	filters := []Filter{projectFilter, repositoryFilter}
 
 	items := []models.FilterItem{
@@ -61,9 +61,9 @@ func TestDoFilter(t *testing.T) {
 
 }
 
-type fakeRepositoryConvertor struct{}
+type fakeRepositoryConverter struct{}
 
-func (f *fakeRepositoryConvertor) Convert(items []models.FilterItem) []models.FilterItem {
+func (f *fakeRepositoryConverter) Convert(items []models.FilterItem) []models.FilterItem {
 	result := []models.FilterItem{}
 	for _, item := range items {
 		result = append(result, models.FilterItem{
diff --git a/src/replication/source/filter.go b/src/replication/source/filter.go
index 535af350f..1d375fa86 100644
--- a/src/replication/source/filter.go
+++ b/src/replication/source/filter.go
@@ -10,8 +10,8 @@ type Filter interface {
 	// Initialize the filter
 	Init() error
 
-	// Return the convertor if existing or nil if never set
-	GetConvertor() Convertor
+	// Return the converter if existing or nil if never set
+	GetConverter() Converter
 
 	// Filter the items
 	DoFilter(filterItems []models.FilterItem) []models.FilterItem
diff --git a/src/replication/source/label_filter.go b/src/replication/source/label_filter.go
index 98900c3a1..6a65ad71d 100644
--- a/src/replication/source/label_filter.go
+++ b/src/replication/source/label_filter.go
@@ -34,8 +34,8 @@ func (l *LabelFilter) Init() error {
 	return nil
 }
 
-// GetConvertor ...
-func (l *LabelFilter) GetConvertor() Convertor {
+// GetConverter ...
+func (l *LabelFilter) GetConverter() Converter {
 	return nil
 }
 
diff --git a/src/replication/source/label_filter_test.go b/src/replication/source/label_filter_test.go
index 433fc2ce8..2486c4af1 100644
--- a/src/replication/source/label_filter_test.go
+++ b/src/replication/source/label_filter_test.go
@@ -29,9 +29,9 @@ func TestInitOfLabelFilter(t *testing.T) {
 	assert.Nil(t, filter.Init())
 }
 
-func TestGetConvertorOfLabelFilter(t *testing.T) {
+func TestGetConverterOfLabelFilter(t *testing.T) {
 	filter := NewLabelFilter(1)
-	assert.Nil(t, filter.GetConvertor())
+	assert.Nil(t, filter.GetConverter())
 }
 
 func TestDoFilterOfLabelFilter(t *testing.T) {
diff --git a/src/replication/source/pattern_filter.go b/src/replication/source/pattern_filter.go
index 293d74432..9492738be 100644
--- a/src/replication/source/pattern_filter.go
+++ b/src/replication/source/pattern_filter.go
@@ -25,18 +25,18 @@ import (
 type PatternFilter struct {
 	kind      string
 	pattern   string
-	convertor Convertor
+	converter Converter
 }
 
 // NewPatternFilter returns an instance of PatternFilter
-func NewPatternFilter(kind, pattern string, convertor ...Convertor) *PatternFilter {
+func NewPatternFilter(kind, pattern string, converter ...Converter) *PatternFilter {
 	filer := &PatternFilter{
 		kind:    kind,
 		pattern: pattern,
 	}
 
-	if len(convertor) > 0 {
-		filer.convertor = convertor[0]
+	if len(converter) > 0 {
+		filer.converter = converter[0]
 	}
 
 	return filer
@@ -47,9 +47,9 @@ func (p *PatternFilter) Init() error {
 	return nil
 }
 
-// GetConvertor returns the convertor
-func (p *PatternFilter) GetConvertor() Convertor {
-	return p.convertor
+// GetConverter returns the converter
+func (p *PatternFilter) GetConverter() Converter {
+	return p.converter
 }
 
 // DoFilter filters resources
diff --git a/src/replication/source/pattern_filter_test.go b/src/replication/source/pattern_filter_test.go
index b5bd373d0..59315dec1 100644
--- a/src/replication/source/pattern_filter_test.go
+++ b/src/replication/source/pattern_filter_test.go
@@ -28,8 +28,8 @@ func TestPatternFilterInit(t *testing.T) {
 	assert.Nil(t, pfilter.Init())
 }
 
-func TestPatternFilterGetConvertor(t *testing.T) {
-	assert.Nil(t, pfilter.GetConvertor())
+func TestPatternFilterGetConverter(t *testing.T) {
+	assert.Nil(t, pfilter.GetConverter())
 }
 
 func TestPatternFilterDoFilter(t *testing.T) {
diff --git a/src/replication/source/repository_convertor.go b/src/replication/source/repository_convertor.go
index 3d4d0522c..5089eb10a 100644
--- a/src/replication/source/repository_convertor.go
+++ b/src/replication/source/repository_convertor.go
@@ -20,20 +20,20 @@ import (
 	"github.com/goharbor/harbor/src/replication/registry"
 )
 
-// RepositoryConvertor implement Convertor interface, convert projects to repositories
-type RepositoryConvertor struct {
+// RepositoryConverter implement Converter interface, convert projects to repositories
+type RepositoryConverter struct {
 	registry registry.Adaptor
 }
 
-// NewRepositoryConvertor returns an instance of RepositoryConvertor
-func NewRepositoryConvertor(registry registry.Adaptor) *RepositoryConvertor {
-	return &RepositoryConvertor{
+// NewRepositoryConverter returns an instance of RepositoryConverter
+func NewRepositoryConverter(registry registry.Adaptor) *RepositoryConverter {
+	return &RepositoryConverter{
 		registry: registry,
 	}
 }
 
 // Convert projects to repositories
-func (r *RepositoryConvertor) Convert(items []models.FilterItem) []models.FilterItem {
+func (r *RepositoryConverter) Convert(items []models.FilterItem) []models.FilterItem {
 	result := []models.FilterItem{}
 	for _, item := range items {
 		// just put it to the result list if the item is not a project
diff --git a/src/replication/source/repository_convertor_test.go b/src/replication/source/repository_convertor_test.go
index 14f7aebf0..334238868 100644
--- a/src/replication/source/repository_convertor_test.go
+++ b/src/replication/source/repository_convertor_test.go
@@ -46,8 +46,8 @@ func TestRepositoryConvert(t *testing.T) {
 		},
 	}
 
-	convertor := NewRepositoryConvertor(&fakeRegistryAdaptor{})
-	assert.EqualValues(t, expected, convertor.Convert(items))
+	converter := NewRepositoryConverter(&fakeRegistryAdaptor{})
+	assert.EqualValues(t, expected, converter.Convert(items))
 }
 
 type fakeRegistryAdaptor struct{}
diff --git a/src/replication/source/repository_filter.go b/src/replication/source/repository_filter.go
index f4c0b98b8..b002a4575 100644
--- a/src/replication/source/repository_filter.go
+++ b/src/replication/source/repository_filter.go
@@ -27,14 +27,14 @@ import (
 // RepositoryFilter implement Filter interface to filter repository
 type RepositoryFilter struct {
 	pattern   string
-	convertor Convertor
+	converter Converter
 }
 
 // NewRepositoryFilter returns an instance of RepositoryFilter
 func NewRepositoryFilter(pattern string, registry registry.Adaptor) *RepositoryFilter {
 	return &RepositoryFilter{
 		pattern:   pattern,
-		convertor: NewRepositoryConvertor(registry),
+		converter: NewRepositoryConverter(registry),
 	}
 }
 
@@ -43,9 +43,9 @@ func (r *RepositoryFilter) Init() error {
 	return nil
 }
 
-// GetConvertor ...
-func (r *RepositoryFilter) GetConvertor() Convertor {
-	return r.convertor
+// GetConverter ...
+func (r *RepositoryFilter) GetConverter() Converter {
+	return r.converter
 }
 
 // DoFilter filters repository and image(according to the repository part) and drops any other resource types
diff --git a/src/replication/source/repository_filter_test.go b/src/replication/source/repository_filter_test.go
index e089aafc7..6570411aa 100644
--- a/src/replication/source/repository_filter_test.go
+++ b/src/replication/source/repository_filter_test.go
@@ -28,9 +28,9 @@ func TestInitOfRepositoryFilter(t *testing.T) {
 	assert.Nil(t, filter.Init())
 }
 
-func TestGetConvertorOfRepositoryFilter(t *testing.T) {
+func TestGetConverterOfRepositoryFilter(t *testing.T) {
 	filter := NewRepositoryFilter("", &registry.HarborAdaptor{})
-	assert.NotNil(t, filter.GetConvertor())
+	assert.NotNil(t, filter.GetConverter())
 }
 
 func TestDoFilterOfRepositoryFilter(t *testing.T) {
diff --git a/src/replication/source/tag_combination_filter.go b/src/replication/source/tag_combination_filter.go
index a7c02744e..ce7be8e6f 100644
--- a/src/replication/source/tag_combination_filter.go
+++ b/src/replication/source/tag_combination_filter.go
@@ -36,8 +36,8 @@ func (t *TagCombinationFilter) Init() error {
 	return nil
 }
 
-// GetConvertor returns the convertor
-func (t *TagCombinationFilter) GetConvertor() Convertor {
+// GetConverter returns the converter
+func (t *TagCombinationFilter) GetConverter() Converter {
 	return nil
 }
 
diff --git a/src/replication/source/tag_combination_filter_test.go b/src/replication/source/tag_combination_filter_test.go
index 5045b022e..336364471 100644
--- a/src/replication/source/tag_combination_filter_test.go
+++ b/src/replication/source/tag_combination_filter_test.go
@@ -28,8 +28,8 @@ func TestTagCombinationFilterInit(t *testing.T) {
 	assert.Nil(t, tcfilter.Init())
 }
 
-func TestTagCombinationFilterGetConvertor(t *testing.T) {
-	assert.Nil(t, tcfilter.GetConvertor())
+func TestTagCombinationFilterGetConverter(t *testing.T) {
+	assert.Nil(t, tcfilter.GetConverter())
 }
 
 func TestTagCombinationFilterDoFilter(t *testing.T) {
diff --git a/src/replication/source/tag_convertor.go b/src/replication/source/tag_convertor.go
index d09e771c8..2eec6de4d 100644
--- a/src/replication/source/tag_convertor.go
+++ b/src/replication/source/tag_convertor.go
@@ -20,20 +20,20 @@ import (
 	"github.com/goharbor/harbor/src/replication/registry"
 )
 
-// TagConvertor implement Convertor interface, convert repositories to tags
-type TagConvertor struct {
+// TagConverter implement Converter interface, convert repositories to tags
+type TagConverter struct {
 	registry registry.Adaptor
 }
 
-// NewTagConvertor returns an instance of TagConvertor
-func NewTagConvertor(registry registry.Adaptor) *TagConvertor {
-	return &TagConvertor{
+// NewTagConverter returns an instance of TagConverter
+func NewTagConverter(registry registry.Adaptor) *TagConverter {
+	return &TagConverter{
 		registry: registry,
 	}
 }
 
 // Convert repositories to tags
-func (t *TagConvertor) Convert(items []models.FilterItem) []models.FilterItem {
+func (t *TagConverter) Convert(items []models.FilterItem) []models.FilterItem {
 	result := []models.FilterItem{}
 	for _, item := range items {
 		if item.Kind != replication.FilterItemKindRepository {
diff --git a/src/replication/source/tag_convertor_test.go b/src/replication/source/tag_convertor_test.go
index 45a7e43bb..835bd29be 100644
--- a/src/replication/source/tag_convertor_test.go
+++ b/src/replication/source/tag_convertor_test.go
@@ -46,6 +46,6 @@ func TestTagConvert(t *testing.T) {
 		},
 	}
 
-	convertor := NewTagConvertor(&fakeRegistryAdaptor{})
-	assert.EqualValues(t, expected, convertor.Convert(items))
+	converter := NewTagConverter(&fakeRegistryAdaptor{})
+	assert.EqualValues(t, expected, converter.Convert(items))
 }
diff --git a/src/replication/source/tag_filter.go b/src/replication/source/tag_filter.go
index 50c7f4e03..f02fb0736 100644
--- a/src/replication/source/tag_filter.go
+++ b/src/replication/source/tag_filter.go
@@ -26,14 +26,14 @@ import (
 // TagFilter implements Filter interface to filter tag
 type TagFilter struct {
 	pattern   string
-	convertor Convertor
+	converter Converter
 }
 
 // NewTagFilter returns an instance of TagFilter
 func NewTagFilter(pattern string, registry registry.Adaptor) *TagFilter {
 	return &TagFilter{
 		pattern:   pattern,
-		convertor: NewTagConvertor(registry),
+		converter: NewTagConverter(registry),
 	}
 }
 
@@ -42,9 +42,9 @@ func (t *TagFilter) Init() error {
 	return nil
 }
 
-// GetConvertor ...
-func (t *TagFilter) GetConvertor() Convertor {
-	return t.convertor
+// GetConverter ...
+func (t *TagFilter) GetConverter() Converter {
+	return t.converter
 }
 
 // DoFilter filters tag of the image
diff --git a/src/replication/source/tag_filter_test.go b/src/replication/source/tag_filter_test.go
index 8f2ffb78c..0b11de444 100644
--- a/src/replication/source/tag_filter_test.go
+++ b/src/replication/source/tag_filter_test.go
@@ -28,9 +28,9 @@ func TestInitOfTagFilter(t *testing.T) {
 	assert.Nil(t, filter.Init())
 }
 
-func TestGetConvertorOfTagFilter(t *testing.T) {
+func TestGetConverterOfTagFilter(t *testing.T) {
 	filter := NewTagFilter("", &registry.HarborAdaptor{})
-	assert.NotNil(t, filter.GetConvertor())
+	assert.NotNil(t, filter.GetConverter())
 }
 
 func TestDoFilterOfTagFilter(t *testing.T) {