Renamed U.readable to U.str.

rapidoid-anyobj/src/main/java/org/rapidoid/anyobj/AnyObj.java

@@ -39,7 +39,7 @@ public static boolean contains(Object arrOrColl, Object value) {
 			Collection<?> coll = (Collection<?>) arrOrColl;
 			return coll.contains(value);
 		} else {
-			throw U.illegalArg("Expected array or collection, but found: %s", U.readable(arrOrColl));
+			throw U.illegalArg("Expected array or collection, but found: %s", U.str(arrOrColl));
 		}
 	}
 

rapidoid-cls/src/main/java/org/rapidoid/cls/Cls.java

@@ -660,7 +660,7 @@ public static <T> T convert(Object value, Class<T> toType) {
 			} else if (value instanceof char[]) {
 				return (T) new String((char[]) value);
 			} else {
-				return (T) U.readable(value);
+				return (T) U.str(value);
 			}
 
 		case OBJECT:
@@ -829,7 +829,7 @@ public static <T> T newInstance(Class<T> clazz, Object... args) {
 			}
 		}
 
-		throw U.rte("Cannot find appropriate constructor for %s with args %s!", clazz, U.readable(args));
+		throw U.rte("Cannot find appropriate constructor for %s with args %s!", clazz, U.str(args));
 	}
 
 	public static <T> T customizable(Class<T> clazz, Object... args) {

rapidoid-cls/src/main/java/org/rapidoid/cls/Proxies.java

@@ -64,7 +64,7 @@ public Object invoke(Object target, Method method, Object[] args) throws Throwab
 	}
 
 	public static <T> T implement(InvocationHandler handler, Class<?>... classes) {
-		return implement(new InterceptorProxy(U.readable(classes)), handler, classes);
+		return implement(new InterceptorProxy(U.str(classes)), handler, classes);
 	}
 
 	public static <T> T implementInterfaces(Object target, InvocationHandler handler) {

rapidoid-html/src/main/java/org/rapidoid/html/impl/TagRenderer.java

@@ -98,7 +98,7 @@ public void str(Object content, int level, boolean inline, Object extra, OutputS
 		}
 
 		indent(out, level, inline);
-		write(out, HTML.escape(U.readable(content)));
+		write(out, HTML.escape(U.str(content)));
 	}
 
 	protected void join(Collection<?> items, int level, boolean inline, Object extra, OutputStream out) {

rapidoid-u/src/main/java/org/rapidoid/util/U.java

@@ -67,7 +67,7 @@ public class U {
 
 	private static final Object[] EMPTY_ARRAY = {};
 
-	public static String readable(Object obj) {
+	public static String str(Object obj) {
 		if (obj == null) {
 			return "null";
 		} else if (obj instanceof byte[]) {
@@ -87,21 +87,21 @@ public static String readable(Object obj) {
 		} else if (obj instanceof char[]) {
 			return Arrays.toString((char[]) obj);
 		} else if (obj instanceof Object[]) {
-			return readable((Object[]) obj);
+			return str((Object[]) obj);
 		} else {
 			return String.valueOf(obj);
 		}
 	}
 
-	public static String readable(Object[] objs) {
+	public static String str(Object[] objs) {
 		StringBuilder sb = new StringBuilder();
 		sb.append("[");
 
 		for (int i = 0; i < objs.length; i++) {
 			if (i > 0) {
 				sb.append(", ");
 			}
-			sb.append(readable(objs[i]));
+			sb.append(str(objs[i]));
 		}
 
 		sb.append("]");
@@ -115,13 +115,13 @@ public static String format(String s, Object... args) {
 
 	public static String nice(String format, Object... args) {
 		for (int i = 0; i < args.length; i++) {
-			args[i] = readable(args[i]);
+			args[i] = str(args[i]);
 		}
 
 		return String.format(format, args);
 	}
 
-	public static String readable(Iterable<Object> coll) {
+	public static String str(Iterable<Object> coll) {
 		StringBuilder sb = new StringBuilder();
 		sb.append("[");
 
@@ -132,15 +132,15 @@ public static String readable(Iterable<Object> coll) {
 				sb.append(", ");
 			}
 
-			sb.append(readable(obj));
+			sb.append(str(obj));
 			first = false;
 		}
 
 		sb.append("]");
 		return sb.toString();
 	}
 
-	public static String readable(Iterator<?> it) {
+	public static String str(Iterator<?> it) {
 		StringBuilder sb = new StringBuilder();
 		sb.append("[");
 
@@ -152,31 +152,14 @@ public static String readable(Iterator<?> it) {
 				first = false;
 			}
 
-			sb.append(readable(it.next()));
+			sb.append(str(it.next()));
 		}
 
 		sb.append("]");
 
 		return sb.toString();
 	}
 
-	public static String readableln(Object[] objs) {
-		StringBuilder sb = new StringBuilder();
-		sb.append("[");
-
-		for (int i = 0; i < objs.length; i++) {
-			if (i > 0) {
-				sb.append(",");
-			}
-			sb.append("\n  ");
-			sb.append(readable(objs[i]));
-		}
-
-		sb.append("\n]");
-
-		return sb.toString();
-	}
-
 	public static String replaceText(String s, String[][] repls) {
 		for (String[] repl : repls) {
 			s = s.replaceAll(Pattern.quote(repl[0]), repl[1]);
@@ -188,7 +171,7 @@ public static void print(Object... values) {
 		String text;
 
 		if (values != null) {
-			text = values.length == 1 ? readable(values[0]) : readable(values);
+			text = values.length == 1 ? str(values[0]) : str(values);
 		} else {
 			text = "null";
 		}
@@ -626,21 +609,21 @@ public static boolean must(boolean expectedCondition, String message, long arg)
 
 	public static boolean must(boolean expectedCondition, String message, Object arg) {
 		if (!expectedCondition) {
-			throw rte(message, readable(arg));
+			throw rte(message, str(arg));
 		}
 		return true;
 	}
 
 	public static boolean must(boolean expectedCondition, String message, Object arg1, Object arg2) {
 		if (!expectedCondition) {
-			throw rte(message, readable(arg1), readable(arg2));
+			throw rte(message, str(arg1), str(arg2));
 		}
 		return true;
 	}
 
 	public static boolean must(boolean expectedCondition, String message, Object arg1, Object arg2, Object arg3) {
 		if (!expectedCondition) {
-			throw rte(message, readable(arg1), readable(arg2), readable(arg3));
+			throw rte(message, str(arg1), str(arg2), str(arg3));
 		}
 		return true;
 	}
@@ -651,7 +634,7 @@ public static IllegalArgumentException illegalArg(String message, Object... args
 
 	public static void secure(boolean condition, String msg) {
 		if (!condition) {
-			throw new SecurityException(readable(msg));
+			throw new SecurityException(str(msg));
 		}
 	}
 
@@ -767,10 +750,6 @@ public static String insert(String target, int atIndex, String insertion) {
 		return target.substring(0, atIndex) + insertion + target.substring(atIndex);
 	}
 
-	public static String str(Object value) {
-		return String.valueOf(value);
-	}
-
 	public static int num(String s) {
 		return Integer.parseInt(s);
 	}

rapidoid-u/src/test/java/org/rapidoid/util/UTest.java

@@ -46,55 +46,55 @@ public class UTest extends TestCommons {
 
 	@Test
 	public void testTextCollectionOfObject() {
-		eq(U.readable(new ArrayList<Integer>()), "[]");
+		eq(U.str(new ArrayList<Integer>()), "[]");
 
 		List<String> lst = new ArrayList<String>();
 
 		lst.add("java");
 		lst.add("c");
 		lst.add("c++");
 
-		eq(U.readable(lst), "[java, c, c++]");
+		eq(U.str(lst), "[java, c, c++]");
 	}
 
 	@Test
 	public void testTextObject() {
-		eq(U.readable((Object) null), "null");
+		eq(U.str((Object) null), "null");
 
-		eq(U.readable(123), "123");
-		eq(U.readable(1.23), "1.23");
+		eq(U.str(123), "123");
+		eq(U.str(1.23), "1.23");
 
-		eq(U.readable(true), "true");
-		eq(U.readable(false), "false");
+		eq(U.str(true), "true");
+		eq(U.str(false), "false");
 
-		eq(U.readable(""), "");
-		eq(U.readable("abc"), "abc");
+		eq(U.str(""), "");
+		eq(U.str("abc"), "abc");
 
-		eq(U.readable(new byte[] { -50, 0, 9 }), "[-50, 0, 9]");
-		eq(U.readable(new short[] { -500, 0, 9 }), "[-500, 0, 9]");
-		eq(U.readable(new int[] { 300000000, 70, 100 }), "[300000000, 70, 100]");
-		eq(U.readable(new long[] { 3000000000000000000L, 1, -8900000000000000000L }),
+		eq(U.str(new byte[] { -50, 0, 9 }), "[-50, 0, 9]");
+		eq(U.str(new short[] { -500, 0, 9 }), "[-500, 0, 9]");
+		eq(U.str(new int[] { 300000000, 70, 100 }), "[300000000, 70, 100]");
+		eq(U.str(new long[] { 3000000000000000000L, 1, -8900000000000000000L }),
 				"[3000000000000000000, 1, -8900000000000000000]");
 
-		eq(U.readable(new float[] { -30.40000000f, -1.587f, 89.3f }), "[-30.4, -1.587, 89.3]");
-		eq(U.readable(new double[] { -9987.1, -1.5, 8.3 }), "[-9987.1, -1.5, 8.3]");
+		eq(U.str(new float[] { -30.40000000f, -1.587f, 89.3f }), "[-30.4, -1.587, 89.3]");
+		eq(U.str(new double[] { -9987.1, -1.5, 8.3 }), "[-9987.1, -1.5, 8.3]");
 
-		eq(U.readable(new boolean[] { true }), "[true]");
+		eq(U.str(new boolean[] { true }), "[true]");
 
-		eq(U.readable(new char[] { 'k', 'o', 'h' }), "[k, o, h]");
-		eq(U.readable(new char[] { '-', '.', '+' }), "[-, ., +]");
+		eq(U.str(new char[] { 'k', 'o', 'h' }), "[k, o, h]");
+		eq(U.str(new char[] { '-', '.', '+' }), "[-, ., +]");
 	}
 
 	@Test
 	public void testTextObjectArray() {
-		eq(U.readable(new Object[] {}), "[]");
-		eq(U.readable(new Object[] { 1, new boolean[] { true, false }, 3 }), "[1, [true, false], 3]");
-		eq(U.readable(new Object[] { new double[] { -9987.1 }, new char[] { 'a', '.' }, new int[] { 300, 70, 100 } }),
+		eq(U.str(new Object[] {}), "[]");
+		eq(U.str(new Object[] { 1, new boolean[] { true, false }, 3 }), "[1, [true, false], 3]");
+		eq(U.str(new Object[] { new double[] { -9987.1 }, new char[] { 'a', '.' }, new int[] { 300, 70, 100 } }),
 				"[[-9987.1], [a, .], [300, 70, 100]]");
 
-		eq(U.readable(new int[][] { { 1, 2 }, { 3, 4, 5 } }), "[[1, 2], [3, 4, 5]]");
+		eq(U.str(new int[][] { { 1, 2 }, { 3, 4, 5 } }), "[[1, 2], [3, 4, 5]]");
 
-		eq(U.readable(new String[][][] { { { "a" }, { "r" } }, { { "m" } } }), "[[[a], [r]], [[m]]]");
+		eq(U.str(new String[][][] { { { "a" }, { "r" } }, { { "m" } } }), "[[[a], [r]], [[m]]]");
 	}
 
 	@Test

rapidoid-utils/src/main/java/org/rapidoid/util/D.java

@@ -36,7 +36,7 @@ public static void print(Object... values) {
 		String text;
 
 		if (values != null) {
-			text = values.length == 1 ? U.readable(values[0]) : U.readable(values);
+			text = values.length == 1 ? U.str(values[0]) : U.str(values);
 		} else {
 			text = "null";
 		}

rapidoid-utils/src/main/java/org/rapidoid/util/Val.java

@@ -45,7 +45,7 @@ public void set(T value) {
 
 	@Override
 	public String toString() {
-		return U.readable(value);
+		return U.str(value);
 	}
 
 }

rapidoid-var/src/main/java/org/rapidoid/var/impl/AbstractVar.java

@@ -39,7 +39,7 @@ public AbstractVar(String name) {
 
 	@Override
 	public String toString() {
-		return U.readable(get());
+		return U.str(get());
 	}
 
 	@Override

rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java

@@ -806,10 +806,10 @@ public static Object values(Object... values) {
 
 		for (Object value : values) {
 			if (Arr.isArray(value) && !hasGUIElements(value)) {
-				value = U.readable(value);
+				value = U.str(value);
 			}
 			if (value == null || value instanceof Iterable<?>) {
-				value = U.readable(value);
+				value = U.str(value);
 			}
 			list.add(row(value));
 		}