Fix some quality flaws
SONARPLUGINS-3160 Move from Sonar to SonarQube
Fix some quality flaws