diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-04-19 22:24:39 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-04-19 22:24:39 +0200 |
commit | 73f00e0684b26c9deadf85aa7d6ca57b243f230d (patch) | |
tree | 5d5f0dedbde8c0d42bd7e37a6506699dbffaf619 /vespaclient-container-plugin | |
parent | ddd16fd9efba8428e0d62430550e8741dcf696b8 (diff) |
Use com.yahoo.messagebus.Error instead of java.lang.Error
Diffstat (limited to 'vespaclient-container-plugin')
2 files changed, 18 insertions, 19 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java index 9ec25f8b6a6..51707a05401 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java @@ -919,7 +919,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { return false; if (result.type() == Result.ResultType.FATAL_ERROR) - throw new DispatchException(result.getError()); + throw new DispatchException(new Throwable(result.error().toString())); outstanding.incrementAndGet(); return true; @@ -1202,7 +1202,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { return false; if (result.type() == Result.ResultType.FATAL_ERROR) - onError.accept(result.getError().getMessage()); + onError.accept(result.error().getMessage()); else outstanding.incrementAndGet(); diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java index 232d49129d7..1fbde14825b 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java @@ -42,7 +42,6 @@ import com.yahoo.documentapi.VisitorParameters; import com.yahoo.documentapi.VisitorResponse; import com.yahoo.documentapi.VisitorSession; import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage; -import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.test.MockMetric; import com.yahoo.messagebus.StaticThrottlePolicy; import com.yahoo.messagebus.Trace; @@ -364,7 +363,7 @@ public class DocumentV1ApiTest { assertEquals(expectedUpdate, update); parameters.responseHandler().get().handleResponse(new UpdateResponse(0, false)); assertEquals(parameters().withRoute("content"), parameters); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/docid?selection=true&cluster=content&timeChunk=10", PUT, "{" + @@ -415,7 +414,7 @@ public class DocumentV1ApiTest { assertEquals(expectedRemove, remove); assertEquals(parameters().withRoute("content"), parameters); parameters.responseHandler().get().handleResponse(new DocumentIdResponse(0, doc2.getId(), "boom", Response.Outcome.ERROR)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/docid?selection=false&cluster=content", DELETE); assertSameJson("{" + @@ -476,7 +475,7 @@ public class DocumentV1ApiTest { assertEquals(doc1.getId(), id); assertEquals(parameters().withRoute("content").withFieldSet("go"), parameters); parameters.responseHandler().get().handleResponse(new DocumentResponse(0, null)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/docid/one?cluster=content&fieldSet=go&timeout=123"); assertSameJson("{" + @@ -490,7 +489,7 @@ public class DocumentV1ApiTest { assertEquals(doc1.getId(), id); assertEquals(parameters().withFieldSet("music:[document]"), parameters); parameters.responseHandler().get().handleResponse(new DocumentResponse(0, doc1)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/docid/one?"); assertSameJson("{" + @@ -507,7 +506,7 @@ public class DocumentV1ApiTest { assertEquals(new DocumentId("id:space:music::one/two/three"), id); assertEquals(parameters().withFieldSet("music:[document]"), parameters); parameters.responseHandler().get().handleResponse(new DocumentResponse(0)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/docid/one/two/three"); assertSameJson("{" + @@ -528,7 +527,7 @@ public class DocumentV1ApiTest { .addChild("Fast Car") .addChild("Baby Can I Hold You")); parameters.responseHandler().get().handleResponse(new DocumentResponse(0, doc2, trace)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two?condition=test%20it&tracelevel=9", POST, "{" + @@ -565,7 +564,7 @@ public class DocumentV1ApiTest { assertEquals(expectedUpdate, update); assertEquals(parameters(), parameters); parameters.responseHandler().get().handleResponse(new UpdateResponse(0, true)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/group/a/three?create=true&timeout=1e1s", PUT, "{" + @@ -617,7 +616,7 @@ public class DocumentV1ApiTest { // PUT on document which is not found is a 200 access.session.expect((update, parameters) -> { parameters.responseHandler().get().handleResponse(new UpdateResponse(0, false)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/docid/sonny", PUT, "{" + @@ -638,7 +637,7 @@ public class DocumentV1ApiTest { assertEquals(expectedRemove, remove); assertEquals(parameters().withRoute("route"), parameters); parameters.responseHandler().get().handleResponse(new DocumentIdResponse(0, doc2.getId())); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two?route=route&condition=false", DELETE); assertSameJson("{" + @@ -669,7 +668,7 @@ public class DocumentV1ApiTest { access.session.expect((id, parameters) -> { assertEquals(clock.instant().plusSeconds(1000), parameters.deadline().get()); parameters.responseHandler().get().handleResponse(new Response(0, "timeout", Response.Outcome.TIMEOUT)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two?timeout=1ks"); assertSameJson("{" + @@ -682,7 +681,7 @@ public class DocumentV1ApiTest { // INSUFFICIENT_STORAGE is a 507 access.session.expect((id, parameters) -> { parameters.responseHandler().get().handleResponse(new Response(0, "disk full", Response.Outcome.INSUFFICIENT_STORAGE)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two", DELETE); assertSameJson("{" + @@ -695,7 +694,7 @@ public class DocumentV1ApiTest { // PRECONDITION_FAILED is a 412 access.session.expect((id, parameters) -> { parameters.responseHandler().get().handleResponse(new Response(0, "no dice", Response.Outcome.CONDITION_FAILED)); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two", DELETE); assertSameJson("{" + @@ -722,7 +721,7 @@ public class DocumentV1ApiTest { assertEquals(405, response.getStatus()); // OVERLOAD is a 429 - access.session.expect((id, parameters) -> new Result(Result.ResultType.TRANSIENT_ERROR, new Error("overload"))); + access.session.expect((id, parameters) -> new Result(Result.ResultType.TRANSIENT_ERROR, Result.toError(Result.ResultType.TRANSIENT_ERROR))); var response1 = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two", POST, "{\"fields\": {}}"); var response2 = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two", POST, "{\"fields\": {}}"); var response3 = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two", POST, "{\"fields\": {}}"); @@ -731,7 +730,7 @@ public class DocumentV1ApiTest { " \"message\": \"Rejecting execution due to overload: 2 requests already enqueued\"" + "}", response3.readAll()); assertEquals(429, response3.getStatus()); - access.session.expect((id, parameters) -> new Result(Result.ResultType.FATAL_ERROR, new Error("error"))); + access.session.expect((id, parameters) -> new Result(Result.ResultType.FATAL_ERROR, Result.toError(Result.ResultType.FATAL_ERROR))); handler.dispatchEnqueued(); assertSameJson("{" + " \"pathId\": \"/document/v1/space/music/number/1/two\"," + @@ -748,7 +747,7 @@ public class DocumentV1ApiTest { AtomicReference<ResponseHandler> handler = new AtomicReference<>(); access.session.expect((id, parameters) -> { handler.set(parameters.responseHandler().get()); - return new Result(Result.ResultType.SUCCESS, null); + return new Result(); }); try { var response4 = driver.sendRequest("http://localhost/document/v1/space/music/docid/one?timeout=1ms"); @@ -808,7 +807,7 @@ public class DocumentV1ApiTest { CountDownLatch setup = new CountDownLatch(queueFill); access.session.expect((id, parameters) -> { setup.countDown(); - return new Result(Result.ResultType.TRANSIENT_ERROR, new Error()); + return new Result(Result.ResultType.TRANSIENT_ERROR, Result.toError(Result.ResultType.TRANSIENT_ERROR)); }); for (int i = 0; i < queueFill; i++) { int j = i; |