This PR changes to use AssertJ assertions consistently.

This PR also updates Checkstyle rule for it.

Comment From: wilkinsona

Thanks very much, @izeye.