Refactoring AOP. Java Configuration instead of XML configuration