Java changing with tests

Guide Java changes with minimal edits, verify using unit/integration tests as needed, and provide a PR-ready summary including plans, changes, test results,...