From bd4e22515ba304396cc2bc8071f795f479cd9ced Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Fri, 8 Mar 2019 09:08:13 +0100 Subject: Rename get -> readLog --- .../java/com/yahoo/vespa/hosted/controller/auditlog/AuditLogger.java | 2 +- .../hosted/controller/restapi/controller/ControllerApiHandler.java | 2 +- .../com/yahoo/vespa/hosted/controller/auditlog/AuditLoggerTest.java | 2 +- .../vespa/hosted/controller/restapi/controller/ControllerApiTest.java | 4 ++-- .../java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java | 2 +- .../yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLogger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLogger.java index 1a91fe9ada1..5ab0cb533f7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLogger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLogger.java @@ -35,7 +35,7 @@ public class AuditLogger { } /** Read the current audit log */ - public AuditLog get() { + public AuditLog readLog() { return db.readAuditLog(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java index 05fc691fefb..fbbd8724a8c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java @@ -67,7 +67,7 @@ public class ControllerApiHandler extends AuditLoggingRequestHandler { private HttpResponse get(HttpRequest request) { Path path = new Path(request.getUri().getPath()); if (path.matches("/controller/v1/")) return root(request); - if (path.matches("/controller/v1/auditlog/")) return new AuditLogResponse(controller.auditLogger().get()); + if (path.matches("/controller/v1/auditlog/")) return new AuditLogResponse(controller.auditLogger().readLog()); if (path.matches("/controller/v1/maintenance/")) return new JobsResponse(maintenance.jobControl()); if (path.matches("/controller/v1/jobs/upgrader")) return new UpgraderResponse(maintenance.upgrader()); return notFound(path); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLoggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLoggerTest.java index 7579b2a02a9..0353a774cab 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLoggerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLoggerTest.java @@ -27,7 +27,7 @@ public class AuditLoggerTest { @Test public void test_logging() { - Supplier log = () -> tester.controller().auditLogger().get(); + Supplier log = () -> tester.controller().auditLogger().readLog(); { // GET request is ignored HttpRequest request = testRequest(Method.GET, URI.create("http://localhost:8080/os/v1/"), ""); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java index 5f0d074fdd8..8856cc5a97f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java @@ -54,7 +54,7 @@ public class ControllerApiTest extends ControllerContainerTest { "{\"message\":\"Re-activated job 'DeploymentExpirer'\"}", 200); - assertFalse("Actions are logged to audit log", tester.controller().auditLogger().get().entries().isEmpty()); + assertFalse("Actions are logged to audit log", tester.controller().auditLogger().readLog().entries().isEmpty()); } @Test @@ -112,7 +112,7 @@ public class ControllerApiTest extends ControllerContainerTest { "{\"upgradesPerMinute\":42.0,\"confidenceOverrides\":[{\"6.43\":\"broken\"}]}", 200); - assertFalse("Actions are logged to audit log", tester.controller().auditLogger().get().entries().isEmpty()); + assertFalse("Actions are logged to audit log", tester.controller().auditLogger().readLog().entries().isEmpty()); } @Test diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java index 5ad2833456a..4ea4975f38c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java @@ -129,7 +129,7 @@ public class OsApiTest extends ControllerContainerTest { assertResponse(new Request("http://localhost:8080/os/v1/firmware/dev/", "", Request.Method.DELETE), "{\"error-code\":\"NOT_FOUND\",\"message\":\"No zones at path '/os/v1/firmware/dev'\"}", 404); - assertFalse("Actions are logged to audit log", tester.controller().auditLogger().get().entries().isEmpty()); + assertFalse("Actions are logged to audit log", tester.controller().auditLogger().readLog().entries().isEmpty()); } private void upgradeAndUpdateStatus() { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java index 5f9f4748676..8f056f1710f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java @@ -108,7 +108,7 @@ public class ZoneApiTest extends ControllerContainerTest { assertEquals("PATCH", proxy.lastReceived().get().getMethod()); assertEquals("{\"currentRestartGeneration\": 1}", proxy.lastRequestBody().get()); - assertFalse("Actions are logged to audit log", tester.controller().auditLogger().get().entries().isEmpty()); + assertFalse("Actions are logged to audit log", tester.controller().auditLogger().readLog().entries().isEmpty()); } @Test -- cgit v1.2.3