Renamed "resourceName" to "name" for simplicity.

rapidoid · Oct 19, 2015 · 9fb9d61 · 9fb9d61
1 parent 0b4c1e3
commit 9fb9d61
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/AppHandler.java b/rapidoid-app/src/main/java/org/rapidoid/app/AppHandler.java
@@ -182,7 +182,7 @@ private DispatchResult doDispatch(PojoDispatcher dispatcher, PojoRequest req) {
 	}
 
 	public static boolean serveDynamicPage(HttpExchange x, Object result, boolean hasEvent, Map<String, Object> config) {
-		String filename = x.resourceName() + ".html";
+		String filename = x.name() + ".html";
 		String firstFile = Conf.rootPath() + "/pages/" + filename;
 		String defaultFile = Conf.rootPathDefault() + "/pages/" + filename;
 		Res res = Res.from(filename, true, firstFile, defaultFile);

diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/Scripting.java b/rapidoid-app/src/main/java/org/rapidoid/app/Scripting.java
@@ -66,7 +66,7 @@ public void run() {
 	}
 
 	private static CompiledScript script(HttpExchangeImpl x) {
-		String scriptName = x.isGetReq() ? x.verbAndResourceName() : x.verb().toUpperCase() + "_" + x.resourceName();
+		String scriptName = x.isGetReq() ? x.verbAndResourceName() : x.verb().toUpperCase() + "_" + x.name();
 		String filename = scriptName + ".js";
 		String firstFile = Conf.rootPath() + "/" + filename;
 		String defaultFile = Conf.rootPathDefault() + "/" + filename;

diff --git a/rapidoid-http-api/src/main/java/org/rapidoid/http/HttpExchange.java b/rapidoid-http-api/src/main/java/org/rapidoid/http/HttpExchange.java
@@ -32,7 +32,7 @@ public interface HttpExchange extends Req, Resp, Runnable {
 
 	/* REQUEST: */
 
-	String resourceName();
+	String name();
 
 	String verbAndResourceName();
 

diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java
@@ -947,11 +947,11 @@ public synchronized HttpExchange authorize(Class<?> clazz) {
 
 	@Override
 	public synchronized boolean serveStaticFile() {
-		if (serveStaticFile(resourceName())) {
+		if (serveStaticFile(name())) {
 			return true;
 		}
 
-		return !resourceNameHasExtension() && serveStaticFile(resourceName() + ".html");
+		return !resourceNameHasExtension() && serveStaticFile(name() + ".html");
 	}
 
 	@Override
@@ -1287,7 +1287,7 @@ public HttpExchangeImpl async() {
 	}
 
 	@Override
-	public synchronized String resourceName() {
+	public synchronized String name() {
 		if (resourceName == null) {
 			resourceName = path().substring(1);
 
@@ -1307,11 +1307,11 @@ public synchronized String resourceName() {
 
 	@Override
 	public synchronized String verbAndResourceName() {
-		return verb().toUpperCase() + "/" + resourceName();
+		return verb().toUpperCase() + "/" + name();
 	}
 
 	public synchronized boolean resourceNameHasExtension() {
-		resourceName(); // make sure it is calculated
+		name(); // make sure it is calculated
 		return resourceNameHasExtension;
 	}