Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'OLINGO-1293' of https://github.com/shawkins/olingo-odata4

This commit is contained in:
Ramesh Reddy 2018-09-24 12:38:20 -05:00
parent e839533bb4 4b77243d9e
commit 003f0f4ffa
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/MetadataDocumentJsonSerializer.java
View File

@ -714,6 +714,10 @@ public class MetadataDocumentJsonSerializer {
if (property.getScale() != null) { if (property.getScale() != null) {
json.writeNumberField(SCALE, property.getScale()); json.writeNumberField(SCALE, property.getScale());
} }
if (property.getSrid() != null) {
json.writeStringField(SRID, "" + property.getSrid());
}
appendAnnotations(json, property, null); appendAnnotations(json, property, null);
json.writeEndObject(); json.writeEndObject();

5
lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java
View File

@ -96,6 +96,7 @@ public class MetadataDocumentXmlSerializer {
private static final String XML_PROPERTY_REF = "PropertyRef"; private static final String XML_PROPERTY_REF = "PropertyRef";
private static final String XML_KEY = "Key"; private static final String XML_KEY = "Key";
private static final String XML_SCALE = "Scale"; 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_PRECISION = "Precision";
private static final String XML_MAX_LENGTH = "MaxLength"; private static final String XML_MAX_LENGTH = "MaxLength";
private static final String XML_DEFAULT_VALUE = "DefaultValue"; private static final String XML_DEFAULT_VALUE = "DefaultValue";
@ -905,6 +906,10 @@ public class MetadataDocumentXmlSerializer {
if (property.getScale() != null) { if (property.getScale() != null) {
writer.writeAttribute(XML_SCALE, "" + property.getScale()); writer.writeAttribute(XML_SCALE, "" + property.getScale());
} }
if (property.getSrid() != null) {
writer.writeAttribute(XML_SRID, "" + property.getSrid());
}
appendAnnotations(writer, property); appendAnnotations(writer, property);
writer.writeEndElement(); writer.writeEndElement();