Merge "CommentsTest: @Inject members instead of using getInstance"
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java
index 4ee3bf4..688835a 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/SubIndex.java
@@ -159,7 +159,7 @@
try {
writer.getIndexWriter().commit();
try {
- writer.getIndexWriter().close(true);
+ writer.getIndexWriter().close();
} catch (AlreadyClosedException e) {
// Ignore.
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java b/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java
index b734007..188e95b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java
@@ -31,7 +31,6 @@
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,8 +45,6 @@
private static final Logger log =
LoggerFactory.getLogger(QueryDocumentationExecutor.class);
- private static final Version LUCENE_VERSION = Version.LUCENE_48;
-
private IndexSearcher searcher;
private QueryParser parser;
@@ -68,8 +65,7 @@
}
IndexReader reader = DirectoryReader.open(dir);
searcher = new IndexSearcher(reader);
- StandardAnalyzer analyzer = new StandardAnalyzer(LUCENE_VERSION);
- parser = new QueryParser(LUCENE_VERSION, Constants.DOC_FIELD, analyzer);
+ parser = new QueryParser(Constants.DOC_FIELD, new StandardAnalyzer());
} catch (IOException e) {
log.error("Cannot initialize documentation full text index", e);
searcher = null;
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesV7Test.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesV7Test.java
deleted file mode 100644
index 1dcd83b..0000000
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesV7Test.java
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright (C) 2013 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.server.query.change;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import com.google.common.collect.Lists;
-import com.google.gerrit.extensions.api.changes.ReviewInput;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.server.change.ChangeInserter;
-import com.google.gerrit.server.change.ChangeJson.ChangeInfo;
-import com.google.gerrit.server.change.RevisionResource;
-import com.google.gerrit.testutil.InMemoryModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
-import org.eclipse.jgit.junit.TestRepository;
-import org.eclipse.jgit.lib.Config;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.List;
-
-public class LuceneQueryChangesV7Test extends AbstractQueryChangesTest {
- protected Injector createInjector() {
- Config cfg = InMemoryModule.newDefaultConfig();
- cfg.setInt("index", "lucene", "testVersion", 7);
- return Guice.createInjector(new InMemoryModule(cfg));
- }
-
- // Tests for features not supported in V7.
- @Ignore
- @Override
- @Test
- public void byProjectPrefix() {}
-
- @Ignore
- @Override
- @Test
- public void byDefault() {}
-
- @Ignore
- @Override
- @Test
- public void bySize() {}
- // End tests for features not supported in V7.
-
- @Test
- public void pagination() throws Exception {
- TestRepository<InMemoryRepository> repo = createProject("repo");
- List<Change> changes = Lists.newArrayList();
- for (int i = 0; i < 5; i++) {
- changes.add(newChange(repo, null, null, null, null).insert());
- }
-
- // Page forward and back through 3 pages of results.
- QueryChanges q;
- List<ChangeInfo> results;
- results = query("status:new limit:2");
- assertEquals(2, results.size());
- assertResultEquals(changes.get(4), results.get(0));
- assertResultEquals(changes.get(3), results.get(1));
-
- q = newQuery("status:new limit:2");
- q.setSortKeyBefore(results.get(1)._sortkey);
- results = query(q);
- assertEquals(2, results.size());
- assertResultEquals(changes.get(2), results.get(0));
- assertResultEquals(changes.get(1), results.get(1));
-
- q = newQuery("status:new limit:2");
- q.setSortKeyBefore(results.get(1)._sortkey);
- results = query(q);
- assertEquals(1, results.size());
- assertResultEquals(changes.get(0), results.get(0));
-
- q = newQuery("status:new limit:2");
- q.setSortKeyAfter(results.get(0)._sortkey);
- results = query(q);
- assertEquals(2, results.size());
- assertResultEquals(changes.get(2), results.get(0));
- assertResultEquals(changes.get(1), results.get(1));
-
- q = newQuery("status:new limit:2");
- q.setSortKeyAfter(results.get(0)._sortkey);
- results = query(q);
- assertEquals(2, results.size());
- assertResultEquals(changes.get(4), results.get(0));
- assertResultEquals(changes.get(3), results.get(1));
- }
-
- @Override
- @Test
- public void updatedOrderWithSubMinuteResolution() throws Exception {
- TestRepository<InMemoryRepository> repo = createProject("repo");
- ChangeInserter ins1 = newChange(repo, null, null, null, null);
- Change change1 = ins1.insert();
- Change change2 = newChange(repo, null, null, null, null).insert();
-
- assertTrue(lastUpdatedMs(change1) < lastUpdatedMs(change2));
-
- List<ChangeInfo> results;
- results = query("status:new");
- assertEquals(2, results.size());
- assertResultEquals(change2, results.get(0));
- assertResultEquals(change1, results.get(1));
-
- ReviewInput input = new ReviewInput();
- input.message = "toplevel";
- postReview.apply(new RevisionResource(
- changes.parse(change1.getId()), ins1.getPatchSet()), input);
- change1 = db.changes().get(change1.getId());
-
- assertTrue(lastUpdatedMs(change1) > lastUpdatedMs(change2));
- assertTrue(lastUpdatedMs(change1) - lastUpdatedMs(change2)
- < MILLISECONDS.convert(1, MINUTES));
-
- results = query("status:new");
- assertEquals(2, results.size());
- // Same order as before change1 was modified.
- assertResultEquals(change2, results.get(0));
- assertResultEquals(change1, results.get(1));
- }
-
- @Test
- public void sortKeyBreaksTiesOnChangeId() throws Exception {
- clockStepMs = 0;
- TestRepository<InMemoryRepository> repo = createProject("repo");
- ChangeInserter ins1 = newChange(repo, null, null, null, null);
- Change change1 = ins1.insert();
- Change change2 = newChange(repo, null, null, null, null).insert();
-
- ReviewInput input = new ReviewInput();
- input.message = "toplevel";
- postReview.apply(new RevisionResource(
- changes.parse(change1.getId()), ins1.getPatchSet()), input);
- change1 = db.changes().get(change1.getId());
-
- assertEquals(change1.getLastUpdatedOn(), change2.getLastUpdatedOn());
-
- List<ChangeInfo> results = query("status:new");
- assertEquals(2, results.size());
- // Updated at the same time, 2 > 1.
- assertResultEquals(change2, results.get(0));
- assertResultEquals(change1, results.get(1));
- }
-
- @Override
- @Test
- public void byTopic() throws Exception {
- TestRepository<InMemoryRepository> repo = createProject("repo");
- ChangeInserter ins1 = newChange(repo, null, null, null, null);
- Change change1 = ins1.getChange();
- change1.setTopic("feature1");
- ins1.insert();
-
- ChangeInserter ins2 = newChange(repo, null, null, null, null);
- Change change2 = ins2.getChange();
- change2.setTopic("feature2");
- ins2.insert();
-
- newChange(repo, null, null, null, null).insert();
-
- assertTrue(query("topic:\"\"").isEmpty());
- assertTrue(query("topic:foo").isEmpty());
- assertResultEquals(change1, queryOne("topic:feature1"));
- assertResultEquals(change2, queryOne("topic:feature2"));
- }
-}
diff --git a/gerrit-solr/src/main/java/com/google/gerrit/solr/SolrChangeIndex.java b/gerrit-solr/src/main/java/com/google/gerrit/solr/SolrChangeIndex.java
index 96ba032..9e9f103 100644
--- a/gerrit-solr/src/main/java/com/google/gerrit/solr/SolrChangeIndex.java
+++ b/gerrit-solr/src/main/java/com/google/gerrit/solr/SolrChangeIndex.java
@@ -50,7 +50,6 @@
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.search.Query;
-import org.apache.lucene.util.Version;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrQuery.SortClause;
import org.apache.solr.client.solrj.SolrServer;
@@ -108,13 +107,8 @@
throw new IllegalStateException("index.url must be supplied");
}
- // Version is only used to determine the list of stop words used by the
- // analyzer, so use the latest version rather than trying to match the Solr
- // server version.
- @SuppressWarnings("deprecation")
- Version v = Version.LUCENE_CURRENT;
queryBuilder = new QueryBuilder(
- schema, new StandardAnalyzer(v, CharArraySet.EMPTY_SET));
+ schema, new StandardAnalyzer(CharArraySet.EMPTY_SET));
base = Strings.nullToEmpty(base);
openIndex = new CloudSolrServer(url);
diff --git a/lib/asciidoctor/java/DocIndexer.java b/lib/asciidoctor/java/DocIndexer.java
index 96f3eb5..4736b0b 100644
--- a/lib/asciidoctor/java/DocIndexer.java
+++ b/lib/asciidoctor/java/DocIndexer.java
@@ -51,7 +51,7 @@
import java.util.zip.ZipOutputStream;
public class DocIndexer {
- private static final Version LUCENE_VERSION = Version.LUCENE_48;
+ private static final Version LUCENE_VERSION = Version.LUCENE_4_10_0;
private static final Pattern SECTION_HEADER = Pattern.compile("^=+ (.*)");
@Option(name = "-o", usage = "output JAR file")
@@ -99,7 +99,7 @@
RAMDirectory directory = new RAMDirectory();
IndexWriterConfig config = new IndexWriterConfig(
LUCENE_VERSION,
- new StandardAnalyzer(LUCENE_VERSION, CharArraySet.EMPTY_SET));
+ new StandardAnalyzer(CharArraySet.EMPTY_SET));
config.setOpenMode(OpenMode.CREATE);
IndexWriter iwriter = new IndexWriter(directory, config);
for (String inputFile : inputFiles) {
