2 commits - java/code proxy/proxy