minor improvement (add @Nonnull annotations and replace single character string)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1440538 13f79535-47bb-0310-9956-ffa450edef68