[OLINGO-1004] TecSvc batch handling changes Modified response status code in batch case from 202 Accepted to 200 OK and adjusted tests. See odata protocol documentation 11.7.4
Signed-off-by: Christian Amend <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/f3cee9b7 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/f3cee9b7 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/f3cee9b7 Branch: refs/heads/master Commit: f3cee9b73ba1f62f77c4d755dde462371501345a Parents: b687190 Author: Morten Riedel <[email protected]> Authored: Wed Sep 28 14:48:21 2016 +0200 Committer: Christian Amend <[email protected]> Committed: Thu Sep 29 14:15:55 2016 +0200 ---------------------------------------------------------------------- .../fit/tecsvc/client/AuthBatchTestITCase.java | 4 +-- .../fit/tecsvc/client/BatchClientITCase.java | 28 ++++++++++---------- .../fit/tecsvc/http/BasicAsyncITCase.java | 4 +-- .../fit/tecsvc/http/BasicBatchITCase.java | 2 +- .../processor/TechnicalBatchProcessor.java | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f3cee9b7/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java index 89ad124..259aabc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/AuthBatchTestITCase.java @@ -96,8 +96,8 @@ public class AuthBatchTestITCase extends AbstractParamTecSvcITCase{ // ------------------------------------------- final ODataBatchResponse response = streamManager.getResponse(); - assertEquals(202, response.getStatusCode()); - assertEquals("Accepted", response.getStatusMessage()); + assertEquals(200, response.getStatusCode()); + assertEquals("OK", response.getStatusMessage()); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f3cee9b7/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java index a03d3c7..53bfa58 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java @@ -103,7 +103,7 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { changeset.addRequest(createRequest); final ODataBatchResponse response = payloadManager.getResponse(); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); // Check response items final Iterator<ODataBatchResponseItem> responseBodyIter = response.getBody(); @@ -128,8 +128,8 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { final ODataBatchResponse response = request.payloadManager().getResponse(); saveCookieHeader(response); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); - assertEquals("Accepted", response.getStatusMessage()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); + assertEquals("OK", response.getStatusMessage()); final Iterator<ODataBatchResponseItem> iter = response.getBody(); assertFalse(iter.hasNext()); @@ -146,8 +146,8 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { final ODataBatchResponse response = payload.getResponse(); saveCookieHeader(response); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); - assertEquals("Accepted", response.getStatusMessage()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); + assertEquals("OK", response.getStatusMessage()); final Iterator<ODataBatchResponseItem> iter = response.getBody(); assertTrue(iter.hasNext()); @@ -178,8 +178,8 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { final ODataBatchResponse response = payload.getResponse(); saveCookieHeader(response); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); - assertEquals("Accepted", response.getStatusMessage()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); + assertEquals("OK", response.getStatusMessage()); final Iterator<ODataBatchResponseItem> iter = response.getBody(); assertTrue(iter.hasNext()); @@ -212,7 +212,7 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { "ESMedia(5)/$value"))); final ODataBatchResponse response = payload.getResponse(); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); Iterator<ODataBatchResponseItem> iter = response.getBody(); assertTrue(iter.hasNext()); @@ -251,7 +251,7 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { final ODataBatchResponse response = payload.getResponse(); saveCookieHeader(response); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); Iterator<ODataBatchResponseItem> iter = response.getBody(); assertTrue(iter.hasNext()); @@ -277,7 +277,7 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { // Fetch result final ODataBatchResponse response = payload.getResponse(); saveCookieHeader(response); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); final Iterator<ODataBatchResponseItem> iter = response.getBody(); @@ -321,7 +321,7 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { // Fetch result final ODataBatchResponse response = payload.getResponse(); saveCookieHeader(response); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); final Iterator<ODataBatchResponseItem> bodyIterator = response.getBody(); assertTrue(bodyIterator.hasNext()); @@ -381,7 +381,7 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { // Fetch result final ODataBatchResponse response = payload.getResponse(); saveCookieHeader(response); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); assertEquals(PreferenceName.CONTINUE_ON_ERROR.getName(), response.getHeader(HttpHeader.PREFERENCE_APPLIED).iterator().next()); @@ -464,7 +464,7 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { changeset.addRequest(updateReq); final ODataBatchResponse response = payload.getResponse(); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); final String cookie = response.getHeader(HttpHeader.SET_COOKIE).iterator().next(); // verify response payload ... @@ -574,7 +574,7 @@ public class BatchClientITCase extends AbstractParamTecSvcITCase { // - Fetch result // ----------------------------- final ODataBatchResponse response = payload.getResponse(); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), response.getStatusCode()); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); final Iterator<ODataBatchResponseItem> bodyIterator = response.getBody(); // Check first get request http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f3cee9b7/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicAsyncITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicAsyncITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicAsyncITCase.java index fa0e4b3..845330f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicAsyncITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicAsyncITCase.java @@ -95,7 +95,7 @@ public class BasicAsyncITCase extends AbstractBaseTestITCase { String resBody = resultBody.asString(); assertEquals("HTTP/1.1 200 OK", resultHeaderFields.get(null).get(0)); - assertEquals(1013, resultBody.byteLength()); + assertEquals(1007, resultBody.byteLength()); contains(resBody, "HTTP/1.1 200 OK", "OData-Version: 4.0", @@ -137,7 +137,7 @@ public class BasicAsyncITCase extends AbstractBaseTestITCase { Map<String, List<String>> resultHeaderFields = result.getHeaderFields(); String resBody = resultBody.asString(); assertEquals("HTTP/1.1 200 OK", resultHeaderFields.get(null).get(0)); - assertEquals(2324, resultBody.byteLength()); + assertEquals(2318, resultBody.byteLength()); contains(resBody, "HTTP/1.1 200 OK", "OData-Version: 4.0", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f3cee9b7/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java index 38b3cf6..1fb31a2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicBatchITCase.java @@ -132,7 +132,7 @@ public class BasicBatchITCase extends AbstractBaseTestITCase { private HttpURLConnection batch(final String content) throws IOException { final HttpURLConnection connection = getConnection(content); - assertEquals(HttpStatusCode.ACCEPTED.getStatusCode(), connection.getResponseCode()); + assertEquals(HttpStatusCode.OK.getStatusCode(), connection.getResponseCode()); return connection; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f3cee9b7/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java index 6821c8f..fa90b7c 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalBatchProcessor.java @@ -94,7 +94,7 @@ public class TechnicalBatchProcessor extends TechnicalProcessor implements Batch odata.createFixedFormatSerializer().batchResponse(responseParts, responseBoundary); response.setHeader(HttpHeader.CONTENT_TYPE, ContentType.MULTIPART_MIXED + ";boundary=" + responseBoundary); response.setContent(responseContent); - response.setStatusCode(HttpStatusCode.ACCEPTED.getStatusCode()); + response.setStatusCode(HttpStatusCode.OK.getStatusCode()); if (continueOnError) { response.setHeader(HttpHeader.PREFERENCE_APPLIED, PreferencesApplied.with().continueOnError().build().toValueString());
