[CB] -- converted the last Scala matchers to Java