commit | a110e092033943ab1d1b55bbe737f5890ba55ab6 | [log] [tgz] |
---|---|---|
author | mibo <mibo@apache.org> | Wed Nov 27 08:31:24 2019 +0100 |
committer | GitHub <noreply@github.com> | Wed Nov 27 08:31:24 2019 +0100 |
tree | 87211587d7c7b3cb4f62d57daa73f5e940d34261 | |
parent | 35e2302576748c36f3b6719dcc311019672a30a6 [diff] | |
parent | 60d5adaff33053d18ecfae358d32251a47cbf440 [diff] |
Merge pull request #55 from danielfernandez/olingo-1395 [OLINGO-1395] Fixed parsing error when ReturnType contains Annotation
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java index d422ef2..8ccfbda 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java
@@ -71,6 +71,9 @@ if (srid != null) { returnType.setSrid(SRID.valueOf(srid)); } + } else if ("Annotation".equals(jp.getCurrentName())) { + jp.nextToken(); + returnType.getAnnotations().add(jp.readValueAs(ClientCsdlAnnotation.class)); } } }
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/$metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/$metadata.xml index d7072de..1523669 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/$metadata.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/$metadata.xml
@@ -138,7 +138,11 @@ <ReturnType Type="SEPMRA_SO_MAN2.I_DraftAdministrativeDataType"/> </Action> <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> <Function Name="_FC_RTTimeOfDay_" IsBound="true" IsComposable="true"> <Parameter Name="ParameterTimeOfDay" Type="Edm.TimeOfDay" Nullable="false"/>