FORGE-1254: Updated java parser