You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by mh...@apache.org on 2011/03/23 04:28:34 UTC
svn commit: r1084468 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/js/
main/java/org/apache/shindig/gadgets/servlet/
test/java/org/apache/shindig/gadgets/js/
test/java/org/apache/shindig/gadgets/rewrite/js/
Author: mhermanto
Date: Wed Mar 23 03:28:34 2011
New Revision: 1084468
URL: http://svn.apache.org/viewvc?rev=1084468&view=rev
Log:
Renaming JsResponse.getJsCode() to toJsString() to better mean conversion, instead of accessor.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJsLoadCallbackProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/InjectJsInfoVariableProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java Wed Mar 23 03:28:34 2011
@@ -46,7 +46,7 @@ public class JsResponse {
/**
* Returns the JavaScript code to serve.
*/
- public String getJsCode() {
+ public String toJsString() {
if (codeString == null) {
StringBuilder sb = new StringBuilder();
for (JsContent js : getAllJsContent()) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java Wed Mar 23 03:28:34 2011
@@ -215,7 +215,7 @@ public class GadgetsHandlerService {
} catch (JsException e) {
throw new ProcessingException(e.getMessage(), e.getStatusCode());
}
- content = response.getJsCode();
+ content = response.toJsString();
if (response.isProxyCacheable()) {
expireMs = timeSource.currentTimeMillis() + (HttpUtil.getDefaultTtl() * 1000);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java Wed Mar 23 03:28:34 2011
@@ -121,7 +121,7 @@ public class JsHandler {
// Compile all pre-processed features.
JsResponse result = compiler.compile(jsUri, responseBuilder.build().getAllJsContent(), allExterns);
- String code = result.getJsCode();
+ String code = result.toJsString();
if (code != null) {
responseBuilder.setJs(code, "[compiled]");
} else {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java Wed Mar 23 03:28:34 2011
@@ -96,7 +96,7 @@ public class JsServlet extends InjectedS
return;
}
- if (jsResponse.getStatusCode() == 200 && jsResponse.getJsCode().length() == 0) {
+ if (jsResponse.getStatusCode() == 200 && jsResponse.toJsString().length() == 0) {
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
@@ -106,7 +106,7 @@ public class JsServlet extends InjectedS
resp.setStatus(jsResponse.getStatusCode());
resp.setContentType("text/javascript; charset=utf-8");
- byte[] response = CharsetUtil.getUtf8Bytes(jsResponse.getJsCode());
+ byte[] response = CharsetUtil.getUtf8Bytes(jsResponse.toJsString());
resp.setContentLength(response.length);
resp.getOutputStream().write(response);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJsLoadCallbackProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJsLoadCallbackProcessorTest.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJsLoadCallbackProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJsLoadCallbackProcessorTest.java Wed Mar 23 03:28:34 2011
@@ -50,7 +50,7 @@ public class AddJsLoadCallbackProcessorT
control.replay();
assertTrue(processor.process(request, response));
assertEquals(AddJsLoadCallbackProcessor.JSL_CALLBACK_JS,
- response.build().getJsCode());
+ response.build().toJsString());
control.verify();
}
@@ -59,7 +59,7 @@ public class AddJsLoadCallbackProcessorT
EasyMock.expect(jsUri.isNohint()).andReturn(true);
control.replay();
assertTrue(processor.process(request, response));
- assertEquals("", response.build().getJsCode());
+ assertEquals("", response.build().toJsString());
control.verify();
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessorTest.java Wed Mar 23 03:28:34 2011
@@ -83,7 +83,7 @@ public class AddOnloadFunctionProcessorT
assertTrue(processor.process(request, response));
assertEquals(HttpServletResponse.SC_OK, response.getStatusCode());
String expectedBody = String.format(AddOnloadFunctionProcessor.ONLOAD_JS_TPL, ONLOAD_FUNCTION);
- assertEquals(expectedBody, response.build().getJsCode());
+ assertEquals(expectedBody, response.build().toJsString());
control.verify();
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/DefaultJsProcessorRegistryTest.java Wed Mar 23 03:28:34 2011
@@ -63,7 +63,7 @@ public class DefaultJsProcessorRegistryT
registry = new DefaultJsProcessorRegistry(ImmutableList.of(processor));
control.replay();
registry.process(request, response);
- assertEquals(JS_CODE, response.build().getJsCode());
+ assertEquals(JS_CODE, response.build().toJsString());
control.verify();
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/GetJsContentProcessorTest.java Wed Mar 23 03:28:34 2011
@@ -107,6 +107,6 @@ public class GetJsContentProcessorTest {
private void checkResponse(boolean proxyCacheable, int expectedTtl) {
assertEquals(proxyCacheable, response.isProxyCacheable());
assertEquals(expectedTtl, response.getCacheTtlSecs());
- assertEquals(JS_CODE, response.build().getJsCode());
+ assertEquals(JS_CODE, response.build().toJsString());
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/InjectJsInfoVariableProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/InjectJsInfoVariableProcessorTest.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/InjectJsInfoVariableProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/InjectJsInfoVariableProcessorTest.java Wed Mar 23 03:28:34 2011
@@ -78,7 +78,7 @@ public class InjectJsInfoVariableProcess
control.replay();
processor.process(request, response);
String expected = String.format(InjectJsInfoVariableProcessor.HINT_TEMPLATE, URI_JS, LIBS_JS);
- assertEquals(expected, response.build().getJsCode());
+ assertEquals(expected, response.build().toJsString());
control.verify();
}
@@ -90,7 +90,7 @@ public class InjectJsInfoVariableProcess
control.replay();
processor.process(request, response);
String expected = String.format(InjectJsInfoVariableProcessor.HINT_TEMPLATE, GENERATED_URI_JS, LIBS_JS);
- assertEquals(expected, response.build().getJsCode());
+ assertEquals(expected, response.build().toJsString());
assertFalse(captureJsUri.getValue().isJsload());
assertTrue(captureJsUri.getValue().isNohint());
control.verify();
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/JsLoadProcessorTest.java Wed Mar 23 03:28:34 2011
@@ -124,7 +124,7 @@ public class JsLoadProcessorTest {
assertEquals(HttpServletResponse.SC_OK, response.getStatusCode());
assertEquals(expectedTtl, response.getCacheTtlSecs());
String expectedBody = String.format(JsLoadProcessor.JSLOAD_JS_TPL, uri.toString());
- assertEquals(expectedBody, response.build().getJsCode());
+ assertEquals(expectedBody, response.build().toJsString());
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java Wed Mar 23 03:28:34 2011
@@ -80,7 +80,7 @@ public class DefaultJsCompilerTest {
public void testCompile() throws Exception {
JsResponse actual = compiler.compile(null,
ImmutableList.of(new JsContent(COMPILE_CONTENT, "js")), null);
- assertEquals(COMPILE_CONTENT, actual.getJsCode());
+ assertEquals(COMPILE_CONTENT, actual.toJsString());
assertEquals(0, actual.getErrors().size());
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java?rev=1084468&r1=1084467&r2=1084468&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java Wed Mar 23 03:28:34 2011
@@ -175,7 +175,7 @@ public class ExportJsCompilerTest {
JsUri jsUri = mockJsUri(JsCompileMode.ALL_RUN_TIME);
JsResponse actual = compiler.compile(jsUri,
ImmutableList.of(new JsContent(COMPILE_CONTENT, "js")), EXTERNS);
- assertEquals(EXPORT_JS_DEB + COMPILE_CONTENT, actual.getJsCode());
+ assertEquals(EXPORT_JS_DEB + COMPILE_CONTENT, actual.toJsString());
}
@Test
@@ -183,7 +183,7 @@ public class ExportJsCompilerTest {
JsUri jsUri = mockJsUri(JsCompileMode.ALL_RUN_TIME);
JsResponse actual = compiler.compile(jsUri,
ImmutableList.of(new JsContent("", "js")), EXTERNS);
- assertEquals(EXPORT_JS_DEB, actual.getJsCode());
+ assertEquals(EXPORT_JS_DEB, actual.toJsString());
}
private String getContent(Iterable<JsContent> jsContent) {