Merge pull request #55 from danielfernandez/olingo-1395

[OLINGO-1395] Fixed parsing error when ReturnType contains Annotation
apache · Nov 27, 2019 · a110e09 · a110e09
2 parents 35e2302 + 60d5ada
commit a110e09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java b/...client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java
@@ -71,6 +71,9 @@ protected ClientCsdlReturnType doDeserialize(final JsonParser jp, final Deserial
             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
@@ -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"/>