commit e06f4b6844a5fe31b7f1f9c196942e8ce61b5c55
author Marco Miller <marco.miller@ericsson.com> Tue Mar 10 16:20:26 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 11 13:54:44 2020 -0400
tree 0b39d7c2acb56d3deae4e0f3846d8485eaff8933
parent 25a543b18a553ff298cd5b998521533a2e224087
parent bede85b0bcd9aa074a49d12e277780dfb398baf0

Merge branch 'stable-3.1'

* stable-3.1:
  Use Gerrit 3.1.3 in Dockerfile
  Use Gerrit 3.0.7 in Dockerfile
  Use Gerrit 2.16.16 in Dockerfile
  Upgrade wiremock to 2.26.3
  Bump Bazel version to 2.2.0
  Upgrade wiremock to 2.26.2
  Upgrade wiremock to 2.26.1

Adapt to the latest ChangeNotes master API changes.

Change-Id: If7231e1fe31a8e65d6e17d995923c8b525714678

.bazelversion

diff --git a/.bazelversion b/.bazelversion
index 7ec1d6d..ccbccc3 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-2.1.0
+2.2.0

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index b91fb9d..ca33b60 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,8 +3,8 @@
 def external_plugin_deps():
     maven_jar(
         name = "wiremock",
-        artifact = "com.github.tomakehurst:wiremock-standalone:2.26.0",
-        sha1 = "c0a192a3fd43b265ff4bc6014d64920d7c6e4174",
+        artifact = "com.github.tomakehurst:wiremock-standalone:2.26.3",
+        sha1 = "245c6efae2cbcb4e4f3457caf3d1c030cbaf2eb5",
     )
 
     maven_jar(

src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/IndexTs.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/IndexTs.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/IndexTs.java
index 6255986..ff42a4e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/IndexTs.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/IndexTs.java
@@ -113,12 +113,12 @@
     currCtx.onlyWithContext(
         (ctx) -> {
           try {
-            ChangeNotes changeNotes = changeFinder.findOne(projectName + "~" + id);
+            Optional<ChangeNotes> changeNotes = changeFinder.findOne(projectName + "~" + id);
             update(
                 IndexName.CHANGE,
-                changeNotes == null
+                !changeNotes.isPresent()
                     ? LocalDateTime.now()
-                    : changeNotes.getChange().getLastUpdatedOn().toLocalDateTime());
+                    : changeNotes.get().getChange().getLastUpdatedOn().toLocalDateTime());
           } catch (Exception e) {
             log.atWarning().withCause(e).log("Unable to update the latest TS for change %d", id);
           }

src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
index 4a0cad7..fe04ee9 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
@@ -76,7 +76,7 @@
   @Override
   public Optional<ChangeNotes> getChangeNotes() {
     try (ManualRequestContext ctx = oneOffReqCtx.open()) {
-      changeNotes = Optional.ofNullable(changeFinder.findOne(changeId));
+      changeNotes = changeFinder.findOne(changeId);
       return changeNotes;
     }
   }

src/test/docker/gerrit/Dockerfile

diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index f3b62f8..426826f 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.1.2
+FROM gerritcodereview/gerrit:3.1.3
 
 ENV GERRIT_BRANCH=stable-3.1