From 1b1705a66162d65ee4f5f18c4a49b4dc596d97ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de>
Date: Tue, 9 Nov 2021 19:33:59 +0100
Subject: [PATCH] remove legacy array utilities

---
 .../easyi18n/util/array/ArrayUtil.java        | 59 -------------------
 .../easyi18n/util/array/JsonArrayUtil.java    | 21 -------
 .../easyi18n/util/array/YamlArrayUtil.java    | 21 -------
 3 files changed, 101 deletions(-)
 delete mode 100644 src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java
 delete mode 100644 src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java
 delete mode 100644 src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java

diff --git a/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java b/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java
deleted file mode 100644
index c13e57c..0000000
--- a/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package de.marhali.easyi18n.util.array;
-
-import de.marhali.easyi18n.util.StringUtil;
-import org.apache.commons.lang.StringEscapeUtils;
-
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-
-/**
- * Utility methods for simple array support.
- * @author marhali
- */
-@Deprecated
-public abstract class ArrayUtil {
-
-    static final String PREFIX = "!arr[";
-    static final String SUFFIX = "]";
-    static final char DELIMITER = ';';
-
-    static final String SPLITERATOR_REGEX =
-            MessageFormat.format("(?<!\\\\){0}", Pattern.quote(String.valueOf(DELIMITER)));
-
-    static <T> String read(Iterator<T> elements, Function<T, String> stringFactory) {
-        StringBuilder builder = new StringBuilder(PREFIX);
-
-        int i = 0;
-        while(elements.hasNext()) {
-            if(i > 0) {
-                builder.append(DELIMITER);
-            }
-
-            String value = stringFactory.apply(elements.next());
-
-            builder.append(StringUtil.escapeControls(
-                    value.replace(String.valueOf(DELIMITER), "\\" + DELIMITER), true));
-
-            i++;
-        }
-
-        builder.append(SUFFIX);
-        return builder.toString();
-    }
-
-    static void write(String concat, Consumer<String> writeElement) {
-        concat = concat.substring(PREFIX.length(), concat.length() - SUFFIX.length());
-
-        for(String element : concat.split(SPLITERATOR_REGEX)) {
-            element = element.replace("\\" + DELIMITER, String.valueOf(DELIMITER));
-            writeElement.accept(StringEscapeUtils.unescapeJava(element));
-        }
-    }
-
-    public static boolean isArray(String concat) {
-        return concat != null && concat.startsWith(PREFIX) && concat.endsWith(SUFFIX);
-    }
-}
diff --git a/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java b/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java
deleted file mode 100644
index 8905c1f..0000000
--- a/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.marhali.easyi18n.util.array;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-
-/**
- * Utility methods to read and write json arrays.
- * @author marhali
- */
-@Deprecated
-public class JsonArrayUtil extends ArrayUtil {
-    public static String read(JsonArray array) {
-        return read(array.iterator(), JsonElement::getAsString);
-    }
-
-    public static JsonArray write(String concat) {
-        JsonArray array = new JsonArray();
-        write(concat, array::add);
-        return array;
-    }
-}
diff --git a/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java b/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java
deleted file mode 100644
index 6c4cac1..0000000
--- a/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.marhali.easyi18n.util.array;
-
-import thito.nodeflow.config.ListSection;
-
-/**
- * Utility methods to read and write yaml lists.
- * @author marhali
- */
-@Deprecated
-public class YamlArrayUtil extends ArrayUtil {
-
-    public static String read(ListSection list) {
-       return read(list.iterator(), Object::toString);
-    }
-
-    public static ListSection write(String concat) {
-        ListSection list = new ListSection();
-        write(concat, list::add);
-        return list;
-    }
-}
\ No newline at end of file