You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2018/05/18 19:36:48 UTC
[sling-org-apache-sling-servlets-get] branch master updated:
correcting whitespace to standards
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git
The following commit(s) were added to refs/heads/master by this push:
new 50f4576 correcting whitespace to standards
50f4576 is described below
commit 50f457689546bc1e0a20f88c969575eedb9ea507
Author: JE Bailey <ja...@sas.com>
AuthorDate: Fri May 18 15:35:30 2018 -0400
correcting whitespace to standards
---
.../get/impl/helpers/HeadServletResponse.java | 196 ++++++++++-----------
.../sling/servlets/get/impl/helpers/Renderer.java | 2 +-
.../servlets/get/impl/util/JsonObjectCreator.java | 150 ++++++++--------
.../servlets/get/impl/DefaultGetServletTest.java | 13 +-
.../servlets/get/impl/JsonRendererServletTest.java | 88 ++++-----
.../servlets/get/impl/RedirectServletTest.java | 57 +++---
.../get/impl/helpers/JsonRendererTest.java | 75 ++++----
.../get/impl/helpers/StreamRendererTest.java | 20 +--
8 files changed, 296 insertions(+), 305 deletions(-)
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/HeadServletResponse.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/HeadServletResponse.java
index 9b627c8..cb5c646 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/HeadServletResponse.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/HeadServletResponse.java
@@ -34,102 +34,102 @@ import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
public class HeadServletResponse extends SlingHttpServletResponseWrapper {
- private ServletOutputStream stream;
-
- private PrintWriter writer;
-
- public HeadServletResponse(SlingHttpServletResponse wrappedResponse) {
- super(wrappedResponse);
- }
-
- @Override
- public ServletOutputStream getOutputStream() {
- if (writer != null) {
- throw new IllegalStateException("Writer already obtained");
- }
-
- if (stream == null) {
- stream = new NullServletOutputStream();
- }
-
- return stream;
- }
-
- @Override
- public PrintWriter getWriter() {
- if (stream != null) {
- throw new IllegalStateException("OutputStream already obtained");
- }
-
- if (writer == null) {
- writer = new PrintWriter(new NullWriter());
- }
-
- return writer;
- }
-
- /**
- * The <code>NullServletOutputStream</code> is a
- * <code>ServletOutputStream</code> which simply does not write out anything.
- *
- * @see HeadServletResponse#getOutputStream()
- */
- private static class NullServletOutputStream extends ServletOutputStream {
- @Override
- public void write(int b) {
- }
-
- @Override
- public void write(byte[] b) {
- }
-
- @Override
- public void write(byte[] b, int off, int len) {
- }
-
- @Override
- public boolean isReady() {
- return true;
- }
-
- @Override
- public void setWriteListener(WriteListener writeListener) {
- }
- }
-
- /**
- * The <code>NullWriter</code> is a <code>Writer</code> which simply does not
- * write out anything.
- *
- * @see HeadServletResponse#getWriter()
- */
- private static class NullWriter extends Writer {
- @Override
- public void write(char[] cbuf, int off, int len) {
- }
-
- @Override
- public void write(char[] cbuf) {
- }
-
- @Override
- public void write(int c) {
- }
-
- @Override
- public void write(String str) {
- }
-
- @Override
- public void write(String str, int off, int len) {
- }
-
- @Override
- public void flush() {
- }
-
- @Override
- public void close() {
- }
- }
+ private ServletOutputStream stream;
+
+ private PrintWriter writer;
+
+ public HeadServletResponse(SlingHttpServletResponse wrappedResponse) {
+ super(wrappedResponse);
+ }
+
+ @Override
+ public ServletOutputStream getOutputStream() {
+ if (writer != null) {
+ throw new IllegalStateException("Writer already obtained");
+ }
+
+ if (stream == null) {
+ stream = new NullServletOutputStream();
+ }
+
+ return stream;
+ }
+
+ @Override
+ public PrintWriter getWriter() {
+ if (stream != null) {
+ throw new IllegalStateException("OutputStream already obtained");
+ }
+
+ if (writer == null) {
+ writer = new PrintWriter(new NullWriter());
+ }
+
+ return writer;
+ }
+
+ /**
+ * The <code>NullServletOutputStream</code> is a
+ * <code>ServletOutputStream</code> which simply does not write out anything.
+ *
+ * @see HeadServletResponse#getOutputStream()
+ */
+ private static class NullServletOutputStream extends ServletOutputStream {
+ @Override
+ public void write(int b) {
+ }
+
+ @Override
+ public void write(byte[] b) {
+ }
+
+ @Override
+ public void write(byte[] b, int off, int len) {
+ }
+
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {
+ }
+ }
+
+ /**
+ * The <code>NullWriter</code> is a <code>Writer</code> which simply does not
+ * write out anything.
+ *
+ * @see HeadServletResponse#getWriter()
+ */
+ private static class NullWriter extends Writer {
+ @Override
+ public void write(char[] cbuf, int off, int len) {
+ }
+
+ @Override
+ public void write(char[] cbuf) {
+ }
+
+ @Override
+ public void write(int c) {
+ }
+
+ @Override
+ public void write(String str) {
+ }
+
+ @Override
+ public void write(String str, int off, int len) {
+ }
+
+ @Override
+ public void flush() {
+ }
+
+ @Override
+ public void close() {
+ }
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/Renderer.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/Renderer.java
index 4b7bd0e..83b0a29 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/Renderer.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/Renderer.java
@@ -24,6 +24,6 @@ import org.apache.sling.api.SlingHttpServletResponse;
public interface Renderer {
- void render(final SlingHttpServletRequest req, final SlingHttpServletResponse resp) throws IOException;
+ void render(final SlingHttpServletRequest req, final SlingHttpServletResponse resp) throws IOException;
}
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
index 5cf4d0a..4b66248 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
@@ -38,58 +38,58 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
public class JsonObjectCreator {
-
+
/** Used to format date values */
private static final String ECMA_DATE_FORMAT = "EEE MMM dd yyyy HH:mm:ss 'GMT'Z";
/** The Locale used to format date values */
static final Locale DATE_FORMAT_LOCALE = Locale.US;
-
- private Resource resource;
-
- private ValueMap valueMap;
-
- private boolean ecmaSupport;
-
- public JsonObjectCreator(Resource resource, boolean ecmaSupport) {
- this.resource = resource;
- this.valueMap = resource.getValueMap();
- this.ecmaSupport = ecmaSupport;
- }
-
- public JsonObjectBuilder create() {
- final JsonObjectBuilder obj = Json.createObjectBuilder();
-
- ValueMap valueMap = resource.getValueMap();
- if (valueMap.isEmpty()) {
- final String value = resource.adaptTo(String.class);
- if (value != null) {
- obj.add(resource.getName(), value.toString());
- } else {
- final String[] values = resource.adaptTo(String[].class);
- if (values != null) {
- JsonArrayBuilder builder = Json.createArrayBuilder();
- for (String v : values) {
- builder.add(v);
- }
- obj.add(resource.getName(), builder);
- }
- }
- return obj;
- }
-
- final Iterator<Map.Entry<String, Object>> props = valueMap.entrySet().iterator();
-
- while (props.hasNext()) {
- final Map.Entry<String, Object> prop = props.next();
- if (prop.getValue() != null) {
- createProperty(obj, prop.getKey(), prop.getValue());
- }
- }
-
- return obj;
- }
-
+
+ private Resource resource;
+
+ private ValueMap valueMap;
+
+ private boolean ecmaSupport;
+
+ public JsonObjectCreator(Resource resource, boolean ecmaSupport) {
+ this.resource = resource;
+ this.valueMap = resource.getValueMap();
+ this.ecmaSupport = ecmaSupport;
+ }
+
+ public JsonObjectBuilder create() {
+ final JsonObjectBuilder obj = Json.createObjectBuilder();
+
+ ValueMap valueMap = resource.getValueMap();
+ if (valueMap.isEmpty()) {
+ final String value = resource.adaptTo(String.class);
+ if (value != null) {
+ obj.add(resource.getName(), value.toString());
+ } else {
+ final String[] values = resource.adaptTo(String[].class);
+ if (values != null) {
+ JsonArrayBuilder builder = Json.createArrayBuilder();
+ for (String v : values) {
+ builder.add(v);
+ }
+ obj.add(resource.getName(), builder);
+ }
+ }
+ return obj;
+ }
+
+ final Iterator<Map.Entry<String, Object>> props = valueMap.entrySet().iterator();
+
+ while (props.hasNext()) {
+ final Map.Entry<String, Object> prop = props.next();
+ if (prop.getValue() != null) {
+ createProperty(obj, prop.getKey(), prop.getValue());
+ }
+ }
+
+ return obj;
+ }
+
public static String formatEcma(final Calendar date) {
DateFormat formatter = new SimpleDateFormat(ECMA_DATE_FORMAT, DATE_FORMAT_LOCALE);
formatter.setTimeZone(date.getTimeZone());
@@ -97,25 +97,25 @@ public class JsonObjectCreator {
}
/** Dump only a value in the correct format */
- private JsonValue getValue(final Object value ) {
+ private JsonValue getValue(final Object value) {
JsonObjectBuilder builder = Json.createObjectBuilder();
- if ( value instanceof InputStream ) {
+ if (value instanceof InputStream) {
// input stream is already handled
builder.add("entry", 0);
- } else if ( value instanceof Calendar ) {
- if (ecmaSupport) {
- builder.add("entry", JsonObjectCreator.formatEcma((Calendar)value));
- } else {
- builder.add("entry", ISO8601.format(((Calendar)value)));
- }
- } else if ( value instanceof Boolean ) {
+ } else if (value instanceof Calendar) {
+ if (ecmaSupport) {
+ builder.add("entry", JsonObjectCreator.formatEcma((Calendar) value));
+ } else {
+ builder.add("entry", ISO8601.format(((Calendar) value)));
+ }
+ } else if (value instanceof Boolean) {
builder.add("entry", (Boolean) value);
- } else if ( value instanceof Long ) {
+ } else if (value instanceof Long) {
builder.add("entry", (Long) value);
- } else if ( value instanceof Double ) {
+ } else if (value instanceof Double) {
builder.add("entry", (Double) value);
- } else if ( value != null ) {
+ } else if (value != null) {
builder.add("entry", value.toString());
} else {
builder.add("entry", "");
@@ -126,36 +126,33 @@ public class JsonObjectCreator {
/**
* Write a single property
*/
- private void createProperty(final JsonObjectBuilder obj,
- final String key,
- final Object value) {
+ private void createProperty(final JsonObjectBuilder obj, final String key, final Object value) {
Object[] values = null;
if (value.getClass().isArray()) {
final int length = Array.getLength(value);
// write out empty array
- if ( length == 0 ) {
+ if (length == 0) {
obj.add(key, Json.createArrayBuilder());
return;
}
values = new Object[Array.getLength(value)];
- for(int i=0; i<length; i++) {
+ for (int i = 0; i < length; i++) {
values[i] = Array.get(value, i);
}
}
// special handling for binaries: we dump the length and not the data!
- if (value instanceof InputStream
- || (values != null && values[0] instanceof InputStream)) {
+ if (value instanceof InputStream || (values != null && values[0] instanceof InputStream)) {
// TODO for now we mark binary properties with an initial colon in
// their name
// (colon is not allowed as a JCR property name)
// in the name, and the value should be the size of the binary data
if (values == null) {
- obj.add(":" + key, getLength(0, key, (InputStream)value));
+ obj.add(":" + key, getLength(0, key, (InputStream) value));
} else {
final JsonArrayBuilder result = Json.createArrayBuilder();
for (int i = 0; i < values.length; i++) {
- result.add(getLength(i, key, (InputStream)values[i]));
+ result.add(getLength(i, key, (InputStream) values[i]));
}
obj.add(":" + key, result);
}
@@ -173,18 +170,17 @@ public class JsonObjectCreator {
}
}
- private long getLength(final int index,
- final String key,
- final InputStream stream) {
+ private long getLength(final int index, final String key, final InputStream stream) {
try {
stream.close();
- } catch (IOException ignore) {}
+ } catch (IOException ignore) {
+ }
long length = -1;
- if ( valueMap != null ) {
- Long[] lengths = valueMap.get(key, Long[].class);
- if ( lengths != null && lengths.length > index ) {
- length = lengths[index];
- }
+ if (valueMap != null) {
+ Long[] lengths = valueMap.get(key, Long[].class);
+ if (lengths != null && lengths.length > index) {
+ length = lengths[index];
+ }
}
return length;
}
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/DefaultGetServletTest.java b/src/test/java/org/apache/sling/servlets/get/impl/DefaultGetServletTest.java
index 7628bbe..a8056c5 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/DefaultGetServletTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/DefaultGetServletTest.java
@@ -32,19 +32,20 @@ import org.mockito.Mockito;
public class DefaultGetServletTest {
- @Test public void testDisabledAlias() throws Exception {
+ @Test
+ public void testDisabledAlias() throws Exception {
@SuppressWarnings("serial")
- final DefaultGetServlet servlet = new DefaultGetServlet() {
- public ServletContext getServletContext() {
- return null;
- }
+ final DefaultGetServlet servlet = new DefaultGetServlet() {
+ public ServletContext getServletContext() {
+ return null;
+ }
};
final DefaultGetServlet.Config config = Mockito.mock(DefaultGetServlet.Config.class);
Mockito.when(config.enable_html()).thenReturn(true);
Mockito.when(config.enable_json()).thenReturn(true);
Mockito.when(config.enable_xml()).thenReturn(false);
Mockito.when(config.enable_txt()).thenReturn(false);
- Mockito.when(config.aliases()).thenReturn(new String[] {"xml:pdf"});
+ Mockito.when(config.aliases()).thenReturn(new String[] { "xml:pdf" });
servlet.activate(config);
servlet.init();
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/JsonRendererServletTest.java b/src/test/java/org/apache/sling/servlets/get/impl/JsonRendererServletTest.java
index 99b7fa5..d7011ab 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/JsonRendererServletTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/JsonRendererServletTest.java
@@ -28,56 +28,62 @@ import org.apache.sling.servlets.get.impl.helpers.JsonRenderer;
public class JsonRendererServletTest {
- private static MockResourceResolver resolver;
+ private static MockResourceResolver resolver;
- @org.junit.BeforeClass
- public static void setup() {
- resolver = new MockResourceResolver();
- resolver.addResource(new MockResource(resolver, "/content/page", "page"));
- resolver.addResource(new MockResource(resolver, "/content/page/one", "one"));
- resolver.addResource(new MockResource(resolver, "/content/page/two", "two"));
+ @org.junit.BeforeClass
+ public static void setup() {
+ resolver = new MockResourceResolver();
+ resolver.addResource(new MockResource(resolver, "/content/page", "page"));
+ resolver.addResource(new MockResource(resolver, "/content/page/one", "one"));
+ resolver.addResource(new MockResource(resolver, "/content/page/two", "two"));
- resolver.addResource(new MockResource(resolver, "/etc", "etc"));
- resolver.addResource(new MockResource(resolver, "/etc/tags", "tags"));
- for (int i = 0; i < 1085; i++) {
- resolver.addResource(new MockResource(resolver, "/etc/tags/" + i, "" + i));
- }
- }
+ resolver.addResource(new MockResource(resolver, "/etc", "etc"));
+ resolver.addResource(new MockResource(resolver, "/etc/tags", "tags"));
+ for (int i = 0; i < 1085; i++) {
+ resolver.addResource(new MockResource(resolver, "/etc/tags/" + i, "" + i));
+ }
+ }
- @org.junit.AfterClass
- public static void teardown() {
- }
+ @org.junit.AfterClass
+ public static void teardown() {
+ }
- @org.junit.Test
- public void test() throws Throwable {
- String response = getJSON("/content/page", "0");
- assertEquals("{\"resourceType\":\"page\"}", response);
+ @org.junit.Test
+ public void test() throws Throwable {
+ String response = getJSON("/content/page", "0");
+ assertEquals("{\"resourceType\":\"page\"}", response);
- response = getJSON("/content/page", "1");
- assertEquals("{\"resourceType\":\"page\",\"one\":{\"resourceType\":\"one\"},\"two\":{\"resourceType\":\"two\"}}", response);
+ response = getJSON("/content/page", "1");
+ assertEquals(
+ "{\"resourceType\":\"page\",\"one\":{\"resourceType\":\"one\"},\"two\":{\"resourceType\":\"two\"}}",
+ response);
- response = getJSON("/content/page", "infinity");
- assertEquals("{\"resourceType\":\"page\",\"one\":{\"resourceType\":\"one\"},\"two\":{\"resourceType\":\"two\"}}", response);
+ response = getJSON("/content/page", "infinity");
+ assertEquals(
+ "{\"resourceType\":\"page\",\"one\":{\"resourceType\":\"one\"},\"two\":{\"resourceType\":\"two\"}}",
+ response);
- response = getJSON("/content/page/one", "infinity");
- assertEquals("{\"resourceType\":\"one\"}", response);
+ response = getJSON("/content/page/one", "infinity");
+ assertEquals("{\"resourceType\":\"one\"}", response);
- response = getJSON("/etc", "infinity");
- assertEquals("[\"/etc.1.json\",\"/etc.0.json\"]", response);
+ response = getJSON("/etc", "infinity");
+ assertEquals("[\"/etc.1.json\",\"/etc.0.json\"]", response);
- response = getJSON("/etc/tags", "1");
- assertEquals("{\"resourceType\":\"tags\",\"0\":{\"resourceType\":\"0\"},\"1\":{\"resourceType\":\"1\"},\"2\":{\"resourceType\":\"2\"},\"3\":{\"resourceType\":\"3\"},\"4\":{\"resourceType\":\"4\"},\"5\":{\"resourceType\":\"5\"},\"6\":{\"resourceType\":\"6\"},\"7\":{\"resourceType\":\"7\"},\"8\":{\"resourceType\":\"8\"},\"9\":{\"resourceType\":\"9\"},\"10\":{\"resourceType\":\"10\"},\"11\":{\"resourceType\":\"11\"},\"12\":{\"resourceType\":\"12\"},\"13\":{\"resourceType\":\"13\"},\"14\": [...]
- }
+ response = getJSON("/etc/tags", "1");
+ assertEquals(
+ "{\"resourceType\":\"tags\",\"0\":{\"resourceType\":\"0\"},\"1\":{\"resourceType\":\"1\"},\"2\":{\"resourceType\":\"2\"},\"3\":{\"resourceType\":\"3\"},\"4\":{\"resourceType\":\"4\"},\"5\":{\"resourceType\":\"5\"},\"6\":{\"resourceType\":\"6\"},\"7\":{\"resourceType\":\"7\"},\"8\":{\"resourceType\":\"8\"},\"9\":{\"resourceType\":\"9\"},\"10\":{\"resourceType\":\"10\"},\"11\":{\"resourceType\":\"11\"},\"12\":{\"resourceType\":\"12\"},\"13\":{\"resourceType\":\"13\"},\"14\" [...]
+ response);
+ }
- private String getJSON(String path, String depth) throws Throwable {
- MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(path, depth, ".json", null, null);
- request.setMethod("GET");
- request.setResourceResolver(resolver);
- request.setResource(resolver.getResource(path));
+ private String getJSON(String path, String depth) throws Throwable {
+ MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(path, depth, ".json", null, null);
+ request.setMethod("GET");
+ request.setResourceResolver(resolver);
+ request.setResource(resolver.getResource(path));
- MockSlingHttpServletResponse response = new MockSlingHttpServletResponse();
- JsonRenderer renderer = new JsonRenderer(1000,true);
- renderer.render(request, response);
- return response.getOutput().toString();
- }
+ MockSlingHttpServletResponse response = new MockSlingHttpServletResponse();
+ JsonRenderer renderer = new JsonRenderer(1000, true);
+ renderer.render(request, response);
+ return response.getOutput().toString();
+ }
}
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java b/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java
index c5a4b7d..ae0b83c 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java
@@ -53,27 +53,22 @@ public class RedirectServletTest extends TestCase {
// regular building without default ports
assertEquals(http + "://" + host + ":" + portAny + target,
- RedirectServlet.toAbsoluteUri(http, host, portAny, target));
+ RedirectServlet.toAbsoluteUri(http, host, portAny, target));
assertEquals(https + "://" + host + ":" + portAny + target,
- RedirectServlet.toAbsoluteUri(https, host, portAny, target));
+ RedirectServlet.toAbsoluteUri(https, host, portAny, target));
assertEquals(scheme + "://" + host + ":" + portAny + target,
- RedirectServlet.toAbsoluteUri(scheme, host, portAny, target));
+ RedirectServlet.toAbsoluteUri(scheme, host, portAny, target));
// building with default ports
- assertEquals(http + "://" + host + target,
- RedirectServlet.toAbsoluteUri(http, host, port80, target));
- assertEquals(https + "://" + host + target,
- RedirectServlet.toAbsoluteUri(https, host, port443, target));
+ assertEquals(http + "://" + host + target, RedirectServlet.toAbsoluteUri(http, host, port80, target));
+ assertEquals(https + "://" + host + target, RedirectServlet.toAbsoluteUri(https, host, port443, target));
assertEquals(scheme + "://" + host + ":" + port80 + target,
- RedirectServlet.toAbsoluteUri(scheme, host, port80, target));
+ RedirectServlet.toAbsoluteUri(scheme, host, port80, target));
// building without ports
- assertEquals(http + "://" + host + target,
- RedirectServlet.toAbsoluteUri(http, host, portNone, target));
- assertEquals(https + "://" + host + target,
- RedirectServlet.toAbsoluteUri(https, host, portNone, target));
- assertEquals(scheme + "://" + host + target,
- RedirectServlet.toAbsoluteUri(scheme, host, portNone, target));
+ assertEquals(http + "://" + host + target, RedirectServlet.toAbsoluteUri(http, host, portNone, target));
+ assertEquals(https + "://" + host + target, RedirectServlet.toAbsoluteUri(https, host, portNone, target));
+ assertEquals(scheme + "://" + host + target, RedirectServlet.toAbsoluteUri(scheme, host, portNone, target));
}
public void testGetStatus() {
@@ -245,24 +240,22 @@ public class RedirectServletTest extends TestCase {
}
public void testEmptyPath() {
- MockSlingHttpServletRequest request = new MockSlingHttpServletRequest("/",
- null, null, null, null, "", TEST_SCHEME, TEST_HOST, TEST_PORT, "/webapp");
+ MockSlingHttpServletRequest request = new MockSlingHttpServletRequest("/", null, null, null, null, "",
+ TEST_SCHEME, TEST_HOST, TEST_PORT, "/webapp");
request.setResourceResolver(new MockResourceResolver());
String path = RedirectServlet.toRedirectPath("/index.html", request);
assertEqualsUri("/webapp/index.html", path, false);
- request = new MockSlingHttpServletRequest("/", null, null, null, null,
- "/", TEST_SCHEME, TEST_HOST, TEST_PORT, "/webapp");
+ request = new MockSlingHttpServletRequest("/", null, null, null, null, "/", TEST_SCHEME, TEST_HOST, TEST_PORT,
+ "/webapp");
request.setResourceResolver(new MockResourceResolver());
path = RedirectServlet.toRedirectPath("/index.html", request);
assertEqualsUri("/webapp/index.html", path, false);
}
- //---------- Helper
+ // ---------- Helper
- private static void assertEquals(
- String selectors, String extension, String suffix,
- String queryString) {
+ private static void assertEquals(String selectors, String extension, String suffix, String queryString) {
final String basePath = "/a/b/c";
final String targetPath = "/a/b/d";
String expected = "/a/b/d";
@@ -280,8 +273,7 @@ public class RedirectServletTest extends TestCase {
expected += "?" + queryString;
}
- String actual = toRedirect(basePath, selectors, extension, suffix,
- queryString, targetPath);
+ String actual = toRedirect(basePath, selectors, extension, suffix, queryString, targetPath);
assertEqualsUri(expected, actual, false);
}
@@ -294,16 +286,15 @@ public class RedirectServletTest extends TestCase {
}
}
- private static void assertStatus(final int expectedStatus,
- final int testStatus) {
+ private static void assertStatus(final int expectedStatus, final int testStatus) {
final ValueMap valueMap;
if (testStatus == -2) {
valueMap = null;
} else if (testStatus == -1) {
valueMap = new ValueMapDecorator(new HashMap<String, Object>());
} else {
- valueMap = new ValueMapDecorator(Collections.singletonMap(
- RedirectServlet.STATUS_PROP, (Object) testStatus));
+ valueMap = new ValueMapDecorator(
+ Collections.singletonMap(RedirectServlet.STATUS_PROP, (Object) testStatus));
}
final int actualStatus = RedirectServlet.getStatus(valueMap);
@@ -315,12 +306,10 @@ public class RedirectServletTest extends TestCase {
return toRedirect(basePath, null, null, null, null, targetPath);
}
- private static String toRedirect(String basePath, String selectors,
- String extension, String suffix, String queryString,
- String targetPath) {
- MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(
- basePath, selectors, extension, suffix, queryString,
- basePath, TEST_SCHEME, TEST_HOST, TEST_PORT, "");
+ private static String toRedirect(String basePath, String selectors, String extension, String suffix,
+ String queryString, String targetPath) {
+ MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(basePath, selectors, extension, suffix,
+ queryString, basePath, TEST_SCHEME, TEST_HOST, TEST_PORT, "");
request.setResourceResolver(new MockResourceResolver());
return RedirectServlet.toRedirectPath(targetPath, request);
}
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java b/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
index b28db92..2ad1cd7 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
@@ -38,48 +38,48 @@ import org.junit.Rule;
import org.junit.Test;
public class JsonRendererTest {
-
- @Rule
- public final SlingContext context = new SlingContext();
-
+
+ @Rule
+ public final SlingContext context = new SlingContext();
+
private MockSlingHttpServletRequest request;
private MockSlingHttpServletResponse response;
private JsonRenderer jrs;
-
+
@Before
public void setup() {
- context.load().json("/data.json", "/content");
+ context.load().json("/data.json", "/content");
request = context.request();
response = context.response();
-
+
context.currentResource("/content");
-
- jrs = new JsonRenderer(42,false);
+
+ jrs = new JsonRenderer(42, false);
}
-
+
@Test
public void testRecursionLevelA() {
- context.requestPathInfo().setSelectorString("12");
+ context.requestPathInfo().setSelectorString("12");
assertEquals(12, jrs.getMaxRecursionLevel(request));
assertFalse(jrs.isTidy(request));
}
-
- @Test(expected=IllegalArgumentException.class)
+
+ @Test(expected = IllegalArgumentException.class)
public void testRecursionLevelB() {
- context.requestPathInfo().setSelectorString("42.more");
+ context.requestPathInfo().setSelectorString("42.more");
jrs.getMaxRecursionLevel(request);
}
-
- @Test(expected=IllegalArgumentException.class)
+
+ @Test(expected = IllegalArgumentException.class)
public void testRecursionLevelC() {
- context.requestPathInfo().setSelectorString("more");
+ context.requestPathInfo().setSelectorString("more");
jrs.getMaxRecursionLevel(request);
}
-
+
@Test
public void testRecursionLevelD() {
- context.requestPathInfo().setSelectorString("tidy");
+ context.requestPathInfo().setSelectorString("tidy");
assertEquals(0, jrs.getMaxRecursionLevel(request));
}
@@ -88,27 +88,27 @@ public class JsonRendererTest {
// Level must be the last selector but
// if the last selector is "tidy" there's
// no error. "for historical reasons"
- context.requestPathInfo().setSelectorString("46.tidy");
+ context.requestPathInfo().setSelectorString("46.tidy");
assertEquals(0, jrs.getMaxRecursionLevel(request));
}
@Test
public void testRecursionLevelF() {
- context.requestPathInfo().setSelectorString("tidy.45");
+ context.requestPathInfo().setSelectorString("tidy.45");
assertEquals(45, jrs.getMaxRecursionLevel(request));
assertTrue(jrs.isTidy(request));
}
-
+
@Test
public void testBadRequest() throws IOException {
- context.requestPathInfo().setSelectorString("bad.selectors");
+ context.requestPathInfo().setSelectorString("bad.selectors");
jrs.render(request, response);
assertTrue(response.getStatus() == 400);
}
-
+
@Test
public void testISO8601() throws IOException {
- context.requestPathInfo().setSelectorString("1");
+ context.requestPathInfo().setSelectorString("1");
String created = responseToJSON().getString("created");
Calendar cal = ISO8601.parse(created);
// at the time of the test the offset it not preserved
@@ -116,37 +116,36 @@ public class JsonRendererTest {
// based on the testing environments time zone
assertTrue(cal != null && ISO8601.getYear(cal) == 2016);
}
-
+
@Test
public void testECMA() throws IOException {
- context.requestPathInfo().setSelectorString("1");
- JsonRenderer ecmajrs = new JsonRenderer(42,true);
- ecmajrs.render(request, response);
- String out = response.getOutputAsString();
+ context.requestPathInfo().setSelectorString("1");
+ JsonRenderer ecmajrs = new JsonRenderer(42, true);
+ ecmajrs.render(request, response);
+ String out = response.getOutputAsString();
JsonObject job = Json.createReader(new StringReader(out)).readObject();
String created = job.getString("created");
assertTrue(created.startsWith("Mon Jan"));
}
-
+
@Test
public void testBoolean() throws IOException {
- context.requestPathInfo().setSelectorString("1");
+ context.requestPathInfo().setSelectorString("1");
assertTrue(responseToJSON().getBoolean("active"));
}
-
+
@Test
- // JSON impl only support Integers, JCR only supports Long values.
+ // JSON impl only support Integers, JCR only supports Long values.
public void testNumber() throws IOException {
- context.requestPathInfo().setSelectorString("1");
+ context.requestPathInfo().setSelectorString("1");
assertTrue(responseToJSON().getInt("number") == 2);
}
-
+
private JsonObject responseToJSON() throws IOException {
jrs.render(request, response);
String out = response.getOutputAsString();
JsonObject job = Json.createReader(new StringReader(out)).readObject();
return job;
}
-
-
+
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererTest.java b/src/test/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererTest.java
index 8318196..5a98d63 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererTest.java
@@ -51,7 +51,7 @@ public class StreamRendererTest {
assertEquals(2, result.length());
assertEquals("34", result);
}
-
+
private void runTests(int randomSeed) throws IOException {
final Random random = new Random(randomSeed);
assertCopyRange(random, StreamRenderer.IO_BUFFER_SIZE * 2 + 42);
@@ -114,8 +114,7 @@ public class StreamRendererTest {
}, a, b);
}
- private void assertCopyRange(
- byte[] expected, InputStream input, int a, int b) throws IOException {
+ private void assertCopyRange(byte[] expected, InputStream input, int a, int b) throws IOException {
ByteArrayOutputStream output = new ByteArrayOutputStream();
StreamRenderer.staticCopyRange(input, output, a, b);
@@ -126,19 +125,20 @@ public class StreamRendererTest {
assertEquals(expected[i], actual[i - a]);
}
}
-
+
@Test
public void test_setHeaders() throws Throwable {
-
+
final Resource resource = Mockito.mock(Resource.class);
- final SlingHttpServletResponse response = Mockito.mock(SlingHttpServletResponse .class);
+ final SlingHttpServletResponse response = Mockito.mock(SlingHttpServletResponse.class);
final ResourceMetadata meta = Mockito.mock(ResourceMetadata.class);
final ServletContext sc = Mockito.mock(ServletContext.class);
-
- StreamRenderer streamRendererServlet = new StreamRenderer(true,new String []{"/"},sc);
+
+ StreamRenderer streamRendererServlet = new StreamRenderer(true, new String[] { "/" }, sc);
Mockito.when(resource.getResourceMetadata()).thenReturn(meta);
- PrivateAccessor.invoke(streamRendererServlet, "setHeaders", new Class[]{Resource.class, SlingHttpServletResponse.class}, new Object[]{resource, response});
- Mockito.verify(response,Mockito.times(1)).setContentType("application/octet-stream");
+ PrivateAccessor.invoke(streamRendererServlet, "setHeaders",
+ new Class[] { Resource.class, SlingHttpServletResponse.class }, new Object[] { resource, response });
+ Mockito.verify(response, Mockito.times(1)).setContentType("application/octet-stream");
}
}
--
To stop receiving notification emails like this one, please contact
jeb@apache.org.