Moved random generator utils from U to a separate class (Rnd).

rapidoid-buffer/src/test/java/org/rapidoid/buffer/BufTest.java

@@ -24,6 +24,7 @@
 import org.rapidoid.data.Range;
 import org.rapidoid.data.Ranges;
 import org.rapidoid.util.Constants;
+import org.rapidoid.util.Rnd;
 import org.rapidoid.util.U;
 import org.testng.annotations.Test;
 
@@ -368,7 +369,7 @@ public void testDeleteAfter() {
 
 		int size = 0;
 		for (int i = 0; i < 1000000; i++) {
-			int add = U.rnd(100);
+			int add = Rnd.rnd(100);
 
 			for (int j = 0; j < 5; j++) {
 				size += add;
@@ -378,14 +379,14 @@ public void testDeleteAfter() {
 
 			for (int j = 0; j < 5; j++) {
 				if (buf.size() > 0) {
-					if (U.rnd(2) == 0) {
-						int delFrom = U.rnd(size);
+					if (Rnd.rnd(2) == 0) {
+						int delFrom = Rnd.rnd(size);
 						int delN = size - delFrom;
 
 						size -= delN;
 						buf.deleteAfter(delFrom);
 					} else {
-						int delN = U.rnd(size);
+						int delN = Rnd.rnd(size);
 
 						size -= delN;
 						buf.deleteBefore(delN);

rapidoid-db-tests/src/test/java/org/rapidoid/db/DbClassPersistenceTest.java

@@ -24,6 +24,7 @@
 
 import org.rapidoid.config.Conf;
 import org.rapidoid.db.model.Person;
+import org.rapidoid.util.Rnd;
 import org.rapidoid.util.U;
 import org.testng.annotations.Test;
 
@@ -52,7 +53,7 @@ public void run() {
 		U.benchmarkMT(10, "update", count, latch, new Runnable() {
 			@Override
 			public void run() {
-				int id = U.rnd(count) + 1;
+				int id = Rnd.rnd(count) + 1;
 				DB.update(id, new Person("x", id * 100));
 				latch.countDown();
 			}

rapidoid-db-tests/src/test/java/org/rapidoid/db/DbInterfacePersistenceTest.java

@@ -22,6 +22,7 @@
 
 import org.rapidoid.config.Conf;
 import org.rapidoid.db.model.IPerson;
+import org.rapidoid.util.Rnd;
 import org.rapidoid.util.U;
 import org.testng.annotations.Test;
 
@@ -48,7 +49,7 @@ public void run() {
 		U.benchmarkMT(10, "update", count, new Runnable() {
 			@Override
 			public void run() {
-				int id = U.rnd(count) + 1;
+				int id = Rnd.rnd(count) + 1;
 				DB.update(id, DB.create(IPerson.class, "name", "x", "age", id * 100));
 			}
 		});

rapidoid-demo/src/main/java/org/rapidoid/demo/db/DbPersistenceBenchmark.java

@@ -22,6 +22,7 @@
 
 import org.rapidoid.config.Conf;
 import org.rapidoid.db.DB;
+import org.rapidoid.util.Rnd;
 import org.rapidoid.util.U;
 
 public class DbPersistenceBenchmark {
@@ -48,7 +49,7 @@ public void run() {
 		U.benchmarkMT(Conf.cpus(), "update", size, new Runnable() {
 			@Override
 			public void run() {
-				DB.update(U.rnd(size) + 1, new Person("xyz", 10));
+				DB.update(Rnd.rnd(size) + 1, new Person("xyz", 10));
 			}
 		});
 

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

@@ -26,6 +26,7 @@
 
 import org.rapidoid.html.Cmd;
 import org.rapidoid.html.TagContext;
+import org.rapidoid.util.Rnd;
 import org.rapidoid.util.U;
 import org.rapidoid.var.Var;
 
@@ -41,7 +42,7 @@ public class TagContextImpl implements TagContext, Serializable {
 	public int newBinding(Var<Object> binding) {
 		int hnd;
 		do {
-			hnd = Math.abs(U.rnd());
+			hnd = Math.abs(Rnd.rnd());
 		} while (bindings.containsKey(hnd));
 
 		bindings.put(hnd, binding);
@@ -53,7 +54,7 @@ public int newBinding(Var<Object> binding) {
 	public int newCommand(Cmd cmd) {
 		int hnd;
 		do {
-			hnd = Math.abs(U.rnd());
+			hnd = Math.abs(Rnd.rnd());
 		} while (commands.containsKey(hnd));
 
 		commands.put(hnd, cmd);

rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java

@@ -44,6 +44,7 @@
 import org.rapidoid.util.Cls;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.IO;
+import org.rapidoid.util.Rnd;
 import org.rapidoid.util.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.util.UserInfo;
@@ -691,7 +692,7 @@ public synchronized String sessionId() {
 			}
 
 			if (sessionId == null) {
-				sessionId = U.rndStr(50);
+				sessionId = Rnd.rndStr(50);
 				setCookie(SESSION_COOKIE, sessionId, "path=/");
 				session.openSession(sessionId);
 			}

rapidoid-http/src/test/java/org/rapidoid/http/HttpServerHeadersTest.java

@@ -25,7 +25,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.rapidoid.util.IO;
-import org.rapidoid.util.U;
+import org.rapidoid.util.Rnd;
 import org.testng.annotations.Test;
 
 public class HttpServerHeadersTest extends HttpTestCommons {
@@ -55,7 +55,7 @@ public Object handle(HttpExchange x) {
 				if (x.cookie("ses", null) == null) {
 					x.setCookie("ses", "023B");
 				}
-				x.setCookie("key" + U.rnd(100), "val" + U.rnd(100));
+				x.setCookie("key" + Rnd.rnd(100), "val" + Rnd.rnd(100));
 
 				return x.writeJSON(x.cookies());
 			}

rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidServerLoop.java

@@ -33,6 +33,7 @@
 import org.rapidoid.log.Log;
 import org.rapidoid.net.TCPServer;
 import org.rapidoid.util.Cls;
+import org.rapidoid.util.Rnd;
 import org.rapidoid.util.U;
 
 public class RapidoidServerLoop extends AbstractEventLoop<TCPServer> implements TCPServer {
@@ -161,7 +162,7 @@ public synchronized TCPServer shutdown() {
 	}
 
 	public synchronized RapidoidConnection newConnection() {
-		int rndWorker = U.rnd(workers.length);
+		int rndWorker = Rnd.rnd(workers.length);
 		return workers[rndWorker].newConnection();
 	}
 

rapidoid-oauth/src/main/java/org/rapidoid/oauth/DefaultOAuthStateCheck.java

@@ -1,6 +1,7 @@
 package org.rapidoid.oauth;
 
 import org.rapidoid.config.Conf;
+import org.rapidoid.util.Rnd;
 import org.rapidoid.util.U;
 
 /*
@@ -31,7 +32,7 @@ public String generateState(String clientSecret, String sessionId) {
 			return "OK";
 		}
 
-		String rnd = U.rndStr(10);
+		String rnd = Rnd.rndStr(10);
 		String hash = U.md5(clientSecret + rnd);
 		return rnd + "_" + hash;
 	}

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

@@ -28,6 +28,7 @@
 import org.rapidoid.security.DataPermissions;
 import org.rapidoid.util.AppCtx;
 import org.rapidoid.util.Cls;
+import org.rapidoid.util.Rnd;
 import org.rapidoid.util.TypeKind;
 import org.rapidoid.util.U;
 import org.rapidoid.var.Var;
@@ -573,7 +574,7 @@ public static Tag[] radios(String name, Collection<?> options, Var<?> var) {
 	}
 
 	public static Tag[] radios(Collection<?> options, Var<?> var) {
-		return radios(U.rndStr(30), options, var);
+		return radios(Rnd.rndStr(30), options, var);
 	}
 
 	public static Tag[] checkboxes(String name, Collection<?> options, Var<?> var) {
@@ -590,7 +591,7 @@ public static Tag[] checkboxes(String name, Collection<?> options, Var<?> var) {
 	}
 
 	public static Tag[] checkboxes(Collection<?> options, Var<?> var) {
-		return checkboxes(U.rndStr(30), options, var);
+		return checkboxes(Rnd.rndStr(30), options, var);
 	}
 
 	public static Object display(Object item) {

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

@@ -0,0 +1,77 @@
+package org.rapidoid.util;
+
+/*
+ * #%L
+ * rapidoid-u
+ * %%
+ * Copyright (C) 2014 - 2015 Nikolche Mihajlovski
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import java.util.Random;
+
+public class Rnd {
+
+	protected static final Random RND = new Random();
+
+	public static char rndChar() {
+		return (char) (65 + rnd(26));
+	}
+
+	public static String rndStr(int length) {
+		return rndStr(length, length);
+	}
+
+	public static String rndStr(int minLength, int maxLength) {
+		int len = minLength + rnd(maxLength - minLength + 1);
+		StringBuffer sb = new StringBuffer();
+
+		for (int i = 0; i < len; i++) {
+			sb.append(rndChar());
+		}
+
+		return sb.toString();
+	}
+
+	public static int rnd(int n) {
+		return RND.nextInt(n);
+	}
+
+	public static int rndExcept(int n, int except) {
+		if (n > 1 || except != 0) {
+			while (true) {
+				int num = RND.nextInt(n);
+				if (num != except) {
+					return num;
+				}
+			}
+		} else {
+			throw new RuntimeException("Cannot produce such number!");
+		}
+	}
+
+	public static <T> T rnd(T[] arr) {
+		return arr[rnd(arr.length)];
+	}
+
+	public static int rnd() {
+		return RND.nextInt();
+	}
+
+	public static long rndL() {
+		return RND.nextLong();
+	}
+
+}

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

@@ -34,7 +34,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
-import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
@@ -47,7 +46,6 @@
 
 public class U {
 
-	protected static final Random RND = new Random();
 	private static ScheduledThreadPoolExecutor EXECUTOR;
 	private static long measureStart;
 
@@ -891,52 +889,4 @@ public static <T> int cmp(T val1, T val2) {
 		}
 	}
 
-	public static char rndChar() {
-		return (char) (65 + rnd(26));
-	}
-
-	public static String rndStr(int length) {
-		return rndStr(length, length);
-	}
-
-	public static String rndStr(int minLength, int maxLength) {
-		int len = minLength + rnd(maxLength - minLength + 1);
-		StringBuffer sb = new StringBuffer();
-
-		for (int i = 0; i < len; i++) {
-			sb.append(rndChar());
-		}
-
-		return sb.toString();
-	}
-
-	public static int rnd(int n) {
-		return RND.nextInt(n);
-	}
-
-	public static int rndExcept(int n, int except) {
-		if (n > 1 || except != 0) {
-			while (true) {
-				int num = RND.nextInt(n);
-				if (num != except) {
-					return num;
-				}
-			}
-		} else {
-			throw new RuntimeException("Cannot produce such number!");
-		}
-	}
-
-	public static <T> T rnd(T[] arr) {
-		return arr[rnd(arr.length)];
-	}
-
-	public static int rnd() {
-		return RND.nextInt();
-	}
-
-	public static long rndL() {
-		return RND.nextLong();
-	}
-
 }