Fix [SonarQube] TODO tags should be handled
Format per coding standards
Fix [SonarQube] Switch cases should end with an unconditional break
statement
Fix [SonarQube] Collection.isEmpty() should be used to test for
emptiness
Fix [SonarQube] TODO tags should be handled
Fix [SonarQube] Empty statements should be removed