Remove (some) use of groovy in src/main

should we move to `Strings.isNonBlank(...)` ?