Remove SetRouter injection

scripts/generate_mocks.sh

@@ -25,7 +25,7 @@ MOCKGEN=$GOPATH/bin/mockgen
 $MOCKGEN  -self_package server -package server \
       -destination server/mocks_server_gen_test.go \
       github.com/smancke/guble/server \
-      PubSubSource,MessageSink,WSConnection,Startable,Stopable,SetRouter,SetMessageEntry,Endpoint
+      PubSubSource,MessageSink,WSConnection,Startable,Stopable,SetMessageEntry,Endpoint
 replace "server/mocks_server_gen_test.go" "server \"github.com\/smancke\/guble\/server\"" "server\."
 
 $MOCKGEN -self_package server -package server \

server/interfaces.go

@@ -76,11 +76,6 @@ type Stopable interface {
 	Stop() error
 }
 
-// SetRouter interface for modules which require a `Router`
-type SetRouter interface {
-	SetRouter(router PubSubSource)
-}
-
 // SetMessageEntry interface for modules which need a MessageEntry set
 type SetMessageEntry interface {
 	SetMessageEntry(messageSink MessageSink)

server/mocks_server_gen_test.go

@@ -1,5 +1,5 @@
 // Automatically generated by MockGen. DO NOT EDIT!
-// Source: github.com/smancke/guble/server (interfaces: PubSubSource,MessageSink,WSConnection,Startable,Stopable,SetRouter,SetMessageEntry,Endpoint)
+// Source: github.com/smancke/guble/server (interfaces: PubSubSource,MessageSink,WSConnection,Startable,Stopable,SetMessageEntry,Endpoint)
 
 package server
 
@@ -227,35 +227,6 @@ func (_mr *_MockStopableRecorder) Stop() *gomock.Call {
 	return _mr.mock.ctrl.RecordCall(_mr.mock, "Stop")
 }
 
-// Mock of SetRouter interface
-type MockSetRouter struct {
-	ctrl     *gomock.Controller
-	recorder *_MockSetRouterRecorder
-}
-
-// Recorder for MockSetRouter (not exported)
-type _MockSetRouterRecorder struct {
-	mock *MockSetRouter
-}
-
-func NewMockSetRouter(ctrl *gomock.Controller) *MockSetRouter {
-	mock := &MockSetRouter{ctrl: ctrl}
-	mock.recorder = &_MockSetRouterRecorder{mock}
-	return mock
-}
-
-func (_m *MockSetRouter) EXPECT() *_MockSetRouterRecorder {
-	return _m.recorder
-}
-
-func (_m *MockSetRouter) SetRouter(_param0 PubSubSource) {
-	_m.ctrl.Call(_m, "SetRouter", _param0)
-}
-
-func (_mr *_MockSetRouterRecorder) SetRouter(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "SetRouter", arg0)
-}
-
 // Mock of SetMessageEntry interface
 type MockSetMessageEntry struct {
 	ctrl     *gomock.Controller

server/service.go

@@ -48,12 +48,11 @@ func NewService(addr string, kvStore store.KVStore, messageStore store.MessageSt
 	return service
 }
 
-// Registers the supplied module on this service.
+// Register the supplied module on this service.
 // This method checks the module for the following interfaces and
 // does the expected tegistrations:
 //   Stopable: notify when the service stops
 //   Endpoint: Register the handler function of the Endpoint in the http service at prefix
-//   SetRouter: Provide the router
 //   SetMessageEntry: Provide the message entry
 //
 // If the module does not have a HandlerFunc, the prefix parameter is ignored
@@ -77,11 +76,6 @@ func (service *Service) Register(module interface{}) {
 
 	// do the injections ...
 
-	if m, ok := module.(SetRouter); ok {
-		guble.Debug("inject Router to %v", name)
-		m.SetRouter(service.router)
-	}
-
 	if m, ok := module.(SetMessageEntry); ok {
 		guble.Debug("inject MessageEntry to %v", name)
 		m.SetMessageEntry(service.messageSink)

server/service_test.go

@@ -53,16 +53,13 @@ func TestRegistrationOfSetter(t *testing.T) {
 	defer initCtrl(t)()
 
 	// given:
-	service, _, _, messageSink, router := aMockedService()
-	setRouterMock := NewMockSetRouter(ctrl)
+	service, _, _, messageSink, _ := aMockedService()
 	setMessageEntryMock := NewMockSetMessageEntry(ctrl)
 
 	// then I expect
-	setRouterMock.EXPECT().SetRouter(router)
 	setMessageEntryMock.EXPECT().SetMessageEntry(messageSink)
 
 	// when I register the modules
-	service.Register(setRouterMock)
 	service.Register(setMessageEntryMock)
 }
 

server/websocket_connector.go

@@ -53,14 +53,6 @@ func (handle *WSHandler) SetMessageEntry(messageSink MessageSink) {
 	handle.MessageSink = messageSink
 }
 
-func (handle *WSHandler) SetRouter(router PubSubSource) {
-	handle.Router = router
-}
-
-func (entry *WSHandler) SetAccessManager(accessManager auth.AccessManager) {
-	entry.accessManager = accessManager
-}
-
 func (handle *WSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	c, err := webSocketUpgrader.Upgrade(w, r, nil)
 	if err != nil {