Fix SonarJ issues