Use the correct @Nonnull annotation, and code style