opendev/gerrit
Code Issues Proposed changes

Wrap URLEncoder, URLDecoder

Browse Source 
These classes throw an exception that is ugly to work with when using
UTF-8 encoding as the JVM is required to support UTF-8, which means
the declared exception cannot occur. Wrap these into a helper class
that catches the declared exception and rethrows as RuntimeException.

Change-Id: Id277cf029348583f5edad5f5447b4ec4198dc980
This commit is contained in:
Shawn O. Pearce
2012-11-23 22:11:53 -08:00
parent f94d40de66
commit abaa4d9578
15 changed files with 111 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java
View File

@@ -39,6 +39,7 @@ import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.git.LocalDiskRepositoryManager;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectControl;
import com.google.gerrit.server.util.Url;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -58,10 +59,8 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
@@ -397,8 +396,7 @@ class GitWebServlet extends HttpServlet {
}
}
private static Map<String, String> getParameters(final HttpServletRequest req)
throws UnsupportedEncodingException {
private static Map<String, String> getParameters(HttpServletRequest req) {
final Map<String, String> params = new HashMap<String, String>();
for (final String pair : req.getQueryString().split("[&;]")) {
final int eq = pair.indexOf('=');
@@ -406,8 +404,8 @@ class GitWebServlet extends HttpServlet {
String name = pair.substring(0, eq);
String value = pair.substring(eq + 1);
name = URLDecoder.decode(name, "UTF-8");
value = URLDecoder.decode(value, "UTF-8");
name = Url.decode(name);
value = Url.decode(value);
params.put(name, value);
}
}