Merge branch 'stable-2.14' into stable-2.15
* 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:
commit
5271b32540
@ -80,11 +80,11 @@ class ElasticConfiguration {
|
||||
}
|
||||
}
|
||||
|
||||
public Config getConfig() {
|
||||
Config getConfig() {
|
||||
return cfg;
|
||||
}
|
||||
|
||||
public String getIndexName(String name, int schemaVersion) {
|
||||
String getIndexName(String name, int schemaVersion) {
|
||||
return String.format("%s%s_%04d", prefix, name, schemaVersion);
|
||||
}
|
||||
|
||||
|
@ -61,7 +61,7 @@ public class ElasticIndexVersionManager extends VersionManager {
|
||||
log.warn("Unrecognized version in index {}: {}", def.getName(), version);
|
||||
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) {
|
||||
log.error("Error scanning index: " + def.getName(), e);
|
||||
|
@ -34,7 +34,7 @@ import java.time.Instant;
|
||||
|
||||
public class ElasticQueryBuilder {
|
||||
|
||||
protected <T> QueryBuilder toQueryBuilder(Predicate<T> p) throws QueryParseException {
|
||||
<T> QueryBuilder toQueryBuilder(Predicate<T> p) throws QueryParseException {
|
||||
if (p instanceof AndPredicate) {
|
||||
return and(p);
|
||||
} else if (p instanceof OrPredicate) {
|
||||
|
@ -25,7 +25,7 @@ public enum ElasticVersion {
|
||||
private final String version;
|
||||
private final Pattern pattern;
|
||||
|
||||
private ElasticVersion(String version) {
|
||||
ElasticVersion(String version) {
|
||||
this.version = version;
|
||||
this.pattern = Pattern.compile(version);
|
||||
}
|
||||
|
@ -65,7 +65,7 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Set<Integer> getLivenessCheckPorts() {
|
||||
public Set<Integer> getLivenessCheckPortNumbers() {
|
||||
return ImmutableSet.of(getMappedPort(ELASTICSEARCH_DEFAULT_PORT));
|
||||
}
|
||||
|
||||
|
@ -880,6 +880,18 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
|
||||
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
|
||||
public void byLabel() throws Exception {
|
||||
accountManager.authenticate(AuthRequest.forUser("anotheruser"));
|
||||
|
Loading…
Reference in New Issue
Block a user