You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/03/07 10:09:24 UTC

[35/57] [abbrv] git commit: [OLINGO-169] Package renaming according to latest ML discussion

[OLINGO-169] Package renaming according to latest ML discussion


Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/cdb520e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/cdb520e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/cdb520e3

Branch: refs/heads/master
Commit: cdb520e34b29e2ca538b3c6d8e9d505bde6f57c3
Parents: eb886d6
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Feb 27 10:54:04 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Feb 27 10:54:04 2014 +0100

----------------------------------------------------------------------
 .../client/api/edm/AbstractAnnotations.java     |  30 ---
 .../client/api/edm/CommonFunctionImport.java    |  22 ---
 .../api/edm/CommonNavigationProperty.java       |  22 ---
 .../odata4/client/api/edm/CommonParameter.java  |  45 -----
 .../odata4/client/api/edm/CommonProperty.java   |  74 -------
 .../odata4/client/api/edm/ComplexType.java      |  32 ---
 .../odata4/client/api/edm/DataServices.java     |  34 ----
 .../odata4/client/api/edm/EdmMetadata.java      |   1 +
 .../olingo/odata4/client/api/edm/EdmType.java   |   3 +
 .../olingo/odata4/client/api/edm/Edmx.java      |  30 ---
 .../odata4/client/api/edm/EntityContainer.java  |  58 ------
 .../olingo/odata4/client/api/edm/EntityKey.java |  26 ---
 .../olingo/odata4/client/api/edm/EntitySet.java |  26 ---
 .../odata4/client/api/edm/EntityType.java       |  42 ----
 .../olingo/odata4/client/api/edm/EnumType.java  |  38 ----
 .../olingo/odata4/client/api/edm/Member.java    |  26 ---
 .../olingo/odata4/client/api/edm/Named.java     |  26 ---
 .../olingo/odata4/client/api/edm/OnDelete.java  |  28 ---
 .../odata4/client/api/edm/PropertyRef.java      |  26 ---
 .../olingo/odata4/client/api/edm/Schema.java    |  79 --------
 .../odata4/client/api/edm/v3/Annotations.java   |  29 ---
 .../odata4/client/api/edm/v3/Association.java   |  32 ---
 .../client/api/edm/v3/AssociationEnd.java       |  40 ----
 .../client/api/edm/v3/AssociationSet.java       |  31 ---
 .../client/api/edm/v3/AssociationSetEnd.java    |  30 ---
 .../client/api/edm/v3/FunctionImport.java       |  60 ------
 .../client/api/edm/v3/NavigationProperty.java   |  34 ----
 .../odata4/client/api/edm/v3/Parameter.java     |  26 ---
 .../odata4/client/api/edm/v3/ParameterMode.java |  27 ---
 .../odata4/client/api/edm/v3/Property.java      |  50 -----
 .../odata4/client/api/edm/v3/PropertyValue.java |  59 ------
 .../api/edm/v3/ReferentialConstraint.java       |  30 ---
 .../api/edm/v3/ReferentialConstraintRole.java   |  32 ---
 .../client/api/edm/v3/TypeAnnotation.java       |  35 ----
 .../olingo/odata4/client/api/edm/v3/Using.java  |  31 ---
 .../client/api/edm/v3/ValueAnnotation.java      |  63 ------
 .../odata4/client/api/edm/v3/ValueTerm.java     |  28 ---
 .../olingo/odata4/client/api/edm/v4/Action.java |  43 ----
 .../odata4/client/api/edm/v4/ActionImport.java  |  26 ---
 .../client/api/edm/v4/AnnotatedEdmItem.java     |  26 ---
 .../odata4/client/api/edm/v4/Annotation.java    |  41 ----
 .../odata4/client/api/edm/v4/Annotations.java   |  29 ---
 .../odata4/client/api/edm/v4/CSDLElement.java   |  37 ----
 .../odata4/client/api/edm/v4/ComplexType.java   |  35 ----
 .../olingo/odata4/client/api/edm/v4/Edmx.java   |  26 ---
 .../client/api/edm/v4/EntityContainer.java      |  43 ----
 .../odata4/client/api/edm/v4/EntitySet.java     |  30 ---
 .../odata4/client/api/edm/v4/EntityType.java    |  23 ---
 .../odata4/client/api/edm/v4/Function.java      |  26 ---
 .../client/api/edm/v4/FunctionImport.java       |  32 ---
 .../odata4/client/api/edm/v4/Include.java       |  30 ---
 .../client/api/edm/v4/IncludeAnnotations.java   |  34 ----
 .../client/api/edm/v4/NavigationProperty.java   |  49 -----
 .../api/edm/v4/NavigationPropertyBinding.java   |  31 ---
 .../client/api/edm/v4/OnDeleteAction.java       |  28 ---
 .../client/api/edm/v4/OperationImport.java      |  28 ---
 .../odata4/client/api/edm/v4/Parameter.java     |  26 ---
 .../odata4/client/api/edm/v4/Property.java      |  25 ---
 .../odata4/client/api/edm/v4/Reference.java     |  35 ----
 .../api/edm/v4/ReferentialConstraint.java       |  31 ---
 .../odata4/client/api/edm/v4/ReturnType.java    |  48 -----
 .../odata4/client/api/edm/v4/Singleton.java     |  32 ---
 .../olingo/odata4/client/api/edm/v4/Term.java   |  60 ------
 .../client/api/edm/v4/TypeDefinition.java       |  52 -----
 .../edm/v4/annotation/ConstExprConstruct.java   |  56 ------
 .../api/edm/v4/annotation/DynExprConstruct.java |  23 ---
 .../api/edm/v4/annotation/ExprConstruct.java    |  23 ---
 .../client/api/edm/xml/AbstractAnnotations.java |  30 +++
 .../api/edm/xml/CommonFunctionImport.java       |  22 +++
 .../api/edm/xml/CommonNavigationProperty.java   |  22 +++
 .../client/api/edm/xml/CommonParameter.java     |  45 +++++
 .../client/api/edm/xml/CommonProperty.java      |  74 +++++++
 .../odata4/client/api/edm/xml/ComplexType.java  |  32 +++
 .../odata4/client/api/edm/xml/DataServices.java |  34 ++++
 .../olingo/odata4/client/api/edm/xml/Edmx.java  |  30 +++
 .../client/api/edm/xml/EntityContainer.java     |  58 ++++++
 .../odata4/client/api/edm/xml/EntityKey.java    |  26 +++
 .../odata4/client/api/edm/xml/EntitySet.java    |  26 +++
 .../odata4/client/api/edm/xml/EntityType.java   |  42 ++++
 .../odata4/client/api/edm/xml/EnumType.java     |  38 ++++
 .../odata4/client/api/edm/xml/Member.java       |  26 +++
 .../olingo/odata4/client/api/edm/xml/Named.java |  26 +++
 .../odata4/client/api/edm/xml/OnDelete.java     |  28 +++
 .../odata4/client/api/edm/xml/PropertyRef.java  |  26 +++
 .../odata4/client/api/edm/xml/Schema.java       |  79 ++++++++
 .../client/api/edm/xml/v3/Annotations.java      |  29 +++
 .../client/api/edm/xml/v3/Association.java      |  32 +++
 .../client/api/edm/xml/v3/AssociationEnd.java   |  40 ++++
 .../client/api/edm/xml/v3/AssociationSet.java   |  31 +++
 .../api/edm/xml/v3/AssociationSetEnd.java       |  30 +++
 .../client/api/edm/xml/v3/FunctionImport.java   |  60 ++++++
 .../api/edm/xml/v3/NavigationProperty.java      |  34 ++++
 .../odata4/client/api/edm/xml/v3/Parameter.java |  26 +++
 .../client/api/edm/xml/v3/ParameterMode.java    |  27 +++
 .../odata4/client/api/edm/xml/v3/Property.java  |  50 +++++
 .../client/api/edm/xml/v3/PropertyValue.java    |  59 ++++++
 .../api/edm/xml/v3/ReferentialConstraint.java   |  30 +++
 .../edm/xml/v3/ReferentialConstraintRole.java   |  32 +++
 .../client/api/edm/xml/v3/TypeAnnotation.java   |  35 ++++
 .../odata4/client/api/edm/xml/v3/Using.java     |  31 +++
 .../client/api/edm/xml/v3/ValueAnnotation.java  |  63 ++++++
 .../odata4/client/api/edm/xml/v3/ValueTerm.java |  28 +++
 .../odata4/client/api/edm/xml/v4/Action.java    |  43 ++++
 .../client/api/edm/xml/v4/ActionImport.java     |  26 +++
 .../client/api/edm/xml/v4/AnnotatedEdmItem.java |  26 +++
 .../client/api/edm/xml/v4/Annotation.java       |  41 ++++
 .../client/api/edm/xml/v4/Annotations.java      |  29 +++
 .../client/api/edm/xml/v4/CSDLElement.java      |  37 ++++
 .../client/api/edm/xml/v4/ComplexType.java      |  35 ++++
 .../odata4/client/api/edm/xml/v4/Edmx.java      |  26 +++
 .../client/api/edm/xml/v4/EntityContainer.java  |  43 ++++
 .../odata4/client/api/edm/xml/v4/EntitySet.java |  30 +++
 .../client/api/edm/xml/v4/EntityType.java       |  23 +++
 .../odata4/client/api/edm/xml/v4/Function.java  |  26 +++
 .../client/api/edm/xml/v4/FunctionImport.java   |  32 +++
 .../odata4/client/api/edm/xml/v4/Include.java   |  30 +++
 .../api/edm/xml/v4/IncludeAnnotations.java      |  34 ++++
 .../api/edm/xml/v4/NavigationProperty.java      |  49 +++++
 .../edm/xml/v4/NavigationPropertyBinding.java   |  31 +++
 .../client/api/edm/xml/v4/OnDeleteAction.java   |  28 +++
 .../client/api/edm/xml/v4/OperationImport.java  |  28 +++
 .../odata4/client/api/edm/xml/v4/Parameter.java |  26 +++
 .../odata4/client/api/edm/xml/v4/Property.java  |  25 +++
 .../odata4/client/api/edm/xml/v4/Reference.java |  35 ++++
 .../api/edm/xml/v4/ReferentialConstraint.java   |  31 +++
 .../client/api/edm/xml/v4/ReturnType.java       |  48 +++++
 .../odata4/client/api/edm/xml/v4/Singleton.java |  32 +++
 .../odata4/client/api/edm/xml/v4/Term.java      |  60 ++++++
 .../client/api/edm/xml/v4/TypeDefinition.java   |  52 +++++
 .../xml/v4/annotation/ConstExprConstruct.java   |  56 ++++++
 .../edm/xml/v4/annotation/DynExprConstruct.java |  23 +++
 .../edm/xml/v4/annotation/ExprConstruct.java    |  23 +++
 .../odata4/client/api/op/ODataDeserializer.java |   2 +-
 .../client/core/edm/AbstractAnnotations.java    |  53 -----
 .../client/core/edm/AbstractComplexType.java    |  53 -----
 .../client/core/edm/AbstractDataServices.java   |  52 -----
 .../odata4/client/core/edm/AbstractEdmItem.java |  61 ------
 .../client/core/edm/AbstractEdmMetadata.java    |   5 +-
 .../odata4/client/core/edm/AbstractEdmType.java |  11 +-
 .../odata4/client/core/edm/AbstractEdmx.java    |  53 -----
 .../core/edm/AbstractEntityContainer.java       | 107 ----------
 .../client/core/edm/AbstractEntitySet.java      |  53 -----
 .../client/core/edm/AbstractEntityType.java     |  90 ---------
 .../client/core/edm/AbstractEnumType.java       |  88 ---------
 .../odata4/client/core/edm/AbstractMember.java  |  51 -----
 .../core/edm/AbstractNavigationProperty.java    |  40 ----
 .../client/core/edm/AbstractParameter.java      | 106 ----------
 .../client/core/edm/AbstractProperty.java       | 197 -------------------
 .../odata4/client/core/edm/AbstractSchema.java  |  71 -------
 .../core/edm/DataServicesDeserializer.java      |  64 ------
 .../client/core/edm/EdmxDeserializer.java       |  67 -------
 .../odata4/client/core/edm/EntityKeyImpl.java   |  38 ----
 .../odata4/client/core/edm/OnDeleteImpl.java    |  42 ----
 .../odata4/client/core/edm/PropertyRefImpl.java |  54 -----
 .../core/edm/v3/AnnotationsDeserializer.java    |  55 ------
 .../client/core/edm/v3/AnnotationsImpl.java     |  46 -----
 .../core/edm/v3/AssociationDeserializer.java    |  53 -----
 .../client/core/edm/v3/AssociationEndImpl.java  |  81 --------
 .../client/core/edm/v3/AssociationImpl.java     |  63 ------
 .../core/edm/v3/AssociationSetDeserializer.java |  52 -----
 .../core/edm/v3/AssociationSetEndImpl.java      |  54 -----
 .../client/core/edm/v3/AssociationSetImpl.java  |  62 ------
 .../client/core/edm/v3/ComplexTypeImpl.java     |  54 -----
 .../client/core/edm/v3/DataServicesImpl.java    |  36 ----
 .../client/core/edm/v3/EdmMetadataImpl.java     |   1 +
 .../odata4/client/core/edm/v3/EdmTypeImpl.java  |   3 +
 .../odata4/client/core/edm/v3/EdmxImpl.java     |  32 ---
 .../client/core/edm/v3/EntityContainerImpl.java |  65 ------
 .../client/core/edm/v3/EntitySetImpl.java       |  27 ---
 .../client/core/edm/v3/EntityTypeImpl.java      |  53 -----
 .../odata4/client/core/edm/v3/EnumTypeImpl.java |  46 -----
 .../core/edm/v3/FunctionImportDeserializer.java |  67 -------
 .../client/core/edm/v3/FunctionImportImpl.java  | 146 --------------
 .../odata4/client/core/edm/v3/MemberImpl.java   |  27 ---
 .../core/edm/v3/NavigationPropertyImpl.java     |  68 -------
 .../client/core/edm/v3/ParameterImpl.java       |  43 ----
 .../odata4/client/core/edm/v3/PropertyImpl.java |  96 ---------
 .../client/core/edm/v3/PropertyValueImpl.java   | 135 -------------
 .../core/edm/v3/ReferentialConstraintImpl.java  |  58 ------
 .../ReferentialConstraintRoleDeserializer.java  |  51 -----
 .../edm/v3/ReferentialConstraintRoleImpl.java   |  50 -----
 .../odata4/client/core/edm/v3/SchemaImpl.java   | 129 ------------
 .../core/edm/v3/TypeAnnotationDeserializer.java |  52 -----
 .../client/core/edm/v3/TypeAnnotationImpl.java  |  63 ------
 .../odata4/client/core/edm/v3/UsingImpl.java    |  54 -----
 .../client/core/edm/v3/ValueAnnotationImpl.java | 148 --------------
 .../client/core/edm/v3/ValueTermImpl.java       |  54 -----
 .../core/edm/v4/AbstractAnnotatedEdmItem.java   |  45 -----
 .../client/core/edm/v4/ActionDeserializer.java  |  60 ------
 .../odata4/client/core/edm/v4/ActionImpl.java   |  92 ---------
 .../client/core/edm/v4/ActionImportImpl.java    |  67 -------
 .../core/edm/v4/AnnotationDeserializer.java     |  57 ------
 .../client/core/edm/v4/AnnotationImpl.java      |  82 --------
 .../core/edm/v4/AnnotationsDeserializer.java    |  53 -----
 .../client/core/edm/v4/AnnotationsImpl.java     |  49 -----
 .../client/core/edm/v4/ComplexTypeImpl.java     | 103 ----------
 .../client/core/edm/v4/DataServicesImpl.java    |  36 ----
 .../client/core/edm/v4/EdmMetadataImpl.java     |   3 +
 .../odata4/client/core/edm/v4/EdmTypeImpl.java  |   3 +
 .../odata4/client/core/edm/v4/EdmxImpl.java     |  42 ----
 .../client/core/edm/v4/EntityContainerImpl.java | 123 ------------
 .../client/core/edm/v4/EntitySetImpl.java       |  63 ------
 .../client/core/edm/v4/EntityTypeImpl.java      |  67 -------
 .../odata4/client/core/edm/v4/EnumTypeImpl.java |  60 ------
 .../core/edm/v4/FunctionDeserializer.java       |  62 ------
 .../odata4/client/core/edm/v4/FunctionImpl.java |  41 ----
 .../client/core/edm/v4/FunctionImportImpl.java  |  96 ---------
 .../core/edm/v4/IncludeAnnotationsImpl.java     |  68 -------
 .../odata4/client/core/edm/v4/IncludeImpl.java  |  55 ------
 .../odata4/client/core/edm/v4/MemberImpl.java   |  45 -----
 .../edm/v4/NavigationPropertyBindingImpl.java   |  55 ------
 .../edm/v4/NavigationPropertyDeserializer.java  |  67 -------
 .../core/edm/v4/NavigationPropertyImpl.java     | 114 -----------
 .../client/core/edm/v4/ParameterImpl.java       |  42 ----
 .../odata4/client/core/edm/v4/PropertyImpl.java |  44 -----
 .../core/edm/v4/ReferenceDeserializer.java      |  58 ------
 .../client/core/edm/v4/ReferenceImpl.java       |  67 -------
 .../core/edm/v4/ReferentialConstraintImpl.java  |  54 -----
 .../client/core/edm/v4/ReturnTypeImpl.java      | 108 ----------
 .../odata4/client/core/edm/v4/SchemaImpl.java   | 165 ----------------
 .../core/edm/v4/SingletonDeserializer.java      |  57 ------
 .../client/core/edm/v4/SingletonImpl.java       |  63 ------
 .../client/core/edm/v4/TermDeserializer.java    |  75 -------
 .../odata4/client/core/edm/v4/TermImpl.java     | 148 --------------
 .../core/edm/v4/TypeDefinitionDeserializer.java |  65 ------
 .../client/core/edm/v4/TypeDefinitionImpl.java  | 122 ------------
 .../annotation/AnnotatedDynExprConstruct.java   |   6 +-
 .../client/core/edm/v4/annotation/Apply.java    |   2 +-
 .../edm/v4/annotation/ApplyDeserializer.java    |   2 +-
 .../client/core/edm/v4/annotation/Cast.java     |   2 +-
 .../edm/v4/annotation/CastDeserializer.java     |   2 +-
 .../core/edm/v4/annotation/Collection.java      |   2 +-
 .../v4/annotation/ConstExprConstructImpl.java   |   2 +-
 .../edm/v4/annotation/DynExprConstructImpl.java |   2 +-
 .../edm/v4/annotation/DynExprDoubleParamOp.java |   2 +-
 .../edm/v4/annotation/DynExprSingleParamOp.java |   2 +-
 .../edm/v4/annotation/ExprConstructImpl.java    |   4 +-
 .../client/core/edm/v4/annotation/If.java       |   2 +-
 .../client/core/edm/v4/annotation/IsOf.java     |   2 +-
 .../edm/v4/annotation/IsOfDeserializer.java     |   2 +-
 .../core/edm/v4/annotation/LabeledElement.java  |   2 +-
 .../annotation/LabeledElementDeserializer.java  |   2 +-
 .../edm/v4/annotation/NullDeserializer.java     |   2 +-
 .../core/edm/v4/annotation/PropertyValue.java   |   2 +-
 .../annotation/PropertyValueDeserializer.java   |   2 +-
 .../edm/v4/annotation/RecordDeserializer.java   |   2 +-
 .../client/core/edm/v4/annotation/UrlRef.java   |   2 +-
 .../core/edm/xml/AbstractAnnotations.java       |  53 +++++
 .../core/edm/xml/AbstractComplexType.java       |  53 +++++
 .../core/edm/xml/AbstractDataServices.java      |  52 +++++
 .../client/core/edm/xml/AbstractEdmItem.java    |  61 ++++++
 .../client/core/edm/xml/AbstractEdmx.java       |  53 +++++
 .../core/edm/xml/AbstractEntityContainer.java   | 107 ++++++++++
 .../client/core/edm/xml/AbstractEntitySet.java  |  53 +++++
 .../client/core/edm/xml/AbstractEntityType.java |  90 +++++++++
 .../client/core/edm/xml/AbstractEnumType.java   |  88 +++++++++
 .../client/core/edm/xml/AbstractMember.java     |  51 +++++
 .../edm/xml/AbstractNavigationProperty.java     |  40 ++++
 .../client/core/edm/xml/AbstractParameter.java  | 106 ++++++++++
 .../client/core/edm/xml/AbstractProperty.java   | 197 +++++++++++++++++++
 .../client/core/edm/xml/AbstractSchema.java     |  71 +++++++
 .../core/edm/xml/DataServicesDeserializer.java  |  64 ++++++
 .../client/core/edm/xml/EdmxDeserializer.java   |  67 +++++++
 .../client/core/edm/xml/EntityKeyImpl.java      |  38 ++++
 .../client/core/edm/xml/OnDeleteImpl.java       |  42 ++++
 .../client/core/edm/xml/PropertyRefImpl.java    |  54 +++++
 .../edm/xml/v3/AnnotationsDeserializer.java     |  55 ++++++
 .../client/core/edm/xml/v3/AnnotationsImpl.java |  46 +++++
 .../edm/xml/v3/AssociationDeserializer.java     |  53 +++++
 .../core/edm/xml/v3/AssociationEndImpl.java     |  81 ++++++++
 .../client/core/edm/xml/v3/AssociationImpl.java |  63 ++++++
 .../edm/xml/v3/AssociationSetDeserializer.java  |  52 +++++
 .../core/edm/xml/v3/AssociationSetEndImpl.java  |  54 +++++
 .../core/edm/xml/v3/AssociationSetImpl.java     |  62 ++++++
 .../client/core/edm/xml/v3/ComplexTypeImpl.java |  54 +++++
 .../core/edm/xml/v3/DataServicesImpl.java       |  36 ++++
 .../odata4/client/core/edm/xml/v3/EdmxImpl.java |  32 +++
 .../core/edm/xml/v3/EntityContainerImpl.java    |  65 ++++++
 .../client/core/edm/xml/v3/EntitySetImpl.java   |  27 +++
 .../client/core/edm/xml/v3/EntityTypeImpl.java  |  53 +++++
 .../client/core/edm/xml/v3/EnumTypeImpl.java    |  46 +++++
 .../edm/xml/v3/FunctionImportDeserializer.java  |  67 +++++++
 .../core/edm/xml/v3/FunctionImportImpl.java     | 146 ++++++++++++++
 .../client/core/edm/xml/v3/MemberImpl.java      |  27 +++
 .../core/edm/xml/v3/NavigationPropertyImpl.java |  68 +++++++
 .../client/core/edm/xml/v3/ParameterImpl.java   |  43 ++++
 .../client/core/edm/xml/v3/PropertyImpl.java    |  96 +++++++++
 .../core/edm/xml/v3/PropertyValueImpl.java      | 135 +++++++++++++
 .../edm/xml/v3/ReferentialConstraintImpl.java   |  58 ++++++
 .../ReferentialConstraintRoleDeserializer.java  |  51 +++++
 .../xml/v3/ReferentialConstraintRoleImpl.java   |  50 +++++
 .../client/core/edm/xml/v3/SchemaImpl.java      | 129 ++++++++++++
 .../edm/xml/v3/TypeAnnotationDeserializer.java  |  52 +++++
 .../core/edm/xml/v3/TypeAnnotationImpl.java     |  63 ++++++
 .../client/core/edm/xml/v3/UsingImpl.java       |  54 +++++
 .../core/edm/xml/v3/ValueAnnotationImpl.java    | 148 ++++++++++++++
 .../client/core/edm/xml/v3/ValueTermImpl.java   |  54 +++++
 .../edm/xml/v4/AbstractAnnotatedEdmItem.java    |  45 +++++
 .../core/edm/xml/v4/ActionDeserializer.java     |  60 ++++++
 .../client/core/edm/xml/v4/ActionImpl.java      |  92 +++++++++
 .../core/edm/xml/v4/ActionImportImpl.java       |  67 +++++++
 .../core/edm/xml/v4/AnnotationDeserializer.java |  57 ++++++
 .../client/core/edm/xml/v4/AnnotationImpl.java  |  82 ++++++++
 .../edm/xml/v4/AnnotationsDeserializer.java     |  53 +++++
 .../client/core/edm/xml/v4/AnnotationsImpl.java |  49 +++++
 .../client/core/edm/xml/v4/ComplexTypeImpl.java | 103 ++++++++++
 .../core/edm/xml/v4/DataServicesImpl.java       |  36 ++++
 .../odata4/client/core/edm/xml/v4/EdmxImpl.java |  42 ++++
 .../core/edm/xml/v4/EntityContainerImpl.java    | 123 ++++++++++++
 .../client/core/edm/xml/v4/EntitySetImpl.java   |  63 ++++++
 .../client/core/edm/xml/v4/EntityTypeImpl.java  |  67 +++++++
 .../client/core/edm/xml/v4/EnumTypeImpl.java    |  60 ++++++
 .../core/edm/xml/v4/FunctionDeserializer.java   |  62 ++++++
 .../client/core/edm/xml/v4/FunctionImpl.java    |  41 ++++
 .../core/edm/xml/v4/FunctionImportImpl.java     |  96 +++++++++
 .../core/edm/xml/v4/IncludeAnnotationsImpl.java |  68 +++++++
 .../client/core/edm/xml/v4/IncludeImpl.java     |  55 ++++++
 .../client/core/edm/xml/v4/MemberImpl.java      |  45 +++++
 .../xml/v4/NavigationPropertyBindingImpl.java   |  55 ++++++
 .../xml/v4/NavigationPropertyDeserializer.java  |  67 +++++++
 .../core/edm/xml/v4/NavigationPropertyImpl.java | 114 +++++++++++
 .../client/core/edm/xml/v4/ParameterImpl.java   |  42 ++++
 .../client/core/edm/xml/v4/PropertyImpl.java    |  44 +++++
 .../core/edm/xml/v4/ReferenceDeserializer.java  |  58 ++++++
 .../client/core/edm/xml/v4/ReferenceImpl.java   |  67 +++++++
 .../edm/xml/v4/ReferentialConstraintImpl.java   |  54 +++++
 .../client/core/edm/xml/v4/ReturnTypeImpl.java  | 108 ++++++++++
 .../client/core/edm/xml/v4/SchemaImpl.java      | 165 ++++++++++++++++
 .../core/edm/xml/v4/SingletonDeserializer.java  |  57 ++++++
 .../client/core/edm/xml/v4/SingletonImpl.java   |  63 ++++++
 .../core/edm/xml/v4/TermDeserializer.java       |  75 +++++++
 .../odata4/client/core/edm/xml/v4/TermImpl.java | 148 ++++++++++++++
 .../edm/xml/v4/TypeDefinitionDeserializer.java  |  65 ++++++
 .../core/edm/xml/v4/TypeDefinitionImpl.java     | 122 ++++++++++++
 .../core/op/impl/AbstractEdmDeserializer.java   |   2 +-
 .../core/op/impl/ComplexTypeDeserializer.java   |  30 +--
 .../op/impl/EntityContainerDeserializer.java    |  42 ++--
 .../core/op/impl/EntityKeyDeserializer.java     |   4 +-
 .../core/op/impl/EntitySetDeserializer.java     |  16 +-
 .../core/op/impl/EntityTypeDeserializer.java    |  32 +--
 .../core/op/impl/EnumTypeDeserializer.java      |  20 +-
 .../client/core/op/impl/SchemaDeserializer.java |  86 ++++----
 .../core/op/impl/v3/ODataDeserializerImpl.java  |   2 +-
 .../core/op/impl/v4/ODataDeserializerImpl.java  |   2 +-
 .../odata4/client/core/v3/MetadataTest.java     |  10 +-
 .../odata4/client/core/v4/MetadataTest.java     |  24 +--
 346 files changed, 8543 insertions(+), 8525 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/AbstractAnnotations.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/AbstractAnnotations.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/AbstractAnnotations.java
deleted file mode 100644
index cf52cf4..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/AbstractAnnotations.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-public abstract interface AbstractAnnotations {
-
-  String getTarget();
-
-  void setTarget(String target);
-
-  String getQualifier();
-
-  void setQualifier(String qualifier);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonFunctionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonFunctionImport.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonFunctionImport.java
deleted file mode 100644
index 739d08a..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonFunctionImport.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-public interface CommonFunctionImport extends Named {
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonNavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonNavigationProperty.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonNavigationProperty.java
deleted file mode 100644
index 2637a0c..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonNavigationProperty.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-public interface CommonNavigationProperty extends Named {
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonParameter.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonParameter.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonParameter.java
deleted file mode 100644
index 31f737f..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonParameter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-import java.math.BigInteger;
-
-public interface CommonParameter extends Named {
-
-  String getType();
-
-  void setType(String type);
-
-  boolean isNullable();
-
-  void setNullable(boolean nullable);
-
-  String getMaxLength();
-
-  void setMaxLength(String maxLength);
-
-  BigInteger getPrecision();
-
-  void setPrecision(BigInteger precision);
-
-  BigInteger getScale();
-
-  void setScale(BigInteger scale);
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonProperty.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonProperty.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonProperty.java
deleted file mode 100644
index 16cc03a..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/CommonProperty.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-import java.math.BigInteger;
-import org.apache.olingo.odata4.commons.api.edm.constants.ConcurrencyMode;
-import org.apache.olingo.odata4.commons.api.edm.constants.StoreGeneratedPattern;
-
-public interface CommonProperty extends Named {
-
-  String getType();
-
-  void setType(String type);
-
-  boolean isNullable();
-
-  void setNullable(boolean nullable);
-
-  String getDefaultValue();
-
-  void setDefaultValue(String defaultValue);
-
-  String getMaxLength();
-
-  void setMaxLength(String maxLength);
-
-  boolean isFixedLength();
-
-  void setFixedLength(boolean fixedLength);
-
-  BigInteger getPrecision();
-
-  void setPrecision(BigInteger precision);
-
-  BigInteger getScale();
-
-  void setScale(BigInteger scale);
-
-  boolean isUnicode();
-
-  void setUnicode(boolean unicode);
-
-  String getCollation();
-
-  void setCollation(String collation);
-
-  String getSrid();
-
-  void setSrid(String srid);
-
-  ConcurrencyMode getConcurrencyMode();
-
-  void setConcurrencyMode(ConcurrencyMode concurrencyMode);
-
-  StoreGeneratedPattern getStoreGeneratedPattern();
-
-  void setStoreGeneratedPattern(StoreGeneratedPattern storeGeneratedPattern);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/ComplexType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/ComplexType.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/ComplexType.java
deleted file mode 100644
index 929d1b8..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/ComplexType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-import java.util.List;
-
-public interface ComplexType extends Named {
-
-  CommonProperty getProperty(String name);
-
-  List<? extends CommonProperty> getProperties();
-
-  CommonNavigationProperty getNavigationProperty(String name);
-
-  List<? extends CommonNavigationProperty> getNavigationProperties();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/DataServices.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/DataServices.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/DataServices.java
deleted file mode 100644
index 2972991..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/DataServices.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-import java.util.List;
-
-public interface DataServices {
-
-  String getDataServiceVersion();
-
-  void setDataServiceVersion(String version);
-
-  String getMaxDataServiceVersion();
-
-  void setMaxDataServiceVersion(String version);
-
-  List<? extends Schema> getSchemas();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmMetadata.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmMetadata.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmMetadata.java
index a75515d..9fef9c5 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmMetadata.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmMetadata.java
@@ -19,6 +19,7 @@
 package org.apache.olingo.odata4.client.api.edm;
 
 import java.util.List;
+import org.apache.olingo.odata4.client.api.edm.xml.Schema;
 
 /**
  * Entry point for access information about EDM metadata.

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmType.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmType.java
index 5a480d7..3e59c03 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmType.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EdmType.java
@@ -19,6 +19,9 @@
 package org.apache.olingo.odata4.client.api.edm;
 
 import org.apache.olingo.odata4.client.api.data.EdmSimpleType;
+import org.apache.olingo.odata4.client.api.edm.xml.ComplexType;
+import org.apache.olingo.odata4.client.api.edm.xml.EntityType;
+import org.apache.olingo.odata4.client.api.edm.xml.EnumType;
 
 public interface EdmType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Edmx.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Edmx.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Edmx.java
deleted file mode 100644
index 94fb5a8..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Edmx.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-public interface Edmx {
-
-  String getVersion();
-
-  void setVersion(String version);
-
-  DataServices getDataServices();
-
-  void setDataServices(DataServices dataServices);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityContainer.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityContainer.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityContainer.java
deleted file mode 100644
index c3eb080..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityContainer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-import java.util.List;
-
-public interface EntityContainer extends Named {
-
-  String getExtends();
-
-  void setExtends(String _extends);
-
-  boolean isLazyLoadingEnabled();
-
-  void setLazyLoadingEnabled(boolean lazyLoadingEnabled);
-
-  boolean isDefaultEntityContainer();
-
-  void setDefaultEntityContainer(boolean defaultEntityContainer);
-
-  EntitySet getEntitySet(String name);
-
-  List<? extends EntitySet> getEntitySets();
-
-  /**
-   * Gets the first function import with given name.
-   *
-   * @param name name.
-   * @return function import.
-   */
-  CommonFunctionImport getFunctionImport(String name);
-
-  /**
-   * Gets all function imports with given name.
-   *
-   * @param name name.
-   * @return function imports.
-   */
-  List<? extends CommonFunctionImport> getFunctionImports(String name);
-
-  List<? extends CommonFunctionImport> getFunctionImports();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityKey.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityKey.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityKey.java
deleted file mode 100644
index ee89a9a..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityKey.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-import java.util.List;
-
-public interface EntityKey {
-
-  List<? extends PropertyRef> getPropertyRefs();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntitySet.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntitySet.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntitySet.java
deleted file mode 100644
index 98c854d..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntitySet.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-public interface EntitySet extends Named {
-
-  String getEntityType();
-
-  void setEntityType(String entityType);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityType.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityType.java
deleted file mode 100644
index 37ebc35..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EntityType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-public interface EntityType extends ComplexType {
-
-  boolean isAbstractEntityType();
-
-  void setAbstractEntityType(boolean abstractEntityType);
-
-  String getBaseType();
-
-  void setBaseType(String baseType);
-
-  boolean isOpenType();
-
-  void setOpenType(boolean openType);
-
-  EntityKey getKey();
-
-  void setKey(EntityKey key);
-
-  boolean isHasStream();
-
-  void setHasStream(boolean hasStream);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EnumType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EnumType.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EnumType.java
deleted file mode 100644
index 614c5e1..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/EnumType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-import java.util.List;
-
-public interface EnumType extends Named {
-
-  String getUnderlyingType();
-
-  void setUnderlyingType(String underlyingType);
-
-  boolean isFlags();
-
-  void setFlags(boolean flags);
-
-  List<? extends Member> getMembers();
-
-  Member getMember(String name);
-
-  Member getMember(Integer value);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Member.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Member.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Member.java
deleted file mode 100644
index 8d91cff..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Member.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-public interface Member {
-
-  String getName();
-
-  Integer getValue();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Named.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Named.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Named.java
deleted file mode 100644
index 5d90e2d..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Named.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-public interface Named {
-
-  String getName();
-
-  void setName(String name);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/OnDelete.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/OnDelete.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/OnDelete.java
deleted file mode 100644
index 1936328..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/OnDelete.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-import org.apache.olingo.odata4.client.api.edm.v4.OnDeleteAction;
-
-public interface OnDelete {
-
-  OnDeleteAction getAction();
-
-  void setAction(OnDeleteAction action);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/PropertyRef.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/PropertyRef.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/PropertyRef.java
deleted file mode 100644
index 02b4c6e..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/PropertyRef.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-public interface PropertyRef extends Named {
-
-  String getAlias();
-
-  void setAlias(String alias);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Schema.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Schema.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Schema.java
deleted file mode 100644
index ac19d11..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/Schema.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm;
-
-import org.apache.olingo.odata4.client.api.edm.v3.Annotations;
-import java.util.List;
-
-public interface Schema {
-
-  String getNamespace();
-
-  void setNamespace(String namespace);
-
-  String getAlias();
-
-  void setAlias(String alias);
-
-  List<? extends EntityType> getEntityTypes();
-
-  List<? extends EnumType> getEnumTypes();
-
-  EnumType getEnumType(String name);
-
-  List<? extends AbstractAnnotations> getAnnotationsList();
-
-  AbstractAnnotations getAnnotationsList(String target);
-
-  List<? extends ComplexType> getComplexTypes();
-
-  List<? extends EntityContainer> getEntityContainers();
-
-  /**
-   * Gets default entity container.
-   *
-   * @return default entity container.
-   */
-  EntityContainer getDefaultEntityContainer();
-
-  /**
-   * Gets entity container with the given name.
-   *
-   * @param name name.
-   * @return entity container.
-   */
-  EntityContainer getEntityContainer(String name);
-
-  /**
-   * Gets entity type with the given name.
-   *
-   * @param name name.
-   * @return entity type.
-   */
-  EntityType getEntityType(String name);
-
-  /**
-   * Gets complex type with the given name.
-   *
-   * @param name name.
-   * @return complex type.
-   */
-  ComplexType getComplexType(String name);
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Annotations.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Annotations.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Annotations.java
deleted file mode 100644
index 30aa26a..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Annotations.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.AbstractAnnotations;
-
-public interface Annotations extends AbstractAnnotations {
-
-  List<? extends TypeAnnotation> getTypeAnnotations();
-
-  List<? extends ValueAnnotation> getValueAnnotations();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Association.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Association.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Association.java
deleted file mode 100644
index 0cb5b0e..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Association.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.Named;
-
-public interface Association extends Named {
-
-  ReferentialConstraint getReferentialConstraint();
-
-  void setReferentialConstraint(ReferentialConstraint referentialConstraint);
-
-  List<? extends AssociationEnd> getEnds();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationEnd.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationEnd.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationEnd.java
deleted file mode 100644
index 8eb34e4..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationEnd.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import org.apache.olingo.odata4.client.api.edm.OnDelete;
-
-public interface AssociationEnd {
-
-  String getType();
-
-  void setType(String type);
-
-  String getRole();
-
-  void setRole(String role);
-
-  String getMultiplicity();
-
-  void setMultiplicity(String multiplicity);
-
-  OnDelete getOnDelete();
-
-  void setOnDelete(OnDelete onDelete);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationSet.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationSet.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationSet.java
deleted file mode 100644
index 1915255..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationSet.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.Named;
-
-public interface AssociationSet extends Named {
-
-  String getAssociation();
-
-  void setAssociation(String association);
-
-  List<? extends AssociationSetEnd> getEnds();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationSetEnd.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationSetEnd.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationSetEnd.java
deleted file mode 100644
index a3cd430..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/AssociationSetEnd.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-public interface AssociationSetEnd {
-
-  String getRole();
-
-  void setRole(String role);
-
-  String getEntitySet();
-
-  void setEntitySet(String entitySet);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/FunctionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/FunctionImport.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/FunctionImport.java
deleted file mode 100644
index 359ba5b..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/FunctionImport.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.CommonParameter;
-
-public interface FunctionImport extends org.apache.olingo.odata4.client.api.edm.CommonFunctionImport {
-
-  String getReturnType();
-
-  void setReturnType(String returnType);
-
-  String getEntitySet();
-
-  void setEntitySet(String entitySet);
-
-  String getEntitySetPath();
-
-  void setEntitySetPath(String entitySetPath);
-
-  boolean isComposable();
-
-  void setComposable(boolean composable);
-
-  boolean isSideEffecting();
-
-  void setSideEffecting(boolean sideEffecting);
-
-  boolean isBindable();
-
-  void setBindable(boolean bindable);
-
-  boolean isAlwaysBindable();
-
-  void setAlwaysBindable(boolean alwaysBindable);
-
-  String getHttpMethod();
-
-  void setHttpMethod(String httpMethod);
-
-  List<? extends CommonParameter> getParameters();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/NavigationProperty.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/NavigationProperty.java
deleted file mode 100644
index 4b24887..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/NavigationProperty.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-public interface NavigationProperty extends org.apache.olingo.odata4.client.api.edm.CommonNavigationProperty {
-
-  String getRelationship();
-
-  void setRelationship(String relationship);
-
-  String getToRole();
-
-  void setToRole(String toRole);
-
-  String getFromRole();
-
-  void setFromRole(String fromRole);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Parameter.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Parameter.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Parameter.java
deleted file mode 100644
index 0d45df0..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Parameter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-public interface Parameter extends org.apache.olingo.odata4.client.api.edm.CommonParameter {
-
-  ParameterMode getMode();
-
-  void setMode(ParameterMode mode);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ParameterMode.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ParameterMode.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ParameterMode.java
deleted file mode 100644
index 0d81505..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ParameterMode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-public enum ParameterMode {
-
-  In,
-  Out,
-  InOut
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Property.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Property.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Property.java
deleted file mode 100644
index 042948f..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Property.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import org.apache.olingo.odata4.client.api.edm.CommonProperty;
-import org.apache.olingo.odata4.commons.api.edm.constants.EdmContentKind;
-
-public interface Property extends CommonProperty {
-
-  String getFcSourcePath();
-
-  void setFcSourcePath(String fcSourcePath);
-
-  String getFcTargetPath();
-
-  void setFcTargetPath(String fcTargetPath);
-
-  EdmContentKind getFcContentKind();
-
-  void setFcContentKind(EdmContentKind fcContentKind);
-
-  String getFcNSPrefix();
-
-  void setFcNSPrefix(String fcNSPrefix);
-
-  String getFcNSURI();
-
-  void setFcNSURI(String fcNSURI);
-
-  boolean isFcKeepInContent();
-
-  void setFcKeepInContent(boolean fcKeepInContent);
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/PropertyValue.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/PropertyValue.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/PropertyValue.java
deleted file mode 100644
index cc29d03..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/PropertyValue.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-
-public interface PropertyValue {
-
-  String getProperty();
-
-  void setProperty(String property);
-
-  String getPath();
-
-  void setPath(String path);
-
-  String getString();
-
-  void setString(String string);
-
-  BigInteger getInt();
-
-  void setInt(BigInteger _int);
-
-  Double getFloat();
-
-  void setFloat(Double _float);
-
-  BigDecimal getDecimal();
-
-  void setDecimal(BigDecimal decimal);
-
-  Boolean getBool();
-
-  void setBool(Boolean bool);
-
-  Date getDateTime();
-
-  void setDateTime(Date dateTime);
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ReferentialConstraint.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ReferentialConstraint.java
deleted file mode 100644
index fd2f8a9..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ReferentialConstraint.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-public interface ReferentialConstraint {
-
-  ReferentialConstraintRole getPrincipal();
-
-  void setPrincipal(ReferentialConstraintRole principal);
-
-  ReferentialConstraintRole getDependent();
-
-  void setDependent(ReferentialConstraintRole dependent);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ReferentialConstraintRole.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ReferentialConstraintRole.java
deleted file mode 100644
index 0676086..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ReferentialConstraintRole.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.PropertyRef;
-
-public interface ReferentialConstraintRole {
-
-  String getRole();
-
-  void setRole(final String role);
-
-  List<? extends PropertyRef> getPropertyRefs();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/TypeAnnotation.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/TypeAnnotation.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/TypeAnnotation.java
deleted file mode 100644
index e6344da..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/TypeAnnotation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import java.util.List;
-
-public interface TypeAnnotation {
-
-  String getTerm();
-
-  void setTerm(String term);
-
-  String getQualifier();
-
-  void setQualifier(String qualifier);
-
-  List<? extends PropertyValue> getPropertyValues();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Using.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Using.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Using.java
deleted file mode 100644
index 479f7fe..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/Using.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-public interface Using {
-
-  String getNamespace();
-
-  void setNamespace(String namespace);
-
-  String getAlias();
-
-  void setAlias(String alias);
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/cdb520e3/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ValueAnnotation.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ValueAnnotation.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ValueAnnotation.java
deleted file mode 100644
index 6068119..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/v3/ValueAnnotation.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- */
-package org.apache.olingo.odata4.client.api.edm.v3;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-
-public interface ValueAnnotation {
-
-  Boolean getBool();
-
-  Date getDateTime();
-
-  BigDecimal getDecimal();
-
-  Double getFloat();
-
-  BigInteger getInt();
-
-  String getPath();
-
-  String getQualifier();
-
-  String getString();
-
-  String getTerm();
-
-  void setBool(Boolean bool);
-
-  void setDateTime(Date dateTime);
-
-  void setDecimal(BigDecimal decimal);
-
-  void setFloat(Double _float);
-
-  void setInt(BigInteger _int);
-
-  void setPath(String path);
-
-  void setQualifier(String qualifier);
-
-  void setString(String string);
-
-  void setTerm(String term);
-
-}