Apache/olingo-odata4
1
0
Fork 0
mirror of https://github.com/apache/olingo-odata4.git synced 2025-03-06 08:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Server deserializer error should result in status code 400

Browse Source 
Change-Id: I2b22fc7aa50285d4e91b0bbb500635a3fb957df0

Signed-off-by: Michael Bolz <michael.bolz@sap.com>
This commit is contained in:
Klaus Straubinger 2015-01-27 10:53:27 +01:00 committed by Michael Bolz
parent 483b417cf0
commit 72018d0cb7
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java
View File

@ -25,7 +25,7 @@ import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.ODataServerError; import org.apache.olingo.server.api.ODataServerError;
import org.apache.olingo.server.api.ODataTranslatedException; import org.apache.olingo.server.api.ODataTranslatedException;
import org.apache.olingo.server.api.ODataTranslatedException.ODataErrorMessage; import org.apache.olingo.server.api.ODataTranslatedException.ODataErrorMessage;
import org.apache.olingo.server.api.batch.exception.BatchDeserializerException; import org.apache.olingo.server.api.deserializer.DeserializerException;
import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.api.serializer.SerializerException;
import org.apache.olingo.server.core.uri.parser.UriParserException; import org.apache.olingo.server.core.uri.parser.UriParserException;
import org.apache.olingo.server.core.uri.parser.UriParserSemanticException; import org.apache.olingo.server.core.uri.parser.UriParserSemanticException;
@ -94,13 +94,12 @@ public class ODataExceptionHelper {
serverError.setStatusCode(HttpStatusCode.BAD_REQUEST.getStatusCode()); serverError.setStatusCode(HttpStatusCode.BAD_REQUEST.getStatusCode());
return serverError; return serverError;
} }
public static ODataServerError createServerErrorObject(BatchDeserializerException e, Locale requestedLocale) { public static ODataServerError createServerErrorObject(final DeserializerException e, final Locale requestedLocale) {
ODataServerError serverError = basicTranslatedError(e, requestedLocale); return basicTranslatedError(e, requestedLocale)
serverError.setStatusCode(HttpStatusCode.BAD_REQUEST.getStatusCode()); .setStatusCode(HttpStatusCode.BAD_REQUEST.getStatusCode());
return serverError;
} }
public static ODataServerError createServerErrorObject(ODataTranslatedException e, Locale requestedLocale) { public static ODataServerError createServerErrorObject(ODataTranslatedException e, Locale requestedLocale) {
return basicTranslatedError(e, requestedLocale); return basicTranslatedError(e, requestedLocale);
} }

4
lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java
View File

@ -40,7 +40,6 @@ import org.apache.olingo.server.api.ODataRequest;
import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ODataResponse;
import org.apache.olingo.server.api.ODataServerError; import org.apache.olingo.server.api.ODataServerError;
import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.ServiceMetadata;
import org.apache.olingo.server.api.batch.exception.BatchDeserializerException;
import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.deserializer.DeserializerException;
import org.apache.olingo.server.api.processor.ActionComplexCollectionProcessor; import org.apache.olingo.server.api.processor.ActionComplexCollectionProcessor;
import org.apache.olingo.server.api.processor.ActionComplexProcessor; import org.apache.olingo.server.api.processor.ActionComplexProcessor;
@ -128,9 +127,6 @@ public class ODataHandler {
} catch (SerializerException e) { } catch (SerializerException e) {
ODataServerError serverError = ODataExceptionHelper.createServerErrorObject(e, null); ODataServerError serverError = ODataExceptionHelper.createServerErrorObject(e, null);
handleException(request, response, serverError); handleException(request, response, serverError);
} catch (BatchDeserializerException e) {
ODataServerError serverError = ODataExceptionHelper.createServerErrorObject(e, null);
handleException(request, response, serverError);
} catch (DeserializerException e) { } catch (DeserializerException e) {
ODataServerError serverError = ODataExceptionHelper.createServerErrorObject(e, null); ODataServerError serverError = ODataExceptionHelper.createServerErrorObject(e, null);
handleException(request, response, serverError); handleException(request, response, serverError);