From 21a68272ec2f810195968a835e78b60b3d82da59 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 7 Aug 2016 05:20:16 +0800 Subject: [PATCH] The Collection.join() extension method somehow interferes with the Groovy runtime (e.g. 'hello'.tr('aeiou', 'AEIOU') fails) --- .../format/ExpressionFormatMethods.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/source/net/filebot/format/ExpressionFormatMethods.java b/source/net/filebot/format/ExpressionFormatMethods.java index dfc6887e..f0497fe6 100644 --- a/source/net/filebot/format/ExpressionFormatMethods.java +++ b/source/net/filebot/format/ExpressionFormatMethods.java @@ -9,7 +9,6 @@ import java.nio.file.Files; import java.nio.file.attribute.BasicFileAttributeView; import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Locale; import java.util.Map; @@ -27,7 +26,6 @@ import groovy.lang.Closure; import net.filebot.Language; import net.filebot.similarity.Normalization; import net.filebot.util.FileUtilities; -import net.filebot.util.StringUtilities; import net.filebot.web.SimpleDate; public class ExpressionFormatMethods { @@ -364,23 +362,6 @@ public class ExpressionFormatMethods { return self; } - /** - * Join non-empty String values and prepend prefix / append suffix values - * - * e.g. (1..3).join('-', '[', ']') - * - * Unwind if list is empty - * - * e.g. [].join('-', '[', ']') => Exception: List is empty - */ - public static String join(Collection self, String delimiter, String prefix, String suffix) throws Exception { - String[] values = self.stream().map(StringUtilities::asNonEmptyString).filter(Objects::nonNull).toArray(String[]::new); - if (values.length > 0) { - return prefix + String.join(delimiter, values) + suffix; - } - throw new Exception("List is empty"); - } - /** * Unwind if an object does not satisfy the given predicate *