2 commits - java/code