You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ra...@apache.org on 2016/03/15 22:25:40 UTC
[1/2] olingo-odata4 git commit: OLINGO-906: correcting xml serializer
to return correct internal code
Repository: olingo-odata4
Updated Branches:
refs/heads/master 64617c814 -> 389975c8f
OLINGO-906: correcting xml serializer to return correct internal code
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/979d96c0
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/979d96c0
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/979d96c0
Branch: refs/heads/master
Commit: 979d96c0832e3853b4d5fd92d593d1eec12ed745
Parents: 92fa7cd
Author: Ramesh Reddy <ra...@jboss.org>
Authored: Mon Mar 14 17:06:21 2016 -0500
Committer: Ramesh Reddy <ra...@jboss.org>
Committed: Mon Mar 14 17:06:21 2016 -0500
----------------------------------------------------------------------
.../olingo/server/core/serializer/xml/ODataXmlSerializer.java | 2 +-
.../server/core/serializer/xml/ServerErrorXmlSerializerTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/979d96c0/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
index cde0593..fa607bd 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
@@ -163,7 +163,7 @@ public class ODataXmlSerializer extends AbstractODataSerializer {
writer.writeStartElement("error");
writer.writeDefaultNamespace(NS_METADATA);
- writeErrorDetails(String.valueOf(error.getStatusCode()), error.getMessage(), error.getTarget(), writer);
+ writeErrorDetails(String.valueOf(error.getCode()), error.getMessage(), error.getTarget(), writer);
if (error.getDetails() != null && !error.getDetails().isEmpty()) {
writer.writeStartElement(Constants.ERROR_DETAILS);
for (ODataErrorDetail inner : error.getDetails()) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/979d96c0/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServerErrorXmlSerializerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServerErrorXmlSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServerErrorXmlSerializerTest.java
index ee9618d..63c3b6a 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServerErrorXmlSerializerTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/ServerErrorXmlSerializerTest.java
@@ -48,7 +48,7 @@ public class ServerErrorXmlSerializerTest {
String jsonString = IOUtils.toString(stream);
assertEquals("<?xml version='1.0' encoding='UTF-8'?>"
+ "<error xmlns=\"http://docs.oasis-open.org/odata/ns/metadata\">"
- + "<code>0</code>"
+ + "<code>Code</code>"
+ "<message>ErrorMessage</message>"
+ "</error>",
jsonString);
@@ -74,7 +74,7 @@ public class ServerErrorXmlSerializerTest {
String jsonString = IOUtils.toString(stream);
assertEquals("<?xml version='1.0' encoding='UTF-8'?>"
+ "<error xmlns=\"http://docs.oasis-open.org/odata/ns/metadata\">"
- + "<code>0</code>"
+ + "<code>code</code>"
+ "<message>err message</message>"
+ "<target>target</target>"
+ "<details>"
[2/2] olingo-odata4 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata4
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/389975c8
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/389975c8
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/389975c8
Branch: refs/heads/master
Commit: 389975c8fb8a10e5d1db1c711103264486405b67
Parents: 979d96c 64617c8
Author: Ramesh Reddy <ra...@localhost.localdomain>
Authored: Tue Mar 15 17:04:42 2016 -0400
Committer: Ramesh Reddy <ra...@localhost.localdomain>
Committed: Tue Mar 15 17:04:42 2016 -0400
----------------------------------------------------------------------
.../tecsvc/client/FilterSystemQueryITCase.java | 4 +-
.../org/apache/olingo/server/api/OData.java | 7 +
.../apache/olingo/server/api/ODataHandler.java | 56 ++
.../olingo/server/api/ODataHttpHandler.java | 36 +-
.../olingo/server/api/OlingoExtension.java | 25 +
.../olingo/server/api/debug/DebugSupport.java | 12 +-
.../server/api/etag/CustomETagSupport.java | 3 +-
.../serializer/CustomContentTypeSupport.java | 5 +-
.../apache/olingo/server/core/OData4Impl.java | 4 +-
.../olingo/server/core/ODataDispatcher.java | 4 +-
.../apache/olingo/server/core/ODataHandler.java | 232 ------
.../olingo/server/core/ODataHandlerImpl.java | 239 ++++++
.../server/core/ODataHttpHandlerImpl.java | 17 +-
.../apache/olingo/server/core/ODataImpl.java | 11 +-
.../core/batchhandler/BatchFacadeImpl.java | 5 +-
.../server/core/batchhandler/BatchHandler.java | 6 +-
.../core/batchhandler/BatchPartHandler.java | 5 +-
.../core/uri/parser/ExpressionParser.java | 4 +-
.../batchhandler/MockedBatchHandlerTest.java | 6 +-
.../expression/operation/BinaryOperator.java | 13 +-
.../server/core/ODataHandlerImplTest.java | 814 +++++++++++++++++++
.../olingo/server/core/ODataHandlerTest.java | 814 -------------------
22 files changed, 1217 insertions(+), 1105 deletions(-)
----------------------------------------------------------------------