replace deepToString for Iterables with Collection

iTitus · May 6, 2021 · 71b3da5 · 71b3da5
1 parent 217e5c8
commit 71b3da5
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/main/java/io/github/ititus/data/ObjectUtil.java b/src/main/java/io/github/ititus/data/ObjectUtil.java
@@ -1,8 +1,6 @@
 package io.github.ititus.data;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 public final class ObjectUtil {
 
@@ -11,27 +9,30 @@ public static String deepToString(Object o) {
             return "null";
         } else if (o instanceof DeepToString) {
             return ((DeepToString) o).deepToString();
-        } else if (o instanceof Iterable) {
-            Iterator<?> it = ((Iterable<?>) o).iterator();
-            if (!it.hasNext()) {
-                return "[]";
+        } else if (o instanceof Collection) {
+            Collection<?> c = (Collection<?>) o;
+            boolean set = c instanceof Set;
+            if (c.isEmpty()) {
+                return set ? "{}" : "[]";
             }
 
-            StringBuilder b = new StringBuilder().append('[');
+            Iterator<?> it = c.iterator();
+            StringBuilder b = new StringBuilder().append(set ? '{' : '[');
             while (true) {
                 b.append(deepToString(it.next()));
                 if (!it.hasNext()) {
-                    return b.append(']').toString();
+                    return b.append(set ? '}' : ']').toString();
                 }
 
                 b.append(',').append(' ');
             }
         } else if (o instanceof Map) {
-            Iterator<? extends Map.Entry<?, ?>> it = ((Map<?, ?>) o).entrySet().iterator();
-            if (!it.hasNext()) {
+            Map<?, ?> m = (Map<?, ?>) o;
+            if (m.isEmpty()) {
                 return "{}";
             }
 
+            Iterator<? extends Map.Entry<?, ?>> it = m.entrySet().iterator();
             StringBuilder b = new StringBuilder().append('{');
             while (true) {
                 Map.Entry<?, ?> e = it.next();