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 <[email protected]> Authored: Mon Mar 14 17:06:21 2016 -0500 Committer: Ramesh Reddy <[email protected]> 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>"
