Changing setter-injection to constructor-injection where instance variables are mandatory.