JAL-1648 Fix review issue - remove usage of String.join