Renamed HTTP "Response" class to "Resp".

rapidoid · Dec 13, 2015 · eff7def · eff7def
1 parent 8adf095
commit eff7def
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 44 deletions.
diff --git a/rapidoid-ctx/src/main/java/org/rapidoid/http/Req.java b/rapidoid-ctx/src/main/java/org/rapidoid/http/Req.java
@@ -138,7 +138,7 @@ public interface Req {
 
 	/* RESPONSE: */
 
-	Response response();
+	Resp response();
 
 	OutputStream out();
 

diff --git a/...main/java/org/rapidoid/http/Response.java → ...src/main/java/org/rapidoid/http/Resp.java b/...main/java/org/rapidoid/http/Response.java → ...src/main/java/org/rapidoid/http/Resp.java
@@ -25,49 +25,49 @@
 
 import org.rapidoid.commons.MediaType;
 
-public interface Response {
+public interface Resp {
 
-	Response content(Object content);
+	Resp content(Object content);
 
 	Object content();
 
-	Response code(int code);
+	Resp code(int code);
 
 	int code();
 
 	Map<String, String> headers();
 
 	Map<String, String> cookies();
 
-	Response contentType(MediaType contentType);
+	Resp contentType(MediaType contentType);
 
 	MediaType contentType();
 
-	Response redirect(String redirect);
+	Resp redirect(String redirect);
 
 	String redirect();
 
-	Response filename(String filename);
+	Resp filename(String filename);
 
 	String filename();
 
-	Response file(File file);
+	Resp file(File file);
 
 	File file();
 
-	Response view(String view);
+	Resp view(String view);
 
 	String view();
 
 	Req done();
 
-	Response plain(Object content);
+	Resp plain(Object content);
 
-	Response html(Object content);
+	Resp html(Object content);
 
-	Response json(Object content);
+	Resp json(Object content);
 
-	Response binary(Object content);
+	Resp binary(Object content);
 
 	Req request();
 

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpResponse.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpResponse.java
@@ -29,12 +29,12 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.commons.MediaType;
 import org.rapidoid.http.Req;
-import org.rapidoid.http.Response;
+import org.rapidoid.http.Resp;
 import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.0.2")
-public class HttpResponse implements Response {
+public class HttpResponse implements Resp {
 
 	private final ReqImpl req;
 
@@ -61,7 +61,7 @@ public HttpResponse(ReqImpl req) {
 	}
 
 	@Override
-	public synchronized Response content(Object content) {
+	public synchronized Resp content(Object content) {
 		ensureCanChange();
 		this.content = content;
 		return this;
@@ -73,7 +73,7 @@ public synchronized Object content() {
 	}
 
 	@Override
-	public synchronized Response code(int code) {
+	public synchronized Resp code(int code) {
 		ensureCanChange();
 		this.code = code;
 		return this;
@@ -95,7 +95,7 @@ public Map<String, String> cookies() {
 	}
 
 	@Override
-	public synchronized Response contentType(MediaType contentType) {
+	public synchronized Resp contentType(MediaType contentType) {
 		ensureCanChange();
 		this.contentType = contentType;
 		return this;
@@ -107,7 +107,7 @@ public synchronized MediaType contentType() {
 	}
 
 	@Override
-	public synchronized Response redirect(String redirect) {
+	public synchronized Resp redirect(String redirect) {
 		ensureCanChange();
 		this.redirect = redirect;
 		return this;
@@ -119,7 +119,7 @@ public synchronized String redirect() {
 	}
 
 	@Override
-	public synchronized Response filename(String filename) {
+	public synchronized Resp filename(String filename) {
 		ensureCanChange();
 		this.filename = filename;
 		return this;
@@ -131,7 +131,7 @@ public synchronized String filename() {
 	}
 
 	@Override
-	public synchronized Response file(File file) {
+	public synchronized Resp file(File file) {
 		ensureCanChange();
 		this.file = file;
 		return this;
@@ -157,22 +157,22 @@ public Req done() {
 	}
 
 	@Override
-	public Response html(Object content) {
+	public Resp html(Object content) {
 		return contentType(MediaType.HTML_UTF_8).content(content);
 	}
 
 	@Override
-	public Response plain(Object content) {
+	public Resp plain(Object content) {
 		return contentType(MediaType.PLAIN_TEXT_UTF_8).content(content);
 	}
 
 	@Override
-	public Response json(Object content) {
+	public Resp json(Object content) {
 		return contentType(MediaType.JSON_UTF_8).content(content);
 	}
 
 	@Override
-	public Response binary(Object content) {
+	public Resp binary(Object content) {
 		return contentType(MediaType.BINARY).content(content);
 	}
 
@@ -182,7 +182,7 @@ public synchronized String view() {
 	}
 
 	@Override
-	public synchronized Response view(String view) {
+	public synchronized Resp view(String view) {
 		this.view = view;
 		return this;
 	}

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpUtils.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpUtils.java
@@ -30,7 +30,7 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.data.JSON;
 import org.rapidoid.http.Req;
-import org.rapidoid.http.Response;
+import org.rapidoid.http.Resp;
 import org.rapidoid.io.Res;
 import org.rapidoid.log.Log;
 import org.rapidoid.u.U;
@@ -144,17 +144,17 @@ public static String renderState(Map<String, Serializable> pageLocals) {
 		}
 	}
 
-	public static void setContentTypeForFile(Response resp, File file) {
+	public static void setContentTypeForFile(Resp resp, File file) {
 		U.must(file.exists());
 		setContentType(resp, MediaType.getByFileName(file.getAbsolutePath()));
 	}
 
-	public static void setContentTypeForResource(Response resp, Res resource) {
+	public static void setContentTypeForResource(Resp resp, Res resource) {
 		U.must(resource.exists());
 		setContentType(resp, MediaType.getByFileName(resource.getShortName()));
 	}
 
-	public static void setContentType(Response resp, MediaType mediaType) {
+	public static void setContentType(Resp resp, MediaType mediaType) {
 		resp.contentType(mediaType);
 	}
 
@@ -207,13 +207,13 @@ public static String getErrorMessage(Throwable err) {
 		}
 	}
 
-	public static void postProcessResponse(Response resp) {
+	public static void postProcessResponse(Resp resp) {
 		postProcessRedirect(resp);
 		postProcessFile(resp);
 		postProcessFilename(resp);
 	}
 
-	private static void postProcessFile(Response resp) {
+	private static void postProcessFile(Resp resp) {
 		File file = resp.file();
 		if (file != null) {
 			U.must(file.exists());
@@ -228,15 +228,15 @@ private static void postProcessFile(Response resp) {
 		}
 	}
 
-	private static void postProcessFilename(Response resp) {
+	private static void postProcessFilename(Resp resp) {
 		String filename = resp.filename();
 		if (filename != null) {
 			resp.headers().put(HttpHeaders.CONTENT_DISPOSITION.name(), "attachment; filename=\"" + filename + "\"");
 			resp.headers().put(HttpHeaders.CACHE_CONTROL.name(), "private");
 		}
 	}
 
-	private static void postProcessRedirect(Response resp) {
+	private static void postProcessRedirect(Resp resp) {
 		String redirect = resp.redirect();
 		if (redirect != null) {
 			resp.code(303);

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/ReqImpl.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/ReqImpl.java
@@ -33,7 +33,7 @@
 import org.rapidoid.cls.Cls;
 import org.rapidoid.commons.MediaType;
 import org.rapidoid.http.Req;
-import org.rapidoid.http.Response;
+import org.rapidoid.http.Resp;
 import org.rapidoid.net.abstracts.Channel;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
@@ -70,7 +70,7 @@ public class ReqImpl implements Req, Constants {
 
 	private final Map<String, Object> attrs = Collections.synchronizedMap(new HashMap<String, Object>());
 
-	private volatile Response response;
+	private volatile Resp response;
 
 	private volatile boolean rendering;
 
@@ -321,7 +321,7 @@ private <T> T withDefault(Object value, T defaultValue) {
 	/************************** RESPONSE **************************/
 
 	@Override
-	public synchronized Response response() {
+	public synchronized Resp response() {
 		if (response == null) {
 			response = new HttpResponse(this);
 			if (defaultContentType != null) {

diff --git a/...doid-http-fast/src/main/java/org/rapidoid/http/fast/handler/AbstractAsyncHttpHandler.java b/...doid-http-fast/src/main/java/org/rapidoid/http/fast/handler/AbstractAsyncHttpHandler.java
@@ -30,7 +30,7 @@
 import org.rapidoid.ctx.Ctx;
 import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.http.Req;
-import org.rapidoid.http.Response;
+import org.rapidoid.http.Resp;
 import org.rapidoid.http.fast.FastHttp;
 import org.rapidoid.http.fast.HttpStatus;
 import org.rapidoid.http.fast.HttpWrapper;
@@ -65,7 +65,7 @@ public HttpStatus handle(Channel ctx, boolean isKeepAlive, Req req) {
 
 	@SuppressWarnings("unchecked")
 	protected Object postprocessResult(Req req, Object result) throws Exception {
-		if (result instanceof Req || result instanceof Response) {
+		if (result instanceof Req || result instanceof Resp) {
 			return result;
 
 		} else if (result == null) {
@@ -184,7 +184,7 @@ public void complete(Channel ctx, boolean isKeepAlive, Req req, Object result) {
 
 			return;
 
-		} else if (result instanceof Response) {
+		} else if (result instanceof Resp) {
 			U.must(req.response() == result);
 
 			// the Req object will do the rendering

diff --git a/rapidoid-rest/src/test/java/org/rapidoid/http/DynamicClientTest.java b/rapidoid-rest/src/test/java/org/rapidoid/http/DynamicClientTest.java
@@ -61,7 +61,7 @@ public Object handle(final Req req) throws Exception {
 					@Override
 					public void run() {
 						U.must(Reqs.req() == req);
-						Response resp = req.response();
+						Resp resp = req.response();
 						resp.content(req.data()).done();
 					}
 				}, 1000, TimeUnit.MILLISECONDS);

diff --git a/rapidoid-web/src/main/java/org/rapidoid/web/WebPojoDispatcher.java b/rapidoid-web/src/main/java/org/rapidoid/web/WebPojoDispatcher.java
@@ -47,7 +47,7 @@
 import org.rapidoid.dispatch.impl.DispatchReqKind;
 import org.rapidoid.dispatch.impl.PojoDispatcherImpl;
 import org.rapidoid.http.Req;
-import org.rapidoid.http.Response;
+import org.rapidoid.http.Resp;
 import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
@@ -60,13 +60,13 @@ public WebPojoDispatcher(Classes components) {
 
 	@Override
 	protected boolean isCustomType(Class<?> type) {
-		return Req.class.isAssignableFrom(type) || Response.class.isAssignableFrom(type) || type.equals(byte[].class)
+		return Req.class.isAssignableFrom(type) || Resp.class.isAssignableFrom(type) || type.equals(byte[].class)
 				|| type.equals(byte[][].class) || super.isCustomType(type);
 	}
 
 	@Override
 	protected Object getCustomArg(PojoRequest request, Class<?> type, String[] parts, int paramsFrom, int paramsSize) {
-		if (Req.class.isAssignableFrom(type) || Response.class.isAssignableFrom(type)) {
+		if (Req.class.isAssignableFrom(type) || Resp.class.isAssignableFrom(type)) {
 			return req(request);
 
 		} else if (type.equals(byte[].class)) {