SONARJAVA-453  Fix quality flaws