Author: cziegeler Date: Mon Mar 27 09:51:29 2017 New Revision: 1788867 URL: http://svn.apache.org/viewvc?rev=1788867&view=rev Log: SLING-6717 : Use commons lang3
Modified: sling/trunk/bundles/servlets/get/pom.xml sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererServlet.java Modified: sling/trunk/bundles/servlets/get/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/pom.xml?rev=1788867&r1=1788866&r2=1788867&view=diff ============================================================================== --- sling/trunk/bundles/servlets/get/pom.xml (original) +++ sling/trunk/bundles/servlets/get/pom.xml Mon Mar 27 09:51:29 2017 @@ -133,9 +133,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.5</version> <scope>provided</scope> </dependency> </dependencies> Modified: sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java?rev=1788867&r1=1788866&r2=1788867&view=diff ============================================================================== --- sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java (original) +++ sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java Mon Mar 27 09:51:29 2017 @@ -24,7 +24,7 @@ import java.util.Map; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.sling.api.SlingConstants; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.SlingHttpServletResponse; @@ -104,7 +104,7 @@ public class HtmlRendererServlet extends pw.println("<h1>Resource dumped by " + getClass().getSimpleName() + "</h1>"); pw.println("<p>Resource path: <b>" + r.getPath() + "</b></p>"); pw.println("<p>Resource metadata: <b>" - + StringEscapeUtils.escapeHtml(String.valueOf(r.getResourceMetadata())) + + StringEscapeUtils.escapeHtml4(String.valueOf(r.getResourceMetadata())) + "</b></p>"); pw.println("<p>Resource type: <b>" + r.getResourceType() + "</b></p>"); Modified: sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererServlet.java?rev=1788867&r1=1788866&r2=1788867&view=diff ============================================================================== --- sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererServlet.java (original) +++ sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererServlet.java Mon Mar 27 09:51:29 2017 @@ -20,7 +20,7 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.SlingException; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.SlingHttpServletResponse; @@ -52,17 +52,17 @@ public class JsonRendererServlet extends /** Selector that means "pretty-print the output */ public static final String TIDY = "tidy"; - - /** Selector that causes hierarchy to be rendered as arrays - * instead of child objects - useful to preserve the order of those - * child objects */ + + /** Selector that causes hierarchy to be rendered as arrays + * instead of child objects - useful to preserve the order of those + * child objects */ public static final String HARRAY = "harray"; - + /** How much to indent in tidy mode */ public static final int INDENT_SPACES = 2; private long maximumResults; - + private final JSONRenderer renderer = new JSONRenderer(); public JsonRendererServlet(long maximumResults) { @@ -136,7 +136,7 @@ public class JsonRendererServlet extends reportException(je); } } - + /** * Get recursion level from selectors. as per SLING-167: the last selector, if present, gives the recursion level. * @@ -160,7 +160,7 @@ public class JsonRendererServlet extends if (StringUtils.isNumeric(level)){ maxRecursionLevels = -1; } else { - throw new IllegalArgumentException("Invalid recursion selector value '" + level + "'"); + throw new IllegalArgumentException("Invalid recursion selector value '" + level + "'"); } } }