diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-21 15:49:05 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-21 16:54:09 +0100 |
commit | 6cc469b7950f4f6f2b67596b162cd73e59c22336 (patch) | |
tree | b19e9a8bf8c1bda395da8862494c3edafabf9b4e /vespa-osgi-testrunner | |
parent | be7847731521fb516269b65905029c1639d4aec8 (diff) |
Deprecate LoggingRequestHandler constructors taking AccessLog
Add replacement constructors without AccessLog.
Remove use of deprecated constructors for internal handlers.
Diffstat (limited to 'vespa-osgi-testrunner')
-rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java | 5 | ||||
-rw-r--r-- | vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/TestRunnerHandlerTest.java | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java index 77c68012005..f32714ec4da 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java @@ -9,7 +9,6 @@ import com.yahoo.container.jdisc.EmptyResponse; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; -import com.yahoo.container.logging.AccessLog; import com.yahoo.slime.Cursor; import com.yahoo.slime.JsonFormat; import com.yahoo.slime.Slime; @@ -47,8 +46,8 @@ public class TestRunnerHandler extends LoggingRequestHandler { private final boolean useOsgiMode; @Inject - public TestRunnerHandler(Executor executor, AccessLog accessLog, TestRunner junitRunner, LegacyTestRunner testRunner) { - super(executor, accessLog); + public TestRunnerHandler(Executor executor, TestRunner junitRunner, LegacyTestRunner testRunner) { + super(executor); this.junitRunner = junitRunner; this.testRunner = testRunner; this.useOsgiMode = junitRunner.isSupported(); diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/TestRunnerHandlerTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/TestRunnerHandlerTest.java index 2234bdff0a0..16f1c7de0ff 100644 --- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/TestRunnerHandlerTest.java +++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/TestRunnerHandlerTest.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.testrunner; import ai.vespa.hosted.api.TestDescriptor; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.logging.AccessLog; import com.yahoo.test.json.JsonTestHelper; import com.yahoo.vespa.testrunner.legacy.LegacyTestRunner; import org.junit.jupiter.api.BeforeAll; @@ -20,7 +19,6 @@ import java.util.logging.LogRecord; import static com.yahoo.jdisc.http.HttpRequest.Method.GET; import static org.junit.Assert.assertEquals; - import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -49,7 +47,6 @@ public class TestRunnerHandlerTest { testRunnerHandler = new TestRunnerHandler( Executors.newSingleThreadExecutor(), - AccessLog.voidAccessLog(), new MockJunitRunner(LegacyTestRunner.Status.SUCCESS, testReport), null); } @@ -85,7 +82,6 @@ public class TestRunnerHandlerTest { when(testRunner.getReport()).thenReturn(null); testRunnerHandler = new TestRunnerHandler( Executors.newSingleThreadExecutor(), - AccessLog.voidAccessLog(), testRunner, null); HttpResponse response = testRunnerHandler.handle(HttpRequest.createTestRequest("http://localhost:1234/tester/v1/log", GET)); @@ -103,7 +99,6 @@ public class TestRunnerHandlerTest { testRunnerHandler = new TestRunnerHandler( Executors.newSingleThreadExecutor(), - AccessLog.voidAccessLog(), testRunner, legacyTestRunner); HttpResponse response = testRunnerHandler.handle(HttpRequest.createTestRequest("http://localhost:1234/tester/v1/log", GET)); |