Reorganise dependency injection in ServiceHandler

No match.