[OLINGO-866] Add deserialization of annotations in ActionImport. Signed-off-by: Christian Amend <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/1563f951 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/1563f951 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/1563f951 Branch: refs/heads/OLINGO-856_ODataHandlerInAPI Commit: 1563f951f0c7eb2137cc317b8c6a10ad527f5106 Parents: c7e6630 Author: Peter Leipold <[email protected]> Authored: Mon Feb 1 00:24:58 2016 +0100 Committer: Christian Amend <[email protected]> Committed: Tue Mar 1 13:33:03 2016 +0100 ---------------------------------------------------------------------- .../olingo/client/core/edm/xml/ClientCsdlActionImport.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1563f951/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java index 1ec869a..1e5af2a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -50,6 +50,9 @@ class ClientCsdlActionImport extends CsdlActionImport implements Serializable { action.setName(jp.nextTextValue()); } else if ("EntitySet".equals(jp.getCurrentName())) { action.setEntitySet(jp.nextTextValue()); + } else if ("Annotation".equals(jp.getCurrentName())) { + jp.nextToken(); + action.getAnnotations().add(jp.readValueAs(ClientCsdlAnnotation.class)); } } }
