[OLINGO-575] Merge 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/8a58a678 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8a58a678 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8a58a678 Branch: refs/heads/master Commit: 8a58a67800cbbc78b8f52dcfdec4697744ad2cb6 Parents: 4768048 Author: Christian Amend <[email protected]> Authored: Tue Mar 17 14:20:07 2015 +0100 Committer: Christian Amend <[email protected]> Committed: Tue Mar 17 14:20:49 2015 +0100 ---------------------------------------------------------------------- .../olingo/client/api/edm/xml/Action.java | 35 --- .../olingo/client/api/edm/xml/ActionImport.java | 25 -- .../olingo/client/api/edm/xml/Annotatable.java | 26 -- .../olingo/client/api/edm/xml/Annotation.java | 30 --- .../olingo/client/api/edm/xml/Annotations.java | 29 -- .../client/api/edm/xml/BindingTarget.java | 26 -- .../olingo/client/api/edm/xml/ComplexType.java | 24 -- .../olingo/client/api/edm/xml/DataServices.java | 2 + .../client/api/edm/xml/EntityContainer.java | 50 ---- .../olingo/client/api/edm/xml/EntityKey.java | 26 -- .../olingo/client/api/edm/xml/EntitySet.java | 27 -- .../olingo/client/api/edm/xml/EntityType.java | 26 -- .../olingo/client/api/edm/xml/EnumType.java | 34 --- .../olingo/client/api/edm/xml/Function.java | 25 -- .../client/api/edm/xml/FunctionImport.java | 27 -- .../olingo/client/api/edm/xml/Member.java | 26 -- .../apache/olingo/client/api/edm/xml/Named.java | 26 -- .../client/api/edm/xml/NavigationProperty.java | 36 --- .../api/edm/xml/NavigationPropertyBinding.java | 27 -- .../olingo/client/api/edm/xml/OnDelete.java | 24 -- .../client/api/edm/xml/OnDeleteAction.java | 28 -- .../client/api/edm/xml/OperationImport.java | 27 -- .../olingo/client/api/edm/xml/Parameter.java | 36 --- .../olingo/client/api/edm/xml/Property.java | 42 --- .../olingo/client/api/edm/xml/PropertyRef.java | 25 -- .../olingo/client/api/edm/xml/Reference.java | 2 + .../api/edm/xml/ReferentialConstraint.java | 28 -- .../olingo/client/api/edm/xml/ReturnType.java | 36 --- .../olingo/client/api/edm/xml/Schema.java | 88 ------ .../olingo/client/api/edm/xml/Singleton.java | 24 -- .../client/api/edm/xml/StructuralType.java | 39 --- .../apache/olingo/client/api/edm/xml/Term.java | 44 --- .../client/api/edm/xml/TypeDefinition.java | 40 --- .../olingo/client/api/edm/xml/XMLMetadata.java | 2 + .../xml/annotation/AnnotationExpression.java | 30 --- .../api/edm/xml/annotation/AnnotationPath.java | 25 -- .../client/api/edm/xml/annotation/Apply.java | 30 --- .../client/api/edm/xml/annotation/Cast.java | 38 --- .../api/edm/xml/annotation/Collection.java | 27 -- .../ConstantAnnotationExpression.java | 56 ---- .../annotation/DynamicAnnotationExpression.java | 91 ------- .../client/api/edm/xml/annotation/If.java | 31 --- .../client/api/edm/xml/annotation/IsOf.java | 38 --- .../api/edm/xml/annotation/LabeledElement.java | 29 -- .../xml/annotation/LabeledElementReference.java | 25 -- .../xml/annotation/NavigationPropertyPath.java | 25 -- .../client/api/edm/xml/annotation/Not.java | 24 -- .../client/api/edm/xml/annotation/Null.java | 25 -- .../client/api/edm/xml/annotation/Path.java | 25 -- .../api/edm/xml/annotation/PropertyPath.java | 25 -- .../api/edm/xml/annotation/PropertyValue.java | 29 -- .../client/api/edm/xml/annotation/Record.java | 31 --- .../TwoParamsOpDynamicAnnotationExpression.java | 50 ---- .../client/api/edm/xml/annotation/UrlRef.java | 25 -- .../client/api/serialization/ODataReader.java | 2 +- .../retrieve/XMLMetadataRequestImpl.java | 6 +- .../olingo/client/core/edm/EdmActionImpl.java | 2 +- .../client/core/edm/EdmActionImportImpl.java | 2 +- .../core/edm/EdmAnnotationHelperImpl.java | 4 +- .../client/core/edm/EdmAnnotationImpl.java | 10 +- .../client/core/edm/EdmAnnotationsImpl.java | 4 +- .../client/core/edm/EdmBindingTargetImpl.java | 4 +- .../olingo/client/core/edm/EdmClientImpl.java | 28 +- .../client/core/edm/EdmComplexTypeImpl.java | 2 +- .../client/core/edm/EdmEntityContainerImpl.java | 22 +- .../client/core/edm/EdmEntitySetImpl.java | 2 +- .../client/core/edm/EdmEntityTypeImpl.java | 13 +- .../olingo/client/core/edm/EdmEnumTypeImpl.java | 8 +- .../olingo/client/core/edm/EdmFunctionImpl.java | 2 +- .../client/core/edm/EdmFunctionImportImpl.java | 2 +- .../client/core/edm/EdmKeyPropertyRefImpl.java | 2 +- .../olingo/client/core/edm/EdmMemberImpl.java | 10 +- .../core/edm/EdmNavigationPropertyImpl.java | 6 +- .../client/core/edm/EdmOperationImpl.java | 8 +- .../client/core/edm/EdmParameterImpl.java | 4 +- .../olingo/client/core/edm/EdmPropertyImpl.java | 10 +- .../core/edm/EdmReferentialConstraintImpl.java | 2 +- .../client/core/edm/EdmReturnTypeImpl.java | 4 +- .../olingo/client/core/edm/EdmSchemaImpl.java | 26 +- .../client/core/edm/EdmSingletonImpl.java | 2 +- .../core/edm/EdmStructuredTypeHelperImpl.java | 8 +- .../olingo/client/core/edm/EdmTermImpl.java | 2 +- .../client/core/edm/EdmTypeDefinitionImpl.java | 2 +- .../client/core/edm/annotation/EdmCastImpl.java | 2 +- .../EdmConstantAnnotationExpressionImpl.java | 2 +- .../client/core/edm/annotation/EdmIsOfImpl.java | 2 +- .../client/core/edm/xml/AbstractEdmItem.java | 65 ----- .../core/edm/xml/AbstractStructuralType.java | 49 ---- .../olingo/client/core/edm/xml/ActionImpl.java | 74 +----- .../client/core/edm/xml/ActionImportImpl.java | 70 ++--- .../client/core/edm/xml/AnnotationImpl.java | 12 +- .../client/core/edm/xml/AnnotationsImpl.java | 50 +--- .../core/edm/xml/ComplexTypeDeserializer.java | 6 +- .../client/core/edm/xml/ComplexTypeImpl.java | 74 +----- .../client/core/edm/xml/DataServicesImpl.java | 3 +- .../olingo/client/core/edm/xml/EdmxImpl.java | 1 + .../edm/xml/EntityContainerDeserializer.java | 6 +- .../core/edm/xml/EntityContainerImpl.java | 141 +--------- .../core/edm/xml/EntityKeyDeserializer.java | 2 +- .../client/core/edm/xml/EntityKeyImpl.java | 7 +- .../core/edm/xml/EntitySetDeserializer.java | 4 +- .../client/core/edm/xml/EntitySetImpl.java | 56 +--- .../core/edm/xml/EntityTypeDeserializer.java | 7 +- .../client/core/edm/xml/EntityTypeImpl.java | 98 +------ .../client/core/edm/xml/EnumMemberImpl.java | 43 +++ .../core/edm/xml/EnumTypeDeserializer.java | 2 +- .../client/core/edm/xml/EnumTypeImpl.java | 79 +----- .../client/core/edm/xml/FunctionImpl.java | 15 +- .../client/core/edm/xml/FunctionImportImpl.java | 61 +---- .../core/edm/xml/IncludeAnnotationsImpl.java | 1 + .../olingo/client/core/edm/xml/IncludeImpl.java | 1 + .../olingo/client/core/edm/xml/MemberImpl.java | 65 ----- .../edm/xml/NavigationPropertyBindingImpl.java | 45 ++-- .../core/edm/xml/NavigationPropertyImpl.java | 109 ++------ .../client/core/edm/xml/OnDeleteImpl.java | 20 +- .../client/core/edm/xml/ParameterImpl.java | 94 +------ .../client/core/edm/xml/PropertyImpl.java | 116 +------- .../client/core/edm/xml/PropertyRefImpl.java | 45 ++-- .../client/core/edm/xml/ReferenceImpl.java | 3 +- .../core/edm/xml/ReferentialConstraintImpl.java | 55 ++-- .../client/core/edm/xml/ReturnTypeImpl.java | 72 +---- .../olingo/client/core/edm/xml/SchemaImpl.java | 252 +----------------- .../core/edm/xml/SingletonDeserializer.java | 2 +- .../client/core/edm/xml/SingletonImpl.java | 65 +---- .../olingo/client/core/edm/xml/TermImpl.java | 122 +-------- .../client/core/edm/xml/TypeDefinitionImpl.java | 93 +------ .../client/core/edm/xml/XMLMetadataImpl.java | 3 +- ...tAnnotatableDynamicAnnotationExpression.java | 4 +- .../AbstractAnnotationExpression.java | 8 +- .../AbstractDynamicAnnotationExpression.java | 36 +-- .../edm/xml/annotation/AnnotationPathImpl.java | 2 +- .../core/edm/xml/annotation/ApplyImpl.java | 4 +- .../core/edm/xml/annotation/CastImpl.java | 4 +- .../core/edm/xml/annotation/CollectionImpl.java | 4 +- .../ConstantAnnotationExpressionImpl.java | 2 +- ...DynamicAnnotationExpressionDeserializer.java | 28 +- .../client/core/edm/xml/annotation/IfImpl.java | 4 +- .../core/edm/xml/annotation/IsOfImpl.java | 4 +- .../edm/xml/annotation/LabeledElementImpl.java | 4 +- .../annotation/LabeledElementReferenceImpl.java | 2 +- .../annotation/NavigationPropertyPathImpl.java | 2 +- .../client/core/edm/xml/annotation/NotImpl.java | 4 +- .../core/edm/xml/annotation/NullImpl.java | 2 +- .../core/edm/xml/annotation/PathImpl.java | 2 +- .../edm/xml/annotation/PropertyPathImpl.java | 2 +- .../edm/xml/annotation/PropertyValueImpl.java | 4 +- .../core/edm/xml/annotation/RecordImpl.java | 4 +- ...ParamsOpDynamicAnnotationExpressionImpl.java | 4 +- .../core/edm/xml/annotation/UrlRefImpl.java | 4 +- .../core/serialization/ODataReaderImpl.java | 2 +- .../olingo/client/core/v4/MetadataTest.java | 31 ++- .../commons/api/edm/EdmNavigationProperty.java | 2 +- .../olingo/commons/api/edm/EdmParameter.java | 2 +- .../olingo/commons/api/edm/EdmProperty.java | 4 +- .../olingo/commons/api/edm/EdmReturnType.java | 2 +- .../commons/api/edm/FullQualifiedName.java | 6 +- .../apache/olingo/commons/api/edm/Target.java | 28 +- .../api/edm/provider/AbstractEdmItem.java | 64 +++++ .../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 | 80 ++++++ .../commons/api/edm/provider/Annotations.java | 66 +++++ .../commons/api/edm/provider/BindingTarget.java | 79 ++++++ .../commons/api/edm/provider/ComplexType.java | 70 +++++ .../commons/api/edm/provider/EdmProvider.java | 195 ++++++++++++++ .../api/edm/provider/EntityContainer.java | 159 +++++++++++ .../api/edm/provider/EntityContainerInfo.java | 47 ++++ .../commons/api/edm/provider/EntitySet.java | 63 +++++ .../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 | 114 ++++++++ .../commons/api/edm/provider/Expression.java | 23 ++ .../commons/api/edm/provider/Function.java | 67 +++++ .../api/edm/provider/FunctionImport.java | 76 ++++++ .../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 | 56 ++++ .../commons/api/edm/provider/Parameter.java | 146 ++++++++++ .../commons/api/edm/provider/Property.java | 181 +++++++++++++ .../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 | 120 +++++++++ .../annotation/AnnotationExpression.java | 30 +++ .../edm/provider/annotation/AnnotationPath.java | 25 ++ .../api/edm/provider/annotation/Apply.java | 30 +++ .../api/edm/provider/annotation/Cast.java | 38 +++ .../api/edm/provider/annotation/Collection.java | 27 ++ .../ConstantAnnotationExpression.java | 56 ++++ .../annotation/DynamicAnnotationExpression.java | 91 +++++++ .../commons/api/edm/provider/annotation/If.java | 31 +++ .../api/edm/provider/annotation/IsOf.java | 38 +++ .../edm/provider/annotation/LabeledElement.java | 29 ++ .../annotation/LabeledElementReference.java | 25 ++ .../annotation/NavigationPropertyPath.java | 25 ++ .../api/edm/provider/annotation/Not.java | 24 ++ .../api/edm/provider/annotation/Null.java | 25 ++ .../api/edm/provider/annotation/Path.java | 25 ++ .../edm/provider/annotation/PropertyPath.java | 25 ++ .../edm/provider/annotation/PropertyValue.java | 29 ++ .../api/edm/provider/annotation/Record.java | 31 +++ .../TwoParamsOpDynamicAnnotationExpression.java | 50 ++++ .../api/edm/provider/annotation/UrlRef.java | 25 ++ .../core/edm/AbstractEdmBindingTarget.java | 5 +- .../commons/core/edm/AbstractEdmParameter.java | 17 -- .../org/apache/olingo/server/api/OData.java | 2 +- .../olingo/server/api/edm/provider/Action.java | 54 ---- .../server/api/edm/provider/ActionImport.java | 48 ---- .../server/api/edm/provider/AliasInfo.java | 45 ---- .../server/api/edm/provider/Annotation.java | 72 ----- .../server/api/edm/provider/BindingTarget.java | 60 ----- .../server/api/edm/provider/ComplexType.java | 62 ----- .../server/api/edm/provider/EdmProvider.java | 195 -------------- .../api/edm/provider/EntityContainer.java | 93 ------- .../api/edm/provider/EntityContainerInfo.java | 47 ---- .../server/api/edm/provider/EntitySet.java | 55 ---- .../server/api/edm/provider/EntitySetPath.java | 44 --- .../server/api/edm/provider/EntityType.java | 84 ------ .../server/api/edm/provider/EnumMember.java | 44 --- .../server/api/edm/provider/EnumType.java | 73 ----- .../server/api/edm/provider/Expression.java | 23 -- .../server/api/edm/provider/Function.java | 65 ----- .../server/api/edm/provider/FunctionImport.java | 64 ----- .../olingo/server/api/edm/provider/Mapping.java | 50 ---- .../api/edm/provider/NavigationProperty.java | 118 --------- .../edm/provider/NavigationPropertyBinding.java | 46 ---- .../server/api/edm/provider/Operation.java | 81 ------ .../api/edm/provider/OperationImport.java | 47 ---- .../server/api/edm/provider/Parameter.java | 113 -------- .../server/api/edm/provider/Property.java | 148 ----------- .../server/api/edm/provider/PropertyRef.java | 44 --- .../api/edm/provider/ReferentialConstraint.java | 45 ---- .../server/api/edm/provider/ReturnType.java | 91 ------- .../olingo/server/api/edm/provider/Schema.java | 135 ---------- .../server/api/edm/provider/Singleton.java | 44 --- .../server/api/edm/provider/StructuredType.java | 93 ------- .../olingo/server/api/edm/provider/Term.java | 149 ----------- .../server/api/edm/provider/TypeDefinition.java | 94 ------- .../apache/olingo/server/core/ODataImpl.java | 2 +- .../olingo/server/core/ServiceMetadataImpl.java | 2 +- .../json/ODataJsonDeserializer.java | 4 +- .../server/core/edm/provider/EdmActionImpl.java | 2 +- .../core/edm/provider/EdmActionImportImpl.java | 4 +- .../core/edm/provider/EdmBindingTargetImpl.java | 21 +- .../core/edm/provider/EdmComplexTypeImpl.java | 4 +- .../edm/provider/EdmEntityContainerImpl.java | 16 +- .../core/edm/provider/EdmEntitySetImpl.java | 2 +- .../core/edm/provider/EdmEntityTypeImpl.java | 6 +- .../core/edm/provider/EdmEnumTypeImpl.java | 7 +- .../core/edm/provider/EdmFunctionImpl.java | 2 +- .../edm/provider/EdmFunctionImportImpl.java | 4 +- .../edm/provider/EdmKeyPropertyRefImpl.java | 4 +- .../edm/provider/EdmNavigationPropertyImpl.java | 10 +- .../core/edm/provider/EdmOperationImpl.java | 19 +- .../edm/provider/EdmOperationImportImpl.java | 6 +- .../core/edm/provider/EdmParameterImpl.java | 10 +- .../core/edm/provider/EdmPropertyImpl.java | 10 +- .../core/edm/provider/EdmProviderImpl.java | 26 +- .../core/edm/provider/EdmReturnTypeImpl.java | 8 +- .../server/core/edm/provider/EdmSchemaImpl.java | 16 +- .../core/edm/provider/EdmSingletonImpl.java | 2 +- .../provider/EdmStructuredTypeHelperImpl.java | 10 +- .../edm/provider/EdmTypeDefinitionImpl.java | 6 +- .../xml/MetadataDocumentXmlSerializer.java | 10 +- .../server/core/uri/validator/UriValidator.java | 2 +- .../core/edm/provider/EdmActionImplTest.java | 36 ++- .../edm/provider/EdmActionImportImplTest.java | 12 +- .../edm/provider/EdmComplexTypeImplTest.java | 11 +- .../provider/EdmEntityContainerImplTest.java | 14 +- .../core/edm/provider/EdmEntitySetImplTest.java | 14 +- .../edm/provider/EdmEntityTypeImplTest.java | 80 +++--- .../server/core/edm/provider/EdmEnumTest.java | 4 +- .../core/edm/provider/EdmFunctionImplTest.java | 4 +- .../edm/provider/EdmFunctionImportImplTest.java | 12 +- .../edm/provider/EdmKeyPropertyRefImplTest.java | 2 +- .../core/edm/provider/EdmMappingTest.java | 6 +- .../core/edm/provider/EdmMemberImplTest.java | 2 +- .../provider/EdmNavigationPropertyImplTest.java | 10 +- .../core/edm/provider/EdmParameterImplTest.java | 10 +- .../core/edm/provider/EdmPropertyImplTest.java | 10 +- .../EdmProviderImplOverloadingTest.java | 8 +- .../core/edm/provider/EdmProviderImplTest.java | 16 +- .../edm/provider/EdmReturnTypeImplTest.java | 4 +- .../core/edm/provider/EdmSchemaImplTest.java | 32 +-- .../core/edm/provider/EdmSingletonImplTest.java | 18 +- .../edm/provider/EdmTypeDefinitionImplTest.java | 4 +- .../core/serializer/json/ComplexTypeHelper.java | 13 +- .../serializer/utils/ContextURLBuilderTest.java | 11 +- .../xml/MetadataDocumentXmlSerializerTest.java | 38 +-- .../olingo/server/tecsvc/data/DataProvider.java | 2 +- .../TechnicalPrimitiveComplexProcessor.java | 2 +- .../server/tecsvc/provider/ActionProvider.java | 6 +- .../tecsvc/provider/ComplexTypeProvider.java | 10 +- .../tecsvc/provider/ContainerProvider.java | 96 +++---- .../server/tecsvc/provider/EdmTechProvider.java | 32 +-- .../tecsvc/provider/EntityTypeProvider.java | 10 +- .../tecsvc/provider/EnumTypeProvider.java | 4 +- .../tecsvc/provider/FunctionProvider.java | 6 +- .../tecsvc/provider/PropertyProvider.java | 6 +- .../server/tecsvc/provider/SchemaProvider.java | 14 +- .../tecsvc/provider/TypeDefinitionProvider.java | 2 +- .../olingo/server/core/ODataHandlerTest.java | 4 +- .../json/ODataJsonDeserializerEntityTest.java | 2 +- .../serializer/xml/MetadataDocumentTest.java | 3 - .../core/uri/testutil/EdmTechTestProvider.java | 10 +- .../sample/edmprovider/CarsEdmProvider.java | 27 +- 318 files changed, 4747 insertions(+), 6619 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Action.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Action.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Action.java deleted file mode 100644 index 920b0f3..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Action.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.client.api.edm.xml; - -import java.util.List; - -public interface Action extends Named, Annotatable { - - boolean isBound(); - - String getEntitySetPath(); - - List<Parameter> getParameters(); - - Parameter getParameter(String name); - - ReturnType getReturnType(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ActionImport.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ActionImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ActionImport.java deleted file mode 100644 index 2c5f8c7..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ActionImport.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml; - - -public interface ActionImport extends OperationImport { - - String getAction(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotatable.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotatable.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotatable.java deleted file mode 100644 index 9c99f71..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotatable.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.client.api.edm.xml; - -import java.util.List; - -public interface Annotatable { - - List<Annotation> getAnnotations(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotation.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotation.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotation.java deleted file mode 100644 index f5f163f..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotation.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.client.api.edm.xml; - -import org.apache.olingo.client.api.edm.xml.annotation.AnnotationExpression; - -public interface Annotation extends Annotatable { - - String getTerm(); - - String getQualifier(); - - AnnotationExpression getExpression(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotations.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotations.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotations.java deleted file mode 100644 index 17a6243..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/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.client.api.edm.xml; - - -public interface Annotations extends Annotatable { - - String getTarget(); - - String getQualifier(); - - Annotation getAnnotation(String term); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/BindingTarget.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/BindingTarget.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/BindingTarget.java deleted file mode 100644 index c702ebd..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/BindingTarget.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.client.api.edm.xml; - -import java.util.List; - -public interface BindingTarget extends Named, Annotatable { - - List<? extends NavigationPropertyBinding> getNavigationPropertyBindings(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java deleted file mode 100644 index d38839f..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java +++ /dev/null @@ -1,24 +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.client.api.edm.xml; - - -public interface ComplexType extends StructuralType { -//No additional methods needed for now. -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/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 bb9fb0a..d542cac 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,6 +20,8 @@ package org.apache.olingo.client.api.edm.xml; import java.util.List; +import org.apache.olingo.commons.api.edm.provider.Schema; + public interface DataServices { String getDataServiceVersion(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java deleted file mode 100644 index c04270e..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.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.client.api.edm.xml; - -import java.util.List; - -public interface EntityContainer extends Named, Annotatable { - - String getExtends(); - - boolean isLazyLoadingEnabled(); - - boolean isDefaultEntityContainer(); - - EntitySet getEntitySet(String name); - - List<EntitySet> getEntitySets(); - - List<Singleton> getSingletons(); - - Singleton getSingleton(String name); - - ActionImport getActionImport(String name); - - List<ActionImport> getActionImports(String name); - - List<ActionImport> getActionImports(); - - FunctionImport getFunctionImport(String name); - - List<FunctionImport> getFunctionImports(String name); - - List<FunctionImport> getFunctionImports(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityKey.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityKey.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityKey.java deleted file mode 100644 index c1c43ec..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/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.client.api.edm.xml; - -import java.util.List; - -public interface EntityKey { - - List<PropertyRef> getPropertyRefs(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java deleted file mode 100644 index 1bf85a2..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.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.client.api.edm.xml; - -public interface EntitySet extends Named, BindingTarget { - - String getEntityType(); - - boolean isIncludeInServiceDocument(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java deleted file mode 100644 index 8d8eeb4..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.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.client.api.edm.xml; - -public interface EntityType extends StructuralType { - - EntityKey getKey(); - - boolean isHasStream(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EnumType.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EnumType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EnumType.java deleted file mode 100644 index 318dc17..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EnumType.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.client.api.edm.xml; - -import java.util.List; - -public interface EnumType extends Named { - - String getUnderlyingType(); - - boolean isFlags(); - - List<Member> getMembers(); - - Member getMember(String name); - - Member getMember(Integer value); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Function.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Function.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Function.java deleted file mode 100644 index 90df25c..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Function.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml; - - -public interface Function extends Action { - - boolean isComposable(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/FunctionImport.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/FunctionImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/FunctionImport.java deleted file mode 100644 index 8d4449a..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/FunctionImport.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.client.api.edm.xml; - - -public interface FunctionImport extends OperationImport, Named { - - String getFunction(); - - boolean isIncludeInServiceDocument(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Member.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Member.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Member.java deleted file mode 100644 index 0cb9b74..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/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.client.api.edm.xml; - -public interface Member { - - String getName(); - - String getValue(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Named.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Named.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Named.java deleted file mode 100644 index e5f8e2d..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/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.client.api.edm.xml; - -import java.io.Serializable; - -public interface Named extends Serializable { - - String getName(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationProperty.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationProperty.java deleted file mode 100644 index 7985561..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationProperty.java +++ /dev/null @@ -1,36 +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.client.api.edm.xml; - -import java.util.List; - -public interface NavigationProperty extends Named, Annotatable { - - String getType(); - - boolean isNullable(); - - String getPartner(); - - List<ReferentialConstraint> getReferentialConstraints(); - - OnDelete getOnDelete(); - - boolean isContainsTarget(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationPropertyBinding.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationPropertyBinding.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationPropertyBinding.java deleted file mode 100644 index 6dda47d..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationPropertyBinding.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.client.api.edm.xml; - -public interface NavigationPropertyBinding { - - String getPath(); - - String getTarget(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDelete.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDelete.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDelete.java deleted file mode 100644 index 7ebbfb3..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDelete.java +++ /dev/null @@ -1,24 +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.client.api.edm.xml; - -public interface OnDelete { - - OnDeleteAction getAction(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java deleted file mode 100644 index c78adda..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.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.client.api.edm.xml; - -public enum OnDeleteAction { - - Cascade, - None, - SetNull, - SetDefault - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OperationImport.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OperationImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OperationImport.java deleted file mode 100644 index 1272921..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OperationImport.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.client.api.edm.xml; - - -public interface OperationImport extends Named, Annotatable { - - String getEntitySet(); - - void setEntitySet(String entitySet); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Parameter.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Parameter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Parameter.java deleted file mode 100644 index 0f4ee36..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Parameter.java +++ /dev/null @@ -1,36 +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.client.api.edm.xml; - -import org.apache.olingo.commons.api.edm.geo.SRID; - -public interface Parameter extends Named, Annotatable { - - String getType(); - - boolean isNullable(); - - Integer getMaxLength(); - - Integer getPrecision(); - - Integer getScale(); - - SRID getSrid(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Property.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Property.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Property.java deleted file mode 100644 index 62909f1..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Property.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.client.api.edm.xml; - -import org.apache.olingo.commons.api.edm.geo.SRID; - - -public interface Property extends Named, Annotatable { - - String getType(); - - boolean isNullable(); - - String getDefaultValue(); - - Integer getMaxLength(); - - Integer getPrecision(); - - Integer getScale(); - - boolean isUnicode(); - - SRID getSrid(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/PropertyRef.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/PropertyRef.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/PropertyRef.java deleted file mode 100644 index 8de4a22..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/PropertyRef.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml; - -public interface PropertyRef extends Named { - - String getAlias(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/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 599aa6a..d85fd6e 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,6 +21,8 @@ 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; + public interface Reference extends Annotatable { URI getUri(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReferentialConstraint.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReferentialConstraint.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReferentialConstraint.java deleted file mode 100644 index 559bf2c..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReferentialConstraint.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.client.api.edm.xml; - - -public interface ReferentialConstraint extends Annotatable { - - String getProperty(); - - String getReferencedProperty(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReturnType.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReturnType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReturnType.java deleted file mode 100644 index 85d5030..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReturnType.java +++ /dev/null @@ -1,36 +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.client.api.edm.xml; - -import org.apache.olingo.commons.api.edm.geo.SRID; - -public interface ReturnType { - - Integer getMaxLength(); - - Integer getPrecision(); - - Integer getScale(); - - SRID getSrid(); - - String getType(); - - boolean isNullable(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java deleted file mode 100644 index 820c327..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java +++ /dev/null @@ -1,88 +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.client.api.edm.xml; - -import java.util.List; -import java.util.Map; - -public interface Schema { - - String getNamespace(); - - String getAlias(); - - List<EnumType> getEnumTypes(); - - EnumType getEnumType(String name); - - /** - * 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); - - List<EntityContainer> getEntityContainers(); - - EntityContainer getEntityContainer(); - - ComplexType getComplexType(String name); - - List<ComplexType> getComplexTypes(); - - EntityType getEntityType(String name); - - List<EntityType> getEntityTypes(); - - List<Action> getActions(); - - List<Action> getActions(String name); - - Annotation getAnnotation(String term); - - Map<String, Annotatable> getAnnotatables(); - - List<Function> getFunctions(); - - List<Function> getFunctions(String name); - - Term getTerm(String name); - - List<Term> getTerms(); - - TypeDefinition getTypeDefinition(String name); - - List<TypeDefinition> getTypeDefinitions(); - - List<Annotations> getAnnotationGroups(); - - Annotations getAnnotationGroup(String target); - - //TODO: Check if there are annotations in V4 - List<Annotation> getAnnotations(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Singleton.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Singleton.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Singleton.java deleted file mode 100644 index 7fd76e4..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Singleton.java +++ /dev/null @@ -1,24 +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.client.api.edm.xml; - - -public interface Singleton extends EntitySet, BindingTarget { -//No additional methods needed for now. -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/StructuralType.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/StructuralType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/StructuralType.java deleted file mode 100644 index 5800d78..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/StructuralType.java +++ /dev/null @@ -1,39 +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.client.api.edm.xml; - -import java.util.List; - -public interface StructuralType extends Named, Annotatable{ - - boolean isAbstractType(); - - String getBaseType(); - - boolean isOpenType(); - - Property getProperty(String name); - - List<Property> getProperties(); - - NavigationProperty getNavigationProperty(String name); - - List<NavigationProperty> getNavigationProperties(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Term.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Term.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Term.java deleted file mode 100644 index fe9712e..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Term.java +++ /dev/null @@ -1,44 +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.client.api.edm.xml; - -import java.util.List; - -import org.apache.olingo.commons.api.edm.geo.SRID; - -public interface Term extends Named, Annotatable { - - List<String> getAppliesTo(); - - String getBaseTerm(); - - String getDefaultValue(); - - Integer getMaxLength(); - - Integer getPrecision(); - - Integer getScale(); - - SRID getSrid(); - - String getType(); - - boolean isNullable(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/TypeDefinition.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/TypeDefinition.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/TypeDefinition.java deleted file mode 100644 index 45ad41e..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/TypeDefinition.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.client.api.edm.xml; - -import java.util.List; - -import org.apache.olingo.commons.api.edm.geo.SRID; - -public interface TypeDefinition extends Named, Annotatable { - - List<Annotation> getAnnotations(); - - Integer getMaxLength(); - - Integer getPrecision(); - - Integer getScale(); - - SRID getSrid(); - - String getUnderlyingType(); - - boolean isUnicode(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/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 9cf10b9..c1231a1 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,6 +21,8 @@ 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; + /** * Entry point for access information about EDM metadata. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationExpression.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationExpression.java deleted file mode 100644 index 470f10a..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationExpression.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.client.api.edm.xml.annotation; - -public interface AnnotationExpression { - - boolean isConstant(); - - ConstantAnnotationExpression asConstant(); - - boolean isDynamic(); - - DynamicAnnotationExpression asDynamic(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationPath.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationPath.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationPath.java deleted file mode 100644 index 09b043e..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationPath.java +++ /dev/null @@ -1,25 +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.client.api.edm.xml.annotation; - -public interface AnnotationPath extends DynamicAnnotationExpression { - - String getValue(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Apply.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Apply.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Apply.java deleted file mode 100644 index 28b31e4..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Apply.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.client.api.edm.xml.annotation; - -import java.util.List; - -import org.apache.olingo.client.api.edm.xml.Annotatable; - -public interface Apply extends DynamicAnnotationExpression, Annotatable { - - String getFunction(); - - List<AnnotationExpression> getParameters(); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Cast.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Cast.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Cast.java deleted file mode 100644 index 4a8cff5..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Cast.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.client.api.edm.xml.annotation; - -import org.apache.olingo.client.api.edm.xml.Annotatable; -import org.apache.olingo.commons.api.edm.geo.SRID; - -public interface Cast extends DynamicAnnotationExpression, Annotatable { - - Integer getMaxLength(); - - Integer getPrecision(); - - Integer getScale(); - - SRID getSrid(); - - String getType(); - - DynamicAnnotationExpression getValue(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Collection.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Collection.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Collection.java deleted file mode 100644 index 61ec914..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Collection.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.client.api.edm.xml.annotation; - -import java.util.List; - -public interface Collection extends DynamicAnnotationExpression { - - List<AnnotationExpression> getItems(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ConstantAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ConstantAnnotationExpression.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ConstantAnnotationExpression.java deleted file mode 100644 index 596d266..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ConstantAnnotationExpression.java +++ /dev/null @@ -1,56 +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.client.api.edm.xml.annotation; - -public interface ConstantAnnotationExpression extends AnnotationExpression { - - public enum Type { - - Binary, - Bool, - Date, - DateTimeOffset, - Decimal, - Duration, - EnumMember, - Float, - Guid, - Int, - String, - TimeOfDay; - - public static Type fromString(final String value) { - Type result = null; - try { - result = valueOf(value); - } catch (IllegalArgumentException e) { - // ignore - } - return result; - } - } - - Type getType(); - - void setType(Type type); - - String getValue(); - - void setValue(String value); -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/DynamicAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/DynamicAnnotationExpression.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/DynamicAnnotationExpression.java deleted file mode 100644 index 2e99d3d..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/DynamicAnnotationExpression.java +++ /dev/null @@ -1,91 +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.client.api.edm.xml.annotation; - -public interface DynamicAnnotationExpression extends AnnotationExpression { - - boolean isNot(); - - Not asNot(); - - boolean isTwoParamsOp(); - - TwoParamsOpDynamicAnnotationExpression asTwoParamsOp(); - - boolean isAnnotationPath(); - - AnnotationPath asAnnotationPath(); - - boolean isApply(); - - Apply asApply(); - - boolean isCast(); - - Cast asCast(); - - boolean isCollection(); - - Collection asCollection(); - - boolean isIf(); - - If asIf(); - - boolean isIsOf(); - - IsOf asIsOf(); - - boolean isLabeledElement(); - - LabeledElement asLabeledElement(); - - boolean isLabeledElementReference(); - - LabeledElementReference asLabeledElementReference(); - - boolean isNull(); - - Null asNull(); - - boolean isNavigationPropertyPath(); - - NavigationPropertyPath asNavigationPropertyPath(); - - boolean isPath(); - - Path asPath(); - - boolean isPropertyPath(); - - PropertyPath asPropertyPath(); - - boolean isPropertyValue(); - - PropertyValue asPropertyValue(); - - boolean isRecord(); - - Record asRecord(); - - boolean isUrlRef(); - - UrlRef asUrlRef(); - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8a58a678/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/If.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/If.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/If.java deleted file mode 100644 index f73857f..0000000 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/If.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.client.api.edm.xml.annotation; - -import org.apache.olingo.client.api.edm.xml.Annotatable; - -public interface If extends DynamicAnnotationExpression, Annotatable { - - AnnotationExpression getGuard(); - - AnnotationExpression getThen(); - - AnnotationExpression getElse(); - -}
