You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/05/23 15:00:17 UTC
git commit: [OLINGO-296] fix JSON EdmSingle format
Repository: olingo-odata2
Updated Branches:
refs/heads/master df063fd01 -> 2baffa85c
[OLINGO-296] fix JSON EdmSingle format
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/2baffa85
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/2baffa85
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/2baffa85
Branch: refs/heads/master
Commit: 2baffa85cc4b94c0103b1ab527d4782fa3f8fd1b
Parents: df063fd
Author: Stephan Klevenz <sk...@apache.org>
Authored: Fri May 23 15:00:09 2014 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Fri May 23 15:00:09 2014 +0200
----------------------------------------------------------------------
.../odata2/core/ep/consumer/JsonPropertyConsumer.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/2baffa85/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
index 1c3ef59..f3fdda3 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
@@ -138,6 +138,17 @@ public class JsonPropertyConsumer {
.addContent(entityPropertyInfo.getName()));
}
break;
+ case Single:
+ if (tokenType == JsonToken.STRING) {
+ value = reader.nextString();
+ } else if (tokenType == JsonToken.NUMBER) {
+ value = reader.nextDouble();
+ value = value.toString();
+ } else {
+ throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE
+ .addContent(entityPropertyInfo.getName()));
+ }
+ break;
default:
if (tokenType == JsonToken.STRING) {
value = reader.nextString();