Repository: olingo-odata4 Updated Branches: refs/heads/master 2dc14d676 -> 8f1a079fa
[OLINGO-1062] Cannot consume Term defined in external vocabulary Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8f1a079f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8f1a079f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8f1a079f Branch: refs/heads/master Commit: 8f1a079faf2f0a327681deb879dcc6d127d561da Parents: 2dc14d6 Author: ramya vasanth <[email protected]> Authored: Wed Jun 21 13:27:06 2017 +0530 Committer: ramya vasanth <[email protected]> Committed: Wed Jun 21 13:27:06 2017 +0530 ---------------------------------------------------------------------- .../olingo/fit/tecsvc/client/BasicITCase.java | 60 +++++++++ .../test/resources/edmxWithCoreAnnotation.xml | 49 ++++++++ .../serialization/ClientODataDeserializer.java | 9 ++ .../client/api/serialization/ODataReader.java | 18 +++ .../ClientODataDeserializerImpl.java | 17 +++ .../core/serialization/ODataReaderImpl.java | 13 ++ .../apache/olingo/client/core/MetadataTest.java | 41 ++++++ .../org/apache/olingo/client/core/VOC_Core.xml | 125 +++++++++++++++++++ .../client/core/edmxWithCoreAnnotation.xml | 48 +++++++ .../commons/core/edm/EdmProviderImpl.java | 19 ++- 10 files changed, 398 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java index 63a0d0e..93a4f1e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java @@ -29,9 +29,12 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; +import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.LinkedHashMap; @@ -83,7 +86,9 @@ import org.apache.olingo.commons.api.edm.EdmActionImport; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntitySet; +import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.ex.ODataError; @@ -116,6 +121,8 @@ public class BasicITCase extends AbstractParamTecSvcITCase { private static final String COL_PROPERTY_COMP = "CollPropertyComp"; private static final String PROPERTY_COMP_TWO_PRIM = "PropertyCompTwoPrim"; + private static final String SERVICE_ROOT_URL = "http://localhost:9080/odata-server-tecsvc/";; + @Test public void readServiceDocument() { ODataServiceDocumentRequest request = getClient().getRetrieveRequestFactory() @@ -1603,4 +1610,57 @@ public class BasicITCase extends AbstractParamTecSvcITCase { getEntities().get(1).getTypeName().toString()); assertEquals("olingo.odata.test1.ETAllPrim", entity.getTypeName().toString()); } + + @Test + public void readViaXmlMetadataAnnotation() throws URISyntaxException, IOException { + InputStream input = Thread.currentThread().getContextClassLoader(). + getResourceAsStream("edmxWithCoreAnnotation.xml"); + final XMLMetadata metadata = getClient().getDeserializer(ContentType.APPLICATION_XML).toMetadata(input); + String vocabUrl = metadata.getReferences().get(0).getUri().toString(); + vocabUrl = vocabUrl.substring(vocabUrl.indexOf("../") + 3); + vocabUrl = SERVICE_ROOT_URL + vocabUrl; + URI uri = new URI(vocabUrl); + input.close(); + ODataRawRequest request = getClient().getRetrieveRequestFactory().getRawRequest(uri); + assertNotNull(request); + setCookieHeader(request); + + ODataRawResponse response = request.execute(); + saveCookieHeader(response); + assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); + + List<InputStream> streams = new ArrayList<InputStream>(); + streams.add(response.getRawResponse()); + Edm edm = getClient().getReader().readMetadata(Thread.currentThread().getContextClassLoader(). + getResourceAsStream("edmxWithCoreAnnotation.xml"), streams); + assertNotNull(edm); + final EdmEntityType person = edm.getEntityType( + new FullQualifiedName("Microsoft.Exchange.Services.OData.Model", "Person")); + assertNotNull(person); + EdmProperty concurrency = (EdmProperty) person.getProperty("Concurrency"); + List<EdmAnnotation> annotations = concurrency.getAnnotations(); + for (EdmAnnotation annotation : annotations) { + annotation.getExpression(); + EdmTerm term = annotation.getTerm(); + assertNotNull(term); + assertEquals("Computed", term.getName()); + assertEquals("Org.OData.Core.V1.Computed", + term.getFullQualifiedName().getFullQualifiedNameAsString()); + assertEquals(1, term.getAnnotations().size()); + } + EdmProperty userName = (EdmProperty) person.getProperty("UserName"); + List<EdmAnnotation> userNameAnnotations = userName.getAnnotations(); + for (EdmAnnotation annotation : userNameAnnotations) { + EdmTerm term = annotation.getTerm(); + assertNotNull(term); + assertEquals("Permissions", term.getName()); + assertEquals("Org.OData.Core.V1.Permissions", + term.getFullQualifiedName().getFullQualifiedNameAsString()); + org.apache.olingo.commons.api.edm.annotation.EdmExpression expression = annotation.getExpression(); + assertNotNull(expression); + assertTrue(expression.isConstant()); + assertEquals("Org.OData.Core.V1.Permission/Read", expression.asConstant().getValueAsString()); + assertEquals("EnumMember", expression.getExpressionName()); + } + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/fit/src/test/resources/edmxWithCoreAnnotation.xml ---------------------------------------------------------------------- diff --git a/fit/src/test/resources/edmxWithCoreAnnotation.xml b/fit/src/test/resources/edmxWithCoreAnnotation.xml new file mode 100644 index 0000000..8974762 --- /dev/null +++ b/fit/src/test/resources/edmxWithCoreAnnotation.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + 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 + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx";> +<edmx:Reference Uri="../v4.0/cs02/vocabularies/Org.OData.Core.V1.xml"/> +<edmx:DataServices m:DataServiceVersion="4.0" m:MaxDataServiceVersion="4.0" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata";> + <Schema Namespace="Microsoft.Exchange.Services.OData.Model" xmlns="http://docs.oasis-open.org/odata/ns/edm";> + <EntityType Name="Person" OpenType="true"> + <Key> + <PropertyRef Name="UserName"/> + </Key> + <Property Name="UserName" Type="Edm.String" Nullable="false"> + <Annotation Term="Org.OData.Core.V1.Permissions"> + <EnumMember>Org.OData.Core.V1.Permission/Read</EnumMember> + </Annotation> + </Property> + <Property Name="FirstName" Type="Edm.String" Nullable="false"/> + <Property Name="LastName" Type="Edm.String" Nullable="false"/> + <Property Name="Emails" Type="Collection(Edm.String)"/> + <Property Name="AddressInfo" Type="Collection(Microsoft.OData.SampleService.Models.TripPin.Location)"/> + <Property Name="Gender" Type="Microsoft.OData.SampleService.Models.TripPin.PersonGender"/> + <Property Name="Concurrency" Type="Edm.Int64" Nullable="false"> + <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/> + </Property> + </EntityType> + <EntityContainer Name="EntityContainer" m:IsDefaultEntityContainer="true"> + <EntitySet Name="People" EntityType="Microsoft.Exchange.Services.OData.Model.Person"/> + </EntityContainer> + </Schema> + </edmx:DataServices> +</edmx:Edmx> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java index ba18683..8a603f1 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java @@ -19,15 +19,24 @@ package org.apache.olingo.client.api.serialization; import java.io.InputStream; +import java.util.List; import org.apache.olingo.client.api.data.ResWrap; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.commons.api.data.Delta; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; public interface ClientODataDeserializer extends ODataDeserializer { XMLMetadata toMetadata(InputStream input); + + /** + * Gets all the terms defined in the given input stream + * @param input + * @return + */ + List<CsdlSchema> fetchTermDefinitionSchema(List<InputStream> input); /** * Gets the ServiceDocument object represented by the given InputStream. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java index a374adb..349f67f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java @@ -19,6 +19,7 @@ package org.apache.olingo.client.api.serialization; import java.io.InputStream; +import java.util.List; import java.util.Map; import org.apache.olingo.client.api.data.ResWrap; @@ -47,6 +48,15 @@ public interface ODataReader { * @return metadata representation. */ Edm readMetadata(InputStream input); + + /** + * Parses a stream into metadata representation. + * Also parses a term definition stream into Term representation. + * @param input + * @param termDefinitions + * @return + */ + Edm readMetadata(InputStream input, List<InputStream> termDefinitions); /** * Parses a stream into metadata representation, including referenced metadata documents. @@ -56,6 +66,14 @@ public interface ODataReader { * @return metadata representation. */ Edm readMetadata(Map<String, CsdlSchema> xmlSchemas); + + /** + * Parses metadata document along with the document which includes term definitions + * @param xmlSchemas + * @param termDefinitionSchema + * @return + */ + Edm readMetadata(Map<String, CsdlSchema> xmlSchemas, List<CsdlSchema> termDefinitionSchema); /** * Parses an OData service document. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java index ec361ab..fcb2ca0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java @@ -20,6 +20,8 @@ package org.apache.olingo.client.core.serialization; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; import javax.xml.stream.XMLStreamException; @@ -38,6 +40,7 @@ import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; import org.apache.olingo.commons.api.ex.ODataError; import org.apache.olingo.commons.api.format.ContentType; @@ -138,4 +141,18 @@ public class ClientODataDeserializerImpl implements ClientODataDeserializer { throw new ODataDeserializerException(e); } } + + @Override + public List<CsdlSchema> fetchTermDefinitionSchema(List<InputStream> input) { + List<CsdlSchema> schemas = new ArrayList<CsdlSchema>(); + try { + for (InputStream stream : input) { + ClientCsdlEdmx edmx = getXmlMapper().readValue(stream, ClientCsdlEdmx.class); + schemas.addAll(edmx.getDataServices().getSchemas()); + } + return schemas; + } catch (Exception e) { + throw new IllegalArgumentException("Could not parse Term definition", e); + } + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java index 6b8c956..4cc171f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java @@ -20,6 +20,7 @@ package org.apache.olingo.client.core.serialization; import java.io.InputStream; import java.net.URI; +import java.util.List; import java.util.Map; import org.apache.commons.io.IOUtils; @@ -174,4 +175,16 @@ public class ODataReaderImpl implements ODataReader { throws ODataDeserializerException { return client.getBinder().getODataProperty(client.getDeserializer(contentType).toProperty(input)); } + + @Override + public Edm readMetadata(InputStream input, List<InputStream> termDefinitions) { + return readMetadata(client.getDeserializer(ContentType.APPLICATION_XML).toMetadata(input).getSchemaByNsOrAlias(), + client.getDeserializer(ContentType.APPLICATION_XML).fetchTermDefinitionSchema(termDefinitions)); + } + + @Override + public Edm readMetadata(Map<String, CsdlSchema> xmlSchemas, List<CsdlSchema> termDefinitionSchema) { + ClientCsdlEdmProvider prov = new ClientCsdlEdmProvider(xmlSchemas); + return new EdmProviderImpl(prov, termDefinitionSchema); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/lib/client-core/src/test/java/org/apache/olingo/client/core/MetadataTest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/MetadataTest.java index c150e64..181335b 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/MetadataTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/MetadataTest.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.InputStream; +import java.util.ArrayList; import java.util.List; import org.apache.olingo.client.api.edm.xml.XMLMetadata; @@ -40,9 +41,12 @@ import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmSchema; +import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.annotation.EdmExpression; import org.apache.olingo.commons.api.edm.annotation.EdmUrlRef; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; @@ -414,4 +418,41 @@ public class MetadataTest extends AbstractTest { assertNotNull(deleteRestrictions); assertEquals("Capabilities.DeleteRestrictionsType", deleteRestrictions.getType()); } + + @Test + public void readPropertyAnnotations() { + List<InputStream> streams = new ArrayList<InputStream>(); + streams.add(getClass().getResourceAsStream("VOC_Core.xml")); + final Edm edm = client.getReader().readMetadata(getClass().getResourceAsStream("edmxWithCoreAnnotation.xml"), + streams); + assertNotNull(edm); + + final EdmEntityType person = edm.getEntityType( + new FullQualifiedName("Microsoft.Exchange.Services.OData.Model", "Person")); + assertNotNull(person); + EdmProperty concurrency = (EdmProperty) person.getProperty("Concurrency"); + List<EdmAnnotation> annotations = concurrency.getAnnotations(); + for (EdmAnnotation annotation : annotations) { + EdmTerm term = annotation.getTerm(); + assertNotNull(term); + assertEquals("Computed", term.getName()); + assertEquals("Org.OData.Core.V1.Computed", + term.getFullQualifiedName().getFullQualifiedNameAsString()); + assertEquals(1, term.getAnnotations().size()); + } + EdmProperty userName = (EdmProperty) person.getProperty("UserName"); + List<EdmAnnotation> userNameAnnotations = userName.getAnnotations(); + for (EdmAnnotation annotation : userNameAnnotations) { + EdmTerm term = annotation.getTerm(); + assertNotNull(term); + assertEquals("Permissions", term.getName()); + assertEquals("Org.OData.Core.V1.Permissions", + term.getFullQualifiedName().getFullQualifiedNameAsString()); + EdmExpression expression = annotation.getExpression(); + assertNotNull(expression); + assertTrue(expression.isConstant()); + assertEquals("Org.OData.Core.V1.Permission/Read", expression.asConstant().getValueAsString()); + assertEquals("EnumMember", expression.getExpressionName()); + } + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/lib/client-core/src/test/resources/org/apache/olingo/client/core/VOC_Core.xml ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/VOC_Core.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/VOC_Core.xml new file mode 100644 index 0000000..4e30cad --- /dev/null +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/VOC_Core.xml @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + 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 + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"; Version="4.0"> + <edmx:DataServices> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm"; Namespace="Org.OData.Core.V1" Alias="Core"> + <Annotation Term="Core.Description"> + <String>Core terms needed to write vocabularies</String> + </Annotation> + + <!--Documentation --> + + <Term Name="Description" Type="Edm.String"> + <Annotation Term="Core.Description" String="A brief description of a model element" /> + <Annotation Term="Core.IsLanguageDependent" /> + </Term> + + <Term Name="LongDescription" Type="Edm.String"> + <Annotation Term="Core.Description" String="A lengthy description of a model element" /> + <Annotation Term="Core.IsLanguageDependent" /> + </Term> + + <!-- Localization --> + + <Term Name="IsLanguageDependent" Type="Core.Tag" DefaultValue="true" AppliesTo="Property Term"> + <Annotation Term="Core.Description" String="Properties and terms annotated with this term are language-dependent" /> + <Annotation Term="Core.RequiresType" String="Edm.String" /> + </Term> + + <!-- Term Restrictions --> + + <TypeDefinition Name="Tag" UnderlyingType="Edm.Boolean"> + <Annotation Term="Core.Description" String="This is the type to use for all tagging terms" /> + </TypeDefinition> + + <Term Name="RequiresType" Type="Edm.String" AppliesTo="Term"> + <Annotation Term="Core.Description" + String="Properties and terms annotated with this annotation MUST have a type that is identical to or derived from the given type name" /> + </Term> + + <!--Resource Paths --> + + <Term Name="ResourcePath" Type="Edm.String" AppliesTo="EntitySet Singleton ActionImport FunctionImport"> + <Annotation Term="Core.Description" + String="Resource path for entity container child, can be relative to xml:base and the request URL" /> + <Annotation Term="Core.IsUrl" /> + </Term> + + <Term Name="DereferenceableIDs" Type="Core.Tag" DefaultValue="true" AppliesTo="EntityContainer"> + <Annotation Term="Core.Description" String="Entity-ids are URLs that locate the identified entity" /> + </Term> + + <Term Name="ConventionalIDs" Type="Core.Tag" DefaultValue="true" AppliesTo="EntityContainer"> + <Annotation Term="Core.Description" String="Entity-ids follow OData URL conventions" /> + </Term> + + <!-- Permissions --> + + <Term Name="Permissions" Type="Core.Permission" AppliesTo="Property"> + <Annotation Term="Core.Description" String="Permissions available for a property.The value of 2 is reserved for future use." /> + </Term> + <EnumType Name="Permission" IsFlags="true"> + <Member Name="None" Value="0" /> + <Member Name="Read" Value="1" /> + <Member Name="ReadWrite" Value="3" /> + </EnumType> + + <!-- Metadata Extensions --> + + <Term Name="Immutable" Type="Core.Tag" DefaultValue="true" AppliesTo="Property"> + <Annotation Term="Core.Description" + String="A value for this non-key property can be provided on insert and remains unchanged on update" /> + </Term> + + <Term Name="Computed" Type="Core.Tag" DefaultValue="true" AppliesTo="Property"> + <Annotation Term="Core.Description" String="A value for this property is generated on both insert and update" /> + </Term> + + <Term Name="IsUrl" Type="Core.Tag" DefaultValue="true" AppliesTo="Property Term"> + <Annotation Term="Core.Description" String="Properties and terms annotated with this term MUST contain a valid URL" /> + <Annotation Term="Core.RequiresType" String="Edm.String" /> + </Term> + + <Term Name="AcceptableMediaTypes" Type="Collection(Edm.String)" AppliesTo="EntityType Property"> + <Annotation Term="Core.Description" + String="Lists the MIME types acceptable for the annotated entity type marked with HasStream="true" or the annotated stream property" /> + <Annotation Term="Core.IsMediaType" /> + </Term> + + <Term Name="MediaType" Type="Edm.String" AppliesTo="Property"> + <Annotation Term="Core.IsMediaType" /> + <Annotation Term="Core.RequiresType" String="Edm.Binary" /> + </Term> + + <Term Name="IsMediaType" Type="Core.Tag" DefaultValue="true" AppliesTo="Property Term"> + <Annotation Term="Core.Description" String="Properties and terms annotated with this term MUST contain a valid MIME type" /> + <Annotation Term="Core.RequiresType" String="Edm.String" /> + </Term> + + <Term Name="OptimisticConcurrency" Type="Collection(Edm.PropertyPath)" AppliesTo="EntitySet"> + <Annotation Term="Core.Description" + String="Data modification requires the use of Etags. A non-empty collection contains the set of properties that are used to compute the ETag" /> + </Term> + + </Schema> + </edmx:DataServices> +</edmx:Edmx> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/lib/client-core/src/test/resources/org/apache/olingo/client/core/edmxWithCoreAnnotation.xml ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/edmxWithCoreAnnotation.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/edmxWithCoreAnnotation.xml new file mode 100644 index 0000000..b7564a6 --- /dev/null +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/edmxWithCoreAnnotation.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + 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 + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx";> +<edmx:DataServices m:DataServiceVersion="4.0" m:MaxDataServiceVersion="4.0" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata";> + <Schema Namespace="Microsoft.Exchange.Services.OData.Model" xmlns="http://docs.oasis-open.org/odata/ns/edm";> + <EntityType Name="Person" OpenType="true"> + <Key> + <PropertyRef Name="UserName"/> + </Key> + <Property Name="UserName" Type="Edm.String" Nullable="false"> + <Annotation Term="Org.OData.Core.V1.Permissions"> + <EnumMember>Org.OData.Core.V1.Permission/Read</EnumMember> + </Annotation> + </Property> + <Property Name="FirstName" Type="Edm.String" Nullable="false"/> + <Property Name="LastName" Type="Edm.String" Nullable="false"/> + <Property Name="Emails" Type="Collection(Edm.String)"/> + <Property Name="AddressInfo" Type="Collection(Microsoft.OData.SampleService.Models.TripPin.Location)"/> + <Property Name="Gender" Type="Microsoft.OData.SampleService.Models.TripPin.PersonGender"/> + <Property Name="Concurrency" Type="Edm.Int64" Nullable="false"> + <Annotation Term="Org.OData.Core.V1.Computed" Bool="true"/> + </Property> + </EntityType> + <EntityContainer Name="EntityContainer" m:IsDefaultEntityContainer="true"> + <EntitySet Name="People" EntityType="Microsoft.Exchange.Services.OData.Model.Person"/> + </EntityContainer> + </Schema> + </edmx:DataServices> +</edmx:Edmx> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8f1a079f/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java index 53c69f4..ed43139 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java @@ -59,10 +59,16 @@ public class EdmProviderImpl extends AbstractEdm { Collections.synchronizedMap(new HashMap<FullQualifiedName, List<CsdlAction>>()); private final Map<FullQualifiedName, List<CsdlFunction>> functionsMap = Collections.synchronizedMap(new HashMap<FullQualifiedName, List<CsdlFunction>>()); + private List<CsdlSchema> termSchemaDefinition = null; public EdmProviderImpl(final CsdlEdmProvider provider) { this.provider = provider; } + + public EdmProviderImpl(final CsdlEdmProvider provider, final List<CsdlSchema> termSchemaDefinition) { + this.provider = provider; + this.termSchemaDefinition = termSchemaDefinition; + } @Override public EdmEntityContainer createEntityContainer(final FullQualifiedName containerName) { @@ -334,7 +340,18 @@ public class EdmProviderImpl extends AbstractEdm { CsdlTerm providerTerm = provider.getTerm(termName); if (providerTerm != null) { return new EdmTermImpl(this, termName.getNamespace(), providerTerm); - } + } else if (termSchemaDefinition != null && termSchemaDefinition.size() > 0) { + for (CsdlSchema schema : termSchemaDefinition) { + if (schema.getNamespace().equalsIgnoreCase(termName.getNamespace())) { + List<CsdlTerm> terms = schema.getTerms(); + for (CsdlTerm term : terms) { + if (term.getName().equals(termName.getName())) { + return new EdmTermImpl(this, termName.getNamespace(), term); + } + } + } + } + } return null; } catch (ODataException e) { throw new EdmException(e);
