From d7b5b4ae1049ba83382e9d2303d49f00064ceb34 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 5 Dec 2020 07:48:35 -0500 Subject: [PATCH] code cleanup --- pom.xml | 5 ---- .../collection/StringPrefixTransformer.java | 14 ----------- .../util/collection/ToStringTransformer.java | 11 -------- .../util/reflect/ReflectionUtil.java | 25 ------------------- .../org/cobbzilla/util/string/StringUtil.java | 19 +------------- 5 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 src/main/java/org/cobbzilla/util/collection/StringPrefixTransformer.java delete mode 100644 src/main/java/org/cobbzilla/util/collection/ToStringTransformer.java diff --git a/pom.xml b/pom.xml index 3fd064c..57a612a 100644 --- a/pom.xml +++ b/pom.xml @@ -127,11 +127,6 @@ cobbzilla-utils is available under the Apache License, version 2: http://www.apa commons-beanutils ${commons-beanutils.version} - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - org.apache.commons diff --git a/src/main/java/org/cobbzilla/util/collection/StringPrefixTransformer.java b/src/main/java/org/cobbzilla/util/collection/StringPrefixTransformer.java deleted file mode 100644 index 996291f..0000000 --- a/src/main/java/org/cobbzilla/util/collection/StringPrefixTransformer.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.cobbzilla.util.collection; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.apache.commons.collections4.Transformer; - -@AllArgsConstructor -public class StringPrefixTransformer implements Transformer { - - @Getter private String prefix; - - @Override public Object transform(Object input) { return prefix + input.toString(); } - -} diff --git a/src/main/java/org/cobbzilla/util/collection/ToStringTransformer.java b/src/main/java/org/cobbzilla/util/collection/ToStringTransformer.java deleted file mode 100644 index 5bae536..0000000 --- a/src/main/java/org/cobbzilla/util/collection/ToStringTransformer.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.cobbzilla.util.collection; - -import org.apache.commons.collections4.Transformer; - -public class ToStringTransformer implements Transformer { - - public static final ToStringTransformer instance = new ToStringTransformer(); - - @Override public Object transform(Object o) { return o == null ? "null" : o.toString(); } - -} diff --git a/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java b/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java index 55de997..42f4e86 100644 --- a/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java +++ b/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java @@ -8,7 +8,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.beanutils.MethodUtils; -import org.apache.commons.collections4.Transformer; import org.apache.commons.lang3.ArrayUtils; import org.cobbzilla.util.collection.ExpirationEvictionPolicy; import org.cobbzilla.util.collection.ExpirationMap; @@ -1125,30 +1124,6 @@ public class ReflectionUtil { public static String caller(StackTraceElement s) { return s.getClassName() + "." + s.getMethodName() + ":" + s.getLineNumber(); } - /** - * Replace any string values with their transformed values - * @param map a map of things - * @param transformer a transformer - * @return the same map, but if any value was a string, the transformer has been applied to it. - */ - public static Map transformStrings(Map map, Transformer transformer) { - if (empty(map)) return map; - final Map setOps = new HashMap(); - for (Object entry : map.entrySet()) { - final Map.Entry e = (Map.Entry) entry; - if (e.getValue() instanceof String) { - setOps.put(e.getKey(), transformer.transform(e.getValue()).toString()); - } else if (e.getValue() instanceof Map) { - setOps.put(e.getKey(), transformStrings((Map) e.getValue(), transformer)); - } - } - for (Object entry : setOps.entrySet()) { - final Map.Entry e = (Map.Entry) entry; - map.put(e.getKey(), e.getValue()); - } - return map; - } - public static boolean isStaticFinalString(Field f) { return isStaticFinal(f, String.class, StringUtil.EMPTY); } public static boolean isStaticFinalString(Field f, String prefix) { return isStaticFinal(f, String.class, prefix); } diff --git a/src/main/java/org/cobbzilla/util/string/StringUtil.java b/src/main/java/org/cobbzilla/util/string/StringUtil.java index 8f8266c..f31d579 100644 --- a/src/main/java/org/cobbzilla/util/string/StringUtil.java +++ b/src/main/java/org/cobbzilla/util/string/StringUtil.java @@ -1,8 +1,6 @@ package org.cobbzilla.util.string; import com.google.common.base.CaseFormat; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.Transformer; import org.apache.commons.io.input.ReaderInputStream; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.LocaleUtils; @@ -25,7 +23,6 @@ import java.nio.charset.StandardCharsets; import java.text.NumberFormat; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -46,16 +43,10 @@ public class StringUtil { public static final char[] EMPTY_CHAR_ARRAY = {}; public static final String CRLF = "\r\n"; - public static final Transformer XFORM_TO_STRING = o -> String.valueOf(o); - public static final String[] VOWELS = {"e", "a", "o", "i", "u"}; public static boolean isVowel(String symbol) { return ArrayUtils.indexOf(VOWELS, symbol) != -1; } - public static List toStringCollection (Collection c) { - return new ArrayList<>(CollectionUtils.collect(c, XFORM_TO_STRING)); - } - public static String prefix(String s, int count) { return s == null ? null : s.length() > count ? s.substring(0, count) : s; } @@ -228,22 +219,14 @@ public class StringUtil { public static String toString (Collection c) { return toString(c, ","); } public static String toString (Collection c, String sep) { - return toString(c, sep, null); - } - - public static String toString (Collection c, String sep, Function transformer) { StringBuilder builder = new StringBuilder(); for (Object o : c) { if (builder.length() > 0) builder.append(sep); - builder.append(transformer != null ? transformer.apply(o) : o); + builder.append(o); } return builder.toString(); } - public static String sqlIn (Collection c) { return toString(c, ",", ESCAPE_SQL); } - - public static final Function ESCAPE_SQL = o -> "'"+o.toString().replace("\'", "\'\'")+"'"; - public static String toString(Map map) { if (map == null) return "null"; final StringBuilder b = new StringBuilder("{");