Used @Service and context:component-scan
Merged calqlator
Merged