Merge "Set version to 3.7.1-SNAPSHOT" into stable-3.7
diff --git a/WORKSPACE b/WORKSPACE
index e5c5d4a..cf399dc 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -42,11 +42,11 @@
http_archive(
name = "rbe_jdk11",
- sha256 = "5939e2a4e56d1fc53b6c44c6db97ee068c9f4bd18e86c762f6ab8b4fff5e294b",
- strip_prefix = "rbe_autoconfig-3.0.0",
+ sha256 = "dbcfd6f26589ef506b91fe03a12dc559ca9c84699e4cf6381150522287f0e6f6",
+ strip_prefix = "rbe_autoconfig-3.1.0",
urls = [
- "https://gerrit-bazel.storage.googleapis.com/rbe_autoconfig/v3.0.0.tar.gz",
- "https://github.com/davido/rbe_autoconfig/archive/v3.0.0.tar.gz",
+ "https://gerrit-bazel.storage.googleapis.com/rbe_autoconfig/v3.1.0.tar.gz",
+ "https://github.com/davido/rbe_autoconfig/archive/v3.1.0.tar.gz",
],
)
diff --git a/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/java/com/google/gerrit/lucene/LuceneChangeIndex.java
index 3276f25..c28e948b 100644
--- a/java/com/google/gerrit/lucene/LuceneChangeIndex.java
+++ b/java/com/google/gerrit/lucene/LuceneChangeIndex.java
@@ -111,26 +111,6 @@
private static final String CHANGES_CLOSED = "closed";
private static final String CHANGE_FIELD = ChangeField.CHANGE.getName();
- /*
- @FunctionalInterface
- interface IdTerm {
- Term get(String name, int id);
- }
-
- static Term idTerm(IdTerm idTerm, FieldDef<ChangeData, ?> idField, ChangeData cd) {
- return idTerm(idTerm, idField, cd.getId());
- }
-
- static Term idTerm(IdTerm idTerm, FieldDef<ChangeData, ?> idField, Change.Id id) {
- return idTerm.get(idField.getName(), id.get());
- }
-
- @FunctionalInterface
- interface ChangeIdExtractor {
- Change.Id extract(IndexableField f);
- }
- */
-
static Term idTerm(ChangeData cd) {
return idTerm(cd.getVirtualId());
}