replace javax.validation.constraints.NotNull to javax.annotation.Nonnull