Merge changes I33906d73,I3fa08067 into stable-3.5
* changes:
LuceneChangeIndex: remove redundant ChangeData lookup
Remove redundant type parameter for TypeLiteral<>
diff --git a/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/java/com/google/gerrit/lucene/LuceneChangeIndex.java
index e986d40..e7d47d0 100644
--- a/java/com/google/gerrit/lucene/LuceneChangeIndex.java
+++ b/java/com/google/gerrit/lucene/LuceneChangeIndex.java
@@ -254,8 +254,6 @@
@Override
public void insert(ChangeData cd) {
- @SuppressWarnings("unused") // TODO: Why do we need to find the lucene id?
- Term id = LuceneChangeIndex.idTerm(idTerm, idField, cd);
// toDocument is essentially static and doesn't depend on the specific
// sub-index, so just pick one.
Document doc = openIndex.toDocument(cd);
diff --git a/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedChildRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedChildRestApiBindingsIT.java
index 23a1d23..d2c1430 100644
--- a/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedChildRestApiBindingsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedChildRestApiBindingsIT.java
@@ -56,8 +56,7 @@
@Inject private TestCommentHelper testCommentHelper;
/** Resource to bind a child collection. */
- public static final TypeLiteral<RestView<TestPluginResource>> TEST_KIND =
- new TypeLiteral<RestView<TestPluginResource>>() {};
+ public static final TypeLiteral<RestView<TestPluginResource>> TEST_KIND = new TypeLiteral<>() {};
private static final String PLUGIN_NAME = "my-plugin";
diff --git a/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedRootRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedRootRestApiBindingsIT.java
index 16dc294..24ce605 100644
--- a/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedRootRestApiBindingsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedRootRestApiBindingsIT.java
@@ -60,8 +60,7 @@
public class PluginProvidedRootRestApiBindingsIT extends AbstractDaemonTest {
/** Resource to bind a child collection. */
- public static final TypeLiteral<RestView<TestPluginResource>> TEST_KIND =
- new TypeLiteral<RestView<TestPluginResource>>() {};
+ public static final TypeLiteral<RestView<TestPluginResource>> TEST_KIND = new TypeLiteral<>() {};
private static final String PLUGIN_NAME = "my-plugin";
