Replace @NotNull with @NotEmpty where appropriate