Move the LinkHandler interface to the models package

Author: thewizardplusplus

crawl.go

@@ -9,18 +9,11 @@ import (
 	syncutils "github.com/thewizardplusplus/go-sync-utils"
 )
 
-//go:generate mockery --name=LinkHandler --inpackage --case=underscore --testonly
-
-// LinkHandler ...
-type LinkHandler interface {
-	HandleLink(ctx context.Context, link models.SourcedLink)
-}
-
 // CrawlDependencies ...
 type CrawlDependencies struct {
 	LinkExtractor models.LinkExtractor
 	LinkChecker   models.LinkChecker
-	LinkHandler   LinkHandler
+	LinkHandler   models.LinkHandler
 	Logger        log.Logger
 }
 

crawl_test.go

@@ -79,7 +79,7 @@ func TestCrawl(test *testing.T) {
 
 						return checker
 					}(),
-					LinkHandler: func() LinkHandler {
+					LinkHandler: func() models.LinkHandler {
 						handler := new(MockLinkHandler)
 						handler.
 							On("HandleLink", context.Background(), models.SourcedLink{
@@ -158,7 +158,7 @@ func TestCrawl(test *testing.T) {
 
 						return checker
 					}(),
-					LinkHandler: func() LinkHandler {
+					LinkHandler: func() models.LinkHandler {
 						handler := new(MockLinkHandler)
 						handler.
 							On("HandleLink", context.Background(), models.SourcedLink{

handle_links_test.go

@@ -87,7 +87,7 @@ func TestHandleLinksConcurrently(test *testing.T) {
 
 							return checker
 						}(),
-						LinkHandler: func() LinkHandler {
+						LinkHandler: func() models.LinkHandler {
 							handler := new(MockLinkHandler)
 							handler.
 								On("HandleLink", context.Background(), models.SourcedLink{
@@ -201,7 +201,7 @@ func TestHandleLinks(test *testing.T) {
 
 							return checker
 						}(),
-						LinkHandler: func() LinkHandler {
+						LinkHandler: func() models.LinkHandler {
 							handler := new(MockLinkHandler)
 							handler.
 								On("HandleLink", context.Background(), models.SourcedLink{
@@ -306,7 +306,7 @@ func TestHandleLink(test *testing.T) {
 
 							return checker
 						}(),
-						LinkHandler: func() LinkHandler {
+						LinkHandler: func() models.LinkHandler {
 							handler := new(MockLinkHandler)
 							handler.
 								On("HandleLink", context.Background(), models.SourcedLink{
@@ -369,7 +369,7 @@ func TestHandleLink(test *testing.T) {
 
 							return checker
 						}(),
-						LinkHandler: func() LinkHandler {
+						LinkHandler: func() models.LinkHandler {
 							handler := new(MockLinkHandler)
 							handler.
 								On("HandleLink", context.Background(), models.SourcedLink{

handlers/checked_handler.go

@@ -3,14 +3,13 @@ package handlers
 import (
 	"context"
 
-	crawler "github.com/thewizardplusplus/go-crawler"
 	"github.com/thewizardplusplus/go-crawler/models"
 )
 
 // CheckedHandler ...
 type CheckedHandler struct {
 	LinkChecker models.LinkChecker
-	LinkHandler crawler.LinkHandler
+	LinkHandler models.LinkHandler
 }
 
 // HandleLink ...

handlers/checked_handler_test.go

@@ -5,14 +5,13 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/mock"
-	crawler "github.com/thewizardplusplus/go-crawler"
 	"github.com/thewizardplusplus/go-crawler/models"
 )
 
 func TestCheckedHandler_HandleLink(test *testing.T) {
 	type fields struct {
 		LinkChecker models.LinkChecker
-		LinkHandler crawler.LinkHandler
+		LinkHandler models.LinkHandler
 	}
 	type args struct {
 		ctx  context.Context
@@ -38,7 +37,7 @@ func TestCheckedHandler_HandleLink(test *testing.T) {
 
 					return checker
 				}(),
-				LinkHandler: func() crawler.LinkHandler {
+				LinkHandler: func() models.LinkHandler {
 					handler := new(MockLinkHandler)
 					handler.
 						On("HandleLink", context.Background(), models.SourcedLink{

handlers/concurrent_handler.go

@@ -4,21 +4,20 @@ import (
 	"context"
 	"sync"
 
-	crawler "github.com/thewizardplusplus/go-crawler"
 	"github.com/thewizardplusplus/go-crawler/models"
 )
 
 // ConcurrentHandler ...
 type ConcurrentHandler struct {
-	linkHandler crawler.LinkHandler
+	linkHandler models.LinkHandler
 
 	links chan models.SourcedLink
 }
 
 // NewConcurrentHandler ...
 func NewConcurrentHandler(
 	bufferSize int,
-	linkHandler crawler.LinkHandler,
+	linkHandler models.LinkHandler,
 ) ConcurrentHandler {
 	return ConcurrentHandler{
 		linkHandler: linkHandler,

handlers/mock_gen.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	crawler "github.com/thewizardplusplus/go-crawler"
 	"github.com/thewizardplusplus/go-crawler/models"
 )
 
@@ -22,5 +21,5 @@ type LinkChecker interface {
 // It's used only for mock generating.
 //
 type LinkHandler interface {
-	crawler.LinkHandler
+	models.LinkHandler
 }

mock_gen.go

@@ -26,6 +26,16 @@ type LinkChecker interface {
 	models.LinkChecker
 }
 
+//go:generate mockery --name=LinkHandler --inpackage --case=underscore --testonly
+
+// LinkHandler ...
+//
+// It's used only for mock generating.
+//
+type LinkHandler interface {
+	models.LinkHandler
+}
+
 //go:generate mockery --name=Waiter --inpackage --case=underscore --testonly
 
 // Waiter ...

models/models.go

@@ -19,3 +19,8 @@ type LinkExtractor interface {
 type LinkChecker interface {
 	CheckLink(ctx context.Context, link SourcedLink) bool
 }
+
+// LinkHandler ...
+type LinkHandler interface {
+	HandleLink(ctx context.Context, link SourcedLink)
+}