OP-421: converted remaining groovy source files to java