Merge pull request #20394 from michaelnebel/java/code-quality-extended

Merge pull request #20394 from michaelnebel/java/code-quality-extended #3587