diff --git a/WORKSPACE b/WORKSPACE index 50714f1655..8c8102bcaf 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1016,8 +1016,8 @@ maven_jar( # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.4.3", - sha1 = "5c24325430971ba2fa4769eb446f026b7680d5e7", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.0", + sha1 = "241436d27cf65b84d17126dc7b6b947e8e2c173c", ) JACKSON_VERSION = "2.9.7" diff --git a/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java b/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java index 05fd7a7afc..65d2916684 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java +++ b/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java @@ -40,6 +40,7 @@ public class ElasticQueryAdapter { case V6_2: case V6_3: case V6_4: + case V6_5: this.searchFilteringName = "_source"; this.indicesExistParam = "?allow_no_indices=false"; this.exactFieldType = "keyword"; diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java index dfa5d21038..4c98df1d08 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -22,7 +22,8 @@ public enum ElasticVersion { V5_6("5.6.*"), V6_2("6.2.*"), V6_3("6.3.*"), - V6_4("6.4.*"); + V6_4("6.4.*"), + V6_5("6.5.*"); private final String version; private final Pattern pattern; diff --git a/java/com/google/gerrit/server/schema/Schema_151.java b/java/com/google/gerrit/server/schema/Schema_151.java index d2440188ff..0e8700f7df 100644 --- a/java/com/google/gerrit/server/schema/Schema_151.java +++ b/java/com/google/gerrit/server/schema/Schema_151.java @@ -60,7 +60,7 @@ public class Schema_151 extends ReviewDbSchemaVersion { PreparedStatement addedOnRetrieval, AccountGroup.Id groupId) throws SQLException { addedOnRetrieval.setInt(1, groupId.get()); try (ResultSet resultSet = addedOnRetrieval.executeQuery()) { - if (resultSet.first()) { + if (resultSet.next()) { return Optional.of(resultSet.getTimestamp(1)); } } diff --git a/java/com/google/gerrit/server/schema/Schema_87.java b/java/com/google/gerrit/server/schema/Schema_87.java index fe2156568c..79884ba19e 100644 --- a/java/com/google/gerrit/server/schema/Schema_87.java +++ b/java/com/google/gerrit/server/schema/Schema_87.java @@ -59,7 +59,7 @@ public class Schema_87 extends ReviewDbSchemaVersion { PreparedStatement uuidRetrieval, AccountGroup.Id id) throws SQLException { uuidRetrieval.setInt(1, id.get()); try (ResultSet uuidResults = uuidRetrieval.executeQuery()) { - if (uuidResults.first()) { + if (uuidResults.next()) { Optional.of(new AccountGroup.UUID(uuidResults.getString(1))); } } diff --git a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java index 0d5d2cd3ee..29a5bd070c 100644 --- a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java @@ -14,28 +14,17 @@ package com.google.gerrit.acceptance.pgm; -import com.google.gerrit.elasticsearch.ElasticContainer; -import com.google.gerrit.elasticsearch.ElasticTestUtils; -import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; +import static com.google.gerrit.elasticsearch.ElasticTestUtils.createAllIndexes; +import static com.google.gerrit.elasticsearch.ElasticTestUtils.getConfig; + import com.google.gerrit.elasticsearch.ElasticVersion; import com.google.gerrit.testing.ConfigSuite; import com.google.inject.Injector; -import java.util.UUID; import org.eclipse.jgit.lib.Config; import org.junit.Before; public class ElasticReindexIT extends AbstractReindexTests { - private static Config getConfig(ElasticVersion version) { - ElasticNodeInfo elasticNodeInfo; - ElasticContainer container = ElasticContainer.createAndStart(version); - elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); - String indicesPrefix = UUID.randomUUID().toString(); - Config cfg = new Config(); - ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix, version); - return cfg; - } - @ConfigSuite.Default public static Config elasticsearchV2() { return getConfig(ElasticVersion.V2_4); @@ -48,12 +37,12 @@ public class ElasticReindexIT extends AbstractReindexTests { @ConfigSuite.Config public static Config elasticsearchV6() { - return getConfig(ElasticVersion.V6_4); + return getConfig(ElasticVersion.V6_5); } @Override public void configureIndex(Injector injector) throws Exception { - ElasticTestUtils.createAllIndexes(injector); + createAllIndexes(injector); } @Before diff --git a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index 9d69955732..1e60071036 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java @@ -14,27 +14,16 @@ package com.google.gerrit.acceptance.ssh; -import com.google.gerrit.elasticsearch.ElasticContainer; -import com.google.gerrit.elasticsearch.ElasticTestUtils; -import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; +import static com.google.gerrit.elasticsearch.ElasticTestUtils.createAllIndexes; +import static com.google.gerrit.elasticsearch.ElasticTestUtils.getConfig; + import com.google.gerrit.elasticsearch.ElasticVersion; import com.google.gerrit.testing.ConfigSuite; import com.google.inject.Injector; -import java.util.UUID; import org.eclipse.jgit.lib.Config; public class ElasticIndexIT extends AbstractIndexTests { - private static Config getConfig(ElasticVersion version) { - ElasticNodeInfo elasticNodeInfo; - ElasticContainer container = ElasticContainer.createAndStart(version); - elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); - String indicesPrefix = UUID.randomUUID().toString(); - Config cfg = new Config(); - ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix, version); - return cfg; - } - @ConfigSuite.Default public static Config elasticsearchV2() { return getConfig(ElasticVersion.V2_4); @@ -47,11 +36,11 @@ public class ElasticIndexIT extends AbstractIndexTests { @ConfigSuite.Config public static Config elasticsearchV6() { - return getConfig(ElasticVersion.V6_4); + return getConfig(ElasticVersion.V6_5); } @Override public void configureIndex(Injector injector) throws Exception { - ElasticTestUtils.createAllIndexes(injector); + createAllIndexes(injector); } } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index 93e97c450e..c3150f1403 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -52,6 +52,8 @@ public class ElasticContainer> extends Gener return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2"; case V6_4: return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3"; + case V6_5: + return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.0"; } throw new IllegalStateException("No tests for version: " + version.name()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java b/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java index b46e0402b3..9f7b60c760 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java @@ -21,6 +21,7 @@ import com.google.inject.Key; import com.google.inject.TypeLiteral; import java.io.IOException; import java.util.Collection; +import java.util.UUID; import org.eclipse.jgit.lib.Config; public final class ElasticTestUtils { @@ -55,6 +56,16 @@ public final class ElasticTestUtils { } } + public static Config getConfig(ElasticVersion version) { + ElasticNodeInfo elasticNodeInfo; + ElasticContainer container = ElasticContainer.createAndStart(version); + elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); + String indicesPrefix = UUID.randomUUID().toString(); + Config cfg = new Config(); + configure(cfg, elasticNodeInfo.port, indicesPrefix, version); + return cfg; + } + private ElasticTestUtils() { // hide default constructor } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java index b8154ced41..eeb4c0927c 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java @@ -41,7 +41,7 @@ public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V6_4); + container = ElasticContainer.createAndStart(ElasticVersion.V6_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java index 3445b36876..7525b65904 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java @@ -41,7 +41,7 @@ public class ElasticV6QueryChangesTest extends AbstractQueryChangesTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V6_4); + container = ElasticContainer.createAndStart(ElasticVersion.V6_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java index 851b27d5a8..e8d568382f 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java @@ -41,7 +41,7 @@ public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V6_4); + container = ElasticContainer.createAndStart(ElasticVersion.V6_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml index c5faa49c57..75f632d7c9 100644 --- a/tools/maven/gerrit-acceptance-framework_pom.xml +++ b/tools/maven/gerrit-acceptance-framework_pom.xml @@ -55,6 +55,9 @@ Luca Milanesio + + Marco Miller + Martin Fick diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml index 52b11c1e9a..cb8494baaa 100644 --- a/tools/maven/gerrit-extension-api_pom.xml +++ b/tools/maven/gerrit-extension-api_pom.xml @@ -55,6 +55,9 @@ Luca Milanesio + + Marco Miller + Martin Fick diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml index d22c3eefb2..f58a6c75c9 100644 --- a/tools/maven/gerrit-plugin-api_pom.xml +++ b/tools/maven/gerrit-plugin-api_pom.xml @@ -55,6 +55,9 @@ Luca Milanesio + + Marco Miller + Martin Fick diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml index e6c04e2927..984923713a 100644 --- a/tools/maven/gerrit-war_pom.xml +++ b/tools/maven/gerrit-war_pom.xml @@ -55,6 +55,9 @@ Luca Milanesio + + Marco Miller + Martin Fick