Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12711. Remove dependency on commons-httpclient for ServletUtil (Wei-Chiu Chuang via iwasakims) 

(cherry picked from commit b0091338f2)
This commit is contained in:
Masatake Iwasaki 2016-02-26 15:32:07 +09:00
parent 6e9a4c598d
commit 7140a02122
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -429,6 +429,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12824. Collect network and disk usage on the node running Windows.
(Inigo Goiri via xyao)
HADOOP-12711. Remove dependency on commons-httpclient for ServletUtil
(Wei-Chiu Chuang via iwasakims)
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp

34
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java
View File

@ -17,18 +17,22 @@
*/
package org.apache.hadoop.util;
import java.io.*;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
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;
import com.google.common.base.Preconditions;
import org.apache.http.client.utils.URIBuilder;
@InterfaceAudience.Private
@InterfaceStability.Unstable
@ -94,9 +98,10 @@ public class ServletUtil {
*/
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!
return URLEncoder.encode(value, "UTF-8");
} catch (UnsupportedEncodingException e) {
throw new AssertionError("Failed to encode query value in UTF-8: " +
value);
}
}
@ -106,11 +111,7 @@ public class ServletUtil {
* @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!
}
return new URIBuilder().setPath(path).toString();
}
/**
@ -119,11 +120,14 @@ public class ServletUtil {
* @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) {
public static String getDecodedPath(final HttpServletRequest request,
String servletName) {
String requestURI = request.getRequestURI();
String uriPath = getRawPath(request, 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!
return new URI(uriPath).getPath();
} catch (URISyntaxException e) {
throw new AssertionError("Failed to decode URI: " + requestURI);
}
}