fix(java): rollback recent annotation ref/id changes (#5294)

5 files changed