Revert "Revert "Java""

This reverts commit 2c9811d0d69e3c01a33a9dd5bcc1c625971c38dc.