[OLINGO-882] Merge branch 'master' into OLINGO-882_EnableContainerManagedPersistence
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/a838b696 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/a838b696 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/a838b696 Branch: refs/heads/OLINGO-882_EnableContainerManagedPersistence Commit: a838b6960bbbeac98a2afe819ee4ce9371791051 Parents: 185e97f 768bc4c Author: mibo <[email protected]> Authored: Tue Apr 26 22:28:55 2016 +0200 Committer: mibo <[email protected]> Committed: Tue Apr 26 22:28:55 2016 +0200 ---------------------------------------------------------------------- .../api/exception/ODataJPARuntimeException.java | 2 + .../jpa/processor/api/model/JPAEdmMapping.java | 4 + .../jpa/processor/core/ODataEntityParser.java | 45 +++-- .../processor/core/ODataExpressionParser.java | 28 ++- .../core/ODataJPAResponseBuilderDefault.java | 4 +- .../processor/core/access/data/JPAEntity.java | 202 ++++++++++++------- .../core/access/data/JPAEntityParser.java | 66 ++++-- .../processor/core/model/JPAEdmMappingImpl.java | 11 + .../main/resources/jpaprocessor_msg.properties | 1 + .../core/ODataFilterExpressionParserTest.java | 26 ++- .../core/ODataJPAResponseBuilderTest.java | 4 +- .../JPAEntityParserForStaticMethodTest.java | 72 ++++++- .../core/access/data/JPAEntityParserTest.java | 29 ++- .../core/access/data/JPAExpandCallBackTest.java | 1 - .../processor/core/mock/data/EdmMockUtil.java | 4 +- .../ref/web/JPAReferenceServiceFactory.java | 16 ++ odata2-lib/odata-core/pom.xml | 1 + .../olingo/odata2/core/commons/XmlHelper.java | 24 ++- .../olingo/odata2/core/debug/DebugInfoBody.java | 4 +- .../olingo/odata2/core/edm/EdmDateTime.java | 3 +- .../odata2/core/edm/EdmDateTimeOffset.java | 3 +- .../apache/olingo/odata2/core/edm/EdmGuid.java | 27 ++- .../apache/olingo/odata2/core/edm/EdmImpl.java | 14 ++ .../apache/olingo/odata2/core/edm/EdmTime.java | 3 +- .../provider/EdmServiceMetadataImplProv.java | 3 +- .../odata2/core/ep/AtomEntityProvider.java | 35 ++-- .../odata2/core/ep/BasicEntityProvider.java | 20 +- .../ep/EntityProviderProducerException.java | 44 ++++ .../odata2/core/ep/JsonEntityProvider.java | 25 ++- .../ep/producer/AtomEntryEntityProducer.java | 43 ++-- .../core/ep/producer/AtomFeedProducer.java | 17 +- .../producer/AtomServiceDocumentProducer.java | 13 +- .../producer/JsonCollectionEntityProducer.java | 6 +- .../JsonDeletedEntryEntityProducer.java | 3 +- .../ep/producer/JsonEntryEntityProducer.java | 10 +- .../ep/producer/JsonFeedEntityProducer.java | 5 +- .../ep/producer/JsonLinkEntityProducer.java | 3 +- .../ep/producer/JsonLinksEntityProducer.java | 3 +- .../ep/producer/JsonPropertyEntityProducer.java | 16 +- .../producer/JsonServiceDocumentProducer.java | 8 +- .../core/ep/producer/TombstoneProducer.java | 5 +- .../producer/XmlCollectionEntityProducer.java | 3 +- .../core/ep/producer/XmlLinkEntityProducer.java | 3 +- .../ep/producer/XmlLinksEntityProducer.java | 3 +- .../core/ep/producer/XmlMetadataProducer.java | 5 +- .../ep/producer/XmlPropertyEntityProducer.java | 15 +- .../odata2/core/rest/ODataExceptionWrapper.java | 11 +- .../core/servlet/ODataExceptionWrapper.java | 11 +- .../odata2/core/commons/XmlHelperTest.java | 31 +++ .../odata2/core/edm/EdmSimpleTypeTest.java | 22 +- .../odata2/core/ep/LoadXMLFactoryTest.java | 6 +- .../olingo/odata2/core/ep/PerformanceTest.java | 3 +- .../core/ep/producer/AtomEntryProducerTest.java | 8 +- .../core/ep/producer/TombstoneProducerTest.java | 3 +- .../ep/producer/XmlMetadataProducerTest.java | 3 +- .../fit/ref/InvalidDataInScenarioTest.java | 164 +++++++++++++++ 56 files changed, 854 insertions(+), 290 deletions(-) ----------------------------------------------------------------------
