You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/01/13 14:12:09 UTC
[7/7] git commit: Merge branch 'master' into
OLINGO-88_AnnotationArchetype
Merge branch 'master' into OLINGO-88_AnnotationArchetype
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/e72d108b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/e72d108b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/e72d108b
Branch: refs/heads/OLINGO-88_AnnotationArchetype
Commit: e72d108bbaa7e175ba8083825d959ca1ef7a0ced
Parents: 595981c 01b5018
Author: Michael Bolz <mi...@apache.org>
Authored: Mon Jan 13 14:08:49 2014 +0100
Committer: Michael Bolz <mi...@apache.org>
Committed: Mon Jan 13 14:08:49 2014 +0100
----------------------------------------------------------------------
.../processor/core/util/ClassHelper.java | 60 ++--
.../jpa/processor/api/ODataJPAProcessor.java | 2 +-
.../api/factory/JPQLBuilderFactory.java | 2 +-
.../api/model/JPAEdmComplexTypeView.java | 4 +-
.../processor/api/model/JPAEdmPropertyView.java | 9 +
.../jpa/processor/core/ODataEntityParser.java | 128 ++++----
.../core/ODataJPAProcessorDefault.java | 8 +
.../processor/core/access/data/JPAEntity.java | 28 +-
.../jpa/processor/core/access/data/JPALink.java | 318 ++++++++++++-------
.../core/access/data/JPAProcessorImpl.java | 18 +-
.../access/model/JPAEdmMappingModelService.java | 2 +-
.../core/access/model/JPAEdmNameBuilder.java | 9 +-
.../processor/core/model/JPAEdmMappingImpl.java | 1 -
.../processor/core/model/JPAEdmProperty.java | 81 +++--
.../core/model/JPAEdmReferentialConstraint.java | 2 +-
.../model/JPAEdmReferentialConstraintRole.java | 2 +-
.../processor/core/ODataEntityParserTest.java | 244 ++++++++++++++
.../core/ODataExpressionParserTest.java | 1 -
.../processor/core/ODataJPAContextImplTest.java | 1 -
.../core/ODataJPAProcessorDefaultTest.java | 2 +-
.../core/access/data/JPAEntityParserTest.java | 1 -
.../JPAEntityParserTestForStaticMethods.java | 1 -
.../core/access/data/JPAEntityTest.java | 3 +-
.../core/access/data/JPAExpandCallBackTest.java | 1 -
.../access/data/JPAFunctionContextTest.java | 1 -
.../processor/core/access/data/JPALinkTest.java | 23 ++
.../core/access/data/JPAProcessorImplTest.java | 2 +-
.../model/JPAEdmMappingModelServiceTest.java | 1 -
.../access/model/JPAEdmNameBuilderTest.java | 2 -
.../core/access/model/JPATypeConvertorTest.java | 1 -
.../edm/ODataJPAEdmProviderNegativeTest.java | 1 -
.../core/edm/ODataJPAEdmProviderTest.java | 1 -
.../core/jpql/JPQLBuilderFactoryTest.java | 6 +-
.../core/jpql/JPQLJoinContextTest.java | 1 -
.../jpql/JPQLJoinSelectSingleContextTest.java | 1 -
...PQLJoinSelectSingleStatementBuilderTest.java | 1 -
.../core/jpql/JPQLJoinStatementBuilderTest.java | 1 -
.../core/jpql/JPQLSelectContextImplTest.java | 1 -
.../jpql/JPQLSelectSingleContextImplTest.java | 1 -
.../JPQLSelectSingleStatementBuilderTest.java | 4 +-
.../jpql/JPQLSelectStatementBuilderTest.java | 4 +-
.../processor/core/mock/ODataContextMock.java | 48 +++
.../core/mock/ODataJPAContextMock.java | 15 +
.../processor/core/mock/ODataServiceMock.java | 106 +++++++
.../jpa/processor/core/mock/PathInfoMock.java | 51 +++
.../processor/core/mock/PathSegmentMock.java | 44 +++
.../processor/core/mock/data/EdmMockUtilV2.java | 27 +-
.../core/model/JPAEdmAssociationEndTest.java | 1 -
.../core/model/JPAEdmAssociationSetTest.java | 1 -
.../core/model/JPAEdmAssociationTest.java | 5 +-
.../core/model/JPAEdmBaseViewImplTest.java | 1 -
.../core/model/JPAEdmComplexTypeTest.java | 2 -
.../core/model/JPAEdmEntityContainerTest.java | 1 -
.../core/model/JPAEdmEntitySetTest.java | 1 -
.../core/model/JPAEdmEntityTypeTest.java | 1 -
.../core/model/JPAEdmFunctionImportTest.java | 1 -
.../jpa/processor/core/model/JPAEdmKeyTest.java | 1 -
.../processor/core/model/JPAEdmModelTest.java | 1 -
.../model/JPAEdmNavigationPropertyTest.java | 1 -
.../core/model/JPAEdmPropertyTest.java | 5 +-
.../JPAEdmReferentialConstraintRoleTest.java | 2 -
.../model/JPAEdmReferentialConstraintTest.java | 1 -
.../processor/core/model/JPAEdmSchemaTest.java | 1 -
.../core/model/JPAEdmTestModelView.java | 10 +-
.../core/model/_JPAEdmFunctionImportTest.java | 1 -
.../odata2/jpa/processor/ref/model/Address.java | 11 +
.../jpa/processor/ref/model/Category.java | 68 ++++
.../jpa/processor/ref/model/Customer.java | 80 +++++
.../jpa/processor/ref/model/Material.java | 28 +-
.../processor/ref/model/SalesOrderHeader.java | 86 +++--
.../src/main/resources/META-INF/persistence.xml | 4 +-
.../jpa/processor/ref/extension/OrderValue.java | 4 +-
.../extension/SalesOrderHeaderProcessor.java | 2 +-
.../SalesOrderProcessingExtension.java | 12 +-
.../extension/_SalesOrderHeaderProcessor.java | 2 +-
.../jpa/processor/ref/util/DataGenerator.java | 4 +-
.../main/resources/DataDeleteSQLs.properties | 22 --
.../src/main/resources/MaterialSQLs.properties | 30 --
.../src/main/resources/NoteSQLs.properties | 20 --
.../main/resources/SQLInsertConfig.properties | 22 --
.../src/main/resources/SQL_Cleanup.properties | 22 ++
.../resources/SQL_Insert_Category.properties | 22 ++
.../main/resources/SQL_Insert_Config.properties | 22 ++
.../resources/SQL_Insert_Customer.properties | 23 ++
.../resources/SQL_Insert_Material.properties | 30 ++
.../main/resources/SQL_Insert_Note.properties | 20 ++
.../SQL_Insert_SalesOrderHeader.properties | 30 ++
.../SQL_Insert_SalesOrderItem.properties | 30 ++
.../main/resources/SQL_Insert_Store.properties | 30 ++
.../resources/SalesOrderHeaderSQLs.properties | 30 --
.../resources/SalesOrderItemSQLs.properties | 30 --
.../src/main/resources/StoreSQLs.properties | 30 --
.../ep/ProducerConsumerIntegrationTest.java | 83 +++++
93 files changed, 1548 insertions(+), 557 deletions(-)
----------------------------------------------------------------------