more java to groovy replacements + added code form existing language groovy repo