Address java (21/22)

Address java