diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-07-04 14:34:41 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-07-04 14:54:20 +0200 |
commit | d64499cde2603e1ffd7cac88d9fae259b8429fc9 (patch) | |
tree | bd49ee3cea712c456e104918d89cafec25245aed /controller-server | |
parent | 369f1a8ab5e5916de46e39ad28203f83ec7ef448 (diff) |
Remove superfluous semicolons
Diffstat (limited to 'controller-server')
4 files changed, 9 insertions, 9 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java index e5e03cf5dfc..ae1102e2cef 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java @@ -145,7 +145,7 @@ public class ConfigServerRestExecutorImpl implements ConfigServerRestExecutor { .setSocketTimeout((int) PROXY_REQUEST_TIMEOUT.toMillis()).build(); try ( CloseableHttpClient client = createHttpClient(config, sslContextProvider, zoneRegistry, proxyRequest); - CloseableHttpResponse response = client.execute(requestBase); + CloseableHttpResponse response = client.execute(requestBase) ) { String content = getContent(response); int status = response.getStatusLine().getStatusCode(); @@ -246,7 +246,7 @@ public class ConfigServerRestExecutorImpl implements ConfigServerRestExecutor { .setSocketTimeout(timeout).build(); try ( CloseableHttpClient client = createHttpClient(config, sslContextProvider, zoneRegistry, proxyRequest); - CloseableHttpResponse response = client.execute(httpget); + CloseableHttpResponse response = client.execute(httpget) ) { if (response.getStatusLine().getStatusCode() == 200) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java index ee9c65013a8..301fc461b6f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilterTest.java @@ -144,7 +144,7 @@ public class AthenzPrincipalFilterTest { } private static void assertUnauthorized(ResponseHandlerMock responseHandler, String expectedMessageSubstring) { - assertNotNull(responseHandler.response);; + assertNotNull(responseHandler.response); assertEquals(UNAUTHORIZED, responseHandler.response.getStatus()); assertTrue(responseHandler.getResponseContent().contains(expectedMessageSubstring)); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java index 03e324cd406..fa6edd939c4 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java @@ -52,7 +52,7 @@ public class MetricsReporterTest { @Test public void test_chef_metrics() { - Clock clock = Clock.fixed(Instant.ofEpochSecond(1475497913), ZoneId.systemDefault());; + Clock clock = Clock.fixed(Instant.ofEpochSecond(1475497913), ZoneId.systemDefault()); ControllerTester tester = new ControllerTester(); MetricsReporter metricsReporter = createReporter(clock, tester.controller(), metrics, SystemName.cd); metricsReporter.maintain(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/PathTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/PathTest.java index 7b1d8d17a5c..0bce930175d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/PathTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/PathTest.java @@ -15,12 +15,12 @@ public class PathTest { @Test public void testPath() { - assertFalse(new Path("").matches("/a/{foo}/bar/{b}"));; - assertFalse(new Path("///").matches("/a/{foo}/bar/{b}"));; - assertFalse(new Path("///foo").matches("/a/{foo}/bar/{b}"));; - assertFalse(new Path("///bar/").matches("/a/{foo}/bar/{b}"));; + assertFalse(new Path("").matches("/a/{foo}/bar/{b}")); + assertFalse(new Path("///").matches("/a/{foo}/bar/{b}")); + assertFalse(new Path("///foo").matches("/a/{foo}/bar/{b}")); + assertFalse(new Path("///bar/").matches("/a/{foo}/bar/{b}")); Path path = new Path("/a/1/bar/fuz"); - assertTrue(path.matches("/a/{foo}/bar/{b}"));; + assertTrue(path.matches("/a/{foo}/bar/{b}")); assertEquals("1", path.get("foo")); assertEquals("fuz", path.get("b")); } |