You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/02/18 16:49:52 UTC
[12/12] git commit: [OLINGO-170] Moved provider and implementation to
server module
[OLINGO-170] Moved provider and implementation to server module
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/e8dccaf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/e8dccaf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/e8dccaf0
Branch: refs/heads/master
Commit: e8dccaf0ceb65791c3a55481a96a820553ea68d7
Parents: e8a63a5
Author: Christian Amend <ch...@apache.org>
Authored: Tue Feb 18 16:48:53 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Tue Feb 18 16:48:53 2014 +0100
----------------------------------------------------------------------
.../olingo/odata4/client/api/ODataConsumer.java | 5 -
.../odata4/client/core/ODataConsumerImpl.java | 8 -
.../odata4/client/core/ODataConsumerTest.java | 18 +-
.../commons/api/ODataApplicationException.java | 36 +++
.../odata4/commons/api/ODataException.java | 36 +++
.../api/ODataNotImplementedException.java | 33 +++
.../olingo/odata4/commons/api/edm/Edm.java | 2 -
.../commons/api/edm/EdmNavigationProperty.java | 1 -
.../commons/api/edm/FullQualifiedName.java | 82 ++++++
.../odata4/commons/api/edm/provider/Action.java | 53 ----
.../commons/api/edm/provider/ActionImport.java | 44 ---
.../commons/api/edm/provider/AliasInfo.java | 43 ---
.../commons/api/edm/provider/Annotation.java | 66 -----
.../commons/api/edm/provider/BindingTarget.java | 56 ----
.../commons/api/edm/provider/ComplexType.java | 60 ----
.../commons/api/edm/provider/EdmProvider.java | 168 -----------
.../api/edm/provider/EntityContainer.java | 87 ------
.../api/edm/provider/EntityContainerInfo.java | 43 ---
.../commons/api/edm/provider/EntitySet.java | 53 ----
.../commons/api/edm/provider/EntitySetPath.java | 44 ---
.../commons/api/edm/provider/EntityType.java | 81 -----
.../commons/api/edm/provider/EnumMember.java | 49 ---
.../commons/api/edm/provider/EnumType.java | 69 -----
.../commons/api/edm/provider/Expression.java | 24 --
.../api/edm/provider/FullQualifiedName.java | 82 ------
.../commons/api/edm/provider/Function.java | 65 ----
.../api/edm/provider/FunctionImport.java | 60 ----
.../commons/api/edm/provider/Mapping.java | 89 ------
.../api/edm/provider/NavigationProperty.java | 112 -------
.../edm/provider/NavigationPropertyBinding.java | 43 ---
.../commons/api/edm/provider/Operation.java | 78 -----
.../api/edm/provider/OperationImport.java | 45 ---
.../commons/api/edm/provider/Parameter.java | 105 -------
.../commons/api/edm/provider/Property.java | 138 ---------
.../commons/api/edm/provider/PropertyRef.java | 53 ----
.../api/edm/provider/ReferentialConstraint.java | 46 ---
.../commons/api/edm/provider/ReturnType.java | 85 ------
.../odata4/commons/api/edm/provider/Schema.java | 127 --------
.../commons/api/edm/provider/Singleton.java | 42 ---
.../api/edm/provider/StructuralType.java | 87 ------
.../odata4/commons/api/edm/provider/Target.java | 44 ---
.../odata4/commons/api/edm/provider/Term.java | 139 ---------
.../api/edm/provider/TypeDefinition.java | 89 ------
.../exception/ODataApplicationException.java | 36 ---
.../commons/api/exception/ODataException.java | 36 ---
.../exception/ODataNotImplementedException.java | 33 ---
.../commons/core/ODataCommonsCoreImpl.java | 31 --
.../odata4/commons/core/edm/ActionMapKey.java | 2 +-
.../olingo/odata4/commons/core/edm/EdmImpl.java | 2 +-
.../odata4/commons/core/edm/FunctionMapKey.java | 2 +-
.../primitivetype/AbstractPrimitiveType.java | 2 +-
.../edm/primitivetype/EdmPrimitiveTypeKind.java | 2 +-
.../core/edm/provider/EdmActionImpl.java | 31 --
.../core/edm/provider/EdmActionImportImpl.java | 41 ---
.../core/edm/provider/EdmBindingTargetImpl.java | 88 ------
.../core/edm/provider/EdmComplexTypeImpl.java | 51 ----
.../core/edm/provider/EdmElementImpl.java | 28 --
.../edm/provider/EdmEntityContainerImpl.java | 136 ---------
.../core/edm/provider/EdmEntitySetImpl.java | 31 --
.../core/edm/provider/EdmEntitySetInfoImpl.java | 53 ----
.../core/edm/provider/EdmEntityTypeImpl.java | 119 --------
.../commons/core/edm/provider/EdmEnumImpl.java | 228 --------------
.../core/edm/provider/EdmFunctionImpl.java | 51 ----
.../edm/provider/EdmFunctionImportImpl.java | 43 ---
.../edm/provider/EdmFunctionImportInfoImpl.java | 53 ----
.../edm/provider/EdmKeyPropertyRefImpl.java | 89 ------
.../core/edm/provider/EdmMemberImpl.java | 38 ---
.../commons/core/edm/provider/EdmNamedImpl.java | 39 ---
.../edm/provider/EdmNavigationPropertyImpl.java | 98 ------
.../core/edm/provider/EdmOperationImpl.java | 110 -------
.../edm/provider/EdmOperationImportImpl.java | 62 ----
.../core/edm/provider/EdmParameterImpl.java | 99 -------
.../core/edm/provider/EdmPropertyImpl.java | 119 --------
.../core/edm/provider/EdmProviderImpl.java | 295 -------------------
.../core/edm/provider/EdmReturnTypeImpl.java | 95 ------
.../edm/provider/EdmServiceMetadataImpl.java | 148 ----------
.../core/edm/provider/EdmSingletonImpl.java | 30 --
.../core/edm/provider/EdmSingletonInfoImpl.java | 53 ----
.../edm/provider/EdmStructuralTypeImpl.java | 129 --------
.../edm/provider/EdmTypeDefinitionImpl.java | 126 --------
.../commons/core/edm/provider/EdmTypeImpl.java | 46 ---
.../commons/core/edm/ActionMapKeyTest.java | 2 +-
.../commons/core/edm/EdmImplCachingTest.java | 2 +-
.../commons/core/edm/EdmImplCallCreateTest.java | 2 +-
.../commons/core/edm/FunctionMapKeyTest.java | 2 +-
.../core/edm/provider/EdmActionImplTest.java | 156 ----------
.../edm/provider/EdmActionImportImplTest.java | 100 -------
.../edm/provider/EdmComplexTypeImplTest.java | 163 ----------
.../provider/EdmEntityContainerImplTest.java | 205 -------------
.../core/edm/provider/EdmEntitySetImplTest.java | 81 -----
.../edm/provider/EdmEntitySetInfoImplTest.java | 51 ----
.../edm/provider/EdmEntityTypeImplTest.java | 276 -----------------
.../commons/core/edm/provider/EdmEnumTest.java | 178 -----------
.../core/edm/provider/EdmFunctionImplTest.java | 75 -----
.../edm/provider/EdmFunctionImportImplTest.java | 84 ------
.../provider/EdmFunctionImportInfoImplTest.java | 50 ----
.../edm/provider/EdmKeyPropertyRefImplTest.java | 142 ---------
.../core/edm/provider/EdmMemberImplTest.java | 38 ---
.../core/edm/provider/EdmNamedImplTest.java | 41 ---
.../provider/EdmNavigationPropertyImplTest.java | 144 ---------
.../core/edm/provider/EdmParameterImplTest.java | 140 ---------
.../core/edm/provider/EdmPropertyImplTest.java | 155 ----------
.../EdmProviderImplOverloadingTest.java | 198 -------------
.../core/edm/provider/EdmProviderImplTest.java | 231 ---------------
.../edm/provider/EdmReturnTypeImplTest.java | 129 --------
.../provider/EdmServiceMetadataImplTest.java | 188 ------------
.../core/edm/provider/EdmSingletonImplTest.java | 129 --------
.../edm/provider/EdmSingletonInfoImplTest.java | 51 ----
.../edm/provider/EdmTypeDefinitionImplTest.java | 74 -----
.../core/edm/provider/EdmTypeImplTest.java | 44 ---
.../odata4/server/api/edm/provider/Action.java | 53 ++++
.../server/api/edm/provider/ActionImport.java | 46 +++
.../server/api/edm/provider/AliasInfo.java | 43 +++
.../server/api/edm/provider/Annotation.java | 68 +++++
.../server/api/edm/provider/BindingTarget.java | 58 ++++
.../server/api/edm/provider/ComplexType.java | 62 ++++
.../server/api/edm/provider/EdmProvider.java | 169 +++++++++++
.../api/edm/provider/EntityContainer.java | 89 ++++++
.../api/edm/provider/EntityContainerInfo.java | 45 +++
.../server/api/edm/provider/EntitySet.java | 55 ++++
.../server/api/edm/provider/EntitySetPath.java | 44 +++
.../server/api/edm/provider/EntityType.java | 83 ++++++
.../server/api/edm/provider/EnumMember.java | 49 +++
.../server/api/edm/provider/EnumType.java | 71 +++++
.../server/api/edm/provider/Expression.java | 24 ++
.../server/api/edm/provider/Function.java | 65 ++++
.../server/api/edm/provider/FunctionImport.java | 62 ++++
.../odata4/server/api/edm/provider/Mapping.java | 89 ++++++
.../api/edm/provider/NavigationProperty.java | 113 +++++++
.../edm/provider/NavigationPropertyBinding.java | 43 +++
.../server/api/edm/provider/Operation.java | 78 +++++
.../api/edm/provider/OperationImport.java | 45 +++
.../server/api/edm/provider/Parameter.java | 107 +++++++
.../server/api/edm/provider/Property.java | 140 +++++++++
.../server/api/edm/provider/PropertyRef.java | 53 ++++
.../api/edm/provider/ReferentialConstraint.java | 46 +++
.../server/api/edm/provider/ReturnType.java | 87 ++++++
.../odata4/server/api/edm/provider/Schema.java | 127 ++++++++
.../server/api/edm/provider/Singleton.java | 44 +++
.../server/api/edm/provider/StructuralType.java | 89 ++++++
.../odata4/server/api/edm/provider/Target.java | 46 +++
.../odata4/server/api/edm/provider/Term.java | 141 +++++++++
.../server/api/edm/provider/TypeDefinition.java | 91 ++++++
.../odata4/server/api/uri/UriInfoMetadata.java | 6 +-
.../odata4/server/api/uri/UriParameter.java | 2 +-
.../odata4/server/api/uri/UriResource.java | 4 +-
.../server/api/uri/UriResourceAction.java | 2 +-
.../api/uri/UriResourceComplexProperty.java | 2 +-
.../odata4/server/api/uri/UriResourceIt.java | 6 +-
.../odata4/server/api/uri/UriResourceKind.java | 2 +-
.../server/api/uri/UriResourceLambdaAll.java | 5 +-
.../server/api/uri/UriResourceLambdaAny.java | 4 +-
.../server/api/uri/UriResourceLambdaRef.java | 3 +-
.../server/api/uri/UriResourceNavigation.java | 2 +-
.../server/api/uri/UriResourcePartTyped.java | 4 +-
.../server/api/uri/UriResourceProperty.java | 4 +-
.../server/api/uri/UriResourceSingleton.java | 2 +-
.../api/uri/UriResourceStartingTypeFilter.java | 2 +-
.../api/uri/queryoption/AliasQueryOption.java | 2 +-
.../uri/queryoption/ExceptionVisitExpand.java | 2 +-
.../api/uri/queryoption/ExpandOption.java | 4 +-
.../api/uri/queryoption/FilterOption.java | 2 +-
.../api/uri/queryoption/FormatOption.java | 2 +-
.../server/api/uri/queryoption/IdOption.java | 4 +-
.../api/uri/queryoption/InlineCountOption.java | 4 +-
.../server/api/uri/queryoption/QueryOption.java | 2 +-
.../api/uri/queryoption/SearchOption.java | 2 +-
.../server/api/uri/queryoption/SelectItem.java | 4 +-
.../server/api/uri/queryoption/TopOption.java | 4 +-
.../queryoption/expression/AliasExpression.java | 4 +-
.../uri/queryoption/expression/Enumeration.java | 1 +
.../expression/ExpressionVisitor.java | 10 +-
.../api/uri/queryoption/expression/Member.java | 2 +-
.../expression/SupportedBinaryOperators.java | 4 +-
.../expression/SupportedConstants.java | 4 +-
.../expression/SupportedMethodCalls.java | 2 +-
.../expression/VisitableExression.java | 4 +-
.../uri/queryoption/search/SearchBinary.java | 2 +-
.../api/uri/queryoption/search/SearchTerm.java | 4 +-
.../api/uri/queryoption/search/SearchUnary.java | 4 +-
.../search/SupportedSearchBinaryOperators.java | 3 +-
.../server/core/edm/provider/EdmActionImpl.java | 31 ++
.../core/edm/provider/EdmActionImportImpl.java | 41 +++
.../core/edm/provider/EdmBindingTargetImpl.java | 88 ++++++
.../core/edm/provider/EdmComplexTypeImpl.java | 51 ++++
.../core/edm/provider/EdmElementImpl.java | 28 ++
.../edm/provider/EdmEntityContainerImpl.java | 136 +++++++++
.../core/edm/provider/EdmEntitySetImpl.java | 31 ++
.../core/edm/provider/EdmEntitySetInfoImpl.java | 53 ++++
.../core/edm/provider/EdmEntityTypeImpl.java | 119 ++++++++
.../server/core/edm/provider/EdmEnumImpl.java | 228 ++++++++++++++
.../core/edm/provider/EdmFunctionImpl.java | 51 ++++
.../edm/provider/EdmFunctionImportImpl.java | 43 +++
.../edm/provider/EdmFunctionImportInfoImpl.java | 53 ++++
.../edm/provider/EdmKeyPropertyRefImpl.java | 89 ++++++
.../server/core/edm/provider/EdmMemberImpl.java | 38 +++
.../server/core/edm/provider/EdmNamedImpl.java | 39 +++
.../edm/provider/EdmNavigationPropertyImpl.java | 98 ++++++
.../core/edm/provider/EdmOperationImpl.java | 110 +++++++
.../edm/provider/EdmOperationImportImpl.java | 62 ++++
.../core/edm/provider/EdmParameterImpl.java | 99 +++++++
.../core/edm/provider/EdmPropertyImpl.java | 119 ++++++++
.../core/edm/provider/EdmProviderImpl.java | 295 +++++++++++++++++++
.../core/edm/provider/EdmReturnTypeImpl.java | 95 ++++++
.../edm/provider/EdmServiceMetadataImpl.java | 148 ++++++++++
.../core/edm/provider/EdmSingletonImpl.java | 30 ++
.../core/edm/provider/EdmSingletonInfoImpl.java | 53 ++++
.../edm/provider/EdmStructuralTypeImpl.java | 129 ++++++++
.../edm/provider/EdmTypeDefinitionImpl.java | 126 ++++++++
.../server/core/edm/provider/EdmTypeImpl.java | 46 +++
.../server/core/uri/apiimpl/UriInfoImpl.java | 19 +-
.../core/uri/apiimpl/UriParameterImpl.java | 8 +-
.../uri/apiimpl/UriResourceFunctionImpl.java | 2 +-
.../core/uri/apiimpl/UriResourceItImpl.java | 2 +-
.../core/uri/apiimpl/UriResourceTypedImpl.java | 2 +-
.../uri/apiimpl/UriResourceWithKeysImpl.java | 3 +-
.../odata4/server/core/uri/parser/Parser.java | 46 +--
.../odata4/server/core/uri/parser/RawUri.java | 6 +-
.../server/core/uri/parser/UriContext.java | 25 +-
.../server/core/uri/parser/UriDecoder.java | 20 +-
.../core/uri/parser/UriParseTreeVisitor.java | 35 +--
.../uri/queryoption/AliasQueryOptionImpl.java | 2 +-
.../core/uri/queryoption/OrderByOptionImpl.java | 2 +-
.../core/uri/queryoption/SearchOptionImpl.java | 2 -
.../core/uri/queryoption/SelectItemImpl.java | 7 +-
.../core/uri/queryoption/TopOptionImpl.java | 2 -
.../uri/queryoption/expression/AliasImpl.java | 8 +-
.../uri/queryoption/expression/BinaryImpl.java | 2 +-
.../queryoption/expression/ConstantImpl.java | 8 +-
.../queryoption/expression/EnumerationImpl.java | 2 +-
.../queryoption/expression/LambdaRefImpl.java | 2 +-
.../uri/queryoption/expression/LiteralImpl.java | 2 +-
.../uri/queryoption/expression/MemberImpl.java | 3 +-
.../queryoption/expression/MethodCallImpl.java | 2 +-
.../queryoption/expression/TypeLiteralImpl.java | 2 +-
.../uri/queryoption/expression/UnaryImpl.java | 2 +-
.../core/edm/provider/EdmActionImplTest.java | 156 ++++++++++
.../edm/provider/EdmActionImportImplTest.java | 100 +++++++
.../edm/provider/EdmComplexTypeImplTest.java | 163 ++++++++++
.../provider/EdmEntityContainerImplTest.java | 205 +++++++++++++
.../core/edm/provider/EdmEntitySetImplTest.java | 81 +++++
.../edm/provider/EdmEntitySetInfoImplTest.java | 51 ++++
.../edm/provider/EdmEntityTypeImplTest.java | 276 +++++++++++++++++
.../server/core/edm/provider/EdmEnumTest.java | 177 +++++++++++
.../core/edm/provider/EdmFunctionImplTest.java | 75 +++++
.../edm/provider/EdmFunctionImportImplTest.java | 84 ++++++
.../provider/EdmFunctionImportInfoImplTest.java | 50 ++++
.../edm/provider/EdmKeyPropertyRefImplTest.java | 142 +++++++++
.../core/edm/provider/EdmMemberImplTest.java | 38 +++
.../core/edm/provider/EdmNamedImplTest.java | 41 +++
.../provider/EdmNavigationPropertyImplTest.java | 144 +++++++++
.../core/edm/provider/EdmParameterImplTest.java | 140 +++++++++
.../core/edm/provider/EdmPropertyImplTest.java | 155 ++++++++++
.../EdmProviderImplOverloadingTest.java | 198 +++++++++++++
.../core/edm/provider/EdmProviderImplTest.java | 231 +++++++++++++++
.../edm/provider/EdmReturnTypeImplTest.java | 129 ++++++++
.../provider/EdmServiceMetadataImplTest.java | 188 ++++++++++++
.../core/edm/provider/EdmSingletonImplTest.java | 129 ++++++++
.../edm/provider/EdmSingletonInfoImplTest.java | 51 ++++
.../edm/provider/EdmTypeDefinitionImplTest.java | 74 +++++
.../core/edm/provider/EdmTypeImplTest.java | 44 +++
.../edm/provider/PrimitiveTypeBaseTest.java | 117 ++++++++
.../server/core/testutil/EdmTechProvider.java | 46 +--
.../core/testutil/EdmTechTestProvider.java | 19 +-
.../server/core/testutil/ExpandValidator.java | 23 +-
.../server/core/testutil/FilterTreeToText.java | 5 +-
.../server/core/testutil/FilterValidator.java | 35 +--
.../odata4/server/core/testutil/ParserTest.java | 6 +-
.../server/core/testutil/ParserValidator.java | 152 +++++-----
.../server/core/testutil/TestErrorLogger.java | 24 +-
.../core/testutil/UriResourceValidator.java | 38 +--
.../server/core/testutil/UriValidator.java | 9 +-
.../odata4/server/core/uri/RawUriTest.java | 16 +-
.../odata4/server/core/uri/UriInfoImplTest.java | 28 +-
.../server/core/uri/UriParameterImplTest.java | 53 ++--
.../core/uri/antlr/TestFullResourcePath.java | 84 +++---
.../odata4/server/core/uri/antlr/TestLexer.java | 2 +-
.../server/core/uri/antlr/TestParser.java | 225 +++++++-------
.../core/uri/antlr/TestUriParserImpl.java | 52 ++--
.../core/uri/queryoption/QueryOptionTest.java | 7 +-
.../queryoption/expression/ExpressionTest.java | 62 ++--
281 files changed, 8996 insertions(+), 8921 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConsumer.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConsumer.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConsumer.java
index 07e6aa1..5fc7d29 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConsumer.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConsumer.java
@@ -18,8 +18,6 @@
******************************************************************************/
package org.apache.olingo.odata4.client.api;
-import org.apache.olingo.odata4.commons.api.edm.Edm;
-import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
//TODO: Exceptionhandling
public abstract class ODataConsumer {
@@ -44,7 +42,4 @@ public abstract class ODataConsumer {
}
return instance;
}
-
- public abstract Edm createEdm(EdmProvider provider);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataConsumerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataConsumerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataConsumerImpl.java
index 460bb22..656bd0b 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataConsumerImpl.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataConsumerImpl.java
@@ -19,15 +19,7 @@
package org.apache.olingo.odata4.client.core;
import org.apache.olingo.odata4.client.api.ODataConsumer;
-import org.apache.olingo.odata4.commons.api.edm.Edm;
-import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
-import org.apache.olingo.odata4.commons.core.ODataCommonsCoreImpl;
public class ODataConsumerImpl extends ODataConsumer {
- @Override
- public Edm createEdm(final EdmProvider provider) {
- return new ODataCommonsCoreImpl().createEdm(provider);
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataConsumerTest.java b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataConsumerTest.java
index 91467fb..216e1ed 100644
--- a/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataConsumerTest.java
+++ b/odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataConsumerTest.java
@@ -18,24 +18,16 @@
******************************************************************************/
package org.apache.olingo.odata4.client.core;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.olingo.odata4.client.api.ODataConsumer;
-import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
-import org.junit.Before;
import org.junit.Test;
public class ODataConsumerTest {
- private ODataConsumer consumer;
-
- @Before
- public void before() {
- consumer = ODataConsumer.create();
- }
-
@Test
- public void edmtest() {
- EdmProvider provider = null;
- consumer.createEdm(provider);
+ public void before() {
+ ODataConsumer consumer = ODataConsumer.create();
+ assertNotNull(consumer);
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataApplicationException.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataApplicationException.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataApplicationException.java
new file mode 100644
index 0000000..fc722be
--- /dev/null
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataApplicationException.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * 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.commons.api;
+
+public class ODataApplicationException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public ODataApplicationException(final String msg) {
+ super(msg);
+ }
+
+ public ODataApplicationException(final String msg, final Throwable e) {
+ super(msg, e);
+ }
+
+ public ODataApplicationException(final Throwable e) {
+ super(e);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataException.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataException.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataException.java
new file mode 100644
index 0000000..f5a975f
--- /dev/null
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataException.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * 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.commons.api;
+
+public class ODataException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public ODataException(final String msg) {
+ super(msg);
+ }
+
+ public ODataException(final String msg, final Throwable e) {
+ super(msg, e);
+ }
+
+ public ODataException(final Throwable e) {
+ super(e);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataNotImplementedException.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataNotImplementedException.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataNotImplementedException.java
new file mode 100644
index 0000000..e936577
--- /dev/null
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/ODataNotImplementedException.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * 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.commons.api;
+
+public class ODataNotImplementedException extends ODataException {
+
+ private static final long serialVersionUID = 1L;
+
+ public ODataNotImplementedException(final String msg) {
+ super(msg);
+ }
+
+ public ODataNotImplementedException() {
+ super("Not implemented");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java
index 52db4fa..635b342 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java
@@ -20,8 +20,6 @@ package org.apache.olingo.odata4.commons.api.edm;
import java.util.List;
-import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
-
/**
* Entity Data Model (EDM) <p>Interface representing a Entity Data Model as described in the Conceptual Schema
* Definition.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java
index 7d4cbbd..3abe02d 100644
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java
@@ -18,7 +18,6 @@
******************************************************************************/
package org.apache.olingo.odata4.commons.api.edm;
-import java.util.List;
/**
* A CSDL NavigationProperty element
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/FullQualifiedName.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/FullQualifiedName.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/FullQualifiedName.java
new file mode 100644
index 0000000..c99bce7
--- /dev/null
+++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/FullQualifiedName.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * 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.commons.api.edm;
+
+/**
+ * A full qualified name of any element in the EDM consists of a name and a namespace.
+ */
+public class FullQualifiedName {
+
+ private final String namespace;
+ private final String name;
+ private final String fqn;
+
+ /**
+ * @param namespace
+ * @param name
+ */
+ public FullQualifiedName(final String namespace, final String name) {
+ this.namespace = namespace;
+ this.name = name;
+ fqn = namespace + "." + name;
+ }
+
+ /**
+ * @return namespace
+ */
+ public String getNamespace() {
+ return namespace;
+ }
+
+ /**
+ * @return name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return namespace.name
+ */
+ public String getFullQualifiedNameAsString() {
+ return fqn;
+ }
+
+ @Override
+ public int hashCode() {
+ return toString().hashCode();
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if ((obj == null) || !(obj instanceof FullQualifiedName)) {
+ return false;
+ }
+ final FullQualifiedName other = (FullQualifiedName) obj;
+ return namespace.equals(other.getNamespace()) && name.equals(other.getName());
+ }
+
+ @Override
+ public String toString() {
+ return fqn;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Action.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Action.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Action.java
deleted file mode 100644
index b074d24..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Action.java
+++ /dev/null
@@ -1,53 +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.commons.api.edm.provider;
-
-import java.util.List;
-
-public class Action extends Operation {
- @Override
- public Action setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public Action setBound(final boolean isBound) {
- this.isBound = isBound;
- return this;
- }
-
- @Override
- public Action setEntitySetPath(final EntitySetPath entitySetPath) {
- this.entitySetPath = entitySetPath;
- return this;
- }
-
- @Override
- public Action setParameters(final List<Parameter> parameters) {
- this.parameters = parameters;
- return this;
- }
-
- @Override
- public Action setReturnType(final ReturnType returnType) {
- this.returnType = returnType;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ActionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ActionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ActionImport.java
deleted file mode 100644
index bca2e9f..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ActionImport.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.odata4.commons.api.edm.provider;
-
-public class ActionImport extends OperationImport {
- private FullQualifiedName action;
-
- @Override
- public ActionImport setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public ActionImport setEntitySet(final Target entitySet) {
- this.entitySet = entitySet;
- return this;
- }
-
- public FullQualifiedName getAction() {
- return action;
- }
-
- public ActionImport setAction(final FullQualifiedName action) {
- this.action = action;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/AliasInfo.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/AliasInfo.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/AliasInfo.java
deleted file mode 100644
index fd41af3..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/AliasInfo.java
+++ /dev/null
@@ -1,43 +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.commons.api.edm.provider;
-
-public class AliasInfo {
- private String namespace;
- private String alias;
-
- public String getNamespace() {
- return namespace;
- }
-
- public AliasInfo setNamespace(final String namespace) {
- this.namespace = namespace;
- return this;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public AliasInfo setAlias(final String alias) {
- this.alias = alias;
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Annotation.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Annotation.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Annotation.java
deleted file mode 100644
index b54f767..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Annotation.java
+++ /dev/null
@@ -1,66 +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.commons.api.edm.provider;
-
-import java.util.List;
-
-public class Annotation {
- private FullQualifiedName term;
- // Target should be a target path
-// private String targetPath;
- private String qualifier;
- private Expression expression;
- private List<Annotation> annotation;
-
- public FullQualifiedName getTerm() {
- return term;
- }
-
- public Annotation setTerm(final FullQualifiedName term) {
- this.term = term;
- return this;
- }
-
- public String getQualifier() {
- return qualifier;
- }
-
- public Annotation setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- return this;
- }
-
- public Expression getExpression() {
- return expression;
- }
-
- public Annotation setExpression(final Expression expression) {
- this.expression = expression;
- return this;
- }
-
- public List<Annotation> getAnnotation() {
- return annotation;
- }
-
- public Annotation setAnnotation(final List<Annotation> annotation) {
- this.annotation = annotation;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/BindingTarget.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/BindingTarget.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/BindingTarget.java
deleted file mode 100644
index 412eeed..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/BindingTarget.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.odata4.commons.api.edm.provider;
-
-import java.util.List;
-
-public abstract class BindingTarget {
-
- protected String name;
- protected FullQualifiedName type;
- protected List<NavigationPropertyBinding> navigationPropertyBindings;
-
- public String getName() {
- return name;
- }
-
- public BindingTarget setName(final String name) {
- this.name = name;
- return this;
- }
-
- public FullQualifiedName getType() {
- return type;
- }
-
- public BindingTarget setType(final FullQualifiedName type) {
- this.type = type;
- return this;
- }
-
- public List<NavigationPropertyBinding> getNavigationPropertyBindings() {
- return navigationPropertyBindings;
- }
-
- public BindingTarget setNavigationPropertyBindings(final List<NavigationPropertyBinding> navigationPropertyBindings) {
- this.navigationPropertyBindings = navigationPropertyBindings;
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ComplexType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ComplexType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ComplexType.java
deleted file mode 100644
index cd51413..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ComplexType.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.commons.api.edm.provider;
-
-import java.util.List;
-
-public class ComplexType extends StructuralType {
-
- @Override
- public ComplexType setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public ComplexType setOpenType(final boolean isOpenType) {
- this.isOpenType = isOpenType;
- return this;
- }
-
- @Override
- public ComplexType setBaseType(final FullQualifiedName baseType) {
- this.baseType = baseType;
- return this;
- }
-
- @Override
- public ComplexType setAbstract(final boolean isAbstract) {
- this.isAbstract = isAbstract;
- return this;
- }
-
- @Override
- public ComplexType setProperties(final List<Property> properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public ComplexType setNavigationProperties(final List<NavigationProperty> navigationProperties) {
- this.navigationProperties = navigationProperties;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProvider.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProvider.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProvider.java
deleted file mode 100644
index 2de16ee..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProvider.java
+++ /dev/null
@@ -1,168 +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.commons.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.exception.ODataException;
-
-public abstract class EdmProvider {
-
- /**
- * This method should return an {@link EnumType} or <b>null</b> if nothing is found
- * @param enumTypeName
- * @return {@link EnumType} for given name
- * @throws ODataException
- */
- public EnumType getEnumType(final FullQualifiedName enumTypeName) throws ODataException {
- return null;
- };
-
- /**
- * This method should return an {@link TypeDefinition} or <b>null</b> if nothing is found
- * @param typeDefinitionName
- * @return {@link TypeDefinition} for given name
- * @throws ODataException
- */
- public TypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) throws ODataException {
- return null;
- };
-
- /**
- * This method should return an {@link EntityType} or <b>null</b> if nothing is found
- * @param entityTypeName
- * @return {@link EntityType} for the given name
- * @throws ODataException
- */
- public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException {
- return null;
- };
-
- /**
- * This method should return a {@link ComplexType} or <b>null</b> if nothing is found
- * @param complexTypeName
- * @return {@link StructuralType} for the given name
- * @throws ODataException
- */
- public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException {
- return null;
- };
-
- /**
- * This method should return a list of all {@link Action} for the FullQualifiedname or <b>null</b> if nothing is found
- * @param actionName
- * @return List of {@link Action} or null
- * @throws ODataException
- */
- public List<Action> getActions(final FullQualifiedName actionName) throws ODataException {
- return null;
- };
-
- /**
- * This method should return a list of all {@link Function} for the FullQualifiedname or <b>null</b> if nothing is
- * found
- * @param functionName
- * @return List of {@link Function} or null
- * @throws ODataException
- */
- public List<Function> getFunctions(final FullQualifiedName functionName) throws ODataException {
- return null;
- };
-
- // TODO: document
- public Term getTerm(final FullQualifiedName termName) throws ODataException {
- return null;
- };
-
- /**
- * This method should return an {@link EntitySet} or <b>null</b> if nothing is found
- * @param entityContainer this EntitySet is contained in
- * @param entitySetName
- * @return {@link EntitySet} for the given container and entityset name
- * @throws ODataException
- */
- public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName)
- throws ODataException {
- return null;
- };
-
- /**
- * This method should return an {@link Singleton} or <b>null</b> if nothing is found
- * @param entityContainer this Singleton is contained in
- * @param singletonName
- * @return {@link Singleton} for given container and singleton name
- * @throws ODataException
- */
- public Singleton getSingleton(final FullQualifiedName entityContainer, final String singletonName)
- throws ODataException {
- return null;
- };
-
- /**
- * This method should return an {@link ActionImport} or <b>null</b> if nothing is found
- * @param entityContainer this ActionImport is contained in
- * @param actionImportName
- * @return {@link ActionImport} for the given container and ActionImport name
- * @throws ODataException
- */
- public ActionImport getActionImport(final FullQualifiedName entityContainer, final String actionImportName)
- throws ODataException {
- return null;
- };
-
- /**
- * This method should return a {@link FunctionImport} or <b>null</b> if nothing is found
- * @param entityContainer this FunctionImport is contained in
- * @param functionImportName
- * @return {@link FunctionImport} for the given container name and function import name
- * @throws ODataException
- */
- public FunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String functionImportName)
- throws ODataException {
- return null;
- };
-
- /**
- * This method should return an {@link EntityContainerInfo} or <b>null</b> if nothing is found
- * @param name (null for default container)
- * @return {@link EntityContainerInfo} for the given name
- * @throws ODataException
- */
- public EntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) throws ODataException {
- return null;
- };
-
- /**
- * This method should return a list of all namespaces which have an alias
- * @return List of alias info
- * @throws ODataException
- */
- public List<AliasInfo> getAliasInfos() throws ODataException {
- return null;
- };
-
- /**
- * This method should return a collection of all {@link Schema}
- * @return List<{@link Schema}>
- * @throws ODataException
- */
- public List<Schema> getSchemas() throws ODataException {
- return null;
- };
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainer.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainer.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainer.java
deleted file mode 100644
index 9334292..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainer.java
+++ /dev/null
@@ -1,87 +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.commons.api.edm.provider;
-
-import java.util.List;
-
-public class EntityContainer {
-
- private String name;
- private FullQualifiedName extendsContainer;
- private List<EntitySet> entitySets;
- private List<ActionImport> actionImports;
- private List<FunctionImport> functionImports;
- private List<Singleton> singletons;
-
- // Annotations
-
- public String getName() {
- return name;
- }
-
- public EntityContainer setName(final String name) {
- this.name = name;
- return this;
- }
-
- public FullQualifiedName getExtendsContainer() {
- return extendsContainer;
- }
-
- public EntityContainer setExtendsContainer(final FullQualifiedName extendsContainer) {
- this.extendsContainer = extendsContainer;
- return this;
- }
-
- public List<EntitySet> getEntitySets() {
- return entitySets;
- }
-
- public EntityContainer setEntitySets(final List<EntitySet> entitySets) {
- this.entitySets = entitySets;
- return this;
- }
-
- public List<ActionImport> getActionImports() {
- return actionImports;
- }
-
- public EntityContainer setActionImports(final List<ActionImport> actionImports) {
- this.actionImports = actionImports;
- return this;
- }
-
- public List<FunctionImport> getFunctionImports() {
- return functionImports;
- }
-
- public EntityContainer setFunctionImports(final List<FunctionImport> functionImports) {
- this.functionImports = functionImports;
- return this;
- }
-
- public List<Singleton> getSingletons() {
- return singletons;
- }
-
- public EntityContainer setSingletons(final List<Singleton> singletons) {
- this.singletons = singletons;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainerInfo.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainerInfo.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainerInfo.java
deleted file mode 100644
index e7de3a9..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainerInfo.java
+++ /dev/null
@@ -1,43 +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.commons.api.edm.provider;
-
-public class EntityContainerInfo {
- private FullQualifiedName containerName;
- private FullQualifiedName extendsContainer;
-
- public FullQualifiedName getContainerName() {
- return containerName;
- }
-
- public EntityContainerInfo setContainerName(final FullQualifiedName containerName) {
- this.containerName = containerName;
- return this;
- }
-
- public FullQualifiedName getExtendsContainer() {
- return extendsContainer;
- }
-
- public EntityContainerInfo setExtendsContainer(final FullQualifiedName extendsContainer) {
- this.extendsContainer = extendsContainer;
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySet.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySet.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySet.java
deleted file mode 100644
index 26969e5..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySet.java
+++ /dev/null
@@ -1,53 +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.commons.api.edm.provider;
-
-import java.util.List;
-
-public class EntitySet extends BindingTarget {
-
- private boolean includeInServiceDocument;
-
- @Override
- public EntitySet setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public EntitySet setNavigationPropertyBindings(final List<NavigationPropertyBinding> navigationPropertyBindings) {
- this.navigationPropertyBindings = navigationPropertyBindings;
- return this;
- }
-
- @Override
- public EntitySet setType(final FullQualifiedName entityType) {
- type = entityType;
- return this;
- }
-
- public boolean isIncludeInServiceDocument() {
- return includeInServiceDocument;
- }
-
- public EntitySet setIncludeInServiceDocument(final boolean includeInServiceDocument) {
- this.includeInServiceDocument = includeInServiceDocument;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySetPath.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySetPath.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySetPath.java
deleted file mode 100644
index e2d48f0..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySetPath.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.odata4.commons.api.edm.provider;
-
-//TODO: Do we really need this class?
-public class EntitySetPath {
-
- private String bindingParameter;
- private String path;
-
- public String getBindingParameter() {
- return bindingParameter;
- }
-
- public EntitySetPath setBindingParameter(final String bindingParameter) {
- this.bindingParameter = bindingParameter;
- return this;
- }
-
- public String getPath() {
- return path;
- }
-
- public EntitySetPath setPath(final String path) {
- this.path = path;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityType.java
deleted file mode 100644
index d1d07d8..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityType.java
+++ /dev/null
@@ -1,81 +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.commons.api.edm.provider;
-
-import java.util.List;
-
-public class EntityType extends StructuralType {
-
- private List<PropertyRef> key;
- private boolean hasStream;
-
- public boolean hasStream() {
- return hasStream;
- }
-
- public EntityType setHasStream(final boolean hasStream) {
- this.hasStream = hasStream;
- return this;
- }
-
- public List<PropertyRef> getKey() {
- return key;
- }
-
- public EntityType setKey(final List<PropertyRef> key) {
- this.key = key;
- return this;
- }
-
- @Override
- public EntityType setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public EntityType setOpenType(final boolean isOpenType) {
- this.isOpenType = isOpenType;
- return this;
- }
-
- @Override
- public EntityType setBaseType(final FullQualifiedName baseType) {
- this.baseType = baseType;
- return this;
- }
-
- @Override
- public EntityType setAbstract(final boolean isAbstract) {
- this.isAbstract = isAbstract;
- return this;
- }
-
- @Override
- public EntityType setProperties(final List<Property> properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public EntityType setNavigationProperties(final List<NavigationProperty> navigationProperties) {
- this.navigationProperties = navigationProperties;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumMember.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumMember.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumMember.java
deleted file mode 100644
index bfc6467..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumMember.java
+++ /dev/null
@@ -1,49 +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.commons.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmMember;
-
-public class EnumMember implements EdmMember {
-
- private String name;
- private String value;
-
- // Annotations?
-
- @Override
- public String getName() {
- return name;
- }
-
- public EnumMember setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public String getValue() {
- return value;
- }
-
- public EnumMember setValue(final String value) {
- this.value = value;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumType.java
deleted file mode 100644
index 0103827..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumType.java
+++ /dev/null
@@ -1,69 +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.commons.api.edm.provider;
-
-import java.util.List;
-
-public class EnumType {
-
- private String name;
- private boolean isFlags;
- // Underlying Type can only be primitve...
- private FullQualifiedName underlyingType;
- private List<EnumMember> members;
-
- // Facets
- // Annotations?
-
- public String getName() {
- return name;
- }
-
- public EnumType setName(final String name) {
- this.name = name;
- return this;
- }
-
- public boolean isFlags() {
- return isFlags;
- }
-
- public EnumType setFlags(final boolean isFlags) {
- this.isFlags = isFlags;
- return this;
- }
-
- public FullQualifiedName getUnderlyingType() {
- return underlyingType;
- }
-
- public EnumType setUnderlyingType(final FullQualifiedName underlyingType) {
- this.underlyingType = underlyingType;
- return this;
- }
-
- public List<EnumMember> getMembers() {
- return members;
- }
-
- public EnumType setMembers(final List<EnumMember> members) {
- this.members = members;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Expression.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Expression.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Expression.java
deleted file mode 100644
index 1e2bee6..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Expression.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.odata4.commons.api.edm.provider;
-
-//TODO: Expression implementation
-public class Expression {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FullQualifiedName.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FullQualifiedName.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FullQualifiedName.java
deleted file mode 100644
index 33c27fb..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FullQualifiedName.java
+++ /dev/null
@@ -1,82 +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.commons.api.edm.provider;
-
-/**
- * A full qualified name of any element in the EDM consists of a name and a namespace.
- */
-public class FullQualifiedName {
-
- private final String namespace;
- private final String name;
- private final String fqn;
-
- /**
- * @param namespace
- * @param name
- */
- public FullQualifiedName(final String namespace, final String name) {
- this.namespace = namespace;
- this.name = name;
- fqn = namespace + "." + name;
- }
-
- /**
- * @return namespace
- */
- public String getNamespace() {
- return namespace;
- }
-
- /**
- * @return name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return namespace.name
- */
- public String getFullQualifiedNameAsString() {
- return fqn;
- }
-
- @Override
- public int hashCode() {
- return toString().hashCode();
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
- if ((obj == null) || !(obj instanceof FullQualifiedName)) {
- return false;
- }
- final FullQualifiedName other = (FullQualifiedName) obj;
- return namespace.equals(other.getNamespace()) && name.equals(other.getName());
- }
-
- @Override
- public String toString() {
- return fqn;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Function.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Function.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Function.java
deleted file mode 100644
index 4894524..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Function.java
+++ /dev/null
@@ -1,65 +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.commons.api.edm.provider;
-
-import java.util.List;
-
-public class Function extends Operation {
-
- private boolean isComposable;
-
- public boolean isComposable() {
- return isComposable;
- }
-
- public Function setComposable(final boolean isComposable) {
- this.isComposable = isComposable;
- return this;
- }
-
- @Override
- public Function setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public Function setBound(final boolean isBound) {
- this.isBound = isBound;
- return this;
- }
-
- @Override
- public Function setEntitySetPath(final EntitySetPath entitySetPath) {
- this.entitySetPath = entitySetPath;
- return this;
- }
-
- @Override
- public Function setParameters(final List<Parameter> parameters) {
- this.parameters = parameters;
- return this;
- }
-
- @Override
- public Function setReturnType(final ReturnType returnType) {
- this.returnType = returnType;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FunctionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FunctionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FunctionImport.java
deleted file mode 100644
index 503f776..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/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.commons.api.edm.provider;
-
-public class FunctionImport extends OperationImport {
-
- private FullQualifiedName function;
- private boolean includeInServiceDocument;
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public FunctionImport setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public FunctionImport setEntitySet(final Target entitySet) {
- this.entitySet = entitySet;
- return this;
- }
-
- public FullQualifiedName getFunction() {
- return function;
- }
-
- public FunctionImport setFunction(final FullQualifiedName function) {
- this.function = function;
- return this;
- }
-
- public boolean isIncludeInServiceDocument() {
- return includeInServiceDocument;
- }
-
- public FunctionImport setIncludeInServiceDocument(final boolean includeInServiceDocument) {
- this.includeInServiceDocument = includeInServiceDocument;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/e8dccaf0/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Mapping.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Mapping.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Mapping.java
deleted file mode 100644
index 609a09f..0000000
--- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Mapping.java
+++ /dev/null
@@ -1,89 +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.commons.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmMapping;
-
-public class Mapping implements EdmMapping {
-
- private String value;
- private Object object;
- private String mediaResourceSourceKey;
- private String mediaResourceMimeTypeKey;
-
- @Override
- public String getInternalName() {
- return value;
- }
-
- @Override
- public Object getObject() {
- return object;
- }
-
- @Override
- public String getMediaResourceSourceKey() {
- return mediaResourceSourceKey;
- }
-
- @Override
- public String getMediaResourceMimeTypeKey() {
- return mediaResourceMimeTypeKey;
- }
-
- /**
- * Sets the value for this {@link Mapping}.
- * @param value
- * @return {@link Mapping} for method chaining
- */
- public Mapping setInternalName(final String value) {
- this.value = value;
- return this;
- }
-
- /**
- * Sets an object. This method can be used by a provider to set whatever it wants to associate with this.
- * @param object
- * @return {@link Mapping} for method chaining
- */
- public Mapping setObject(final Object object) {
- this.object = object;
- return this;
- }
-
- /**
- * Sets the key for the resource source key which is used for the lookup in the data map
- * @param mediaResourceSourceKey under which the source can be found in the data map
- * @return {@link Mapping} for method chaining
- */
- public Mapping setMediaResourceSourceKey(final String mediaResourceSourceKey) {
- this.mediaResourceSourceKey = mediaResourceSourceKey;
- return this;
- }
-
- /**
- * Sets the key for the resource mime type key which is used for the lookup in the data map
- * @param mediaResourceMimeTypeKey under which the mime type can be found in the data map
- * @return {@link Mapping} for method chaining
- */
- public Mapping setMediaResourceMimeTypeKey(final String mediaResourceMimeTypeKey) {
- this.mediaResourceMimeTypeKey = mediaResourceMimeTypeKey;
- return this;
- }
-}