Replace @NotNull with @NotEmpty where appropriate

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>