opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  AbstractQueryChangesTest: Add byMessageMixedCase test
  ElasticContainer: replace the deprecated override
  ElasticVersion: remove redundant private modifier
  ElasticIndexVersionManager: remove unneeded type
  Elasticsearch: make package-private usage explicit

Change-Id: I755cf8369136e4aac9703398cc4ddf950611a7e0
This commit is contained in:
David Pursehouse
2018-06-13 08:42:27 +09:00
parent 4e3b480c35 db2eb89d11
commit 5271b32540
6 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticConfiguration.java
View File

@@ -80,11 +80,11 @@ class ElasticConfiguration {
} }
} }
public Config getConfig() { Config getConfig() {
return cfg; return cfg;
} }
public String getIndexName(String name, int schemaVersion) { String getIndexName(String name, int schemaVersion) {
return String.format("%s%s_%04d", prefix, name, schemaVersion); return String.format("%s%s_%04d", prefix, name, schemaVersion);
} }

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionManager.java
View File

@@ -61,7 +61,7 @@ public class ElasticIndexVersionManager extends VersionManager {
log.warn("Unrecognized version in index {}: {}", def.getName(), version); log.warn("Unrecognized version in index {}: {}", def.getName(), version);
continue; continue;
} }
versions.put(v, new Version<V>(null, v, true, cfg.getReady(def.getName(), v))); versions.put(v, new Version<>(null, v, true, cfg.getReady(def.getName(), v)));
} }
} catch (IOException e) { } catch (IOException e) {
log.error("Error scanning index: " + def.getName(), e); log.error("Error scanning index: " + def.getName(), e);

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java
View File

@@ -34,7 +34,7 @@ import java.time.Instant;
public class ElasticQueryBuilder { public class ElasticQueryBuilder {
protected <T> QueryBuilder toQueryBuilder(Predicate<T> p) throws QueryParseException { <T> QueryBuilder toQueryBuilder(Predicate<T> p) throws QueryParseException {
if (p instanceof AndPredicate) { if (p instanceof AndPredicate) {
return and(p); return and(p);
} else if (p instanceof OrPredicate) { } else if (p instanceof OrPredicate) {

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java
View File

@@ -25,7 +25,7 @@ public enum ElasticVersion {
private final String version; private final String version;
private final Pattern pattern; private final Pattern pattern;
private ElasticVersion(String version) { ElasticVersion(String version) {
this.version = version; this.version = version;
this.pattern = Pattern.compile(version); this.pattern = Pattern.compile(version);
} }

2
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@@ -65,7 +65,7 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
} }
@Override @Override
protected Set<Integer> getLivenessCheckPorts() { public Set<Integer> getLivenessCheckPortNumbers() {
return ImmutableSet.of(getMappedPort(ELASTICSEARCH_DEFAULT_PORT)); return ImmutableSet.of(getMappedPort(ELASTICSEARCH_DEFAULT_PORT));
} }

12
gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
View File

@@ -880,6 +880,18 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
assertQuery("message:12346", change2); assertQuery("message:12346", change2);
} }
@Test
public void byMessageMixedCase() throws Exception {
TestRepository<Repo> repo = createProject("repo");
RevCommit commit1 = repo.parseBody(repo.commit().message("Hello gerrit").create());
Change change1 = insert(repo, newChangeForCommit(repo, commit1));
RevCommit commit2 = repo.parseBody(repo.commit().message("Hello Gerrit").create());
Change change2 = insert(repo, newChangeForCommit(repo, commit2));
assertQuery("message:gerrit", change2, change1);
assertQuery("message:Gerrit", change2, change1);
}
@Test @Test
public void byLabel() throws Exception { public void byLabel() throws Exception {
accountManager.authenticate(AuthRequest.forUser("anotheruser")); accountManager.authenticate(AuthRequest.forUser("anotheruser"));