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

[OLINGO-1472]Support string-based scales in property metadata

This commit is contained in:
ramya vasanth 2021-03-03 14:31:12 +05:30
parent 162750f2ce
commit e32302bc32
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -939,8 +939,10 @@ public class MetadataDocumentXmlSerializer {
writer.writeAttribute(XML_PRECISION, "" + property.getPrecision()); writer.writeAttribute(XML_PRECISION, "" + property.getPrecision());
} }
if (property.getScale() != null) { if (property.getScaleAsString() != null) {
writer.writeAttribute(XML_SCALE, "" + property.getScale()); writer.writeAttribute(XML_SCALE, property.getScaleAsString());
} else if (property.getScale() != null) {
writer.writeAttribute(XML_SCALE, "" + property.getScale());
} }
if (property.getSrid() != null) { if (property.getSrid() != null) {

15
lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java
View File

@ -343,6 +343,13 @@ public class MetadataDocumentXmlSerializerTest {
+ "AppliesTo=\"Property EntitySet Schema\"></Term>")); + "AppliesTo=\"Property EntitySet Schema\"></Term>"));
assertTrue(metadata.contains("<Term Name=\"Term4\" Type=\"Edm.String\" BaseTerm=\"Alias.Term1\"></Term>")); assertTrue(metadata.contains("<Term Name=\"Term4\" Type=\"Edm.String\" BaseTerm=\"Alias.Term1\"></Term>"));
} }
@Test
public void entityTypeProperties() throws Exception {
String metadata = localMetadata();
assertTrue(metadata.contains("<Property Name=\"PropertyDecimal\" " +
"Type=\"Edm.Decimal\" Scale=\"variable\"></Property>"));
}
@Test @Test
public void annotationsTest() throws Exception { public void annotationsTest() throws Exception {
@ -495,6 +502,7 @@ public class MetadataDocumentXmlSerializerTest {
private final FullQualifiedName nameInt16 = EdmPrimitiveTypeKind.Int16.getFullQualifiedName(); private final FullQualifiedName nameInt16 = EdmPrimitiveTypeKind.Int16.getFullQualifiedName();
private final FullQualifiedName nameString = EdmPrimitiveTypeKind.String.getFullQualifiedName(); private final FullQualifiedName nameString = EdmPrimitiveTypeKind.String.getFullQualifiedName();
private final FullQualifiedName nameDecimal = EdmPrimitiveTypeKind.Decimal.getFullQualifiedName();
private final FullQualifiedName nameUARTPrimParam = new FullQualifiedName(nameSpace, "UARTPrimParam"); private final FullQualifiedName nameUARTPrimParam = new FullQualifiedName(nameSpace, "UARTPrimParam");
private final FullQualifiedName nameUARTOtherEntity = new FullQualifiedName(nameSpace, "UARTOtherEntity"); private final FullQualifiedName nameUARTOtherEntity = new FullQualifiedName(nameSpace, "UARTOtherEntity");
private final FullQualifiedName nameUARTEntity = new FullQualifiedName(nameSpace, "UARTEntity"); private final FullQualifiedName nameUARTEntity = new FullQualifiedName(nameSpace, "UARTEntity");
@ -505,6 +513,11 @@ public class MetadataDocumentXmlSerializerTest {
private final CsdlProperty propertyString = new CsdlProperty() private final CsdlProperty propertyString = new CsdlProperty()
.setName("PropertyString") .setName("PropertyString")
.setType(nameString); .setType(nameString);
private final CsdlProperty propertyDecimal_VariableScale = new CsdlProperty()
.setName("PropertyDecimal")
.setType(nameDecimal)
.setScale(0)
.setScaleAsString("variable");
private final CsdlNavigationProperty navProperty = new CsdlNavigationProperty() private final CsdlNavigationProperty navProperty = new CsdlNavigationProperty()
.setName("NavProperty") .setName("NavProperty")
@ -556,7 +569,7 @@ public class MetadataDocumentXmlSerializerTest {
return new CsdlEntityType() return new CsdlEntityType()
.setName("ET") .setName("ET")
.setKey(Collections.singletonList(new CsdlPropertyRef().setName("PropertyInt16"))) .setKey(Collections.singletonList(new CsdlPropertyRef().setName("PropertyInt16")))
.setProperties(Collections.singletonList(propertyInt16_NotNullable)) .setProperties(Arrays.asList(propertyInt16_NotNullable, propertyDecimal_VariableScale))
.setNavigationProperties(Collections.singletonList(navProperty)); .setNavigationProperties(Collections.singletonList(navProperty));
} }
return null; return null;