[OLINGO-482][OLINGO-507] Merge branch 'OLINGO-507_MinorRefactoring'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/3fd38436 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/3fd38436 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/3fd38436 Branch: refs/heads/master Commit: 3fd3843662592a607cabebeb1126c548b5c23d7e Parents: c096bbf 40e0ae5 Author: Michael Bolz <[email protected]> Authored: Wed Jan 14 07:42:41 2015 +0100 Committer: Michael Bolz <[email protected]> Committed: Wed Jan 14 08:00:31 2015 +0100 ---------------------------------------------------------------------- .../olingo/fit/tecsvc/client/BasicITCase.java | 41 ++ .../ActionComplexCollectionProcessor.java | 48 ++ .../api/processor/ActionComplexProcessor.java | 48 ++ .../ActionEntityCollectionProcessor.java | 48 ++ .../api/processor/ActionEntityProcessor.java | 48 ++ .../ActionPrimitiveCollectionProcessor.java | 48 ++ .../api/processor/ActionPrimitiveProcessor.java | 48 ++ .../server/api/processor/ComplexProcessor.java | 1 + .../processor/EntityCollectionProcessor.java | 2 + .../server/api/processor/EntityProcessor.java | 1 + .../api/processor/PrimitiveProcessor.java | 1 + .../olingo/server/core/ContentNegotiator.java | 13 + .../server/core/ContentNegotiatorException.java | 1 + .../apache/olingo/server/core/ODataHandler.java | 711 ++++++++++++------- .../server/core/ODataHandlerException.java | 3 +- .../server-core-exceptions-i18n.properties | 1 + .../processor/TechnicalEntityProcessor.java | 23 +- .../TechnicalPrimitiveComplexProcessor.java | 92 ++- .../server/tecsvc/provider/ActionProvider.java | 132 ++-- .../tecsvc/provider/ContainerProvider.java | 72 +- .../server/tecsvc/provider/SchemaProvider.java | 14 +- .../olingo/server/core/ODataHandlerTest.java | 98 +++ .../serializer/xml/MetadataDocumentTest.java | 6 +- .../server/core/uri/UriResourceImplTest.java | 8 +- .../core/uri/antlr/TestFullResourcePath.java | 11 +- .../core/uri/antlr/TestUriParserImpl.java | 38 +- .../queryoption/expression/ExpressionTest.java | 8 +- .../core/uri/validator/UriValidatorTest.java | 7 +- .../server/sample/processor/CarsProcessor.java | 2 - 29 files changed, 1160 insertions(+), 414 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3fd38436/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java ----------------------------------------------------------------------
