Merged in feature/collectorset (pull request #96)

Set Collector

* set

cmd/docSyncRunner/main.go

@@ -16,11 +16,8 @@ import (
 
 	docsyncrunner "queryorchestration/api/docSyncRunner"
 	"queryorchestration/internal/client"
-	"queryorchestration/internal/collector"
 	"queryorchestration/internal/document"
-	cleanversion "queryorchestration/internal/document/clean/version"
 	documentsync "queryorchestration/internal/document/sync"
-	textversion "queryorchestration/internal/document/text/version"
 	"queryorchestration/internal/server/runner"
 	documentcleanc "queryorchestration/internal/serviceconfig/queue/documentclean"
 
@@ -38,13 +35,7 @@ func main() {
 	cfg := &DocSyncConfig{}
 
 	cfg.ControllerFunc = func() runner.Controller {
-		coll := collector.New(cfg, &collector.Services{
-			CleanVersion: cleanversion.New(cfg),
-			TextVersion:  textversion.New(cfg),
-		})
-		cli := client.New(cfg, &client.Services{
-			Collector: coll,
-		})
+		cli := client.New(cfg)
 		doc := document.New(cfg)
 		docsync := documentsync.New(cfg, &documentsync.Services{
 			Document: doc,

cmd/queryService/main.go

@@ -22,7 +22,7 @@ import (
 	queryservice "queryorchestration/api/queryService"
 	"queryorchestration/internal/client"
 	"queryorchestration/internal/collector"
-	collectorupdate "queryorchestration/internal/collector/update"
+	collectorset "queryorchestration/internal/collector/set"
 	"queryorchestration/internal/document"
 	cleanversion "queryorchestration/internal/document/clean/version"
 	textversion "queryorchestration/internal/document/text/version"
@@ -58,18 +58,13 @@ func main() {
 		})
 		tev := textversion.New(cfg)
 		clv := cleanversion.New(cfg)
-		col := collector.New(cfg, &collector.Services{
-			CleanVersion: clv,
-			TextVersion:  tev,
-		})
-		colupdate := collectorupdate.New(cfg, &collectorupdate.Services{
+		col := collector.New(cfg)
+		colupdate := collectorset.New(cfg, &collectorset.Services{
 			Collector:    col,
 			CleanVersion: clv,
 			TextVersion:  tev,
 		})
-		cli := client.New(cfg, &client.Services{
-			Collector: col,
-		})
+		cli := client.New(cfg)
 		doc := document.New(cfg)
 		quetest := querytest.New(cfg, &querytest.Services{
 			Collector: col,
@@ -81,14 +76,14 @@ func main() {
 		})
 
 		services := &queryservice.Services{
-			Export:          exp,
-			Collector:       col,
-			CollectorUpdate: colupdate,
-			Query:           que,
-			QueryUpdate:     qupdate,
-			QueryTest:       quetest,
-			Client:          cli,
-			Document:        doc,
+			Export:       exp,
+			Collector:    col,
+			CollectorSet: colupdate,
+			Query:        que,
+			QueryUpdate:  qupdate,
+			QueryTest:    quetest,
+			Client:       cli,
+			Document:     doc,
 		}
 
 		cons := queryservice.NewControllers(cfg.GetValidator(), services)