[DF-1206] fix java implementation