Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Allow using healthcheck on slaves
  Reformat with GJF 1.7

Bug: Issue 12240
Change-Id: I7324fd85a202e9987886c14d34271887797def08

src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/AuthHealthCheck.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/AuthHealthCheck.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/AuthHealthCheck.java
index be17e74..4003351 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/AuthHealthCheck.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/AuthHealthCheck.java
@@ -55,7 +55,6 @@
     authRequest.setPassword(password);
     realm.authenticate(authRequest);
 
-    byIdCache.evictByUsername(username);
     AccountState accountState = byIdCache.getByUsername(username);
     if (accountState == null) {
       log.error("Cannot load account state for username " + username);

src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java
index b244b65..54dd424 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java
@@ -49,7 +49,7 @@
     for (int i = 0; i < numChanges; i++) {
       createChange("refs/for/master");
     }
-    accounts.create(config.getUsername(HealthCheckNames.AUTH));
+    accountCreator.create(config.getUsername(HealthCheckNames.AUTH));
   }
 
   @Test

src/test/java/com/googlesource/gerrit/plugins/healthcheck/ProjectsListHealthCheckTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ProjectsListHealthCheckTest.java b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ProjectsListHealthCheckTest.java
index 0d29109..564ccd2 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ProjectsListHealthCheckTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ProjectsListHealthCheckTest.java
@@ -61,7 +61,7 @@
   }
 
   private ListProjects getFailingProjectList() {
-    return new ListProjects(null, null, null, null, null, null, null) {
+    return new ListProjects(null, null, null, null, null, null, null, null) {
       @Override
       public SortedMap<String, ProjectInfo> apply() throws BadRequestException {
         throw new IllegalArgumentException("Unable to return project list");
@@ -70,7 +70,7 @@
   }
 
   private ListProjects getWorkingProjectList(long execTime) {
-    return new ListProjects(null, null, null, null, null, null, null) {
+    return new ListProjects(null, null, null, null, null, null, null, null) {
       @Override
       public SortedMap<String, ProjectInfo> apply() throws BadRequestException {
         SortedMap<String, ProjectInfo> projects = new TreeMap<>();