Renamed and restructured utilities in U class.

rapidoid · Jan 24, 2015 · 5e9272a · 5e9272a
1 parent bca370f
commit 5e9272a
Show file tree

Hide file tree

Showing 13 changed files with 129 additions and 117 deletions.
diff --git a/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagRenderer.java b/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagRenderer.java
@@ -91,7 +91,7 @@ public void str(TagContext ctx, Object content, int level, boolean inline, Objec
 		}
 
 		indent(out, level, inline);
-		write(out, HTML.escape(U.text(content)));
+		write(out, HTML.escape(U.readable(content)));
 	}
 
 	protected void join(TagContext ctx, Collection<?> items, int level, boolean inline, Object extra, OutputStream out) {

diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpParser.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpParser.java
@@ -242,7 +242,7 @@ public void parseBody(Buf src, KeyValueRanges headers, Range body, KeyValueRange
 
 			src.get(multipartBoundary, helper.bytes, 2);
 
-			U.failIf(multipartBoundary.isEmpty(), "Invalid multi-part HTTP request!");
+			U.rteIf(multipartBoundary.isEmpty(), "Invalid multi-part HTTP request!");
 
 			parseMultiParts(src, body, data, files, multipartBoundary, helper);
 		} else {
@@ -334,7 +334,7 @@ private void parseMultiPart(Buf src, Range body, KeyValueRanges data, KeyValueRa
 				charset.strip(CHARSET_EQ.length, 0);
 				BytesUtil.trim(src.bytes(), charset);
 
-				U.failIf(!BytesUtil.matches(src.bytes(), charset, _UTF_8, false), "Only the UTF-8 charset is supported!");
+				U.rteIf(!BytesUtil.matches(src.bytes(), charset, _UTF_8, false), "Only the UTF-8 charset is supported!");
 			}
 		}
 
@@ -345,7 +345,7 @@ private void parseMultiPart(Buf src, Range body, KeyValueRanges data, KeyValueRa
 			boolean validEncoding = BytesUtil.matches(src.bytes(), encoding, _7BIT, false)
 					|| BytesUtil.matches(src.bytes(), encoding, _8BIT, false)
 					|| BytesUtil.matches(src.bytes(), encoding, BINARY, false);
-			U.failIf(!validEncoding, "Invalid Content-transfer-encoding header value!");
+			U.rteIf(!validEncoding, "Invalid Content-transfer-encoding header value!");
 		}
 
 		if (filename.isEmpty()) {

diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpProtocol.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpProtocol.java
@@ -62,8 +62,8 @@ protected void process(Channel ctx, HttpExchangeImpl x) {
 		parser.parse(x.input(), x.isGet, x.isKeepAlive, x.body, x.verb, x.uri, x.path, x.query, x.protocol, x.headers,
 				x.helper());
 
-		U.failIf(x.verb.isEmpty() || x.uri.isEmpty(), "Invalid HTTP request!");
+		U.rteIf(x.verb.isEmpty() || x.uri.isEmpty(), "Invalid HTTP request!");
-		U.failIf(x.isGet.value && !x.body.isEmpty(), "Body is NOT allowed in HTTP GET requests!");
+		U.rteIf(x.isGet.value && !x.body.isEmpty(), "Body is NOT allowed in HTTP GET requests!");
 
 		processRequest(x);
 	}

diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorker.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorker.java
@@ -140,7 +140,7 @@ protected void connectOP(SelectionKey key) throws IOException {
 		boolean ready;
 		try {
 			ready = socketChannel.finishConnect();
-			U.failIf(!ready, "Expected an established connection!");
+			U.rteIf(!ready, "Expected an established connection!");
 			connected.add(new RapidoidChannel(socketChannel, true));
 		} catch (ConnectException e) {
 			retryConnecting(target);

diff --git a/rapidoid-pages/src/main/java/org/rapidoid/widget/BootstrapWidgets.java b/rapidoid-pages/src/main/java/org/rapidoid/widget/BootstrapWidgets.java
@@ -489,7 +489,7 @@ public static Var<Integer> localVar(String name, int defaultValue, int min, int
 		Var<Integer> var = sessionVar(name + ":" + Pages.viewId(x), defaultValue);
 
 		// TODO put the constraints into the variable implementation
-		Integer pageN = U.limit(min, var.get(), max);
+		Integer pageN = U.limited(min, var.get(), max);
 		var.set(pageN);
 
 		return var;

diff --git a/rapidoid-pojo/src/main/java/org/rapidoid/pojo/impl/PojoDispatcherImpl.java b/rapidoid-pojo/src/main/java/org/rapidoid/pojo/impl/PojoDispatcherImpl.java
@@ -286,7 +286,7 @@ private static void setBeanProperties(Object instance, Map<String, String> param
 	}
 
 	private static PojoDispatchException error(Throwable cause, String msg, Object... args) {
-		return new PojoDispatchException(U.readable(msg, args), cause);
+		return new PojoDispatchException(U.nice(msg, args), cause);
 	}
 
 	private static PojoHandlerNotFoundException notFound() {