Some more sonarLint fixes
189 files changed