Repository: olingo-odata4 Updated Branches: refs/heads/master 9825f36db -> b8187f530
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java index 2984ede..30edc5a 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataDispatcher.java @@ -30,9 +30,9 @@ import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; 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.deserializer.DeserializerException; import org.apache.olingo.server.api.processor.ActionComplexCollectionProcessor; import org.apache.olingo.server.api.processor.ActionComplexProcessor; import org.apache.olingo.server.api.processor.ActionEntityCollectionProcessor; @@ -57,7 +57,6 @@ import org.apache.olingo.server.api.processor.ReferenceCollectionProcessor; import org.apache.olingo.server.api.processor.ReferenceProcessor; import org.apache.olingo.server.api.processor.ServiceDocumentProcessor; import org.apache.olingo.server.api.serializer.RepresentationType; -import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.api.uri.UriInfo; import org.apache.olingo.server.api.uri.UriResource; import org.apache.olingo.server.api.uri.UriResourceAction; @@ -81,9 +80,8 @@ public class ODataDispatcher { this.handler = handler; } - public void dispatch(ODataRequest request, ODataResponse response) throws ODataHandlerException, - ContentNegotiatorException, SerializerException, ODataApplicationException, DeserializerException, - PreconditionRequiredException { + public void dispatch(ODataRequest request, ODataResponse response) throws ODataApplicationException, + ODataLibraryException { switch (uriInfo.getKind()) { case metadata: checkMethod(method, HttpMethod.GET); @@ -123,8 +121,7 @@ public class ODataDispatcher { } private void handleResourceDispatching(final ODataRequest request, final ODataResponse response) - throws ODataHandlerException, ContentNegotiatorException, ODataApplicationException, - SerializerException, DeserializerException, PreconditionRequiredException { + throws ODataApplicationException, ODataLibraryException { final int lastPathSegmentIndex = uriInfo.getUriResourceParts().size() - 1; final UriResource lastPathSegment = uriInfo.getUriResourceParts().get(lastPathSegmentIndex); @@ -176,9 +173,7 @@ public class ODataDispatcher { } private void handleFunctionDispatching(final ODataRequest request, final ODataResponse response, - final UriResourceFunction uriResourceFunction) - throws ODataHandlerException, ContentNegotiatorException, ODataApplicationException, - SerializerException, DeserializerException, PreconditionRequiredException { + final UriResourceFunction uriResourceFunction) throws ODataApplicationException, ODataLibraryException { EdmFunction function = uriResourceFunction.getFunction(); if (function == null) { function = uriResourceFunction.getFunctionImport().getUnboundFunctions().get(0); @@ -203,9 +198,7 @@ public class ODataDispatcher { } private void handleActionDispatching(final ODataRequest request, final ODataResponse response, - final UriResourceAction uriResourceAction) - throws ODataHandlerException, ContentNegotiatorException, ODataApplicationException, - SerializerException, DeserializerException, PreconditionRequiredException { + final UriResourceAction uriResourceAction) throws ODataApplicationException, ODataLibraryException { final EdmAction action = uriResourceAction.getAction(); if (action.isBound()) { // Only bound actions can have etag control for the binding parameter @@ -269,41 +262,39 @@ public class ODataDispatcher { } private void handleReferenceDispatching(final ODataRequest request, final ODataResponse response, - final int lastPathSegmentIndex) - throws ODataHandlerException, ContentNegotiatorException, ODataApplicationException, - SerializerException, DeserializerException { + final int lastPathSegmentIndex) throws ODataApplicationException, ODataLibraryException { final HttpMethod method = request.getMethod(); final boolean isCollection = ((UriResourcePartTyped) uriInfo.getUriResourceParts() - .get(lastPathSegmentIndex - 1)) - .isCollection(); - - if(isCollection && method == HttpMethod.GET) { + .get(lastPathSegmentIndex - 1)) + .isCollection(); + + if (isCollection && method == HttpMethod.GET) { final ContentType responseFormat = ContentNegotiator.doContentNegotiation(uriInfo.getFormatOption(), request, handler.getCustomContentTypeSupport(), RepresentationType.COLLECTION_REFERENCE); handler.selectProcessor(ReferenceCollectionProcessor.class) .readReferenceCollection(request, response, uriInfo, responseFormat); - - } else if(isCollection && method == HttpMethod.POST ) { + + } else if (isCollection && method == HttpMethod.POST) { final ContentType requestFormat = ContentType.parse(request.getHeader(HttpHeader.CONTENT_TYPE)); checkContentTypeSupport(requestFormat, RepresentationType.REFERENCE); handler.selectProcessor(ReferenceProcessor.class) .createReference(request, response, uriInfo, requestFormat); - - } else if(!isCollection && method == HttpMethod.GET) { + + } else if (!isCollection && method == HttpMethod.GET) { final ContentType responseFormat = ContentNegotiator.doContentNegotiation(uriInfo.getFormatOption(), request, handler.getCustomContentTypeSupport(), RepresentationType.REFERENCE); handler.selectProcessor(ReferenceProcessor.class).readReference(request, response, uriInfo, responseFormat); - - } else if(!isCollection && (method == HttpMethod.PUT || method == HttpMethod.PATCH)) { + + } else if (!isCollection && (method == HttpMethod.PUT || method == HttpMethod.PATCH)) { final ContentType requestFormat = ContentType.parse(request.getHeader(HttpHeader.CONTENT_TYPE)); checkContentTypeSupport(requestFormat, RepresentationType.REFERENCE); handler.selectProcessor(ReferenceProcessor.class) .updateReference(request, response, uriInfo, requestFormat); - - } else if(method == HttpMethod.DELETE) { + + } else if (method == HttpMethod.DELETE) { handler.selectProcessor(ReferenceProcessor.class) - .deleteReference(request, response, uriInfo); - + .deleteReference(request, response, uriInfo); + } else { throw new ODataHandlerException("HTTP method " + method + " is not allowed.", ODataHandlerException.MessageKeys.HTTP_METHOD_NOT_ALLOWED, method.toString()); @@ -311,9 +302,7 @@ public class ODataDispatcher { } private void handleValueDispatching(final ODataRequest request, final ODataResponse response, - final int lastPathSegmentIndex) - throws ODataHandlerException, ContentNegotiatorException, ODataApplicationException, - SerializerException, DeserializerException, PreconditionRequiredException { + final int lastPathSegmentIndex) throws ODataApplicationException, ODataLibraryException { final HttpMethod method = request.getMethod(); final UriResource resource = uriInfo.getUriResourceParts().get(lastPathSegmentIndex - 1); if (resource instanceof UriResourceProperty @@ -367,9 +356,7 @@ public class ODataDispatcher { } private void handleComplexDispatching(final ODataRequest request, final ODataResponse response, - final boolean isCollection) - throws ODataHandlerException, ContentNegotiatorException, ODataApplicationException, - SerializerException, DeserializerException { + final boolean isCollection) throws ODataApplicationException, ODataLibraryException { final HttpMethod method = request.getMethod(); final RepresentationType complexRepresentationType = isCollection ? RepresentationType.COLLECTION_COMPLEX : RepresentationType.COMPLEX; @@ -410,9 +397,7 @@ public class ODataDispatcher { } private void handlePrimitiveDispatching(final ODataRequest request, final ODataResponse response, - final boolean isCollection) - throws ODataHandlerException, ContentNegotiatorException, ODataApplicationException, - SerializerException, DeserializerException { + final boolean isCollection) throws ODataApplicationException, ODataLibraryException { final HttpMethod method = request.getMethod(); final RepresentationType representationType = isCollection ? RepresentationType.COLLECTION_PRIMITIVE : RepresentationType.PRIMITIVE; @@ -453,8 +438,7 @@ public class ODataDispatcher { } private void handleCountDispatching(final ODataRequest request, final ODataResponse response, - final int lastPathSegmentIndex) - throws ODataHandlerException, ODataApplicationException, SerializerException { + final int lastPathSegmentIndex) throws ODataApplicationException, ODataLibraryException { final HttpMethod method = request.getMethod(); if (method == HttpMethod.GET) { final UriResource resource = uriInfo.getUriResourceParts().get(lastPathSegmentIndex - 1); @@ -480,9 +464,7 @@ public class ODataDispatcher { } private void handleEntityDispatching(final ODataRequest request, final ODataResponse response, - final boolean isCollection, final boolean isMedia) - throws ODataHandlerException, ContentNegotiatorException, ODataApplicationException, - SerializerException, DeserializerException, PreconditionRequiredException { + final boolean isCollection, final boolean isMedia) throws ODataApplicationException, ODataLibraryException { final HttpMethod method = request.getMethod(); if (isCollection) { if (method == HttpMethod.GET) { @@ -535,8 +517,8 @@ public class ODataDispatcher { // If needed perform preconditions validation if (handler.getCustomETagSupport() != null) { new PreconditionsValidator(handler.getCustomETagSupport(), uriInfo, - request.getHeader(HttpHeader.IF_MATCH), - request.getHeader(HttpHeader.IF_NONE_MATCH)).validatePreconditions(isMediaValue); + request.getHeader(HttpHeader.IF_MATCH), + request.getHeader(HttpHeader.IF_NONE_MATCH)).validatePreconditions(isMediaValue); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java index f7c2fe4..e91e9e2 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java @@ -23,8 +23,8 @@ import java.util.Locale; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.server.api.ODataServerError; import org.apache.olingo.server.api.ODataApplicationException; -import org.apache.olingo.server.api.ODataTranslatedException; -import org.apache.olingo.server.api.ODataTranslatedException.ODataErrorMessage; +import org.apache.olingo.server.api.ODataLibraryException; +import org.apache.olingo.server.api.ODataLibraryException.ODataErrorMessage; import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.core.uri.parser.UriParserException; @@ -110,7 +110,7 @@ public class ODataExceptionHelper { } public static ODataServerError - createServerErrorObject(final ODataTranslatedException e, final Locale requestedLocale) { + createServerErrorObject(final ODataLibraryException e, final Locale requestedLocale) { return basicTranslatedError(e, requestedLocale); } @@ -133,7 +133,7 @@ public class ODataExceptionHelper { return new ODataServerError().setException(e).setMessage(e.getMessage()); } - private static ODataServerError basicTranslatedError(final ODataTranslatedException e, + private static ODataServerError basicTranslatedError(final ODataLibraryException e, final Locale requestedLocale) { ODataServerError serverError = basicServerError(e); ODataErrorMessage translatedMessage = e.getTranslatedMessage(requestedLocale); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java index b6468d7..b266549 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java @@ -29,6 +29,7 @@ import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.server.api.CustomETagSupport; 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; import org.apache.olingo.server.api.ODataServerError; @@ -110,8 +111,7 @@ public class ODataHandler { } private void processInternal(final ODataRequest request, final ODataResponse response) - throws ODataHandlerException, UriParserException, UriValidationException, ContentNegotiatorException, - ODataApplicationException, SerializerException, DeserializerException, PreconditionRequiredException { + throws ODataApplicationException, ODataLibraryException { validateODataVersion(request, response); uriInfo = new Parser().parseUri(request.getRawODataPath(), request.getRawQueryPath(), null, http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java index 38556fb..145bae9 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandlerException.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.core; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; /** Exception thrown during basic request handling. */ -public class ODataHandlerException extends ODataTranslatedException { +public class ODataHandlerException extends ODataLibraryException { private static final long serialVersionUID = -907752788975531134L; public static enum MessageKeys implements MessageKey { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java index 191b522..4fb6640 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java @@ -39,7 +39,7 @@ import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataHttpHandler; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.processor.Processor; import org.apache.olingo.server.api.serializer.CustomContentTypeSupport; @@ -84,8 +84,8 @@ public class ODataHttpHandlerImpl implements ODataHttpHandler { ODataServerError serverError; if (e instanceof ODataHandlerException) { serverError = ODataExceptionHelper.createServerErrorObject((ODataHandlerException) e, null); - } else if (e instanceof ODataTranslatedException) { - serverError = ODataExceptionHelper.createServerErrorObject((ODataTranslatedException) e, null); + } else if (e instanceof ODataLibraryException) { + serverError = ODataExceptionHelper.createServerErrorObject((ODataLibraryException) e, null); } else { serverError = ODataExceptionHelper.createServerErrorObject(e); } @@ -132,7 +132,7 @@ public class ODataHttpHandlerImpl implements ODataHttpHandler { private ODataRequest fillODataRequest(final ODataRequest odRequest, final HttpServletRequest httpRequest, final int split) - throws ODataTranslatedException { + throws ODataLibraryException { try { odRequest.setBody(httpRequest.getInputStream()); extractHeaders(odRequest, httpRequest); @@ -147,7 +147,7 @@ public class ODataHttpHandlerImpl implements ODataHttpHandler { } static void extractMethod(final ODataRequest odRequest, final HttpServletRequest httpRequest) - throws ODataTranslatedException { + throws ODataLibraryException { try { HttpMethod httpRequestMethod = HttpMethod.valueOf(httpRequest.getMethod()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/main/java/org/apache/olingo/server/core/PreconditionRequiredException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/PreconditionRequiredException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/PreconditionRequiredException.java index e9e1e6a..25ba117 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/PreconditionRequiredException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/PreconditionRequiredException.java @@ -18,9 +18,9 @@ */ package org.apache.olingo.server.core; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; -public class PreconditionRequiredException extends ODataTranslatedException { +public class PreconditionRequiredException extends ODataLibraryException { private static final long serialVersionUID = -8112658467394158700L; public static enum MessageKeys implements MessageKey { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/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 4a9ca4b..f54b0dd 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.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.batch.BatchFacade; @@ -43,7 +44,8 @@ public class BatchFacadeImpl implements BatchFacade { } @Override - public ODataResponsePart handleBatchRequest(final BatchRequestPart request) throws BatchDeserializerException { + public ODataResponsePart handleBatchRequest(final BatchRequestPart request) throws BatchDeserializerException, + ODataLibraryException { return partHandler.handleBatchRequest(request); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/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 6e6bc90..bce18bb 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,14 +20,13 @@ 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.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.BatchDeserializerException.MessageKeys; -import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.processor.BatchProcessor; -import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.core.ODataHandler; import org.apache.olingo.server.core.deserializer.batch.BatchParserCommon; @@ -42,7 +41,7 @@ public class BatchHandler { } public void process(final ODataRequest request, final ODataResponse response, final boolean isStrict) - throws DeserializerException, SerializerException { + throws ODataLibraryException { validateRequest(request); final BatchFacade operation = new BatchFacadeImpl(oDataHandler, request, batchProcessor, isStrict); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/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 4c7783c..7c9e51a 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.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.batch.BatchFacade; @@ -47,7 +48,8 @@ public class BatchPartHandler { return handle(request, true); } - public ODataResponsePart handleBatchRequest(final BatchRequestPart request) throws BatchDeserializerException { + public ODataResponsePart handleBatchRequest(final BatchRequestPart request) throws BatchDeserializerException, + ODataLibraryException { if (request.isChangeSet()) { return handleChangeSet(request); } else { @@ -80,7 +82,8 @@ public class BatchPartHandler { return response; } - private ODataResponsePart handleChangeSet(final BatchRequestPart request) throws BatchDeserializerException { + private ODataResponsePart handleChangeSet(final BatchRequestPart request) throws BatchDeserializerException, + ODataLibraryException { return batchProcessor.processChangeSet(batchFascade, request.getRequests()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java index ce38c8f..8623d12 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserException.java @@ -18,9 +18,9 @@ */ package org.apache.olingo.server.core.uri.parser; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; -abstract public class UriParserException extends ODataTranslatedException { +abstract public class UriParserException extends ODataLibraryException { private static final long serialVersionUID = -6438700016830955949L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java index 1546df4..5760e88 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidationException.java @@ -18,9 +18,9 @@ */ package org.apache.olingo.server.core.uri.validator; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; -public class UriValidationException extends ODataTranslatedException { +public class UriValidationException extends ODataLibraryException { private static final long serialVersionUID = -3179078078053564742L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java index 6ce4226..516fea0 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.server.api.ODataRequest; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; import org.junit.Test; public class ODataHttpHandlerImplTest { @@ -87,7 +87,7 @@ public class ODataHttpHandlerImplTest { try { ODataHttpHandlerImpl.extractMethod(odr, hr); fail(); - } catch (ODataTranslatedException e) { + } catch (ODataLibraryException e) { // expected } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java index 47e4547..2df68aa 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java @@ -25,7 +25,7 @@ import java.util.Locale; import java.util.Properties; import java.util.UUID; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.core.uri.parser.UriParserSemanticException; import org.apache.olingo.server.core.uri.parser.UriParserSyntaxException; @@ -59,26 +59,26 @@ public class TranslatedExceptionSubclassesTest { testException(UriParserSyntaxException.class, UriParserSyntaxException.MessageKeys.values()); } - private void testException(final Class<? extends ODataTranslatedException> clazz, - final ODataTranslatedException.MessageKey[] messageKeys) throws Exception { + private void testException(final Class<? extends ODataLibraryException> clazz, + final ODataLibraryException.MessageKey[] messageKeys) throws Exception { - for (ODataTranslatedException.MessageKey messageKey : messageKeys) { + for (ODataLibraryException.MessageKey messageKey : messageKeys) { String propKey = clazz.getSimpleName() + "." + messageKey.toString(); String value = properties.getProperty(propKey); Assert.assertNotNull("No value found for message key '" + propKey + "'", value); // int paraCount = countParameters(value); - Constructor<? extends ODataTranslatedException> ctor = - clazz.getConstructor(String.class, ODataTranslatedException.MessageKey.class, String[].class); + Constructor<? extends ODataLibraryException> ctor = + clazz.getConstructor(String.class, ODataLibraryException.MessageKey.class, String[].class); String[] paras = new String[paraCount]; for (int i = 0; i < paras.length; i++) { paras[i] = "470" + i; } String developerMessage = UUID.randomUUID().toString(); - ODataTranslatedException e = ctor.newInstance(developerMessage, messageKey, paras); + ODataLibraryException e = ctor.newInstance(developerMessage, messageKey, paras); try { throw e; - } catch (ODataTranslatedException translatedException) { + } catch (ODataLibraryException translatedException) { Formatter formatter = new Formatter(); String formattedValue = formatter.format(value, (Object[]) paras).toString(); formatter.close(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/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 22e71d2..988f6d1 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.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ServiceMetadata; @@ -591,7 +592,7 @@ public class MockedBatchHandlerTest { @Override public void processBatch(final BatchFacade fascade, final ODataRequest request, final ODataResponse response) - throws BatchDeserializerException, BatchSerializerException { + throws BatchDeserializerException, 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/b8187f53/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalActionProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalActionProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalActionProcessor.java index d018733..f3f85fd 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalActionProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalActionProcessor.java @@ -35,10 +35,10 @@ import org.apache.olingo.commons.api.format.ODataFormat; 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.ServiceMetadata; -import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.deserializer.DeserializerResult; import org.apache.olingo.server.api.processor.ActionComplexCollectionProcessor; import org.apache.olingo.server.api.processor.ActionComplexProcessor; @@ -51,7 +51,6 @@ import org.apache.olingo.server.api.serializer.ComplexSerializerOptions; import org.apache.olingo.server.api.serializer.EntityCollectionSerializerOptions; import org.apache.olingo.server.api.serializer.EntitySerializerOptions; import org.apache.olingo.server.api.serializer.PrimitiveSerializerOptions; -import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.api.serializer.SerializerResult; import org.apache.olingo.server.api.uri.UriInfo; import org.apache.olingo.server.api.uri.UriResourceAction; @@ -74,7 +73,7 @@ public class TechnicalActionProcessor extends TechnicalProcessor @Override public void processActionEntityCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { blockBoundActions(uriInfo); final EdmAction action = ((UriResourceAction) uriInfo.asUriInfoResource().getUriResourceParts().get(0)) .getAction(); @@ -108,7 +107,7 @@ public class TechnicalActionProcessor extends TechnicalProcessor @Override public void processActionEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { blockBoundActions(uriInfo); final EdmAction action = ((UriResourceAction) uriInfo.asUriInfoResource().getUriResourceParts().get(0)) .getAction(); @@ -151,7 +150,7 @@ public class TechnicalActionProcessor extends TechnicalProcessor @Override public void processActionPrimitiveCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { blockBoundActions(uriInfo); final EdmAction action = ((UriResourceAction) uriInfo.asUriInfoResource().getUriResourceParts().get(0)) .getAction(); @@ -187,7 +186,7 @@ public class TechnicalActionProcessor extends TechnicalProcessor @Override public void processActionPrimitive(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { blockBoundActions(uriInfo); final EdmAction action = ((UriResourceAction) uriInfo.asUriInfoResource().getUriResourceParts().get(0)) .getAction(); @@ -221,7 +220,7 @@ public class TechnicalActionProcessor extends TechnicalProcessor @Override public void processActionComplexCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { blockBoundActions(uriInfo); final EdmAction action = ((UriResourceAction) uriInfo.asUriInfoResource().getUriResourceParts().get(0)) .getAction(); @@ -257,7 +256,7 @@ public class TechnicalActionProcessor extends TechnicalProcessor @Override public void processActionComplex(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { blockBoundActions(uriInfo); final EdmAction action = ((UriResourceAction) uriInfo.asUriInfoResource().getUriResourceParts().get(0)) .getAction(); @@ -291,7 +290,7 @@ public class TechnicalActionProcessor extends TechnicalProcessor @Override public void processActionVoid(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, - final ContentType requestFormat) throws ODataApplicationException, DeserializerException { + final ContentType requestFormat) throws ODataApplicationException, ODataLibraryException { final UriResourceAction resource = ((UriResourceAction) uriInfo.getUriResourceParts().get(uriInfo.getUriResourceParts().size() - 1)); final EdmAction action = resource.getAction(); @@ -304,7 +303,7 @@ public class TechnicalActionProcessor extends TechnicalProcessor } private ContextURL getContextUrl(final EdmEntitySet entitySet, final EdmEntityType entityType, - final boolean isSingleEntity) throws SerializerException { + final boolean isSingleEntity) throws ODataLibraryException { Builder builder = ContextURL.with(); builder = entitySet == null ? isSingleEntity ? builder.type(entityType) : builder.asCollection().type(entityType) : http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/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 83e9525..8f377a6 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,6 +26,7 @@ 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.ODataLibraryException; import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.batch.BatchFacade; @@ -46,7 +47,7 @@ public class TechnicalBatchProcessor extends TechnicalProcessor implements Batch @Override public void processBatch(final BatchFacade facade, final ODataRequest request, final ODataResponse response) - throws BatchSerializerException, BatchDeserializerException { + throws BatchSerializerException, BatchDeserializerException, ODataLibraryException { boolean continueOnError = isContinueOnError(request); final String boundary = facade.extractBoundaryFromContentType(request.getHeader(HttpHeader.CONTENT_TYPE)); @@ -94,7 +95,7 @@ public class TechnicalBatchProcessor extends TechnicalProcessor implements Batch @Override public ODataResponsePart processChangeSet(final BatchFacade facade, final List<ODataRequest> requests) - throws BatchDeserializerException { + throws BatchDeserializerException, ODataLibraryException { List<ODataResponse> responses = new ArrayList<ODataResponse>(); for (ODataRequest request : requests) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java index 98b88e3..eaec6d0 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java @@ -35,10 +35,10 @@ 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.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.ServiceMetadata; -import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.deserializer.DeserializerResult; import org.apache.olingo.server.api.deserializer.ODataDeserializer; import org.apache.olingo.server.api.processor.CountEntityCollectionProcessor; @@ -49,7 +49,6 @@ import org.apache.olingo.server.api.processor.ReferenceCollectionProcessor; import org.apache.olingo.server.api.processor.ReferenceProcessor; import org.apache.olingo.server.api.serializer.EntityCollectionSerializerOptions; import org.apache.olingo.server.api.serializer.EntitySerializerOptions; -import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.api.serializer.SerializerResult; import org.apache.olingo.server.api.uri.UriInfo; import org.apache.olingo.server.api.uri.UriResource; @@ -84,7 +83,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor @Override public void readEntityCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, - final ContentType requestedContentType) throws ODataApplicationException, SerializerException { + final ContentType requestedContentType) throws ODataApplicationException, ODataLibraryException { validateOptions(uriInfo.asUriInfoResource()); readEntityCollection(request, response, uriInfo, requestedContentType, false); @@ -92,13 +91,12 @@ public class TechnicalEntityProcessor extends TechnicalProcessor @Override public void countEntityCollection(final ODataRequest request, final ODataResponse response, final UriInfo - uriInfo) - throws ODataApplicationException, SerializerException { + uriInfo) throws ODataApplicationException, ODataLibraryException { validateOptions(uriInfo.asUriInfoResource()); final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo); // including checks final EntityCollection entitySetInitial = readEntityCollection(uriInfo); EntityCollection entitySet = new EntityCollection(); - + entitySet.getEntities().addAll(entitySetInitial.getEntities()); FilterHandler.applyFilterSystemQuery(uriInfo.getFilterOption(), entitySet, edmEntitySet); response.setContent(odata.createFixedFormatSerializer().count( @@ -109,7 +107,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor @Override public void readEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, - final ContentType requestedContentType) throws ODataApplicationException, SerializerException { + final ContentType requestedContentType) throws ODataApplicationException, ODataLibraryException { validateOptions(uriInfo.asUriInfoResource()); readEntity(request, response, uriInfo, requestedContentType, false); @@ -117,10 +115,10 @@ public class TechnicalEntityProcessor extends TechnicalProcessor @Override public void readMediaEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, - final ContentType responseFormat) throws ODataApplicationException, SerializerException { + final ContentType responseFormat) throws ODataApplicationException, ODataLibraryException { getEdmEntitySet(uriInfo); // including checks final Entity entity = readEntity(uriInfo); - + response.setContent(odata.createFixedFormatSerializer().binary(dataProvider.readMedia(entity))); response.setStatusCode(HttpStatusCode.OK.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, entity.getMediaContentType()); @@ -132,14 +130,14 @@ public class TechnicalEntityProcessor extends TechnicalProcessor @Override public void createMediaEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { createEntity(request, response, uriInfo, requestFormat, responseFormat); } @Override public void createEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { if (uriInfo.asUriInfoResource().getUriResourceParts().size() > 1) { throw new ODataApplicationException("Invalid resource type.", HttpStatusCode.NOT_IMPLEMENTED.getStatusCode(), Locale.ROOT); @@ -184,7 +182,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor @Override public void updateEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo); final EdmEntityType edmEntityType = edmEntitySet.getEntityType(); @@ -229,7 +227,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor @Override public void updateMediaEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo); final EdmEntityType edmEntityType = edmEntitySet.getEntityType(); @@ -267,15 +265,15 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } @Override - public void readReference(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, - final ContentType requestedContentType) throws ODataApplicationException, SerializerException { + public void readReference(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + final ContentType requestedContentType) throws ODataApplicationException, ODataLibraryException { readEntity(request, response, uriInfo, requestedContentType, true); } @Override public void createReference(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, - final ContentType requestFormat) throws ODataApplicationException, DeserializerException { - + final ContentType requestFormat) throws ODataApplicationException, ODataLibraryException { + final ODataDeserializer deserializer = odata.createDeserializer(ODataFormat.fromContentType(requestFormat)); final DeserializerResult references = deserializer.entityReferences(request.getBody()); @@ -283,18 +281,18 @@ public class TechnicalEntityProcessor extends TechnicalProcessor throw new ODataApplicationException("A post request to a collection navigation property must " + "contain a single entity reference", HttpStatusCode.BAD_REQUEST.getStatusCode(), Locale.ROOT); } - + final Entity entity = readEntity(uriInfo, true); final UriResourceNavigation navigationProperty = getLastNavigation(uriInfo); - dataProvider.createReference(entity, navigationProperty.getProperty(), references.getEntityReferences().get(0), + dataProvider.createReference(entity, navigationProperty.getProperty(), references.getEntityReferences().get(0), request.getRawBaseUri()); - + response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode()); } - + @Override - public void updateReference(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, - final ContentType requestFormat) throws ODataApplicationException, DeserializerException { + public void updateReference(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, + final ContentType requestFormat) throws ODataApplicationException, ODataLibraryException { final ODataDeserializer deserializer = odata.createDeserializer(ODataFormat.fromContentType(requestFormat)); final DeserializerResult references = deserializer.entityReferences(request.getBody()); @@ -303,50 +301,50 @@ public class TechnicalEntityProcessor extends TechnicalProcessor throw new ODataApplicationException("A post request to a collection navigation property must " + "contain a single entity reference", HttpStatusCode.BAD_REQUEST.getStatusCode(), Locale.ROOT); } - + final Entity entity = readEntity(uriInfo, true); final UriResourceNavigation navigationProperty = getLastNavigation(uriInfo); - dataProvider.createReference(entity, navigationProperty.getProperty(), references.getEntityReferences().get(0), + dataProvider.createReference(entity, navigationProperty.getProperty(), references.getEntityReferences().get(0), request.getRawBaseUri()); - + response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode()); } - + @Override - public void deleteReference(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) + public void deleteReference(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) throws ODataApplicationException { final UriResourceNavigation lastNavigation = getLastNavigation(uriInfo); final IdOption idOption = uriInfo.getIdOption(); - - if(lastNavigation.isCollection() && idOption == null) { - throw new ODataApplicationException("Id system query option must be provided", - HttpStatusCode.BAD_REQUEST.getStatusCode(), + + if (lastNavigation.isCollection() && idOption == null) { + throw new ODataApplicationException("Id system query option must be provided", + HttpStatusCode.BAD_REQUEST.getStatusCode(), Locale.ROOT); - } else if(!lastNavigation.isCollection() && idOption != null) { - throw new ODataApplicationException("Id system query option must not be provided", - HttpStatusCode.BAD_REQUEST.getStatusCode(), + } else if (!lastNavigation.isCollection() && idOption != null) { + throw new ODataApplicationException("Id system query option must not be provided", + HttpStatusCode.BAD_REQUEST.getStatusCode(), Locale.ROOT); } - + final Entity entity = readEntity(uriInfo, true); - dataProvider.deleteReference(entity, - lastNavigation.getProperty(), - (uriInfo.getIdOption() != null) ? uriInfo.getIdOption().getValue() : null, - request.getRawBaseUri()); - + dataProvider.deleteReference(entity, + lastNavigation.getProperty(), + (uriInfo.getIdOption() != null) ? uriInfo.getIdOption().getValue() : null, + request.getRawBaseUri()); + response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode()); } @Override - public void readReferenceCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, - final ContentType requestedContentType) throws ODataApplicationException, SerializerException { + public void readReferenceCollection(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, + final ContentType requestedContentType) throws ODataApplicationException, ODataLibraryException { readEntityCollection(request, response, uriInfo, requestedContentType, true); } - private void readEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, + private void readEntity(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestedContentType, final boolean isReference) - throws ODataApplicationException, SerializerException { + throws ODataApplicationException, ODataLibraryException { final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo); final EdmEntityType edmEntityType = edmEntitySet == null ? (EdmEntityType) ((UriResourceFunction) uriInfo.getUriResourceParts() @@ -378,10 +376,10 @@ public class TechnicalEntityProcessor extends TechnicalProcessor response.setStatusCode(HttpStatusCode.OK.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString()); } - - private void readEntityCollection(final ODataRequest request, final ODataResponse response, - final UriInfo uriInfo, final ContentType requestedContentType, final boolean isReference) - throws ODataApplicationException, SerializerException { + + private void readEntityCollection(final ODataRequest request, final ODataResponse response, + final UriInfo uriInfo, final ContentType requestedContentType, final boolean isReference) + throws ODataApplicationException, ODataLibraryException { final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource()); final EdmEntityType edmEntityType = edmEntitySet == null ? (EdmEntityType) ((UriResourceFunction) uriInfo.getUriResourceParts() @@ -390,10 +388,10 @@ public class TechnicalEntityProcessor extends TechnicalProcessor EntityCollection entitySetInitial = readEntityCollection(uriInfo); - if(entitySetInitial == null) { + if (entitySetInitial == null) { entitySetInitial = new EntityCollection(); } - + // Modifying the original entitySet means modifying the "database", so we have to make a shallow // copy of the entity set (new EntitySet, but exactly the same data) EntityCollection entitySet = new EntityCollection(); @@ -427,20 +425,20 @@ public class TechnicalEntityProcessor extends TechnicalProcessor final CountOption countOption = uriInfo.getCountOption(); // Serialize - final SerializerResult serializerResult = (isReference) ? + final SerializerResult serializerResult = (isReference) ? serializeReferenceCollection(entitySetSerialization, edmEntitySet, format) : serializeEntityCollection(entitySetSerialization, edmEntitySet, edmEntityType, format, expand, select, countOption); - + response.setContent(serializerResult.getContent()); response.setStatusCode(HttpStatusCode.OK.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString()); } - private SerializerResult serializeEntityCollection(final EntityCollection entityCollection, - final EdmEntitySet edmEntitySet, final EdmEntityType edmEntityType, final ODataFormat format, - final ExpandOption expand, final SelectOption select, final CountOption countOption) - throws SerializerException { + private SerializerResult serializeEntityCollection(final EntityCollection entityCollection, + final EdmEntitySet edmEntitySet, final EdmEntityType edmEntityType, final ODataFormat format, + final ExpandOption expand, final SelectOption select, final CountOption countOption) + throws ODataLibraryException { return odata.createSerializer(format).entityCollection( serviceMetadata, edmEntityType, @@ -453,15 +451,15 @@ public class TechnicalEntityProcessor extends TechnicalProcessor .build()); } - private SerializerResult serializeReferenceCollection(final EntityCollection entityCollection, - final EdmEntitySet edmEntitySet, final ODataFormat format) throws SerializerException { + private SerializerResult serializeReferenceCollection(final EntityCollection entityCollection, + final EdmEntitySet edmEntitySet, final ODataFormat format) throws ODataLibraryException { return odata.createSerializer(format) .referenceCollection(serviceMetadata, edmEntitySet, entityCollection, ContextURL.with().asCollection().suffix(Suffix.REFERENCE).build()); } - private SerializerResult serializeReference(final Entity entity, final EdmEntitySet edmEntitySet, - final ODataFormat format ) throws SerializerException { + private SerializerResult serializeReference(final Entity entity, final EdmEntitySet edmEntitySet, + final ODataFormat format) throws ODataLibraryException { return odata.createSerializer(format) .reference(serviceMetadata, edmEntitySet, entity, ContextURL.with().suffix(Suffix.REFERENCE).build()); @@ -469,7 +467,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor private SerializerResult serializeEntity(final Entity entity, final EdmEntitySet edmEntitySet, final EdmEntityType edmEntityType, final ODataFormat format, - final ExpandOption expand, final SelectOption select) throws SerializerException { + final ExpandOption expand, final SelectOption select) throws ODataLibraryException { return odata.createSerializer(format).entity( serviceMetadata, edmEntityType, @@ -482,7 +480,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor } private ContextURL getContextUrl(final EdmEntitySet entitySet, final EdmEntityType entityType, - final boolean isSingleEntity, final ExpandOption expand, final SelectOption select) throws SerializerException { + final boolean isSingleEntity, final ExpandOption expand, final SelectOption select) throws ODataLibraryException { Builder builder = ContextURL.with(); builder = entitySet == null ? isSingleEntity ? builder.type(entityType) : builder.asCollection().type(entityType) : http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java index fd9920c..4ba7081 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java @@ -42,10 +42,10 @@ 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.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.ServiceMetadata; -import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.processor.ComplexCollectionProcessor; import org.apache.olingo.server.api.processor.ComplexProcessor; import org.apache.olingo.server.api.processor.PrimitiveCollectionProcessor; @@ -57,7 +57,6 @@ import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.PrimitiveSerializerOptions; import org.apache.olingo.server.api.serializer.PrimitiveValueSerializerOptions; import org.apache.olingo.server.api.serializer.RepresentationType; -import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.api.serializer.SerializerResult; import org.apache.olingo.server.api.uri.UriHelper; import org.apache.olingo.server.api.uri.UriInfo; @@ -84,83 +83,83 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor @Override public void readPrimitive(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, - final ContentType contentType) throws ODataApplicationException, SerializerException { + final ContentType contentType) throws ODataApplicationException, ODataLibraryException { readProperty(request, response, uriInfo, contentType, RepresentationType.PRIMITIVE); } @Override public void updatePrimitive(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { updateProperty(request, response, uriInfo, requestFormat, responseFormat, RepresentationType.PRIMITIVE); } @Override public void deletePrimitive(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) - throws ODataApplicationException { + throws ODataApplicationException, ODataLibraryException { deleteProperty(request, response, uriInfo); } @Override public void readPrimitiveCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, - final ContentType contentType) throws ODataApplicationException, SerializerException { + final ContentType contentType) throws ODataApplicationException, ODataLibraryException { readProperty(request, response, uriInfo, contentType, RepresentationType.COLLECTION_PRIMITIVE); } @Override public void updatePrimitiveCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { updateProperty(request, response, uriInfo, requestFormat, responseFormat, RepresentationType.COLLECTION_PRIMITIVE); } @Override public void deletePrimitiveCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) - throws ODataApplicationException { + throws ODataApplicationException, ODataLibraryException { deleteProperty(request, response, uriInfo); } @Override public void readComplex(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, - final ContentType contentType) throws ODataApplicationException, SerializerException { + final ContentType contentType) throws ODataApplicationException, ODataLibraryException { readProperty(request, response, uriInfo, contentType, RepresentationType.COMPLEX); } @Override public void updateComplex(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { updateProperty(request, response, uriInfo, requestFormat, responseFormat, RepresentationType.COMPLEX); } @Override public void deleteComplex(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) - throws ODataApplicationException { + throws ODataApplicationException, ODataLibraryException { deleteProperty(request, response, uriInfo); } @Override public void readComplexCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, - final ContentType contentType) throws ODataApplicationException, SerializerException { + final ContentType contentType) throws ODataApplicationException, ODataLibraryException { readProperty(request, response, uriInfo, contentType, RepresentationType.COLLECTION_COMPLEX); } @Override public void updateComplexCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { updateProperty(request, response, uriInfo, requestFormat, responseFormat, RepresentationType.COLLECTION_COMPLEX); } @Override public void deleteComplexCollection(final ODataRequest request, ODataResponse response, final UriInfo uriInfo) - throws ODataApplicationException { + throws ODataApplicationException, ODataLibraryException { deleteProperty(request, response, uriInfo); } private void readProperty(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType contentType, final RepresentationType representationType) - throws ODataApplicationException, SerializerException { + throws ODataApplicationException, ODataLibraryException { final UriInfoResource resource = uriInfo.asUriInfoResource(); validateOptions(resource); validatePath(resource); @@ -214,7 +213,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor private void updateProperty(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType requestFormat, final ContentType responseFormat, final RepresentationType representationType) - throws ODataApplicationException, DeserializerException, SerializerException { + throws ODataApplicationException, ODataLibraryException { final UriInfoResource resource = uriInfo.asUriInfoResource(); validatePath(resource); final EdmEntitySet edmEntitySet = getEdmEntitySet(resource); @@ -323,7 +322,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor final List<String> path, final Property property, final EdmProperty edmProperty, final EdmType type, final EdmReturnType returnType, final RepresentationType representationType, final ODataFormat format, - final ExpandOption expand, final SelectOption select) throws SerializerException { + final ExpandOption expand, final SelectOption select) throws ODataLibraryException { ODataSerializer serializer = odata.createSerializer(format); final ContextURL contextURL = format == ODataFormat.JSON_NO_METADATA ? null : getContextUrl(edmEntitySet, entity, path, type, representationType, expand, select); @@ -369,7 +368,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor private ContextURL getContextUrl(final EdmEntitySet entitySet, final Entity entity, final List<String> path, final EdmType type, final RepresentationType representationType, - final ExpandOption expand, final SelectOption select) throws SerializerException { + final ExpandOption expand, final SelectOption select) throws ODataLibraryException { final UriHelper helper = odata.createUriHelper(); Builder builder = ContextURL.with(); builder = entitySet == null ? @@ -387,7 +386,7 @@ public class TechnicalPrimitiveComplexProcessor extends TechnicalProcessor @Override public void readPrimitiveValue(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, - final ContentType contentType) throws ODataApplicationException, SerializerException { + final ContentType contentType) throws ODataApplicationException, ODataLibraryException { final UriInfoResource resource = uriInfo.asUriInfoResource(); validateOptions(resource); validatePath(resource); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestUriValidator.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestUriValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestUriValidator.java index 8614380..0eb0378 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestUriValidator.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestUriValidator.java @@ -28,7 +28,7 @@ import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.uri.UriInfo; import org.apache.olingo.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.queryoption.CustomQueryOption; @@ -49,7 +49,7 @@ public class TestUriValidator implements TestValidator { private Edm edm; private UriInfo uriInfo; - private ODataTranslatedException exception; + private ODataLibraryException exception; // Setup public TestUriValidator setEdm(final Edm edm) {
