diff options
| author | Luca Milanesio <luca.milanesio@gmail.com> | 2021-11-24 19:22:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-11-24 19:22:30 +0000 |
| commit | 9f4311219ccc46945f9d6dd1dc1d71595b65ba47 (patch) | |
| tree | 9192e6b908af1b1ca01f32c5450744c38ca2daa3 | |
| parent | 1d1867d27e58ea529228ce515a8b9427c01737d1 (diff) | |
| parent | 1e4bf424ee92e1c2ea75256abdda94478050788c (diff) | |
Merge changes I33906d73,I3fa08067 into stable-3.5
* changes:
LuceneChangeIndex: remove redundant ChangeData lookup
Remove redundant type parameter for TypeLiteral<>
3 files changed, 2 insertions, 6 deletions
diff --git a/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/java/com/google/gerrit/lucene/LuceneChangeIndex.java index e986d40c52..e7d47d0778 100644 --- a/java/com/google/gerrit/lucene/LuceneChangeIndex.java +++ b/java/com/google/gerrit/lucene/LuceneChangeIndex.java @@ -254,8 +254,6 @@ public class LuceneChangeIndex implements ChangeIndex { @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 23a1d23944..d2c1430409 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 @@ public class PluginProvidedChildRestApiBindingsIT extends AbstractDaemonTest { @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 16dc29485a..24ce605635 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 @@ import org.kohsuke.args4j.Option; 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"; |