Refactor test for notnull parameter
Merge branch '4bcf574b8a' (early part) into lombok-refactor
Merge commit '4bcf574b8a' into lombok-refactor
Use files from commit 6afeb231 to fix merge errors, then reformat