Remove incorrect NotNull annotations. Use javax.annotation.Nonnull.