Merge branch 'stable-3.6'
* stable-3.6:
Bump global-refdb to v3.6.3.1
Bump global-refdb to v3.5.4
Do not include global-refdb library in high-availability
Bump global-refdb to v3.4.8
Fix issue with incorrect import for Nullable annotation
Cache the resolution of allowed listeners
Bump Gerrit to v3.4.5
Allow unrestricted listeners to be called for forwarded events
Also fix Flogger's function call with string parameters, which
was failing the build because of errorprone checks.
Change-Id: Iddff6360eb03f9e504ffb0e1ad636759977f7023
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
index cdca21b..e0d5a50 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
@@ -123,7 +123,7 @@
log.atInfo().log("Loading configuration from %s", fileConfigFileName);
cfg.load();
} catch (IOException | ConfigInvalidException e) {
- log.atSevere().withCause(e).log("Unable to load configuration from " + fileConfigFileName);
+ log.atSevere().withCause(e).log("Unable to load configuration from %s", fileConfigFileName);
}
return cfg;
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ChangeReindexRunnable.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ChangeReindexRunnable.java
index c0b60c3..aa44770 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ChangeReindexRunnable.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ChangeReindexRunnable.java
@@ -88,7 +88,7 @@
return true;
}
log.atWarning().withCause(cnr.error().get()).log(
- "Error fetching change " + cnr.id());
+ "Error fetching change %s", cnr.id());
return false;
})
.map(cnr -> cnr.notes().getChange());
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventLocks.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventLocks.java
index 3fd26db..bbff4ee 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventLocks.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventLocks.java
@@ -65,7 +65,7 @@
String.format(
"Acquisition of the locking of %s timed out after %d msec: consider increasing the number of shards",
indexId, WAIT_TIMEOUT_MS);
- log.atWarning().log(timeoutMessage);
+ log.atWarning().log("%s", timeoutMessage);
lockAcquireTimeoutCallback.invoke();
CompletableFuture<?> failureFuture = new CompletableFuture<>();
failureFuture.completeExceptionally(new InterruptedException(timeoutMessage));
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
index 674de10..92253f7 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
@@ -210,7 +210,7 @@
"Entry %s in cache %s has an incompatible class and can't be"
+ " deserialized. Invalidating entry.",
path, websessionsDir);
- log.atFine().withCause(e).log(e.getMessage());
+ log.atFine().withCause(e).log("%s", e.getMessage());
invalidate(path.getFileName().toString());
} catch (IOException e) {
log.atWarning().withCause(e).log("Cannot read cache %s", websessionsDir);
