OP-421: Further Progress: Converting doWithTransaction…closures from groovy to java…restructured code as well