Sonar check fix: Nested code blocks should not be used.
Sonar check fix: Collection.isEmpty() should be used to test for emptiness.
Sonar check fix: Long suffix "L" should be upper case.
Sonar check fix: Case insensitive string comparisons should be made without intermediate upper or lower casing.
Sonar check fix: Unused Modifier.