Repository: olingo-odata4 Updated Branches: refs/heads/master 1dae99912 -> 0090e0207
[OLINGO-663] Fix batch processor exception signature Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7ce457d8 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7ce457d8 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7ce457d8 Branch: refs/heads/master Commit: 7ce457d82b2b1338655ca5210e067d84a47a2f8c Parents: 1dae999 Author: Christian Amend <[email protected]> Authored: Wed Jun 3 15:17:51 2015 +0200 Committer: Christian Amend <[email protected]> Committed: Wed Jun 3 15:17:51 2015 +0200 ---------------------------------------------------------------------- .../apache/olingo/server/api/batch/BatchFacade.java | 14 +++++++------- .../olingo/server/api/processor/BatchProcessor.java | 12 +++++------- .../server/core/batchhandler/BatchFacadeImpl.java | 6 ++++-- .../olingo/server/core/batchhandler/BatchHandler.java | 3 ++- .../server/core/batchhandler/BatchPartHandler.java | 5 +++-- .../core/batchhandler/MockedBatchHandlerTest.java | 3 ++- .../tecsvc/processor/TechnicalBatchProcessor.java | 7 +++---- 7 files changed, 26 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7ce457d8/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java index 6692f93..b5a2b1b 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java @@ -17,10 +17,10 @@ * under the License. */package org.apache.olingo.server.api.batch; +import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; -import org.apache.olingo.server.api.batch.exception.BatchDeserializerException; import org.apache.olingo.server.api.deserializer.batch.BatchRequestPart; import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart; @@ -43,10 +43,10 @@ public interface BatchFacade { * * @param request ODataRequest to process * @return Corresponding ODataResult to the given request - * @throws BatchDeserializerException + * @throws ODataApplicationException * @throws ODataLibraryException */ - public ODataResponse handleODataRequest(ODataRequest request) throws BatchDeserializerException, + public ODataResponse handleODataRequest(ODataRequest request) throws ODataApplicationException, ODataLibraryException; /** @@ -54,10 +54,10 @@ public interface BatchFacade { * * @param request Request to process * @return Corresponding {@link ODataResponsePart} - * @throws BatchDeserializerException + * @throws ODataApplicationException * @throws ODataLibraryException */ - public ODataResponsePart handleBatchRequest(BatchRequestPart request) throws BatchDeserializerException, + public ODataResponsePart handleBatchRequest(BatchRequestPart request) throws ODataApplicationException, ODataLibraryException; /** @@ -66,9 +66,9 @@ public interface BatchFacade { * * @param contentType Content Type * @return Boundary - * @throws BatchDeserializerException + * @throws ODataApplicationException * @throws ODataLibraryException */ - public String extractBoundaryFromContentType(String contentType) throws BatchDeserializerException, + public String extractBoundaryFromContentType(String contentType) throws ODataApplicationException, ODataLibraryException; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7ce457d8/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java index e61f758..cb7f02a 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java @@ -20,12 +20,11 @@ package org.apache.olingo.server.api.processor; import java.util.List; +import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.batch.BatchFacade; -import org.apache.olingo.server.api.batch.exception.BatchDeserializerException; -import org.apache.olingo.server.api.batch.exception.BatchSerializerException; import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart; /** @@ -38,21 +37,20 @@ public interface BatchProcessor extends Processor { * @param facade BatchFacade which should be used for further batch part handling * @param request OData request object containing raw HTTP information * @param response OData response object for collecting response data - * @throws BatchSerializerException if the service implementation encounters a failure - * @throws BatchDeserializerException if de-serialization failed + * @throws ODataApplicationException * @throws ODataLibraryException */ void processBatch(BatchFacade facade, ODataRequest request, ODataResponse response) - throws BatchSerializerException, BatchDeserializerException, ODataLibraryException; + throws ODataApplicationException, ODataLibraryException; /** * Process a batch change set (containing several batch requests) * and puts serialized content and status into the response. * @param facade BatchFacade which should be used for further batch part handling * @param requests List of ODataRequests which are included in the to be processed change set - * @throws BatchDeserializerException if de-serialization failed + * @throws ODataApplicationException * @throws ODataLibraryException */ ODataResponsePart processChangeSet(BatchFacade facade, List<ODataRequest> requests) - throws BatchDeserializerException, ODataLibraryException; + throws ODataApplicationException, ODataLibraryException; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7ce457d8/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchFacadeImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchFacadeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchFacadeImpl.java index f54b0dd..856897c 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchFacadeImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchFacadeImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.server.core.batchhandler; +import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; @@ -39,12 +40,13 @@ public class BatchFacadeImpl implements BatchFacade { } @Override - public ODataResponse handleODataRequest(final ODataRequest request) throws BatchDeserializerException { + public ODataResponse handleODataRequest(final ODataRequest request) throws ODataApplicationException, + ODataLibraryException { return partHandler.handleODataRequest(request); } @Override - public ODataResponsePart handleBatchRequest(final BatchRequestPart request) throws BatchDeserializerException, + public ODataResponsePart handleBatchRequest(final BatchRequestPart request) throws ODataApplicationException, ODataLibraryException { return partHandler.handleBatchRequest(request); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7ce457d8/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchHandler.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchHandler.java index bce18bb..7568f67 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchHandler.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchHandler.java @@ -20,6 +20,7 @@ package org.apache.olingo.server.core.batchhandler; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpMethod; +import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; @@ -41,7 +42,7 @@ public class BatchHandler { } public void process(final ODataRequest request, final ODataResponse response, final boolean isStrict) - throws ODataLibraryException { + throws ODataApplicationException, ODataLibraryException { validateRequest(request); final BatchFacade operation = new BatchFacadeImpl(oDataHandler, request, batchProcessor, isStrict); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7ce457d8/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchPartHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchPartHandler.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchPartHandler.java index 7c9e51a..c3cf73a 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchPartHandler.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/batchhandler/BatchPartHandler.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.server.core.batchhandler; +import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; @@ -48,7 +49,7 @@ public class BatchPartHandler { return handle(request, true); } - public ODataResponsePart handleBatchRequest(final BatchRequestPart request) throws BatchDeserializerException, + public ODataResponsePart handleBatchRequest(final BatchRequestPart request) throws ODataApplicationException, ODataLibraryException { if (request.isChangeSet()) { return handleChangeSet(request); @@ -82,7 +83,7 @@ public class BatchPartHandler { return response; } - private ODataResponsePart handleChangeSet(final BatchRequestPart request) throws BatchDeserializerException, + private ODataResponsePart handleChangeSet(final BatchRequestPart request) throws ODataApplicationException, ODataLibraryException { return batchProcessor.processChangeSet(batchFascade, request.getRequests()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7ce457d8/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java index 988f6d1..75496e3 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java @@ -39,6 +39,7 @@ import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.server.api.OData; +import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; @@ -592,7 +593,7 @@ public class MockedBatchHandlerTest { @Override public void processBatch(final BatchFacade fascade, final ODataRequest request, final ODataResponse response) - throws BatchDeserializerException, BatchSerializerException, ODataLibraryException { + throws ODataApplicationException, BatchSerializerException, ODataLibraryException { final String boundary = getBoundary(request.getHeader(HttpHeader.CONTENT_TYPE)); final BatchOptions options = BatchOptions.with().isStrict(true).rawBaseUri(BASE_URI).build(); final List<BatchRequestPart> parts = http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7ce457d8/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 8f377a6..b96ab82 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 @@ -26,12 +26,11 @@ import java.util.UUID; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpStatusCode; +import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.batch.BatchFacade; -import org.apache.olingo.server.api.batch.exception.BatchDeserializerException; -import org.apache.olingo.server.api.batch.exception.BatchSerializerException; import org.apache.olingo.server.api.deserializer.batch.BatchOptions; import org.apache.olingo.server.api.deserializer.batch.BatchRequestPart; import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart; @@ -47,7 +46,7 @@ public class TechnicalBatchProcessor extends TechnicalProcessor implements Batch @Override public void processBatch(final BatchFacade facade, final ODataRequest request, final ODataResponse response) - throws BatchSerializerException, BatchDeserializerException, ODataLibraryException { + throws ODataApplicationException, ODataLibraryException { boolean continueOnError = isContinueOnError(request); final String boundary = facade.extractBoundaryFromContentType(request.getHeader(HttpHeader.CONTENT_TYPE)); @@ -95,7 +94,7 @@ public class TechnicalBatchProcessor extends TechnicalProcessor implements Batch @Override public ODataResponsePart processChangeSet(final BatchFacade facade, final List<ODataRequest> requests) - throws BatchDeserializerException, ODataLibraryException { + throws ODataApplicationException, ODataLibraryException { List<ODataResponse> responses = new ArrayList<ODataResponse>(); for (ODataRequest request : requests) {
