opendev/gerrit
Code Issues Proposed changes

QueryScreen: Use precompiled regex patterns to test for single query

Browse Source 
Change-Id: I523b1c8fca33d1a1985f7261bbf78de524243320
This commit is contained in:
Jacek Centkowski
2016-04-25 17:11:46 +02:00
committed by David Pursehouse
parent c65490d3b5
commit 696efd4933
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/QueryScreen.java
View File

@@ -20,11 +20,21 @@ import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.common.PageLinks; import com.google.gerrit.common.PageLinks;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.reviewdb.client.RevId;
import com.google.gwt.regexp.shared.RegExp;
import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwtorm.client.KeyUtil; import com.google.gwtorm.client.KeyUtil;
public class QueryScreen extends PagedSingleListScreen implements public class QueryScreen extends PagedSingleListScreen implements
ChangeListScreen { ChangeListScreen {
// Legacy numeric identifier.
private static final RegExp NUMERIC_ID = RegExp.compile("^[1-9][0-9]*$");
// Commit SHA1 hash
private static final RegExp COMMIT_SHA1 =
RegExp.compile("^([0-9a-fA-F]{4," + RevId.LEN + "})$");
// Change-Id
private static final String ID_PATTERN = "[iI][0-9a-f]{4,}$";
private static final RegExp CHANGE_ID = RegExp.compile("^" + ID_PATTERN);
public static QueryScreen forQuery(String query) { public static QueryScreen forQuery(String query) {
return forQuery(query, 0); return forQuery(query, 0);
} }
@@ -80,24 +90,8 @@ public class QueryScreen extends PagedSingleListScreen implements
} }
private static boolean isSingleQuery(String query) { private static boolean isSingleQuery(String query) {
if (query.matches("^[1-9][0-9]*$")) { return NUMERIC_ID.test(query)
// Legacy numeric identifier. || CHANGE_ID.test(query)
// || COMMIT_SHA1.test(query);
return true;
}
if (query.matches("^[iI][0-9a-f]{4,}$")) {
// Newer style Change-Id.
//
return true;
}
if (query.matches("^([0-9a-fA-F]{4," + RevId.LEN + "})$")) {
// Commit SHA-1 of any change.
//
return true;
}
return false;
} }
} }