commit 0d14ee781ef4dc44bf37f057d5a3836c10865247
author Kaushik Lingarkar <kaushik.lingarkar@linaro.org> Tue Jul 19 15:51:49 2022 -0700
committer Kaushik Lingarkar <kaushik.lingarkar@linaro.org> Thu Jul 21 10:06:14 2022 -0700
tree 748f5dbd5bf3c22e06dbfb3a06a1a6dc20be0c05
parent 9f4a6d16ca0b1ccb501c16a7c51bddb94a8a0a9e

Add 7.10.* to supported versions

Also, update tests to run with 7.10.0

Change-Id: I0bcc728835fec63212fff271710da690a6df5c28

src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java

diff --git a/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java
index b5bf44b..fdc60ec 100644
--- a/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java
+++ b/src/main/java/com/google/gerrit/elasticsearch/ElasticVersion.java
@@ -20,7 +20,8 @@
 public enum ElasticVersion {
   V7_6("7.6.*"),
   V7_7("7.7.*"),
-  V7_8("7.8.*");
+  V7_8("7.8.*"),
+  V7_10("7.10.*");
 
   private final String version;
   private final Pattern pattern;

src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
index 503852b..b99deb0 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -38,6 +38,8 @@
         return "blacktop/elasticsearch:7.7.1";
       case V7_8:
         return "blacktop/elasticsearch:7.8.1";
+      case V7_10:
+        return "blacktop/elasticsearch:7.10.0";
     }
     throw new IllegalStateException("No tests for version: " + version.name());
   }

src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
index 30d07c7..850adef 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
@@ -41,7 +41,7 @@
   public static void startIndexService() {
     if (container == null) {
       // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
+      container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
       client = HttpAsyncClients.createDefault();
       client.start();
     }

src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
index e7f1d1c..49d9ee2 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
@@ -47,7 +47,7 @@
   public static void startIndexService() {
     if (container == null) {
       // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
+      container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
       client = HttpAsyncClients.createDefault();
       client.start();
     }

src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
index 17fc0d2..eabacdc 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
@@ -42,7 +42,7 @@
   public static void startIndexService() {
     if (container == null) {
       // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
+      container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
       client = HttpAsyncClients.createDefault();
       client.start();
     }

src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
index f5524d7..8753acc 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
@@ -42,7 +42,7 @@
   public static void startIndexService() {
     if (container == null) {
       // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_8);
+      container = ElasticContainer.createAndStart(ElasticVersion.V7_10);
       client = HttpAsyncClients.createDefault();
       client.start();
     }

src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java
index 2ce3a2c..e5f03d9 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticVersionTest.java
@@ -30,6 +30,9 @@
 
     assertThat(ElasticVersion.forVersion("7.8.0")).isEqualTo(ElasticVersion.V7_8);
     assertThat(ElasticVersion.forVersion("7.8.1")).isEqualTo(ElasticVersion.V7_8);
+
+    assertThat(ElasticVersion.forVersion("7.10.0")).isEqualTo(ElasticVersion.V7_10);
+    assertThat(ElasticVersion.forVersion("7.10.1")).isEqualTo(ElasticVersion.V7_10);
   }
 
   @Test