diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 5a5b0d4d3b1..c9c4246ee25 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -359,6 +359,8 @@ Release 2.7.0 - UNRELEASED
HADOOP-11172. Improve error message in Shell#runCommand on OutOfMemoryError.
(Yongjun Zhang via wang)
+ HADOOP-11231. Remove dead code in ServletUtil. (Li Lu via wheat9)
+
OPTIMIZATIONS
BUG FIXES
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java
index a401f3f65a4..6a8ca0f9938 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java
@@ -23,8 +23,6 @@ import java.util.Calendar;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.httpclient.URIException;
-import org.apache.commons.httpclient.util.URIUtil;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -87,85 +85,6 @@ public class ServletUtil {
public static String htmlFooter() {
return HTML_TAIL;
}
-
- /**
- * Generate the percentage graph and returns HTML representation string
- * of the same.
- *
- * @param perc The percentage value for which graph is to be generated
- * @param width The width of the display table
- * @return HTML String representation of the percentage graph
- * @throws IOException
- */
- public static String percentageGraph(int perc, int width) throws IOException {
- assert perc >= 0; assert perc <= 100;
-
- StringBuilder builder = new StringBuilder();
-
- builder.append("
");
- if(perc > 0) {
- builder.append(" | ");
- }if(perc < 100) {
- builder.append(" | ");
- }
- builder.append("
");
- return builder.toString();
- }
-
- /**
- * Generate the percentage graph and returns HTML representation string
- * of the same.
- * @param perc The percentage value for which graph is to be generated
- * @param width The width of the display table
- * @return HTML String representation of the percentage graph
- * @throws IOException
- */
- public static String percentageGraph(float perc, int width) throws IOException {
- return percentageGraph((int)perc, width);
- }
-
- /**
- * Escape and encode a string regarded as within the query component of an URI.
- * @param value the value to encode
- * @return encoded query, null if the default charset is not supported
- */
- public static String encodeQueryValue(final String value) {
- try {
- return URIUtil.encodeWithinQuery(value, "UTF-8");
- } catch (URIException e) {
- throw new AssertionError("JVM does not support UTF-8"); // should never happen!
- }
- }
-
- /**
- * Escape and encode a string regarded as the path component of an URI.
- * @param path the path component to encode
- * @return encoded path, null if UTF-8 is not supported
- */
- public static String encodePath(final String path) {
- try {
- return URIUtil.encodePath(path, "UTF-8");
- } catch (URIException e) {
- throw new AssertionError("JVM does not support UTF-8"); // should never happen!
- }
- }
-
- /**
- * Parse and decode the path component from the given request.
- * @param request Http request to parse
- * @param servletName the name of servlet that precedes the path
- * @return decoded path component, null if UTF-8 is not supported
- */
- public static String getDecodedPath(final HttpServletRequest request, String servletName) {
- try {
- return URIUtil.decode(getRawPath(request, servletName), "UTF-8");
- } catch (URIException e) {
- throw new AssertionError("JVM does not support UTF-8"); // should never happen!
- }
- }
/**
* Parse the path component from the given request and return w/o decoding.