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

Merge pull request #55 from danielfernandez/olingo-1395 

[OLINGO-1395] Fixed parsing error when ReturnType contains Annotation
This commit is contained in:
mibo 2019-11-27 08:31:24 +01:00 committed by GitHub
parent 35e2302576 60d5adaff3
commit a110e09203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java
View File

@ -71,6 +71,9 @@ class ClientCsdlReturnType extends CsdlReturnType implements Serializable {
if (srid != null) { if (srid != null) {
returnType.setSrid(SRID.valueOf(srid)); returnType.setSrid(SRID.valueOf(srid));
} }
} else if ("Annotation".equals(jp.getCurrentName())) {
jp.nextToken();
returnType.getAnnotations().add(jp.readValueAs(ClientCsdlAnnotation.class));
} }
} }
} }

6
lib/client-core/src/test/resources/org/apache/olingo/client/core/$metadata.xml
View File

@ -138,7 +138,11 @@
<ReturnType Type="SEPMRA_SO_MAN2.I_DraftAdministrativeDataType"/> <ReturnType Type="SEPMRA_SO_MAN2.I_DraftAdministrativeDataType"/>
</Action> </Action>
<Action Name="UARTString" IsBound="false"> <Action Name="UARTString" IsBound="false">
<ReturnType Type="Edm.String"/> <ReturnType Type="Edm.String">
<Annotation Term="Core.Description">
<String>The description for this return type</String>
</Annotation>
</ReturnType>
</Action> </Action>
<Function Name="_FC_RTTimeOfDay_" IsBound="true" IsComposable="true"> <Function Name="_FC_RTTimeOfDay_" IsBound="true" IsComposable="true">
<Parameter Name="ParameterTimeOfDay" Type="Edm.TimeOfDay" Nullable="false"/> <Parameter Name="ParameterTimeOfDay" Type="Edm.TimeOfDay" Nullable="false"/>