Proper Annotation-based spring configuration