4 commits - java/code