JIRA: https://jira.spring.io/browse/INT-3509 **Cherry-pick to 3.0.x and 4.0.x** Polishing - Javadoc - Refactor duplicated code
JIRA: https://jira.spring.io/browse/INT-3509 **Cherry-pick to 3.0.x and 4.0.x** Polishing - Javadoc - Refactor duplicated code