PIM-1582 : apply PMD fixes (deprecated use statements, missing blank
line)