Fixed npe when deploy to eap due to removed inject
Further refactoring - works in EAP with JPASituationStore injected.