Repository: olingo-odata4 Updated Branches: refs/heads/master e839533bb -> 003f0f4ff
OLINGO-1293 adding srid to property metadata Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/4b77243d Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/4b77243d Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/4b77243d Branch: refs/heads/master Commit: 4b77243d9e518a9a0e5aae3f4346d42acccb20b4 Parents: 8cbe468 Author: shawkins <[email protected]> Authored: Mon Sep 24 13:11:00 2018 -0400 Committer: shawkins <[email protected]> Committed: Mon Sep 24 13:11:00 2018 -0400 ---------------------------------------------------------------------- .../core/serializer/json/MetadataDocumentJsonSerializer.java | 4 ++++ .../core/serializer/xml/MetadataDocumentXmlSerializer.java | 5 +++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/4b77243d/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/MetadataDocumentJsonSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/MetadataDocumentJsonSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/MetadataDocumentJsonSerializer.java index 7c9e957..9d7c276 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/MetadataDocumentJsonSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/MetadataDocumentJsonSerializer.java @@ -714,6 +714,10 @@ public class MetadataDocumentJsonSerializer { if (property.getScale() != null) { json.writeNumberField(SCALE, property.getScale()); } + + if (property.getSrid() != null) { + json.writeStringField(SRID, "" + property.getSrid()); + } appendAnnotations(json, property, null); json.writeEndObject(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/4b77243d/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java index 2505440..e293000 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java @@ -96,6 +96,7 @@ public class MetadataDocumentXmlSerializer { private static final String XML_PROPERTY_REF = "PropertyRef"; private static final String XML_KEY = "Key"; private static final String XML_SCALE = "Scale"; + private static final String XML_SRID = "SRID"; private static final String XML_PRECISION = "Precision"; private static final String XML_MAX_LENGTH = "MaxLength"; private static final String XML_DEFAULT_VALUE = "DefaultValue"; @@ -905,6 +906,10 @@ public class MetadataDocumentXmlSerializer { if (property.getScale() != null) { writer.writeAttribute(XML_SCALE, "" + property.getScale()); } + + if (property.getSrid() != null) { + writer.writeAttribute(XML_SRID, "" + property.getSrid()); + } appendAnnotations(writer, property); writer.writeEndElement();
