http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-api/src/test/java/org/apache/olingo/server/api/TranslatedExceptionsTest.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/test/java/org/apache/olingo/server/api/TranslatedExceptionsTest.java b/lib/server-api/src/test/java/org/apache/olingo/server/api/TranslatedExceptionsTest.java index 5fc2110..e349ef5 100644 --- a/lib/server-api/src/test/java/org/apache/olingo/server/api/TranslatedExceptionsTest.java +++ b/lib/server-api/src/test/java/org/apache/olingo/server/api/TranslatedExceptionsTest.java @@ -25,14 +25,14 @@ import static org.junit.Assert.assertThat; import java.util.Locale; -import org.apache.olingo.server.api.ODataTranslatedException.ODataErrorMessage; +import org.apache.olingo.server.api.ODataLibraryException.ODataErrorMessage; import org.junit.Test; public class TranslatedExceptionsTest { private static final String DEV = "devMessage"; - private static class TestException extends ODataTranslatedException { + private static class TestException extends ODataLibraryException { private static final long serialVersionUID = -7199975861656921724L; public static enum Keys implements MessageKey {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/OData4HttpHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/OData4HttpHandler.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/OData4HttpHandler.java index ddb8e6b..6392414 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/OData4HttpHandler.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/OData4HttpHandler.java @@ -28,7 +28,7 @@ import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.server.api.OData; 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; @@ -74,7 +74,7 @@ public class OData4HttpHandler extends ODataHttpHandlerImpl { ODataRequest createODataRequest(final HttpServletRequest httpRequest, final int split) - throws ODataTranslatedException { + throws ODataLibraryException { try { ODataRequest odRequest = new ODataRequest(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java index 55ebcfc..17ec358 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceDispatcher.java @@ -28,7 +28,7 @@ import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.serializer.CustomContentTypeSupport; import org.apache.olingo.server.api.uri.UriInfo; @@ -74,7 +74,7 @@ public class ServiceDispatcher extends RequestURLHierarchyVisitor { } public void execute(ODataRequest odRequest, ODataResponse odResponse) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { UriInfo uriInfo = new Parser().parseUri(odRequest.getRawODataPath(), odRequest.getRawQueryPath(), null, this.metadata.getEdm()); @@ -93,7 +93,7 @@ public class ServiceDispatcher extends RequestURLHierarchyVisitor { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { handler.anyUnsupported(getODataRequest(), response); } }; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceHandler.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceHandler.java index 2e84b40..a7753ec 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceHandler.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceHandler.java @@ -28,7 +28,7 @@ import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.server.api.ODataApplicationException; 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.processor.Processor; import org.apache.olingo.server.core.requests.ActionRequest; import org.apache.olingo.server.core.requests.DataRequest; @@ -50,43 +50,43 @@ public interface ServiceHandler extends Processor { * Read CSDL document of the Service * @param request * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void readMetadata(MetadataRequest request, MetadataResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Read ServiceDocument of the service * @param request * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void readServiceDocument(ServiceDocumentRequest request, ServiceDocumentResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Read operation for EntitySets, Entities, Properties, Media etc. Based on the type of request * the response object is different. Even the navigation based queries are handled by this method. * @param request * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ <T extends ServiceResponse> void read(DataRequest request, T response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Create new entity in the service based on the entity object provided * @param request * @param entity * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void createEntity(DataRequest request, Entity entity, EntityResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Update the entity object. @@ -95,22 +95,22 @@ public interface ServiceHandler extends Processor { * @param merge - true if merge operation, false it needs to be replaced * @param entityETag - previous entity tag if provided by the user. "*" means allow. * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void updateEntity(DataRequest request, Entity entity, boolean merge, String entityETag, - EntityResponse response) throws ODataTranslatedException, ODataApplicationException; + EntityResponse response) throws ODataLibraryException, ODataApplicationException; /** * Delete the Entity * @param request * @param entityETag - entity tag to match, if provided by the user. "*" means allow * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void deleteEntity(DataRequest request, String entityETag, EntityResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Update a non-media/stream property.if the value of property NULL, it should be treated as @@ -120,11 +120,11 @@ public interface ServiceHandler extends Processor { * @param merge - if the property is complex, true here means merge, false is replace * @param entityETag - entity tag to match before update operation, "*" allows all. * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void updateProperty(DataRequest request, Property property, boolean merge, String entityETag, - PropertyResponse response) throws ODataTranslatedException, ODataApplicationException; + PropertyResponse response) throws ODataLibraryException, ODataApplicationException; /** * Update Stream property, if StreamContent is null, it should treated as delete request @@ -132,43 +132,43 @@ public interface ServiceHandler extends Processor { * @param entityETag - entity tag to match before update operation, "*" allows all. * @param streamContent - updated stream content * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void upsertStreamProperty(DataRequest request, String entityETag, InputStream streamContent, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException; + NoContentResponse response) throws ODataLibraryException, ODataApplicationException; /** * Invocation of a Function. The response object will be based on metadata defined for service * @param request * @param method * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ <T extends ServiceResponse> void invoke(FunctionRequest request, HttpMethod method, T response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Invocation of a Function. The response object will be based on metadata defined for service * @param request * @param eTag * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ <T extends ServiceResponse> void invoke(ActionRequest request, String eTag, T response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Read media stream content of a Entity * @param request * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void readMediaStream(MediaRequest request, StreamResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Update of Media Stream Content of a Entity. If the mediaContent is null it should be treated @@ -177,21 +177,21 @@ public interface ServiceHandler extends Processor { * @param entityETag - entity etag to match before update operation, "*" allows all. * @param mediaContent - if null, must be treated as delete request * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void upsertMediaStream(MediaRequest request, String entityETag, InputStream mediaContent, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException; + NoContentResponse response) throws ODataLibraryException, ODataApplicationException; /** * Any Unsupported one will be directed here. * @param request * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void anyUnsupported(ODataRequest request, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Add references (relationships) to Entity. This is always on collection valued navigation property @@ -199,11 +199,11 @@ public interface ServiceHandler extends Processor { * @param entityETag - entity etag to match before add operation, "*" allows all. * @param referenceId - references to add * @param response - return always should be 204 - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void addReference(DataRequest request, String entityETag, URI referenceId, NoContentResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Update references (relationships) in an Entity; This is always against single valued navigation property @@ -211,11 +211,11 @@ public interface ServiceHandler extends Processor { * @param entityETag * @param referenceId * @param response - always should be 204 - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void updateReference(DataRequest request, String entityETag, URI referenceId, NoContentResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * Delete references (relationships) in an Entity @@ -224,47 +224,47 @@ public interface ServiceHandler extends Processor { * navigation property, this will be null. * @param entityETag * @param response - always should be 204 - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void deleteReference(DataRequest request, URI deleteId, String entityETag, NoContentResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; /** * During a batch operation, this method starts the transaction (if any) before any operation is handled * by the service. No nested transactions. * @return must return a unique transaction id that references a atomic operation. - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ - String startTransaction() throws ODataTranslatedException, ODataApplicationException;; + String startTransaction() throws ODataLibraryException, ODataApplicationException;; /** * When a batch operation is complete and all the intermediate service requests are successful, then * commit is called with transaction id returned in the startTransaction method. * @param txnId - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ - void commit(String txnId) throws ODataTranslatedException, ODataApplicationException;; + void commit(String txnId) throws ODataLibraryException, ODataApplicationException;; /** * When a batch operation is in-complete due to an error in the middle of changeset, then rollback is * called with transaction id, that returned from startTransaction method. * @param txnId - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ - void rollback(String txnId) throws ODataTranslatedException, ODataApplicationException;; + void rollback(String txnId) throws ODataLibraryException, ODataApplicationException;; /** * This is not complete, more URL parsing changes required. Cross join between two entities. * @param dataRequest * @param entitySetNames * @param response - * @throws ODataTranslatedException + * @throws ODataLibraryException * @throws ODataApplicationException */ void crossJoin(DataRequest dataRequest, List<String> entitySetNames, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java index 13ec05f..53db4c8 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java @@ -35,7 +35,7 @@ import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.serializer.ComplexSerializerOptions; import org.apache.olingo.server.api.serializer.CustomContentTypeSupport; @@ -105,7 +105,7 @@ public abstract class ServiceRequest { } public abstract void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; public abstract ContentType getResponseContentType() throws ContentNegotiatorException; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/legacy/ProcessorServiceHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/legacy/ProcessorServiceHandler.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/legacy/ProcessorServiceHandler.java index 3a2c144..acbc8c0 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/legacy/ProcessorServiceHandler.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/legacy/ProcessorServiceHandler.java @@ -31,7 +31,7 @@ import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.ComplexCollectionProcessor; import org.apache.olingo.server.api.processor.ComplexProcessor; @@ -97,24 +97,24 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void readMetadata(MetadataRequest request, MetadataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { selectProcessor(MetadataProcessor.class).readMetadata(request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); } @Override public void readServiceDocument(ServiceDocumentRequest request, ServiceDocumentResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { selectProcessor(ServiceDocumentProcessor.class).readServiceDocument(request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); } @Override public <T extends ServiceResponse> void read(final DataRequest request, final T response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { response.accepts(new ServiceResponseVisior() { @Override - public void visit(CountResponse response) throws ODataTranslatedException, ODataApplicationException { + public void visit(CountResponse response) throws ODataLibraryException, ODataApplicationException { if (request.getUriResourceProperty() != null) { EdmProperty edmProperty = request.getUriResourceProperty().getProperty(); if (edmProperty.isPrimitive()) { @@ -131,14 +131,14 @@ public class ProcessorServiceHandler implements ServiceHandler { } @Override - public void visit(EntityResponse response) throws ODataTranslatedException, + public void visit(EntityResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(EntityProcessor.class).readEntity(request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); } @Override - public void visit(PrimitiveValueResponse response) throws ODataTranslatedException, + public void visit(PrimitiveValueResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(PrimitiveValueProcessor.class).readPrimitiveValue( request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), @@ -146,7 +146,7 @@ public class ProcessorServiceHandler implements ServiceHandler { } @Override - public void visit(PropertyResponse response) throws ODataTranslatedException, + public void visit(PropertyResponse response) throws ODataLibraryException, ODataApplicationException { EdmProperty edmProperty = request.getUriResourceProperty().getProperty(); if (edmProperty.isPrimitive()) { @@ -176,13 +176,13 @@ public class ProcessorServiceHandler implements ServiceHandler { } @Override - public void visit(StreamResponse response) throws ODataTranslatedException, + public void visit(StreamResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } @Override - public void visit(EntitySetResponse response) throws ODataTranslatedException, + public void visit(EntitySetResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(EntityCollectionProcessor.class).readEntityCollection(request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); @@ -192,7 +192,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void createEntity(DataRequest request, Entity entity, EntityResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { if (request.getEntitySet().getEntityType().hasStream()) { selectProcessor(MediaEntityProcessor.class).createMediaEntity( request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), @@ -206,7 +206,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void updateEntity(DataRequest request, Entity entity, boolean merge, String entityETag, - EntityResponse response) throws ODataTranslatedException, ODataApplicationException { + EntityResponse response) throws ODataLibraryException, ODataApplicationException { if (request.getEntitySet().getEntityType().hasStream()) { selectProcessor(MediaEntityProcessor.class).updateMediaEntity( request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), @@ -220,14 +220,14 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void deleteEntity(DataRequest request, String entityETag, EntityResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { selectProcessor(EntityProcessor.class).deleteEntity(request.getODataRequest(), response.getODataResponse(), request.getUriInfo()); } @Override public void updateProperty(DataRequest request, Property property, boolean merge, - String entityETag, PropertyResponse response) throws ODataTranslatedException, + String entityETag, PropertyResponse response) throws ODataLibraryException, ODataApplicationException { if (property.isPrimitive()) { if (property.isCollection()) { @@ -254,7 +254,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void upsertStreamProperty(DataRequest request, String entityETag, - InputStream streamContent, NoContentResponse response) throws ODataTranslatedException, + InputStream streamContent, NoContentResponse response) throws ODataLibraryException, ODataApplicationException { throw new ODataHandlerException("not implemented", ODataHandlerException.MessageKeys.FUNCTIONALITY_NOT_IMPLEMENTED); @@ -262,7 +262,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public <T extends ServiceResponse> void invoke(final FunctionRequest request, HttpMethod method, - final T response) throws ODataTranslatedException, ODataApplicationException { + final T response) throws ODataLibraryException, ODataApplicationException { if (method != HttpMethod.GET) { throw new ODataHandlerException("HTTP method " + method + " is not allowed.", ODataHandlerException.MessageKeys.HTTP_METHOD_NOT_ALLOWED, method.toString()); @@ -270,14 +270,14 @@ public class ProcessorServiceHandler implements ServiceHandler { response.accepts(new ServiceResponseVisior() { @Override - public void visit(EntityResponse response) throws ODataTranslatedException, + public void visit(EntityResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(EntityProcessor.class).readEntity(request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); } @Override - public void visit(PropertyResponse response) throws ODataTranslatedException, + public void visit(PropertyResponse response) throws ODataLibraryException, ODataApplicationException { if (request.isReturnTypePrimitive()) { if(request.isCollection()) { @@ -304,7 +304,7 @@ public class ProcessorServiceHandler implements ServiceHandler { } } @Override - public void visit(EntitySetResponse response) throws ODataTranslatedException, + public void visit(EntitySetResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(EntityCollectionProcessor.class).readEntityCollection(request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); @@ -314,7 +314,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public <T extends ServiceResponse> void invoke(final ActionRequest request, String eTag, final T response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { final HttpMethod method = request.getODataRequest().getMethod(); if (method != HttpMethod.POST) { throw new ODataHandlerException("HTTP method " + method + " is not allowed.", @@ -322,14 +322,14 @@ public class ProcessorServiceHandler implements ServiceHandler { } response.accepts(new ServiceResponseVisior() { @Override - public void visit(EntityResponse response) throws ODataTranslatedException, + public void visit(EntityResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(EntityProcessor.class).readEntity(request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); } @Override - public void visit(PropertyResponse response) throws ODataTranslatedException, + public void visit(PropertyResponse response) throws ODataLibraryException, ODataApplicationException { if (request.isReturnTypePrimitive()) { if(request.isCollection()) { @@ -356,7 +356,7 @@ public class ProcessorServiceHandler implements ServiceHandler { } } @Override - public void visit(EntitySetResponse response) throws ODataTranslatedException, + public void visit(EntitySetResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(EntityCollectionProcessor.class).readEntityCollection(request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); @@ -367,7 +367,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void readMediaStream(MediaRequest request, StreamResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { selectProcessor(MediaEntityProcessor.class).readMediaEntity( request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); @@ -375,7 +375,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void upsertMediaStream(MediaRequest request, String entityETag, InputStream mediaContent, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException { + NoContentResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(MediaEntityProcessor.class).updateMediaEntity( request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getRequestContentType(), request.getResponseContentType()); @@ -383,14 +383,14 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void anyUnsupported(ODataRequest request, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { throw new ODataHandlerException("not implemented", ODataHandlerException.MessageKeys.FUNCTIONALITY_NOT_IMPLEMENTED); } @Override public void addReference(DataRequest request, String entityETag, URI referenceId, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException { + NoContentResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(ReferenceProcessor.class).createReference( request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); @@ -398,7 +398,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void updateReference(DataRequest request, String entityETag, URI referenceId, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException { + NoContentResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(ReferenceProcessor.class).updateReference( request.getODataRequest(), response.getODataResponse(), request.getUriInfo(), request.getResponseContentType()); @@ -406,7 +406,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void deleteReference(DataRequest request, URI deleteId, String entityETag, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException { + NoContentResponse response) throws ODataLibraryException, ODataApplicationException { selectProcessor(ReferenceProcessor.class).deleteReference( request.getODataRequest(), response.getODataResponse(), request.getUriInfo()); } @@ -426,7 +426,7 @@ public class ProcessorServiceHandler implements ServiceHandler { @Override public void crossJoin(DataRequest dataRequest, List<String> entitySetNames, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { throw new ODataHandlerException("not implemented", ODataHandlerException.MessageKeys.FUNCTIONALITY_NOT_IMPLEMENTED); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java index a8bcd37..bef9da0 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ActionRequest.java @@ -27,7 +27,7 @@ import org.apache.olingo.commons.api.edm.EdmReturnType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.serializer.PrimitiveSerializerOptions; import org.apache.olingo.server.api.uri.UriResourceAction; @@ -47,7 +47,7 @@ public class ActionRequest extends OperationRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { if (!allowedMethod()) { methodNotAllowed(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/BatchRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/BatchRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/BatchRequest.java index 0547775..a38f9d8 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/BatchRequest.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/BatchRequest.java @@ -31,7 +31,7 @@ import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.batch.exception.BatchDeserializerException; import org.apache.olingo.server.api.deserializer.batch.BatchOptions; @@ -56,7 +56,7 @@ public class BatchRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { if (!allowedMethod()) { methodNotAllowed(); @@ -85,7 +85,7 @@ public class BatchRequest extends ServiceRequest { handler.rollback(txnId); } handler.commit(txnId); - } catch(ODataTranslatedException e) { + } catch(ODataLibraryException e) { if (txnId != null) { handler.rollback(txnId); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java index 98daf7a..c92af8a 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java @@ -48,7 +48,7 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmStream; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.deserializer.DeserializerException; import org.apache.olingo.server.api.deserializer.DeserializerException.MessageKeys; @@ -104,7 +104,7 @@ public class DataRequest extends ServiceRequest { public ContextURL getContextURL(OData odata) throws SerializerException; public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException; + throws ODataLibraryException, ODataApplicationException; } public DataRequest(OData odata, ServiceMetadata serviceMetadata) { @@ -234,7 +234,7 @@ public class DataRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { if (!this.type.allowedMethod()) { methodNotAllowed(); @@ -290,7 +290,7 @@ public class DataRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { EntityResponse entityResponse = EntityResponse.getInstance(DataRequest.this, getContextURL(odata), false, response); @@ -364,7 +364,7 @@ public class DataRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { handler.read(DataRequest.this, CountResponse.getInstance(DataRequest.this, response)); } @@ -417,7 +417,7 @@ public class DataRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { if (isGET()) { if (isCollection()) { handler.read(DataRequest.this, @@ -513,7 +513,7 @@ public class DataRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { EdmProperty edmProperty = getUriResourceProperty().getProperty(); @@ -608,7 +608,7 @@ public class DataRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { EdmProperty edmProperty = getUriResourceProperty().getProperty(); if (isGET()) { handler.read(DataRequest.this, PrimitiveValueResponse.getInstance(DataRequest.this, @@ -661,7 +661,7 @@ public class DataRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { handler.read(DataRequest.this, EntityResponse.getInstance(DataRequest.this, getContextURL(odata), false, response)); } @@ -687,7 +687,7 @@ public class DataRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { handler.crossJoin(DataRequest.this, this.entitySetNames, response); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java index ad3cd2f..94275ca 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/FunctionRequest.java @@ -27,7 +27,7 @@ import org.apache.olingo.commons.api.edm.EdmReturnType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.serializer.PrimitiveSerializerOptions; import org.apache.olingo.server.api.uri.UriParameter; @@ -47,7 +47,7 @@ public class FunctionRequest extends OperationRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { if (!allowedMethod()) { methodNotAllowed(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MediaRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MediaRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MediaRequest.java index a4a333a..b5626b5 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MediaRequest.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MediaRequest.java @@ -27,7 +27,7 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.uri.UriParameter; import org.apache.olingo.server.api.uri.UriResourceEntitySet; @@ -46,7 +46,7 @@ public class MediaRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { if (!allowedMethod()) { methodNotAllowed(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MetadataRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MetadataRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MetadataRequest.java index e2c5c54..f448942 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MetadataRequest.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/MetadataRequest.java @@ -22,7 +22,7 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.serializer.RepresentationType; import org.apache.olingo.server.api.uri.UriInfoMetadata; @@ -50,7 +50,7 @@ public class MetadataRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { if (!allowedMethod()) { methodNotAllowed(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ServiceDocumentRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ServiceDocumentRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ServiceDocumentRequest.java index f99aaf5..c8f484d 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ServiceDocumentRequest.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/ServiceDocumentRequest.java @@ -23,7 +23,7 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.serializer.RepresentationType; import org.apache.olingo.server.core.ContentNegotiator; @@ -46,7 +46,7 @@ public class ServiceDocumentRequest extends ServiceRequest { @Override public void execute(ServiceHandler handler, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { if (!allowedMethod()) { methodNotAllowed(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/CountResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/CountResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/CountResponse.java index f7cde33..25cd1fb 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/CountResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/CountResponse.java @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.olingo.commons.api.http.HttpContentType; import org.apache.olingo.server.api.ODataApplicationException; 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.serializer.FixedFormatSerializer; import org.apache.olingo.server.api.serializer.SerializerException; @@ -53,7 +53,7 @@ public class CountResponse extends ServiceResponse { } @Override - public void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException { visitor.visit(this); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java index eb79c07..2a49d92 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java @@ -30,7 +30,7 @@ import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ODataServerError; -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.serializer.EntitySerializerOptions; import org.apache.olingo.server.api.serializer.ODataSerializer; @@ -138,7 +138,7 @@ public class EntityResponse extends ServiceResponse { } @Override - public void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException { visitor.visit(this); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java index 27675c3..bb7340b 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntitySetResponse.java @@ -27,7 +27,7 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ODataServerError; -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.serializer.EntityCollectionSerializerOptions; import org.apache.olingo.server.api.serializer.ODataSerializer; @@ -77,7 +77,7 @@ public class EntitySetResponse extends ServiceResponse { } @Override - public void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException { visitor.visit(this); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java index a644358..14ca537 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/MetadataResponse.java @@ -24,7 +24,7 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ODataServerError; -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.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.SerializerException; @@ -48,7 +48,7 @@ public class MetadataResponse extends ServiceResponse { this.responseContentType = responseContentType; } - public void writeMetadata()throws ODataTranslatedException { + public void writeMetadata()throws ODataLibraryException { assert (!isClosed()); this.response.setContent(this.serializer.metadataDocument(this.metadata).getContent()); writeOK(this.responseContentType.toContentTypeString()); @@ -56,7 +56,7 @@ public class MetadataResponse extends ServiceResponse { } @Override - public void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException { visitor.visit(this); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/NoContentResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/NoContentResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/NoContentResponse.java index 908a69c..6fffc32 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/NoContentResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/NoContentResponse.java @@ -23,7 +23,7 @@ import java.util.Collections; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.server.api.ODataApplicationException; 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; public class NoContentResponse extends ServiceResponse { @@ -93,7 +93,7 @@ public class NoContentResponse extends ServiceResponse { } @Override - public void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException { visitor.visit(this); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PrimitiveValueResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PrimitiveValueResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PrimitiveValueResponse.java index d5fa32b..c219174 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PrimitiveValueResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PrimitiveValueResponse.java @@ -27,7 +27,7 @@ import org.apache.olingo.commons.api.edm.EdmReturnType; import org.apache.olingo.commons.api.http.HttpContentType; import org.apache.olingo.server.api.ODataApplicationException; 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.serializer.FixedFormatSerializer; import org.apache.olingo.server.api.serializer.PrimitiveValueSerializerOptions; @@ -108,7 +108,7 @@ public class PrimitiveValueResponse extends ServiceResponse { } @Override - public void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException { visitor.visit(this); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java index 86ce46f..1353ece 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/PropertyResponse.java @@ -31,7 +31,7 @@ import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ODataServerError; -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.serializer.ComplexSerializerOptions; import org.apache.olingo.server.api.serializer.ODataSerializer; @@ -129,7 +129,7 @@ public class PropertyResponse extends ServiceResponse { } @Override - public void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException { visitor.visit(this); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java index 0f3733c..43bafbc 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceDocumentResponse.java @@ -24,7 +24,7 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ODataServerError; -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.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.SerializerException; @@ -49,7 +49,7 @@ public class ServiceDocumentResponse extends ServiceResponse { } public void writeServiceDocument(String serviceRoot) - throws ODataTranslatedException { + throws ODataLibraryException { assert (!isClosed()); this.response.setContent(this.serializer.serviceDocument(this.metadata.getEdm(), serviceRoot).getContent()); writeOK(this.responseContentType.toContentTypeString()); @@ -57,7 +57,7 @@ public class ServiceDocumentResponse extends ServiceResponse { } @Override - public void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException { visitor.visit(this); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponse.java index bf000e0..deb1206 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponse.java @@ -26,7 +26,7 @@ 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.ODataResponse; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; import org.apache.olingo.server.api.ServiceMetadata; public abstract class ServiceResponse { @@ -123,6 +123,6 @@ public abstract class ServiceResponse { this.strictApplyPreferences = flag; } - public abstract void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public abstract void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponseVisior.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponseVisior.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponseVisior.java index 022c72d..5be8113 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponseVisior.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ServiceResponseVisior.java @@ -19,51 +19,51 @@ package org.apache.olingo.server.core.responses; import org.apache.olingo.server.api.ODataApplicationException; -import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ODataLibraryException; public class ServiceResponseVisior { - public void visit(CountResponse response) throws ODataTranslatedException, + public void visit(CountResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } - public void visit(EntityResponse response) throws ODataTranslatedException, + public void visit(EntityResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } - public void visit(MetadataResponse response) throws ODataTranslatedException, + public void visit(MetadataResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } - public void visit(NoContentResponse response) throws ODataTranslatedException, + public void visit(NoContentResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } - public void visit(PrimitiveValueResponse response) throws ODataTranslatedException, + public void visit(PrimitiveValueResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } - public void visit(PropertyResponse response) throws ODataTranslatedException, + public void visit(PropertyResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } - public void visit(ServiceDocumentResponse response) throws ODataTranslatedException, + public void visit(ServiceDocumentResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } - public void visit(StreamResponse response) throws ODataTranslatedException, + public void visit(StreamResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } - public void visit(EntitySetResponse response) throws ODataTranslatedException, + public void visit(EntitySetResponse response) throws ODataLibraryException, ODataApplicationException { response.writeServerError(true); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/StreamResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/StreamResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/StreamResponse.java index 3c8f78b..02580e8 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/StreamResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/StreamResponse.java @@ -25,7 +25,7 @@ import java.util.Collections; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.ODataApplicationException; 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; public class StreamResponse extends ServiceResponse { @@ -47,7 +47,7 @@ public class StreamResponse extends ServiceResponse { } @Override - public void accepts(ServiceResponseVisior visitor) throws ODataTranslatedException, + public void accepts(ServiceResponseVisior visitor) throws ODataLibraryException, ODataApplicationException { visitor.visit(this); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java b/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java index df2b645..6ca0fcd 100644 --- a/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java +++ b/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinHandler.java @@ -42,7 +42,7 @@ import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataApplicationException; 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.uri.UriParameter; import org.apache.olingo.server.api.uri.UriResourceNavigation; @@ -82,13 +82,13 @@ public class TripPinHandler implements ServiceHandler { @Override public void readMetadata(MetadataRequest request, MetadataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { response.writeMetadata(); } @Override public void readServiceDocument(ServiceDocumentRequest request, ServiceDocumentResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { response.writeServiceDocument(request.getODataRequest().getRawBaseUri()); } @@ -164,18 +164,18 @@ public class TripPinHandler implements ServiceHandler { @Override public <T extends ServiceResponse> void read(final DataRequest request, final T response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { final EntityDetails details = process(request); response.accepts(new ServiceResponseVisior() { @Override - public void visit(CountResponse response) throws ODataTranslatedException, ODataApplicationException { + public void visit(CountResponse response) throws ODataLibraryException, ODataApplicationException { response.writeCount(details.entitySet.getCount()); } @Override - public void visit(PrimitiveValueResponse response) throws ODataTranslatedException, + public void visit(PrimitiveValueResponse response) throws ODataLibraryException, ODataApplicationException { EdmProperty edmProperty = request.getUriResourceProperty().getProperty(); Property property = details.entity.getProperty(edmProperty.getName()); @@ -183,7 +183,7 @@ public class TripPinHandler implements ServiceHandler { } @Override - public void visit(PropertyResponse response) throws ODataTranslatedException, + public void visit(PropertyResponse response) throws ODataLibraryException, ODataApplicationException { EdmProperty edmProperty = request.getUriResourceProperty().getProperty(); Property property = details.entity.getProperty(edmProperty.getName()); @@ -191,7 +191,7 @@ public class TripPinHandler implements ServiceHandler { } @Override - public void visit(StreamResponse response) throws ODataTranslatedException, + public void visit(StreamResponse response) throws ODataLibraryException, ODataApplicationException { // stream property response response.writeStreamResponse(new ByteArrayInputStream("dummy".getBytes()), @@ -199,7 +199,7 @@ public class TripPinHandler implements ServiceHandler { } @Override - public void visit(EntitySetResponse response) throws ODataTranslatedException, + public void visit(EntitySetResponse response) throws ODataLibraryException, ODataApplicationException { if (request.getPreference("odata.maxpagesize") != null) { response.writeHeader("Preference-Applied", "odata.maxpagesize="+request.getPreference("odata.maxpagesize")); @@ -212,7 +212,7 @@ public class TripPinHandler implements ServiceHandler { } @Override - public void visit(EntityResponse response) throws ODataTranslatedException, + public void visit(EntityResponse response) throws ODataLibraryException, ODataApplicationException { if (details.entity == null && !request.getNavigations().isEmpty()) { response.writeNoContent(true); @@ -233,7 +233,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void createEntity(DataRequest request, Entity entity, EntityResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { EdmEntitySet edmEntitySet = request.getEntitySet(); Entity created = this.dataModel.createEntity(edmEntitySet, entity, request.getODataRequest().getRawBaseUri()); @@ -274,7 +274,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void updateEntity(DataRequest request, Entity entity, boolean merge, String eTag, - EntityResponse response) throws ODataTranslatedException, ODataApplicationException { + EntityResponse response) throws ODataLibraryException, ODataApplicationException { EdmEntitySet edmEntitySet = request.getEntitySet(); Entity currentEntity = this.dataModel.getEntity(edmEntitySet.getName(), request.getKeyPredicates()); @@ -296,7 +296,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void deleteEntity(DataRequest request, String eTag, EntityResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { EdmEntitySet edmEntitySet = request.getEntitySet(); Entity entity = this.dataModel.getEntity(edmEntitySet.getName(), request.getKeyPredicates()); @@ -317,7 +317,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void updateProperty(DataRequest request, final Property property, boolean merge, - String entityETag, PropertyResponse response) throws ODataTranslatedException, + String entityETag, PropertyResponse response) throws ODataLibraryException, ODataApplicationException { EdmEntitySet edmEntitySet = request.getEntitySet(); @@ -344,7 +344,7 @@ public class TripPinHandler implements ServiceHandler { @Override public <T extends ServiceResponse> void invoke(FunctionRequest request, HttpMethod method, - T response) throws ODataTranslatedException, ODataApplicationException { + T response) throws ODataLibraryException, ODataApplicationException { EdmFunction function = request.getFunction(); if (function.getName().equals("GetNearestAirport")) { @@ -357,7 +357,7 @@ public class TripPinHandler implements ServiceHandler { response.accepts(new ServiceResponseVisior() { @Override - public void visit(EntityResponse response) throws ODataTranslatedException, + public void visit(EntityResponse response) throws ODataLibraryException, ODataApplicationException { response.writeReadEntity(type, entity); } @@ -367,14 +367,14 @@ public class TripPinHandler implements ServiceHandler { @Override public <T extends ServiceResponse> void invoke(ActionRequest request, String eTag, T response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { EdmAction action = request.getAction(); if (action.getName().equals("ResetDataSource")) { try { this.dataModel.loadData(); response.accepts(new ServiceResponseVisior() { @Override - public void visit(NoContentResponse response) throws ODataTranslatedException, + public void visit(NoContentResponse response) throws ODataLibraryException, ODataApplicationException { response.writeNoContent(); } @@ -389,7 +389,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void readMediaStream(MediaRequest request, StreamResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { final EdmEntitySet edmEntitySet = request.getEntitySet(); List<UriParameter> keys = request.getKeyPredicates(); @@ -401,7 +401,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void upsertMediaStream(MediaRequest request, String entityETag, InputStream mediaContent, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException { + NoContentResponse response) throws ODataLibraryException, ODataApplicationException { final EdmEntitySet edmEntitySet = request.getEntitySet(); List<UriParameter> keys = request.getKeyPredicates(); Entity entity = this.dataModel.getEntity(edmEntitySet.getName(), keys); @@ -425,7 +425,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void upsertStreamProperty(DataRequest request, String entityETag, InputStream streamContent, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException { + NoContentResponse response) throws ODataLibraryException, ODataApplicationException { final EdmEntitySet edmEntitySet = request.getEntitySet(); List<UriParameter> keys = request.getKeyPredicates(); Entity entity = this.dataModel.getEntity(edmEntitySet.getName(), keys); @@ -451,7 +451,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void addReference(DataRequest request, String entityETag, URI referenceId, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException { + NoContentResponse response) throws ODataLibraryException, ODataApplicationException { final EntityDetails details = process(request); @@ -468,7 +468,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void updateReference(DataRequest request, String entityETag, URI updateId, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException { + NoContentResponse response) throws ODataLibraryException, ODataApplicationException { // this single valued navigation. boolean updated = false; try { @@ -493,7 +493,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void deleteReference(DataRequest request, URI deleteId, String entityETag, - NoContentResponse response) throws ODataTranslatedException, ODataApplicationException { + NoContentResponse response) throws ODataLibraryException, ODataApplicationException { boolean removed = false; if (deleteId != null) { try { @@ -523,7 +523,7 @@ public class TripPinHandler implements ServiceHandler { @Override public void anyUnsupported(ODataRequest request, ODataResponse response) - throws ODataTranslatedException, ODataApplicationException { + throws ODataLibraryException, ODataApplicationException { response.setStatusCode(500); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b8187f53/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java index 5f82570..5ecb118 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiatorException.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 ContentNegotiatorException extends ODataTranslatedException { +public class ContentNegotiatorException extends ODataLibraryException { private static final long serialVersionUID = -8112658467394158700L; public static enum MessageKeys implements MessageKey {
