| commit | 1c530ec85354f119439e0f7e93da24bd6d893b85 | [log] [tgz] |
|---|---|---|
| author | Luca Milanesio <luca.milanesio@gmail.com> | Fri Aug 16 22:46:43 2019 +0100 |
| committer | Luca Milanesio <luca.milanesio@gmail.com> | Sat Aug 17 09:21:55 2019 +0100 |
| tree | cba8d2d9d63fce3264cc417e1df3fce472d55fa3 | |
| parent | 97913542dbe511f7f6c28d3f1b87048656e57000 [diff] |
Adapt RestAPI apply() method to Gerrit master Gerrit master requires that the RestAPI apply() method returns a typed response instead of a generic Java Object. Change-Id: Ief1472f955a49ec5d3e7c14c6698ac6e17c92aca
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/api/HealthCheckStatusEndpoint.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/api/HealthCheckStatusEndpoint.java index b032c02..ecae202 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/api/HealthCheckStatusEndpoint.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/api/HealthCheckStatusEndpoint.java
@@ -34,7 +34,7 @@ } @Override - public Object apply(ConfigResource resource) + public Response<Map<String, Object>> apply(ConfigResource resource) throws AuthException, BadRequestException, ResourceConflictException, Exception { long ts = System.currentTimeMillis(); Map<String, Object> result = healthChecks.run();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/QueryChangesHealthCheck.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/QueryChangesHealthCheck.java index 331ef21..5ccaf9b 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/QueryChangesHealthCheck.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/QueryChangesHealthCheck.java
@@ -59,7 +59,7 @@ queryChanges.addQuery(config.getQuery(QUERYCHANGES)); queryChanges.setStart(0); - List<?> changes = queryChanges.apply(null); + List<?> changes = queryChanges.apply(null).value(); if (changes == null) { log.warn("Cannot query changes: received a null list of results"); return Result.FAILED;