Use Spring annotation configuration instead of xml configuration
Update javadoc for classes with @Configuration annotation