[JAVA-1410] encoders/decoders - addressing pull request comments.