Changes to keep NOSONAR comment in one line with method header
Marked several non-null arguments as @Nonnull to guide
SonarSource/FindBugs correctly through