[OLINGO-564] Renamed 'edm.provider.*' classes
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/2318953c Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/2318953c Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/2318953c Branch: refs/heads/OLINGO-564 Commit: 2318953c26781e40b034f91781a5d9689ea3a14a Parents: cbbe3da Author: Michael Bolz <[email protected]> Authored: Tue Apr 28 12:52:14 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Tue Apr 28 12:52:14 2015 +0200 ---------------------------------------------------------------------- .../olingo/client/api/edm/xml/DataServices.java | 4 +- .../olingo/client/api/edm/xml/Reference.java | 4 +- .../olingo/client/api/edm/xml/XMLMetadata.java | 10 +- .../client/api/serialization/ODataReader.java | 4 +- .../retrieve/XMLMetadataRequestImpl.java | 18 +- .../client/core/edm/ClientEdmProvider.java | 123 ++--- .../client/core/edm/ClientXMLMetadata.java | 18 +- ...tAnnotatableDynamicAnnotationExpression.java | 10 +- .../xml/AbstractClientAnnotationExpression.java | 4 +- .../client/core/edm/xml/ClientAction.java | 4 +- .../client/core/edm/xml/ClientActionImport.java | 4 +- .../client/core/edm/xml/ClientAnnotation.java | 8 +- .../client/core/edm/xml/ClientAnnotations.java | 4 +- .../client/core/edm/xml/ClientComplexType.java | 8 +- .../client/core/edm/xml/ClientDataServices.java | 10 +- .../olingo/client/core/edm/xml/ClientEdmx.java | 4 +- .../core/edm/xml/ClientEntityContainer.java | 4 +- .../client/core/edm/xml/ClientEntityKey.java | 10 +- .../client/core/edm/xml/ClientEntitySet.java | 8 +- .../client/core/edm/xml/ClientEntityType.java | 8 +- .../client/core/edm/xml/ClientEnumMember.java | 10 +- .../client/core/edm/xml/ClientEnumType.java | 4 +- .../client/core/edm/xml/ClientFunction.java | 4 +- .../core/edm/xml/ClientFunctionImport.java | 4 +- .../client/core/edm/xml/ClientInclude.java | 4 +- .../core/edm/xml/ClientIncludeAnnotations.java | 4 +- .../core/edm/xml/ClientNavigationProperty.java | 10 +- .../xml/ClientNavigationPropertyBinding.java | 13 +- .../client/core/edm/xml/ClientOnDelete.java | 14 +- .../client/core/edm/xml/ClientParameter.java | 4 +- .../client/core/edm/xml/ClientProperty.java | 4 +- .../client/core/edm/xml/ClientPropertyRef.java | 10 +- .../client/core/edm/xml/ClientReference.java | 10 +- .../edm/xml/ClientReferentialConstraint.java | 10 +- .../client/core/edm/xml/ClientReturnType.java | 4 +- .../client/core/edm/xml/ClientSchema.java | 4 +- .../client/core/edm/xml/ClientSingleton.java | 4 +- .../olingo/client/core/edm/xml/ClientTerm.java | 4 +- .../core/edm/xml/ClientTypeDefinition.java | 4 +- .../core/serialization/ODataReaderImpl.java | 4 +- .../olingo/client/core/uri/URIEscapeTest.java | 4 +- .../client/core/uri/v4/FilterFactoryTest.java | 4 +- .../olingo/client/core/v4/MetadataTest.java | 52 +- .../api/edm/provider/AbstractEdmItem.java | 64 --- .../api/edm/provider/AbstractEdmProvider.java | 116 ---- .../olingo/commons/api/edm/provider/Action.java | 56 -- .../commons/api/edm/provider/ActionImport.java | 59 --- .../commons/api/edm/provider/AliasInfo.java | 45 -- .../commons/api/edm/provider/Annotatable.java | 26 - .../commons/api/edm/provider/Annotation.java | 77 --- .../commons/api/edm/provider/Annotations.java | 66 --- .../commons/api/edm/provider/BindingTarget.java | 79 --- .../commons/api/edm/provider/ComplexType.java | 70 --- .../api/edm/provider/CsdlAbstractEdmItem.java | 64 +++ .../edm/provider/CsdlAbstractEdmProvider.java | 117 +++++ .../commons/api/edm/provider/CsdlAction.java | 56 ++ .../api/edm/provider/CsdlActionImport.java | 59 +++ .../commons/api/edm/provider/CsdlAliasInfo.java | 45 ++ .../api/edm/provider/CsdlAnnotatable.java | 26 + .../api/edm/provider/CsdlAnnotation.java | 77 +++ .../api/edm/provider/CsdlAnnotations.java | 66 +++ .../api/edm/provider/CsdlBindingTarget.java | 81 +++ .../api/edm/provider/CsdlComplexType.java | 70 +++ .../api/edm/provider/CsdlEdmProvider.java | 179 +++++++ .../api/edm/provider/CsdlEntityContainer.java | 159 ++++++ .../edm/provider/CsdlEntityContainerInfo.java | 47 ++ .../commons/api/edm/provider/CsdlEntitySet.java | 65 +++ .../api/edm/provider/CsdlEntitySetPath.java | 44 ++ .../api/edm/provider/CsdlEntityType.java | 92 ++++ .../api/edm/provider/CsdlEnumMember.java | 57 ++ .../commons/api/edm/provider/CsdlEnumType.java | 113 ++++ .../api/edm/provider/CsdlExpression.java | 23 + .../commons/api/edm/provider/CsdlFunction.java | 67 +++ .../api/edm/provider/CsdlFunctionImport.java | 77 +++ .../commons/api/edm/provider/CsdlMapping.java | 50 ++ .../commons/api/edm/provider/CsdlNamed.java | 26 + .../edm/provider/CsdlNavigationProperty.java | 138 +++++ .../provider/CsdlNavigationPropertyBinding.java | 47 ++ .../commons/api/edm/provider/CsdlOnDelete.java | 38 ++ .../api/edm/provider/CsdlOnDeleteAction.java | 28 + .../commons/api/edm/provider/CsdlOperation.java | 92 ++++ .../api/edm/provider/CsdlOperationImport.java | 54 ++ .../commons/api/edm/provider/CsdlParameter.java | 146 +++++ .../commons/api/edm/provider/CsdlProperty.java | 180 +++++++ .../api/edm/provider/CsdlPropertyRef.java | 46 ++ .../edm/provider/CsdlReferentialConstraint.java | 56 ++ .../api/edm/provider/CsdlReturnType.java | 114 ++++ .../commons/api/edm/provider/CsdlSchema.java | 265 ++++++++++ .../commons/api/edm/provider/CsdlSingleton.java | 53 ++ .../api/edm/provider/CsdlStructuralType.java | 122 +++++ .../commons/api/edm/provider/CsdlTerm.java | 162 ++++++ .../api/edm/provider/CsdlTypeDefinition.java | 123 +++++ .../commons/api/edm/provider/EdmProvider.java | 177 ------- .../api/edm/provider/EntityContainer.java | 159 ------ .../api/edm/provider/EntityContainerInfo.java | 47 -- .../commons/api/edm/provider/EntitySet.java | 64 --- .../commons/api/edm/provider/EntitySetPath.java | 44 -- .../commons/api/edm/provider/EntityType.java | 92 ---- .../commons/api/edm/provider/EnumMember.java | 57 -- .../commons/api/edm/provider/EnumType.java | 113 ---- .../commons/api/edm/provider/Expression.java | 23 - .../commons/api/edm/provider/Function.java | 67 --- .../api/edm/provider/FunctionImport.java | 77 --- .../commons/api/edm/provider/Mapping.java | 50 -- .../olingo/commons/api/edm/provider/Named.java | 26 - .../api/edm/provider/NavigationProperty.java | 137 ----- .../edm/provider/NavigationPropertyBinding.java | 47 -- .../commons/api/edm/provider/OnDelete.java | 38 -- .../api/edm/provider/OnDeleteAction.java | 28 - .../commons/api/edm/provider/Operation.java | 92 ---- .../api/edm/provider/OperationImport.java | 54 -- .../commons/api/edm/provider/Parameter.java | 146 ----- .../commons/api/edm/provider/Property.java | 180 ------- .../commons/api/edm/provider/PropertyRef.java | 46 -- .../api/edm/provider/ReferentialConstraint.java | 56 -- .../commons/api/edm/provider/ReturnType.java | 114 ---- .../olingo/commons/api/edm/provider/Schema.java | 265 ---------- .../commons/api/edm/provider/Singleton.java | 52 -- .../api/edm/provider/StructuralType.java | 122 ----- .../olingo/commons/api/edm/provider/Term.java | 162 ------ .../api/edm/provider/TypeDefinition.java | 123 ----- .../api/edm/provider/annotation/Apply.java | 4 +- .../api/edm/provider/annotation/Cast.java | 4 +- .../commons/api/edm/provider/annotation/If.java | 4 +- .../api/edm/provider/annotation/IsOf.java | 4 +- .../edm/provider/annotation/LabeledElement.java | 4 +- .../api/edm/provider/annotation/Null.java | 4 +- .../edm/provider/annotation/PropertyValue.java | 4 +- .../api/edm/provider/annotation/Record.java | 4 +- .../core/edm/AbstractEdmAnnotatable.java | 10 +- .../core/edm/AbstractEdmBindingTarget.java | 12 +- .../commons/core/edm/AbstractEdmNamed.java | 4 +- .../commons/core/edm/AbstractEdmOperation.java | 16 +- .../core/edm/AbstractEdmOperationImport.java | 4 +- .../core/edm/AbstractEdmStructuredType.java | 18 +- .../olingo/commons/core/edm/EdmActionImpl.java | 4 +- .../commons/core/edm/EdmActionImportImpl.java | 6 +- .../commons/core/edm/EdmAnnotationImpl.java | 12 +- .../commons/core/edm/EdmAnnotationsImpl.java | 10 +- .../commons/core/edm/EdmComplexTypeImpl.java | 4 +- .../core/edm/EdmEntityContainerImpl.java | 54 +- .../commons/core/edm/EdmEntitySetImpl.java | 6 +- .../commons/core/edm/EdmEntityTypeImpl.java | 12 +- .../commons/core/edm/EdmEnumTypeImpl.java | 10 +- .../commons/core/edm/EdmFunctionImpl.java | 6 +- .../commons/core/edm/EdmFunctionImportImpl.java | 7 +- .../commons/core/edm/EdmKeyPropertyRefImpl.java | 6 +- .../olingo/commons/core/edm/EdmMemberImpl.java | 6 +- .../core/edm/EdmNavigationPropertyImpl.java | 16 +- .../commons/core/edm/EdmParameterImpl.java | 6 +- .../commons/core/edm/EdmPropertyImpl.java | 6 +- .../commons/core/edm/EdmProviderImpl.java | 98 ++-- .../core/edm/EdmReferentialConstraintImpl.java | 6 +- .../commons/core/edm/EdmReturnTypeImpl.java | 6 +- .../olingo/commons/core/edm/EdmSchemaImpl.java | 64 +-- .../commons/core/edm/EdmSingletonImpl.java | 4 +- .../olingo/commons/core/edm/EdmTermImpl.java | 6 +- .../commons/core/edm/EdmTypeDefinitionImpl.java | 6 +- .../olingo/commons/core/edm/EdmTypeImpl.java | 4 +- .../org/apache/olingo/server/api/OData.java | 4 +- .../olingo/server/core/MetadataParser.java | 228 ++++---- .../server/core/SchemaBasedEdmProvider.java | 164 +++--- .../olingo/server/core/MetadataParserTest.java | 54 +- .../server/core/ServiceDispatcherTest.java | 8 +- .../olingo/server/example/TripPinServlet.java | 4 +- .../apache/olingo/server/core/ODataImpl.java | 4 +- .../olingo/server/core/ServiceMetadataImpl.java | 4 +- .../core/edm/provider/AbstractEdmNamedTest.java | 10 +- .../core/edm/provider/EdmActionImplTest.java | 20 +- .../edm/provider/EdmActionImportImplTest.java | 10 +- .../edm/provider/EdmComplexTypeImplTest.java | 38 +- .../provider/EdmEntityContainerImplTest.java | 75 +-- .../core/edm/provider/EdmEntitySetImplTest.java | 24 +- .../edm/provider/EdmEntityTypeImplTest.java | 132 ++--- .../server/core/edm/provider/EdmEnumTest.java | 40 +- .../core/edm/provider/EdmFunctionImplTest.java | 9 +- .../edm/provider/EdmFunctionImportImplTest.java | 24 +- .../edm/provider/EdmKeyPropertyRefImplTest.java | 18 +- .../core/edm/provider/EdmMappingTest.java | 16 +- .../core/edm/provider/EdmMemberImplTest.java | 4 +- .../provider/EdmNavigationPropertyImplTest.java | 56 +- .../core/edm/provider/EdmParameterImplTest.java | 45 +- .../core/edm/provider/EdmPropertyImplTest.java | 45 +- .../EdmProviderImplOverloadingTest.java | 62 +-- .../core/edm/provider/EdmProviderImplTest.java | 40 +- .../edm/provider/EdmReturnTypeImplTest.java | 20 +- .../core/edm/provider/EdmSchemaImplTest.java | 143 ++--- .../core/edm/provider/EdmSingletonImplTest.java | 44 +- .../edm/provider/EdmTypeDefinitionImplTest.java | 10 +- .../core/edm/provider/EdmTypeImplTest.java | 10 +- .../core/serializer/json/ComplexTypeHelper.java | 30 +- .../serializer/utils/ContextURLBuilderTest.java | 20 +- .../xml/MetadataDocumentXmlSerializerTest.java | 139 ++--- .../server/tecsvc/provider/ActionProvider.java | 118 ++--- .../tecsvc/provider/ComplexTypeProvider.java | 48 +- .../tecsvc/provider/ContainerProvider.java | 489 ++++++++--------- .../server/tecsvc/provider/EdmTechProvider.java | 67 +-- .../tecsvc/provider/EntityTypeProvider.java | 178 +++---- .../tecsvc/provider/EnumTypeProvider.java | 14 +- .../tecsvc/provider/FunctionProvider.java | 526 ++++++++++--------- .../tecsvc/provider/PropertyProvider.java | 304 +++++------ .../server/tecsvc/provider/SchemaProvider.java | 32 +- .../tecsvc/provider/TypeDefinitionProvider.java | 6 +- .../olingo/server/core/ODataHandlerTest.java | 8 +- .../json/ODataJsonDeserializerEntityTest.java | 4 +- .../core/uri/testutil/EdmTechTestProvider.java | 36 +- .../sample/edmprovider/CarsEdmProvider.java | 99 ++-- 207 files changed, 5559 insertions(+), 5481 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java index d542cac..99a9a70 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml; import java.util.List; -import org.apache.olingo.commons.api.edm.provider.Schema; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; public interface DataServices { @@ -28,5 +28,5 @@ public interface DataServices { String getMaxDataServiceVersion(); - List<Schema> getSchemas(); + List<CsdlSchema> getSchemas(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java index d85fd6e..8f24a91 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java @@ -21,9 +21,9 @@ package org.apache.olingo.client.api.edm.xml; import java.net.URI; import java.util.List; -import org.apache.olingo.commons.api.edm.provider.Annotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; -public interface Reference extends Annotatable { +public interface Reference extends CsdlAnnotatable { URI getUri(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java index c1231a1..74191cf 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.api.edm.xml; import java.util.List; import java.util.Map; -import org.apache.olingo.commons.api.edm.provider.Schema; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; /** * Entry point for access information about EDM metadata. @@ -34,7 +34,7 @@ public interface XMLMetadata { * @param index index of the Schema to return * @return the Schema at the specified position in the EdM metadata document */ - Schema getSchema(final int index); + CsdlSchema getSchema(final int index); /** * Returns the Schema with the specified key (namespace or alias) in the EdM metadata document. @@ -42,16 +42,16 @@ public interface XMLMetadata { * @param key namespace or alias * @return the Schema with the specified key in the EdM metadata document */ - Schema getSchema(final String key); + CsdlSchema getSchema(final String key); /** * Returns all Schema objects defined in the EdM metadata document. * * @return all Schema objects defined in the EdM metadata document */ - List<Schema> getSchemas(); + List<CsdlSchema> getSchemas(); - Map<String, Schema> getSchemaByNsOrAlias(); + Map<String, CsdlSchema> getSchemaByNsOrAlias(); List<Reference> getReferences(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/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 e895341..0634673 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 @@ -28,7 +28,7 @@ import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.provider.Schema; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; @@ -55,7 +55,7 @@ public interface ODataReader { * <tt><edmx:Reference/></tt>) metadata document * @return metadata representation. */ - Edm readMetadata(Map<String, Schema> xmlSchemas); + Edm readMetadata(Map<String, CsdlSchema> xmlSchemas); /** * Parses an OData service document. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java index 304c1bc..ff49b7b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java @@ -31,9 +31,9 @@ import org.apache.olingo.client.api.edm.xml.Include; import org.apache.olingo.client.api.edm.xml.IncludeAnnotations; import org.apache.olingo.client.api.edm.xml.Reference; import org.apache.olingo.client.api.edm.xml.XMLMetadata; -import org.apache.olingo.commons.api.edm.provider.Annotation; -import org.apache.olingo.commons.api.edm.provider.Annotations; -import org.apache.olingo.commons.api.edm.provider.Schema; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotations; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; import org.apache.olingo.commons.api.format.ODataFormat; public class XMLMetadataRequestImpl @@ -62,7 +62,7 @@ public class XMLMetadataRequestImpl // edmx:Include for (Include include : reference.getIncludes()) { - final Schema includedSchema = includeMetadata.getSchema(include.getNamespace()); + final CsdlSchema includedSchema = includeMetadata.getSchema(include.getNamespace()); if (includedSchema != null) { response.getBody().getSchemas().add(includedSchema); if (StringUtils.isNotBlank(include.getAlias())) { @@ -73,14 +73,14 @@ public class XMLMetadataRequestImpl // edmx:IncludeAnnotations for (IncludeAnnotations include : reference.getIncludeAnnotations()) { - for (Schema schema : includeMetadata.getSchemas()) { + for (CsdlSchema schema : includeMetadata.getSchemas()) { // create empty schema that will be fed with edm:Annotations that match the criteria in IncludeAnnotations - final Schema forInclusion = new Schema(); + final CsdlSchema forInclusion = new CsdlSchema(); forInclusion.setNamespace(schema.getNamespace()); forInclusion.setAlias(schema.getAlias()); // process all edm:Annotations in each schema of the included document - for (Annotations annotationGroup : schema.getAnnotationGroups()) { + for (CsdlAnnotations annotationGroup : schema.getAnnotationGroups()) { // take into account only when (TargetNamespace was either not provided or matches) and // (Qualifier was either not provided or matches) if ((StringUtils.isBlank(include.getTargetNamespace()) @@ -89,11 +89,11 @@ public class XMLMetadataRequestImpl && (StringUtils.isBlank(include.getQualifier()) || include.getQualifier().equals(annotationGroup.getQualifier()))) { - final Annotations toBeIncluded = new Annotations(); + final CsdlAnnotations toBeIncluded = new CsdlAnnotations(); toBeIncluded.setTarget(annotationGroup.getTarget()); toBeIncluded.setQualifier(annotationGroup.getQualifier()); // only import annotations with terms matching the given TermNamespace - for (Annotation annotation : annotationGroup.getAnnotations()) { + for (CsdlAnnotation annotation : annotationGroup.getAnnotations()) { if (include.getTermNamespace().equals(StringUtils.substringBeforeLast(annotation.getTerm(), "."))) { toBeIncluded.getAnnotations().add(annotation); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientEdmProvider.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientEdmProvider.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientEdmProvider.java index b062447..6284ade 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientEdmProvider.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientEdmProvider.java @@ -24,36 +24,36 @@ import java.util.Map; import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmProvider; -import org.apache.olingo.commons.api.edm.provider.Action; -import org.apache.olingo.commons.api.edm.provider.ActionImport; -import org.apache.olingo.commons.api.edm.provider.AliasInfo; -import org.apache.olingo.commons.api.edm.provider.Annotatable; -import org.apache.olingo.commons.api.edm.provider.Annotations; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EntityContainer; -import org.apache.olingo.commons.api.edm.provider.EntityContainerInfo; -import org.apache.olingo.commons.api.edm.provider.EntitySet; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.EnumType; -import org.apache.olingo.commons.api.edm.provider.Function; -import org.apache.olingo.commons.api.edm.provider.FunctionImport; -import org.apache.olingo.commons.api.edm.provider.Schema; -import org.apache.olingo.commons.api.edm.provider.Singleton; -import org.apache.olingo.commons.api.edm.provider.Term; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; - -public class ClientEdmProvider extends AbstractEdmProvider { - - private final Map<String, Schema> xmlSchemas; - - public ClientEdmProvider(Map<String, Schema> xmlSchemas) { +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlAction; +import org.apache.olingo.commons.api.edm.provider.CsdlActionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlAliasInfo; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotations; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo; +import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlFunction; +import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; +import org.apache.olingo.commons.api.edm.provider.CsdlSingleton; +import org.apache.olingo.commons.api.edm.provider.CsdlTerm; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; + +public class ClientEdmProvider extends CsdlAbstractEdmProvider { + + private final Map<String, CsdlSchema> xmlSchemas; + + public ClientEdmProvider(Map<String, CsdlSchema> xmlSchemas) { this.xmlSchemas = xmlSchemas; } @Override - public EnumType getEnumType(final FullQualifiedName enumTypeName) throws ODataException { - Schema schema = xmlSchemas.get(enumTypeName.getNamespace()); + public CsdlEnumType getEnumType(final FullQualifiedName enumTypeName) throws ODataException { + CsdlSchema schema = xmlSchemas.get(enumTypeName.getNamespace()); if (schema != null) { return schema.getEnumType(enumTypeName.getName()); } @@ -61,8 +61,8 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public TypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) throws ODataException { - Schema schema = xmlSchemas.get(typeDefinitionName.getNamespace()); + public CsdlTypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) throws ODataException { + CsdlSchema schema = xmlSchemas.get(typeDefinitionName.getNamespace()); if (schema != null) { return schema.getTypeDefinition(typeDefinitionName.getName()); } @@ -70,8 +70,8 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException { - Schema schema = xmlSchemas.get(entityTypeName.getNamespace()); + public CsdlEntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException { + CsdlSchema schema = xmlSchemas.get(entityTypeName.getNamespace()); if (schema != null) { return schema.getEntityType(entityTypeName.getName()); } @@ -79,8 +79,8 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException { - Schema schema = xmlSchemas.get(complexTypeName.getNamespace()); + public CsdlComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException { + CsdlSchema schema = xmlSchemas.get(complexTypeName.getNamespace()); if (schema != null) { return schema.getComplexType(complexTypeName.getName()); } @@ -88,8 +88,8 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public List<Action> getActions(final FullQualifiedName actionName) throws ODataException { - Schema schema = xmlSchemas.get(actionName.getNamespace()); + public List<CsdlAction> getActions(final FullQualifiedName actionName) throws ODataException { + CsdlSchema schema = xmlSchemas.get(actionName.getNamespace()); if (schema != null) { return schema.getActions(actionName.getName()); } @@ -97,8 +97,8 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public List<Function> getFunctions(final FullQualifiedName functionName) throws ODataException { - Schema schema = xmlSchemas.get(functionName.getNamespace()); + public List<CsdlFunction> getFunctions(final FullQualifiedName functionName) throws ODataException { + CsdlSchema schema = xmlSchemas.get(functionName.getNamespace()); if (schema != null) { return schema.getFunctions(functionName.getName()); } @@ -106,8 +106,8 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public Term getTerm(final FullQualifiedName termName) throws ODataException { - Schema schema = xmlSchemas.get(termName.getNamespace()); + public CsdlTerm getTerm(final FullQualifiedName termName) throws ODataException { + CsdlSchema schema = xmlSchemas.get(termName.getNamespace()); if (schema != null) { return schema.getTerm(termName.getName()); } @@ -115,9 +115,9 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName) + public CsdlEntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName) throws ODataException { - Schema schema = xmlSchemas.get(entityContainer.getNamespace()); + CsdlSchema schema = xmlSchemas.get(entityContainer.getNamespace()); if (schema != null) { return schema.getEntityContainer().getEntitySet(entitySetName); } @@ -125,9 +125,9 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public Singleton getSingleton(final FullQualifiedName entityContainer, final String singletonName) + public CsdlSingleton getSingleton(final FullQualifiedName entityContainer, final String singletonName) throws ODataException { - Schema schema = xmlSchemas.get(entityContainer.getNamespace()); + CsdlSchema schema = xmlSchemas.get(entityContainer.getNamespace()); if (schema != null) { return schema.getEntityContainer().getSingleton(singletonName); } @@ -135,9 +135,9 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public ActionImport getActionImport(final FullQualifiedName entityContainer, final String actionImportName) + public CsdlActionImport getActionImport(final FullQualifiedName entityContainer, final String actionImportName) throws ODataException { - Schema schema = xmlSchemas.get(entityContainer.getNamespace()); + CsdlSchema schema = xmlSchemas.get(entityContainer.getNamespace()); if (schema != null) { return schema.getEntityContainer().getActionImport(actionImportName); } @@ -145,9 +145,9 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public FunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String functionImportName) + public CsdlFunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String functionImportName) throws ODataException { - Schema schema = xmlSchemas.get(entityContainer.getNamespace()); + CsdlSchema schema = xmlSchemas.get(entityContainer.getNamespace()); if (schema != null) { return schema.getEntityContainer().getFunctionImport(functionImportName); } @@ -155,10 +155,11 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public EntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) throws ODataException { - for (Schema schema : xmlSchemas.values()) { + public CsdlEntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) + throws ODataException { + for (CsdlSchema schema : xmlSchemas.values()) { if (schema.getEntityContainer() != null) { - return new EntityContainerInfo().setContainerName(entityContainerName).setExtendsContainer( + return new CsdlEntityContainerInfo().setContainerName(entityContainerName).setExtendsContainer( schema.getEntityContainer().getExtendsContainerFQN()); } } @@ -166,24 +167,24 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public List<AliasInfo> getAliasInfos() throws ODataException { - ArrayList<AliasInfo> aliasInfo = new ArrayList<AliasInfo>(); - for (Schema schema : xmlSchemas.values()) { + public List<CsdlAliasInfo> getAliasInfos() throws ODataException { + ArrayList<CsdlAliasInfo> aliasInfo = new ArrayList<CsdlAliasInfo>(); + for (CsdlSchema schema : xmlSchemas.values()) { if (schema.getAlias() != null) { - aliasInfo.add(new AliasInfo().setNamespace(schema.getNamespace()).setAlias(schema.getAlias())); + aliasInfo.add(new CsdlAliasInfo().setNamespace(schema.getNamespace()).setAlias(schema.getAlias())); } } return aliasInfo; } @Override - public List<Schema> getSchemas() throws ODataException { - return new ArrayList<Schema>(xmlSchemas.values()); + public List<CsdlSchema> getSchemas() throws ODataException { + return new ArrayList<CsdlSchema>(xmlSchemas.values()); } @Override - public EntityContainer getEntityContainer() throws ODataException { - for (Schema schema : xmlSchemas.values()) { + public CsdlEntityContainer getEntityContainer() throws ODataException { + for (CsdlSchema schema : xmlSchemas.values()) { if (schema.getEntityContainer() != null) { return schema.getEntityContainer(); } @@ -192,8 +193,8 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public Annotations getAnnotationsGroup(FullQualifiedName targetName) throws ODataException { - Schema schema = xmlSchemas.get(targetName.getNamespace()); + public CsdlAnnotations getAnnotationsGroup(FullQualifiedName targetName) throws ODataException { + CsdlSchema schema = xmlSchemas.get(targetName.getNamespace()); if (schema != null) { return schema.getAnnotationGroup(targetName.getName()); } @@ -201,8 +202,8 @@ public class ClientEdmProvider extends AbstractEdmProvider { } @Override - public Annotatable getAnnoatatable(FullQualifiedName annotatedName) throws ODataException { - final Schema schema = xmlSchemas.get(annotatedName.getNamespace()); + public CsdlAnnotatable getAnnoatatable(FullQualifiedName annotatedName) throws ODataException { + final CsdlSchema schema = xmlSchemas.get(annotatedName.getNamespace()); if (schema != null) { return schema.getAnnotatables().get(annotatedName.getName()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientXMLMetadata.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientXMLMetadata.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientXMLMetadata.java index 661750d..96c07c2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientXMLMetadata.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientXMLMetadata.java @@ -26,13 +26,13 @@ import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.edm.xml.Edmx; import org.apache.olingo.client.api.edm.xml.Reference; import org.apache.olingo.client.api.edm.xml.XMLMetadata; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmItem; -import org.apache.olingo.commons.api.edm.provider.Schema; +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; /** * Entry point for access information about EDM metadata. */ -public class ClientXMLMetadata extends AbstractEdmItem implements XMLMetadata { +public class ClientXMLMetadata extends CsdlAbstractEdmItem implements XMLMetadata { private static final long serialVersionUID = 6025723060298454901L; protected final Edmx edmx; @@ -42,24 +42,24 @@ public class ClientXMLMetadata extends AbstractEdmItem implements XMLMetadata { } @Override - public List<Schema> getSchemas() { + public List<CsdlSchema> getSchemas() { return this.edmx.getDataServices().getSchemas(); } @Override - public Schema getSchema(final int index) { + public CsdlSchema getSchema(final int index) { return getSchemas().get(index); } @Override - public Schema getSchema(final String key) { + public CsdlSchema getSchema(final String key) { return getSchemaByNsOrAlias().get(key); } @Override - public Map<String, Schema> getSchemaByNsOrAlias() { - final Map<String, Schema> schemaByNsOrAlias = new HashMap<String, Schema>(); - for (Schema schema : getSchemas()) { + public Map<String, CsdlSchema> getSchemaByNsOrAlias() { + final Map<String, CsdlSchema> schemaByNsOrAlias = new HashMap<String, CsdlSchema>(); + for (CsdlSchema schema : getSchemas()) { schemaByNsOrAlias.put(schema.getNamespace(), schema); if (StringUtils.isNotBlank(schema.getAlias())) { schemaByNsOrAlias.put(schema.getAlias(), schema); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotatableDynamicAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotatableDynamicAnnotationExpression.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotatableDynamicAnnotationExpression.java index 614ca1f..052c4c7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotatableDynamicAnnotationExpression.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotatableDynamicAnnotationExpression.java @@ -21,18 +21,18 @@ package org.apache.olingo.client.core.edm.xml; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.edm.provider.Annotatable; -import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; abstract class AbstractClientAnnotatableDynamicAnnotationExpression - extends AbstractClientDynamicAnnotationExpression implements Annotatable { + extends AbstractClientDynamicAnnotationExpression implements CsdlAnnotatable { private static final long serialVersionUID = -450668773857358139L; - private final List<Annotation> annotations = new ArrayList<Annotation>(); + private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override - public List<Annotation> getAnnotations() { + public List<CsdlAnnotation> getAnnotations() { return annotations; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotationExpression.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotationExpression.java index 4bc802f..bcdaf40 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotationExpression.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractClientAnnotationExpression.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.client.core.edm.xml; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmItem; +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; import org.apache.olingo.commons.api.edm.provider.annotation.AnnotationExpression; import org.apache.olingo.commons.api.edm.provider.annotation.ConstantAnnotationExpression; import org.apache.olingo.commons.api.edm.provider.annotation.DynamicAnnotationExpression; -abstract class AbstractClientAnnotationExpression extends AbstractEdmItem implements AnnotationExpression { +abstract class AbstractClientAnnotationExpression extends CsdlAbstractEdmItem implements AnnotationExpression { private static final long serialVersionUID = -4238652997159205377L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAction.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAction.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAction.java index ceedc25..af274c5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAction.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAction.java @@ -22,14 +22,14 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.Action; +import org.apache.olingo.commons.api.edm.provider.CsdlAction; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientAction.ActionDeserializer.class) -class ClientAction extends Action { +class ClientAction extends CsdlAction { private static final long serialVersionUID = 5321541275349234088L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientActionImport.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientActionImport.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientActionImport.java index 4be6305..2419332 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientActionImport.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientActionImport.java @@ -22,12 +22,12 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.commons.api.edm.provider.ActionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlActionImport; import java.io.IOException; @JsonDeserialize(using = ClientActionImport.ActionImportDeserializer.class) -class ClientActionImport extends ActionImport { +class ClientActionImport extends CsdlActionImport { private static final long serialVersionUID = 2971468441177647068L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotation.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotation.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotation.java index cb27d0b..a8a978a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotation.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotation.java @@ -23,19 +23,19 @@ import java.io.IOException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize(using = ClientAnnotation.AnnotationDeserializer.class) -class ClientAnnotation extends Annotation { +class ClientAnnotation extends CsdlAnnotation { private static final long serialVersionUID = 5464714417411058033L; - static class AnnotationDeserializer extends AbstractClientEdmDeserializer<Annotation> { + static class AnnotationDeserializer extends AbstractClientEdmDeserializer<CsdlAnnotation> { @Override - protected Annotation doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlAnnotation doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { final ClientAnnotation annotation = new ClientAnnotation(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotations.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotations.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotations.java index 561fcfd..d395706 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotations.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientAnnotations.java @@ -21,14 +21,14 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.Annotations; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotations; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientAnnotations.AnnotationsDeserializer.class) -class ClientAnnotations extends Annotations { +class ClientAnnotations extends CsdlAnnotations { private static final long serialVersionUID = -5961207981571644200L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientComplexType.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientComplexType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientComplexType.java index 875b56f..1f6e6de 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientComplexType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientComplexType.java @@ -22,21 +22,21 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.ComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientComplexType.ComplexTypeDeserializer.class) -class ClientComplexType extends ComplexType { +class ClientComplexType extends CsdlComplexType { private static final long serialVersionUID = 4076944306925840115L; - static class ComplexTypeDeserializer extends AbstractClientEdmDeserializer<ComplexType> { + static class ComplexTypeDeserializer extends AbstractClientEdmDeserializer<CsdlComplexType> { @Override - protected ComplexType doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlComplexType doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { final ClientComplexType complexType = new ClientComplexType(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientDataServices.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientDataServices.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientDataServices.java index 3292b34..d4a4406 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientDataServices.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientDataServices.java @@ -26,17 +26,17 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.olingo.client.api.edm.xml.DataServices; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmItem; -import org.apache.olingo.commons.api.edm.provider.Schema; +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize(using = ClientDataServices.DataServicesDeserializer.class) -class ClientDataServices extends AbstractEdmItem implements DataServices { +class ClientDataServices extends CsdlAbstractEdmItem implements DataServices { private static final long serialVersionUID = 4200317286476885204L; - private final List<Schema> schemas = new ArrayList<Schema>(); + private final List<CsdlSchema> schemas = new ArrayList<CsdlSchema>(); private String dataServiceVersion; @@ -61,7 +61,7 @@ class ClientDataServices extends AbstractEdmItem implements DataServices { } @Override - public List<Schema> getSchemas() { + public List<CsdlSchema> getSchemas() { return schemas; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEdmx.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEdmx.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEdmx.java index 29a399c..736030b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEdmx.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEdmx.java @@ -28,12 +28,12 @@ import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.olingo.client.api.edm.xml.DataServices; import org.apache.olingo.client.api.edm.xml.Edmx; import org.apache.olingo.client.api.edm.xml.Reference; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmItem; +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize(using = ClientEdmx.EdmxDeserializer.class) -public class ClientEdmx extends AbstractEdmItem implements Edmx { +public class ClientEdmx extends CsdlAbstractEdmItem implements Edmx { private static final long serialVersionUID = -6293476719276092572L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityContainer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityContainer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityContainer.java index 6efbf34..2109cee 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityContainer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityContainer.java @@ -21,14 +21,14 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.EntityContainer; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientEntityContainer.EntityContainerDeserializer.class) -class ClientEntityContainer extends EntityContainer { +class ClientEntityContainer extends CsdlEntityContainer { private static final long serialVersionUID = 5631432527646955795L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityKey.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityKey.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityKey.java index 6e2a137..6b9e230 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityKey.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityKey.java @@ -25,19 +25,19 @@ import java.util.List; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmItem; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize(using = ClientEntityKey.EntityKeyDeserializer.class) -class ClientEntityKey extends AbstractEdmItem { +class ClientEntityKey extends CsdlAbstractEdmItem { private static final long serialVersionUID = 520227585458843347L; - private final List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>(); + private final List<CsdlPropertyRef> propertyRefs = new ArrayList<CsdlPropertyRef>(); - public List<PropertyRef> getPropertyRefs() { + public List<CsdlPropertyRef> getPropertyRefs() { return propertyRefs; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntitySet.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntitySet.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntitySet.java index 11d3cde..ca358cb 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntitySet.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntitySet.java @@ -22,20 +22,20 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.EntitySet; +import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientEntitySet.EntitySetDeserializer.class) -class ClientEntitySet extends EntitySet { +class ClientEntitySet extends CsdlEntitySet { private static final long serialVersionUID = -5553885465204370676L; - static class EntitySetDeserializer extends AbstractClientEdmDeserializer<EntitySet> { + static class EntitySetDeserializer extends AbstractClientEdmDeserializer<CsdlEntitySet> { @Override - protected EntitySet doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlEntitySet doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { final ClientEntitySet entitySet = new ClientEntitySet(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityType.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityType.java index 4e1e7eb..ceef35e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEntityType.java @@ -22,20 +22,20 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.EntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientEntityType.EntityTypeDeserializer.class) -class ClientEntityType extends EntityType { +class ClientEntityType extends CsdlEntityType { private static final long serialVersionUID = -3986417775876689669L; - static class EntityTypeDeserializer extends AbstractClientEdmDeserializer<EntityType> { + static class EntityTypeDeserializer extends AbstractClientEdmDeserializer<CsdlEntityType> { @Override - protected EntityType doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlEntityType doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { final ClientEntityType entityType = new ClientEntityType(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumMember.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumMember.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumMember.java index 603e7fe..b72e2df 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumMember.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumMember.java @@ -22,21 +22,21 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.commons.api.edm.provider.EnumMember; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember; import java.io.IOException; @JsonDeserialize(using = ClientEnumMember.EnumMemberDeserializer.class) -class ClientEnumMember extends EnumMember { +class ClientEnumMember extends CsdlEnumMember { private static final long serialVersionUID = -6138606817225829791L; - static class EnumMemberDeserializer extends AbstractClientEdmDeserializer<EnumMember> { + static class EnumMemberDeserializer extends AbstractClientEdmDeserializer<CsdlEnumMember> { @Override - protected EnumMember doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlEnumMember doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { - final EnumMember member = new EnumMember(); + final CsdlEnumMember member = new CsdlEnumMember(); for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { final JsonToken token = jp.getCurrentToken(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumType.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumType.java index 4abaebb..e64f1c8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientEnumType.java @@ -22,14 +22,14 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.EnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientEnumType.EnumTypeDeserializer.class) -class ClientEnumType extends EnumType { +class ClientEnumType extends CsdlEnumType { private static final long serialVersionUID = 9191189755592743333L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunction.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunction.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunction.java index 7901399..c07b37e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunction.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunction.java @@ -22,14 +22,14 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.Function; +import org.apache.olingo.commons.api.edm.provider.CsdlFunction; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientFunction.FunctionDeserializer.class) -class ClientFunction extends Function { +class ClientFunction extends CsdlFunction { private static final long serialVersionUID = -5494898295282843362L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunctionImport.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunctionImport.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunctionImport.java index 86bce9c..25c3a91 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunctionImport.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientFunctionImport.java @@ -22,14 +22,14 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.FunctionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientFunctionImport.FunctionImportDeserializer.class) -class ClientFunctionImport extends FunctionImport { +class ClientFunctionImport extends CsdlFunctionImport { private static final long serialVersionUID = -1686801084142932402L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientInclude.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientInclude.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientInclude.java index 4bc8075..fafd3a4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientInclude.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientInclude.java @@ -23,12 +23,12 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.olingo.client.api.edm.xml.Include; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmItem; +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; import java.io.IOException; @JsonDeserialize(using = ClientInclude.IncludeDeserializer.class) -class ClientInclude extends AbstractEdmItem implements Include { +class ClientInclude extends CsdlAbstractEdmItem implements Include { private static final long serialVersionUID = -5450008299655584221L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIncludeAnnotations.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIncludeAnnotations.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIncludeAnnotations.java index 30ddccc..3617c65 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIncludeAnnotations.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientIncludeAnnotations.java @@ -23,12 +23,12 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.olingo.client.api.edm.xml.IncludeAnnotations; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmItem; +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; import java.io.IOException; @JsonDeserialize(using = ClientIncludeAnnotations.IncludeAnnotationsDeserializer.class) -class ClientIncludeAnnotations extends AbstractEdmItem implements IncludeAnnotations { +class ClientIncludeAnnotations extends CsdlAbstractEdmItem implements IncludeAnnotations { private static final long serialVersionUID = -8157841387011422396L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationProperty.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationProperty.java index 2c561c7..5b0af33 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationProperty.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationProperty.java @@ -22,24 +22,24 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.commons.api.edm.provider.NavigationProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientNavigationProperty.NavigationPropertyDeserializer.class) -class ClientNavigationProperty extends NavigationProperty { +class ClientNavigationProperty extends CsdlNavigationProperty { private static final long serialVersionUID = 6240231735592427582L; - static class NavigationPropertyDeserializer extends AbstractClientEdmDeserializer<NavigationProperty> { + static class NavigationPropertyDeserializer extends AbstractClientEdmDeserializer<CsdlNavigationProperty> { @Override - protected NavigationProperty doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlNavigationProperty doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { - final NavigationProperty property = new ClientNavigationProperty(); + final CsdlNavigationProperty property = new ClientNavigationProperty(); for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { final JsonToken token = jp.getCurrentToken(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyBinding.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyBinding.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyBinding.java index fffe729..250c769 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyBinding.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientNavigationPropertyBinding.java @@ -22,30 +22,31 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.commons.api.edm.provider.NavigationPropertyBinding; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationPropertyBinding; import java.io.IOException; @JsonDeserialize(using = ClientNavigationPropertyBinding.NavigationPropertyBindingDeserializer.class) -class ClientNavigationPropertyBinding extends NavigationPropertyBinding { +class ClientNavigationPropertyBinding extends CsdlNavigationPropertyBinding { private static final long serialVersionUID = -7056978592235483660L; @Override - public NavigationPropertyBinding setPath(final String path) { + public CsdlNavigationPropertyBinding setPath(final String path) { super.setPath(path); return this; } @Override - public NavigationPropertyBinding setTarget(final String target) { + public CsdlNavigationPropertyBinding setTarget(final String target) { super.setTarget(target); return this; } - static class NavigationPropertyBindingDeserializer extends AbstractClientEdmDeserializer<NavigationPropertyBinding> { + static class NavigationPropertyBindingDeserializer extends + AbstractClientEdmDeserializer<CsdlNavigationPropertyBinding> { @Override - protected NavigationPropertyBinding doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlNavigationPropertyBinding doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { final ClientNavigationPropertyBinding member = new ClientNavigationPropertyBinding(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientOnDelete.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientOnDelete.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientOnDelete.java index bd38595..489326d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientOnDelete.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientOnDelete.java @@ -22,28 +22,28 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.commons.api.edm.provider.OnDelete; -import org.apache.olingo.commons.api.edm.provider.OnDeleteAction; +import org.apache.olingo.commons.api.edm.provider.CsdlOnDelete; +import org.apache.olingo.commons.api.edm.provider.CsdlOnDeleteAction; import java.io.IOException; @JsonDeserialize(using = ClientOnDelete.OnDeleteDeserializer.class) -class ClientOnDelete extends OnDelete { +class ClientOnDelete extends CsdlOnDelete { private static final long serialVersionUID = -7130889202653716784L; - static class OnDeleteDeserializer extends AbstractClientEdmDeserializer<OnDelete> { + static class OnDeleteDeserializer extends AbstractClientEdmDeserializer<CsdlOnDelete> { @Override - protected OnDelete doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlOnDelete doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { - final OnDelete ondelete = new ClientOnDelete(); + final CsdlOnDelete ondelete = new ClientOnDelete(); for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { final JsonToken token = jp.getCurrentToken(); if (token == JsonToken.FIELD_NAME) { if ("Action".equals(jp.getCurrentName())) { - OnDeleteAction action = OnDeleteAction.valueOf(jp.nextTextValue()); + CsdlOnDeleteAction action = CsdlOnDeleteAction.valueOf(jp.nextTextValue()); ondelete.setAction(action); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientParameter.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientParameter.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientParameter.java index be2ecea..24e8650 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientParameter.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientParameter.java @@ -23,14 +23,14 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.Parameter; +import org.apache.olingo.commons.api.edm.provider.CsdlParameter; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientParameter.ParameterDeserializer.class) -class ClientParameter extends Parameter { +class ClientParameter extends CsdlParameter { private static final long serialVersionUID = 7119478691341167904L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientProperty.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientProperty.java index 7389d67..d753fd4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientProperty.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientProperty.java @@ -23,14 +23,14 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.Property; +import org.apache.olingo.commons.api.edm.provider.CsdlProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientProperty.PropertyDeserializer.class) -class ClientProperty extends Property { +class ClientProperty extends CsdlProperty { private static final long serialVersionUID = -4521766603286651372L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientPropertyRef.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientPropertyRef.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientPropertyRef.java index 3f1c8e3..17bdc33 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientPropertyRef.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientPropertyRef.java @@ -22,21 +22,21 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; import java.io.IOException; @JsonDeserialize(using = ClientPropertyRef.PropertyRefDeserializer.class) -class ClientPropertyRef extends PropertyRef { +class ClientPropertyRef extends CsdlPropertyRef { private static final long serialVersionUID = 1504095609268590326L; - static class PropertyRefDeserializer extends AbstractClientEdmDeserializer<PropertyRef> { + static class PropertyRefDeserializer extends AbstractClientEdmDeserializer<CsdlPropertyRef> { @Override - protected PropertyRef doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlPropertyRef doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { - final PropertyRef propertyRef = new ClientPropertyRef(); + final CsdlPropertyRef propertyRef = new ClientPropertyRef(); for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { final JsonToken token = jp.getCurrentToken(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReference.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReference.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReference.java index a172405..36b43d6 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReference.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReference.java @@ -29,23 +29,23 @@ import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.olingo.client.api.edm.xml.Include; import org.apache.olingo.client.api.edm.xml.IncludeAnnotations; import org.apache.olingo.client.api.edm.xml.Reference; -import org.apache.olingo.commons.api.edm.provider.AbstractEdmItem; -import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @JsonDeserialize(using = ClientReference.ReferenceDeserializer.class) -class ClientReference extends AbstractEdmItem implements Reference { +class ClientReference extends CsdlAbstractEdmItem implements Reference { private static final long serialVersionUID = 7720274712545267654L; private URI uri; private final List<Include> includes = new ArrayList<Include>(); private final List<IncludeAnnotations> includeAnnotations = new ArrayList<IncludeAnnotations>(); - private final List<Annotation> annotations = new ArrayList<Annotation>(); + private final List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>(); @Override - public List<Annotation> getAnnotations() { + public List<CsdlAnnotation> getAnnotations() { return annotations; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReferentialConstraint.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReferentialConstraint.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReferentialConstraint.java index 04b554d..e613563 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReferentialConstraint.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReferentialConstraint.java @@ -22,21 +22,21 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.olingo.commons.api.edm.provider.ReferentialConstraint; +import org.apache.olingo.commons.api.edm.provider.CsdlReferentialConstraint; import java.io.IOException; @JsonDeserialize(using = ClientReferentialConstraint.ReferentialConstraintDeserializer.class) -class ClientReferentialConstraint extends ReferentialConstraint { +class ClientReferentialConstraint extends CsdlReferentialConstraint { private static final long serialVersionUID = -5822115908069878139L; - static class ReferentialConstraintDeserializer extends AbstractClientEdmDeserializer<ReferentialConstraint> { + static class ReferentialConstraintDeserializer extends AbstractClientEdmDeserializer<CsdlReferentialConstraint> { @Override - protected ReferentialConstraint doDeserialize(final JsonParser jp, final DeserializationContext ctxt) + protected CsdlReferentialConstraint doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException { - final ReferentialConstraint refConst = new ClientReferentialConstraint(); + final CsdlReferentialConstraint refConst = new ClientReferentialConstraint(); for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { final JsonToken token = jp.getCurrentToken(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReturnType.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReturnType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReturnType.java index 987d374..72db23f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReturnType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientReturnType.java @@ -23,14 +23,14 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.ReturnType; +import org.apache.olingo.commons.api.edm.provider.CsdlReturnType; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientReturnType.ReturnTypeDeserializer.class) -class ClientReturnType extends ReturnType { +class ClientReturnType extends CsdlReturnType { private static final long serialVersionUID = 6261092793901735110L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSchema.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSchema.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSchema.java index 5846b36..a4a0dd7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSchema.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSchema.java @@ -21,14 +21,14 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.Schema; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientSchema.SchemaDeserializer.class) -class ClientSchema extends Schema { +class ClientSchema extends CsdlSchema { private static final long serialVersionUID = 1911087363912024939L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSingleton.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSingleton.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSingleton.java index cba4b32..a06d6e8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSingleton.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientSingleton.java @@ -21,14 +21,14 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.commons.api.edm.provider.Singleton; +import org.apache.olingo.commons.api.edm.provider.CsdlSingleton; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.io.IOException; @JsonDeserialize(using = ClientSingleton.SingletonDeserializer.class) -class ClientSingleton extends Singleton { +class ClientSingleton extends CsdlSingleton { private static final long serialVersionUID = 1656749615107151921L; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientTerm.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientTerm.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientTerm.java index ed78e03..f0904dd 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientTerm.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientTerm.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.Term; +import org.apache.olingo.commons.api.edm.provider.CsdlTerm; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -32,7 +32,7 @@ import java.io.IOException; import java.util.Arrays; @JsonDeserialize(using = ClientTerm.TermDeserializer.class) -class ClientTerm extends Term { +class ClientTerm extends CsdlTerm { private static final long serialVersionUID = -8350072064720586186L;
