Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/1fb616ff Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/1fb616ff Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/1fb616ff Branch: refs/heads/master Commit: 1fb616fff98193904118599eb80e4512192e11d3 Parents: 10f03a2 53de4ab Author: Francesco Chicchiriccò <[email protected]> Authored: Wed Apr 30 09:13:27 2014 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed Apr 30 09:13:27 2014 +0200 ---------------------------------------------------------------------- .../apache/olingo/server/api/ODataServer.java | 12 +- .../olingo/server/api/edm/provider/Action.java | 16 +- .../server/api/edm/provider/ActionImport.java | 16 +- .../server/api/edm/provider/AliasInfo.java | 16 +- .../server/api/edm/provider/Annotation.java | 16 +- .../server/api/edm/provider/BindingTarget.java | 16 +- .../server/api/edm/provider/ComplexType.java | 16 +- .../server/api/edm/provider/EdmProvider.java | 50 +-- .../api/edm/provider/EntityContainer.java | 16 +- .../api/edm/provider/EntityContainerInfo.java | 16 +- .../server/api/edm/provider/EntitySet.java | 16 +- .../server/api/edm/provider/EntitySetPath.java | 16 +- .../server/api/edm/provider/EntityType.java | 16 +- .../server/api/edm/provider/EnumMember.java | 16 +- .../server/api/edm/provider/EnumType.java | 16 +- .../server/api/edm/provider/Expression.java | 16 +- .../server/api/edm/provider/Function.java | 16 +- .../server/api/edm/provider/FunctionImport.java | 16 +- .../olingo/server/api/edm/provider/Mapping.java | 24 +- .../api/edm/provider/NavigationProperty.java | 16 +- .../edm/provider/NavigationPropertyBinding.java | 16 +- .../server/api/edm/provider/Operation.java | 16 +- .../api/edm/provider/OperationImport.java | 16 +- .../server/api/edm/provider/Parameter.java | 146 +++---- .../server/api/edm/provider/Property.java | 16 +- .../server/api/edm/provider/PropertyRef.java | 16 +- .../api/edm/provider/ReferentialConstraint.java | 16 +- .../server/api/edm/provider/ReturnType.java | 114 +++--- .../olingo/server/api/edm/provider/Schema.java | 16 +- .../server/api/edm/provider/Singleton.java | 16 +- .../server/api/edm/provider/StructuredType.java | 16 +- .../olingo/server/api/edm/provider/Term.java | 16 +- .../server/api/edm/provider/TypeDefinition.java | 16 +- .../server/api/serializer/ODataSerializer.java | 4 +- .../apache/olingo/server/api/uri/UriInfo.java | 1 - .../olingo/server/api/uri/UriInfoResource.java | 2 +- .../uri/queryoption/SystemQueryOptionKind.java | 1 - .../uri/queryoption/search/SearchBinary.java | 16 +- .../search/SearchBinaryOperatorKind.java | 16 +- .../queryoption/search/SearchExpression.java | 16 +- .../api/uri/queryoption/search/SearchTerm.java | 16 +- .../api/uri/queryoption/search/SearchUnary.java | 16 +- .../search/SearchUnaryOperatorKind.java | 16 +- .../core/edm/provider/EdmComplexTypeImpl.java | 2 +- .../core/edm/provider/EdmEntityTypeImpl.java | 2 +- .../core/edm/provider/EdmEnumTypeImpl.java | 6 +- .../edm/provider/EdmNavigationPropertyImpl.java | 2 +- .../core/edm/provider/EdmProviderImpl.java | 30 +- .../provider/EdmStructuredTypeHelperImpl.java | 2 +- .../edm/provider/EdmTypeDefinitionImpl.java | 4 +- .../server/core/servlet/ODataServlet.java | 2 +- .../core/uri/UriResourceLambdaAnyImpl.java | 3 +- .../server/core/uri/parser/UriContext.java | 9 +- .../core/uri/parser/UriParseTreeVisitor.java | 220 +++++------ .../uri/validator/UriValidationException.java | 4 +- .../server/core/uri/validator/UriValidator.java | 165 ++++++-- .../edm/provider/EdmFunctionImportImplTest.java | 23 +- .../edm/provider/EdmTypeDefinitionImplTest.java | 12 +- .../server/core/testutil/EdmTechProvider.java | 16 +- .../techprovider/EntityTypeProvider.java | 20 +- .../server/core/uri/UriResourceImplTest.java | 4 +- .../core/uri/antlr/TestFullResourcePath.java | 10 +- .../core/uri/antlr/TestUriParserImpl.java | 72 ++-- .../core/uri/testutil/ExpandValidator.java | 6 +- .../core/uri/testutil/FilterValidator.java | 8 +- .../core/uri/testutil/ResourceValidator.java | 16 +- .../core/uri/testutil/TestUriValidator.java | 258 +++++++++++++ .../server/core/uri/testutil/TestValidator.java | 23 ++ .../server/core/uri/testutil/UriValidator.java | 257 ------------- .../server/core/uri/testutil/Validator.java | 23 -- .../core/uri/validator/UriEdmValidatorTest.java | 330 ---------------- .../core/uri/validator/UriValidatorTest.java | 378 +++++++++++++++++++ 72 files changed, 1483 insertions(+), 1322 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1fb616ff/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1fb616ff/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1fb616ff/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java ----------------------------------------------------------------------
