Add javadoc
SONAR-5389 Improve logging