You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2016/05/08 06:46:00 UTC
olingo-odata2 git commit: [OLINGO-942] Improved error message
Repository: olingo-odata2
Updated Branches:
refs/heads/master a838b6960 -> e2531ad99
[OLINGO-942] Improved error message
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/e2531ad9
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/e2531ad9
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/e2531ad9
Branch: refs/heads/master
Commit: e2531ad99198b7bec651ab65afa94982e7b75ddb
Parents: a838b69
Author: mibo <mi...@mirb.de>
Authored: Sun May 8 08:44:10 2016 +0200
Committer: mibo <mi...@mirb.de>
Committed: Sun May 8 08:45:40 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/olingo/odata2/api/batch/BatchException.java | 4 ++++
.../olingo/odata2/core/batch/v2/BatchRequestTransformator.java | 3 +--
odata2-lib/odata-core/src/main/resources/i18n.properties | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/e2531ad9/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
index 96aa4dd..ea82106 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchException.java
@@ -113,6 +113,10 @@ public class BatchException extends ODataMessageException {
public static final MessageReference INVALID_REQUEST_LINE = createMessageReference(BatchException.class,
"INVALID_REQUEST_LINE");
+ /** INVALID_BODY_FOR_REQUEST requires 1 content value ('line number') */
+ public static final MessageReference INVALID_BODY_FOR_REQUEST = createMessageReference(BatchException.class,
+ "INVALID_BODY_FOR_REQUEST");
+
/** INVALID_STATUS_LINE requires 2 content value ('status line', 'line number') */
public static final MessageReference INVALID_STATUS_LINE = createMessageReference(BatchException.class,
"INVALID_STATUS_LINE");
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/e2531ad9/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java
index dbe349d..232bb7a 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java
@@ -109,8 +109,7 @@ public class BatchRequestTransformator implements BatchTransformator {
private void validateBody(final HttpRequestStatusLine httpStatusLine, final BatchQueryOperation operation)
throws BatchException {
if (httpStatusLine.getMethod().equals(ODataHttpMethod.GET) && isUnvalidGetRequestBody(operation)) {
- throw new BatchException(BatchException.INVALID_REQUEST_LINE
- .addContent(httpStatusLine.getMethod())
+ throw new BatchException(BatchException.INVALID_BODY_FOR_REQUEST
.addContent(httpStatusLine.getLineNumber()));
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/e2531ad9/odata2-lib/odata-core/src/main/resources/i18n.properties
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/resources/i18n.properties b/odata2-lib/odata-core/src/main/resources/i18n.properties
index ff227a9..42311e4 100644
--- a/odata2-lib/odata-core/src/main/resources/i18n.properties
+++ b/odata2-lib/odata-core/src/main/resources/i18n.properties
@@ -128,6 +128,7 @@ org.apache.olingo.odata2.api.batch.BatchException.INVALID_CONTENT_TYPE=Content-T
org.apache.olingo.odata2.api.batch.BatchException.INVALID_CHANGESET_BOUNDARY=The boundary of the ChangeSet should be different from that used by the Batch: line '%1$s'.
org.apache.olingo.odata2.api.batch.BatchException.INVALID_CHANGESET_METHOD= Invalid method: a ChangeSet cannot contain retrieve requests at line '%1$s'.
org.apache.olingo.odata2.api.batch.BatchException.INVALID_REQUEST_LINE=Invalid request line '%1$s' at line '%2$s'.
+org.apache.olingo.odata2.api.batch.BatchException.INVALID_BODY_FOR_REQUEST=Invalid body for GET request at line '%1$s'.
org.apache.olingo.odata2.api.batch.BatchException.INVALID_PATHINFO=PathInfo should not be null.
org.apache.olingo.odata2.api.batch.BatchException.INVALID_URI=Invalid URI: line '%1$s'.
org.apache.olingo.odata2.api.batch.BatchException.INVALID_QUERY_OPERATION_METHOD=Invalid method: a Query Operation cannot contain insert, update or delete requests at line '%1$s'.