Revert "Fix around 165 "Javadoc Style" warning from sonar"

This reverts commit cfc3592d9ffc0d991dd907728145b610fb04dcfb.
Fix JavaStyle (better algorithm)